diff options
Diffstat (limited to 'keyboards/input_club')
22 files changed, 801 insertions, 1109 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index fdadcd5642..6d642e5d45 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -39,13 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -// For some reason, the rows are colums in the schematic, and vice versa -#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 } -#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Serial config (for communication between halves) */ #define SERIAL_USART_DRIVER SD1 // Only true for the master half #define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c index fbe1bdb77f..b8f0d4ae13 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "ergodox_infinity.h" #include <ch.h> #include <hal.h> #include <string.h> diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h index b9636b69be..99826529ed 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h @@ -80,74 +80,3 @@ inline void ergodox_led_all_set(uint8_t n) { } void ergodox_infinity_lcd_color(uint16_t r, uint16_t g, uint16_t b); - -#define XXX KC_NO - -#define LAYOUT_ergodox( \ - A80, A70, A60, A50, A40, A30, A20, \ - A81, A71, A61, A51, A41, A31, A21, \ - A82, A72, A62, A52, A42, A32, \ - A83, A73, A63, A53, A43, A33, A23, \ - A84, A74, A64, A54, A44, \ - A13, A03, \ - A04, \ - A34, A24, A14, \ -\ - B20, B30, B40, B50, B60, B70, B80, \ - B21, B31, B41, B51, B61, B71, B81, \ - B32, B42, B52, B62, B72, B82, \ - B23, B33, B43, B53, B63, B73, B83, \ - B44, B54, B64, B74, B84, \ - B03, B13, \ - B04, \ - B14, B24, B34 \ -) { \ - { XXX, XXX, XXX, A03, A04 }, \ - { XXX, XXX, XXX, A13, A14 }, \ - { A20, A21, XXX, A23, A24 }, \ - { A30, A31, A32, A33, A34 }, \ - { A40, A41, A42, A43, A44 }, \ - { A50, A51, A52, A53, A54 }, \ - { A60, A61, A62, A63, A64 }, \ - { A70, A71, A72, A73, A74 }, \ - { A80, A81, A82, A83, A84 }, \ - { XXX, XXX, XXX, B03, B04 }, \ - { XXX, XXX, XXX, B13, B14 }, \ - { B20, B21, XXX, B23, B24 }, \ - { B30, B31, B32, B33, B34 }, \ - { B40, B41, B42, B43, B44 }, \ - { B50, B51, B52, B53, B54 }, \ - { B60, B61, B62, B63, B64 }, \ - { B70, B71, B72, B73, B74 }, \ - { B80, B81, B82, B83, B84 } \ -} - -#define LAYOUT_ergodox_pretty( \ - A80, A70, A60, A50, A40, A30, A20, B20, B30, B40, B50, B60, B70, B80, \ - A81, A71, A61, A51, A41, A31, A21, B21, B31, B41, B51, B61, B71, B81, \ - A82, A72, A62, A52, A42, A32, B32, B42, B52, B62, B72, B82, \ - A83, A73, A63, A53, A43, A33, A23, B23, B33, B43, B53, B63, B73, B83, \ - A84, A74, A64, A54, A44, B44, B54, B64, B74, B84, \ - A13, A03, B03, B13, \ - A04, B04, \ - A34, A24, A14, B14, B24, B34 \ -) { \ - { XXX, XXX, XXX, A03, A04 }, \ - { XXX, XXX, XXX, A13, A14 }, \ - { A20, A21, XXX, A23, A24 }, \ - { A30, A31, A32, A33, A34 }, \ - { A40, A41, A42, A43, A44 }, \ - { A50, A51, A52, A53, A54 }, \ - { A60, A61, A62, A63, A64 }, \ - { A70, A71, A72, A73, A74 }, \ - { A80, A81, A82, A83, A84 }, \ - { XXX, XXX, XXX, B03, B04 }, \ - { XXX, XXX, XXX, B13, B14 }, \ - { B20, B21, XXX, B23, B24 }, \ - { B30, B31, B32, B33, B34 }, \ - { B40, B41, B42, B43, B44 }, \ - { B50, B51, B52, B53, B54 }, \ - { B60, B61, B62, B63, B64 }, \ - { B70, B71, B72, B73, B74 }, \ - { B80, B81, B82, B83, B84 } \ -} diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index 635355d490..ca6aa92b5d 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -6,57 +6,206 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "led_matrix": { + "driver": "IS31FL3731" + }, + "matrix_pins": { + "cols": ["D1", "D4", "D5", "D6", "D7"], + "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"] + }, + "diode_direction": "ROW2COL", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", "community_layouts": ["ergodox"], "layouts": { - "LAYOUT_ergodox": { - "layout": [ - {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, - {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, - {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, - {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5}, - {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, - - {"x":6, "y":5}, {"x":7, "y":5}, - {"x":7, "y":6}, - {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, - - - {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, - {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, - {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, - {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, - {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, - - - {"x":9, "y":5}, {"x":10, "y":5}, - {"x":9, "y":6}, - {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} - ] - }, - "LAYOUT_ergodox_pretty": { - "layout": [ - {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25}, - {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5}, + "LAYOUT_ergodox": { + "layout": [ + {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5}, + {"matrix": [7, 0], "x": 1.5, "y": 0.375}, + {"matrix": [6, 0], "x": 2.5, "y": 0.125}, + {"matrix": [5, 0], "x": 3.5, "y": 0}, + {"matrix": [4, 0], "x": 4.5, "y": 0.125}, + {"matrix": [3, 0], "x": 5.5, "y": 0.25}, + {"matrix": [2, 0], "x": 6.5, "y": 0.25}, + + {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5}, + {"matrix": [7, 1], "x": 1.5, "y": 1.375}, + {"matrix": [6, 1], "x": 2.5, "y": 1.125}, + {"matrix": [5, 1], "x": 3.5, "y": 1}, + {"matrix": [4, 1], "x": 4.5, "y": 1.125}, + {"matrix": [3, 1], "x": 5.5, "y": 1.25}, + {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5}, + + {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 2.375}, + {"matrix": [6, 2], "x": 2.5, "y": 2.125}, + {"matrix": [5, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2.125}, + {"matrix": [3, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5}, + {"matrix": [7, 3], "x": 1.5, "y": 3.375}, + {"matrix": [6, 3], "x": 2.5, "y": 3.125}, + {"matrix": [5, 3], "x": 3.5, "y": 3}, + {"matrix": [4, 3], "x": 4.5, "y": 3.125}, + {"matrix": [3, 3], "x": 5.5, "y": 3.25}, + {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5}, + + {"matrix": [8, 4], "x": 0.5, "y": 4.375}, + {"matrix": [7, 4], "x": 1.5, "y": 4.375}, + {"matrix": [6, 4], "x": 2.5, "y": 4.125}, + {"matrix": [5, 4], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4.125}, + + {"matrix": [1, 3], "x": 6, "y": 5}, + {"matrix": [0, 3], "x": 7, "y": 5}, + + {"matrix": [0, 4], "x": 7, "y": 6}, + {"matrix": [3, 4], "x": 5, "y": 6, "h": 2}, + {"matrix": [2, 4], "x": 6, "y": 6, "h": 2}, + + {"matrix": [1, 4], "x": 7, "y": 7}, + + {"matrix": [11, 0], "x": 9.5, "y": 0.25}, + {"matrix": [12, 0], "x": 10.5, "y": 0.25}, + {"matrix": [13, 0], "x": 11.5, "y": 0.125}, + {"matrix": [14, 0], "x": 12.5, "y": 0}, + {"matrix": [15, 0], "x": 13.5, "y": 0.125}, + {"matrix": [16, 0], "x": 14.5, "y": 0.375}, + {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5}, + + {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5}, + {"matrix": [12, 1], "x": 10.5, "y": 1.25}, + {"matrix": [13, 1], "x": 11.5, "y": 1.125}, + {"matrix": [14, 1], "x": 12.5, "y": 1}, + {"matrix": [15, 1], "x": 13.5, "y": 1.125}, + {"matrix": [16, 1], "x": 14.5, "y": 1.375}, + {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5}, + + {"matrix": [12, 2], "x": 10.5, "y": 2.25}, + {"matrix": [13, 2], "x": 11.5, "y": 2.125}, + {"matrix": [14, 2], "x": 12.5, "y": 2}, + {"matrix": [15, 2], "x": 13.5, "y": 2.125}, + {"matrix": [16, 2], "x": 14.5, "y": 2.375}, + {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5}, + {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5}, + + {"matrix": [12, 3], "x": 10.5, "y": 3.25}, + {"matrix": [13, 3], "x": 11.5, "y": 3.125}, + {"matrix": [14, 3], "x": 12.5, "y": 3}, + {"matrix": [15, 3], "x": 13.5, "y": 3.125}, + {"matrix": [16, 3], "x": 14.5, "y": 3.375}, + {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5}, + + {"matrix": [13, 4], "x": 11.5, "y": 4.125}, + {"matrix": [14, 4], "x": 12.5, "y": 4}, + {"matrix": [15, 4], "x": 13.5, "y": 4.125}, + {"matrix": [16, 4], "x": 14.5, "y": 4.375}, + {"matrix": [17, 4], "x": 15.5, "y": 4.375}, + + {"matrix": [9, 3], "x": 9, "y": 5}, + {"matrix": [10, 3], "x": 10, "y": 5}, + + {"matrix": [9, 4], "x": 9, "y": 6}, + + {"matrix": [10, 4], "x": 9, "y": 7}, + + {"matrix": [11, 4], "x": 10, "y": 6, "h": 2}, + {"matrix": [12, 4], "x": 11, "y": 6, "h": 2} + ] + }, + "LAYOUT_ergodox_pretty": { + "layout": [ + {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5}, + {"matrix": [7, 0], "x": 1.5, "y": 0.375}, + {"matrix": [6, 0], "x": 2.5, "y": 0.125}, + {"matrix": [5, 0], "x": 3.5, "y": 0}, + {"matrix": [4, 0], "x": 4.5, "y": 0.125}, + {"matrix": [3, 0], "x": 5.5, "y": 0.25}, + {"matrix": [2, 0], "x": 6.5, "y": 0.25}, + + {"matrix": [11, 0], "x": 9.5, "y": 0.25}, + {"matrix": [12, 0], "x": 10.5, "y": 0.25}, + {"matrix": [13, 0], "x": 11.5, "y": 0.125}, + {"matrix": [14, 0], "x": 12.5, "y": 0}, + {"matrix": [15, 0], "x": 13.5, "y": 0.125}, + {"matrix": [16, 0], "x": 14.5, "y": 0.375}, + {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5}, + + {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5}, + {"matrix": [7, 1], "x": 1.5, "y": 1.375}, + {"matrix": [6, 1], "x": 2.5, "y": 1.125}, + {"matrix": [5, 1], "x": 3.5, "y": 1}, + {"matrix": [4, 1], "x": 4.5, "y": 1.125}, + {"matrix": [3, 1], "x": 5.5, "y": 1.25}, + {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5}, + + {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5}, + {"matrix": [12, 1], "x": 10.5, "y": 1.25}, + {"matrix": [13, 1], "x": 11.5, "y": 1.125}, + {"matrix": [14, 1], "x": 12.5, "y": 1}, + {"matrix": [15, 1], "x": 13.5, "y": 1.125}, + {"matrix": [16, 1], "x": 14.5, "y": 1.375}, + {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5}, + + {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 2.375}, + {"matrix": [6, 2], "x": 2.5, "y": 2.125}, + {"matrix": [5, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2.125}, + {"matrix": [3, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [12, 2], "x": 10.5, "y": 2.25}, + {"matrix": [13, 2], "x": 11.5, "y": 2.125}, + {"matrix": [14, 2], "x": 12.5, "y": 2}, + {"matrix": [15, 2], "x": 13.5, "y": 2.125}, + {"matrix": [16, 2], "x": 14.5, "y": 2.375}, + {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5}, + + {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5}, + {"matrix": [7, 3], "x": 1.5, "y": 3.375}, + {"matrix": [6, 3], "x": 2.5, "y": 3.125}, + {"matrix": [5, 3], "x": 3.5, "y": 3}, + {"matrix": [4, 3], "x": 4.5, "y": 3.125}, + {"matrix": [3, 3], "x": 5.5, "y": 3.25}, + {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5}, + + {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5}, + {"matrix": [12, 3], "x": 10.5, "y": 3.25}, + {"matrix": [13, 3], "x": 11.5, "y": 3.125}, + {"matrix": [14, 3], "x": 12.5, "y": 3}, + {"matrix": [15, 3], "x": 13.5, "y": 3.125}, + {"matrix": [16, 3], "x": 14.5, "y": 3.375}, + {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5}, - {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5}, - {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5}, + {"matrix": [8, 4], "x": 0.5, "y": 4.375}, + {"matrix": [7, 4], "x": 1.5, "y": 4.375}, + {"matrix": [6, 4], "x": 2.5, "y": 4.125}, + {"matrix": [5, 4], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4.125}, + {"matrix": [13, 4], "x": 11.5, "y": 4.125}, + {"matrix": [14, 4], "x": 12.5, "y": 4}, + {"matrix": [15, 4], "x": 13.5, "y": 4.125}, + {"matrix": [16, 4], "x": 14.5, "y": 4.375}, + {"matrix": [17, 4], "x": 15.5, "y": 4.375}, - {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, - {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5}, + {"matrix": [1, 3], "x": 6, "y": 5}, + {"matrix": [0, 3], "x": 7, "y": 5}, + {"matrix": [9, 3], "x": 9, "y": 5}, + {"matrix": [10, 3], "x": 10, "y": 5}, - {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5}, - {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5}, + {"matrix": [0, 4], "x": 7, "y": 6}, + {"matrix": [9, 4], "x": 9, "y": 6}, + {"matrix": [3, 4], "x": 5, "y": 6, "h": 2}, + {"matrix": [2, 4], "x": 6, "y": 6, "h": 2}, - {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, - {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375}, + {"matrix": [1, 4], "x": 7, "y": 7}, + {"matrix": [10, 4], "x": 9, "y": 7}, - {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, - {"x":7, "y":6}, {"x":9, "y":6}, - {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2} - ] + {"matrix": [11, 4], "x": 10, "y": 6, "h": 2}, + {"matrix": [12, 4], "x": 11, "y": 6, "h": 2} + ] + } } - } } diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h index d5ed0a8e9e..3fef45f887 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h +++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h @@ -6,7 +6,6 @@ #define COMBO_TERM 20 #define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #undef MOUSEKEY_DELAY diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index 88bd6b0041..4f1b0c0188 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -19,4 +19,3 @@ SERIAL_DRIVER = usart ST7565_ENABLE = yes LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h deleted file mode 100644 index c4ec6a4a7d..0000000000 --- a/keyboards/input_club/infinity60/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/input_club/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c deleted file mode 100644 index 73751140ea..0000000000 --- a/keyboards/input_club/infinity60/infinity60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "infinity60.h" diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h deleted file mode 100644 index 301003e8b9..0000000000 --- a/keyboards/input_club/infinity60/led/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json new file mode 100644 index 0000000000..7a9b924a71 --- /dev/null +++ b/keyboards/input_club/infinity60/led/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h deleted file mode 100644 index 1207dffc78..0000000000 --- a/keyboards/input_club/infinity60/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2015 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 } - - diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/info.json new file mode 100644 index 0000000000..a5afb37751 --- /dev/null +++ b/keyboards/input_club/infinity60/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"], + "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h index aa7dca86d3..2a4c7d057c 100644 --- a/keyboards/input_club/k_type/config.h +++ b/keyboards/input_club/k_type/config.h @@ -18,22 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json index 60522333d7..7279c8a933 100644 --- a/keyboards/input_club/k_type/info.json +++ b/keyboards/input_club/k_type/info.json @@ -8,6 +8,14 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "custom" + }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"], + "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", @@ -15,103 +23,106 @@ "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - {"x": 0, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 12, "y": 0}, + {"matrix": [1, 1], "x": 13, "y": 0}, + {"matrix": [1, 2], "x": 14, "y": 0}, - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, + {"matrix": [1, 3], "x": 15.25, "y": 0}, + {"matrix": [1, 4], "x": 16.25, "y": 0}, + {"matrix": [1, 5], "x": 17.25, "y": 0}, - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 6], "x": 0, "y": 1.5}, + {"matrix": [1, 7], "x": 1, "y": 1.5}, + {"matrix": [1, 8], "x": 2, "y": 1.5}, + {"matrix": [1, 9], "x": 3, "y": 1.5}, + {"matrix": [2, 0], "x": 4, "y": 1.5}, + {"matrix": [2, 1], "x": 5, "y": 1.5}, + {"matrix": [2, 2], "x": 6, "y": 1.5}, + {"matrix": [2, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [2, 5], "x": 9, "y": 1.5}, + {"matrix": [2, 6], "x": 10, "y": 1.5}, + {"matrix": [2, 7], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [3, 0], "x": 13, "y": 1.5, "w": 2}, - {"x": 15.25, "y": 1.5}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5}, + {"matrix": [3, 2], "x": 15.25, "y": 1.5}, + {"matrix": [3, 3], "x": 16.25, "y": 1.5}, + {"matrix": [3, 4], "x": 17.25, "y": 1.5}, - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 6], "x": 1.5, "y": 2.5}, + {"matrix": [3, 7], "x": 2.5, "y": 2.5}, + {"matrix": [3, 8], "x": 3.5, "y": 2.5}, + {"matrix": [3, 9], "x": 4.5, "y": 2.5}, + {"matrix": [4, 0], "x": 5.5, "y": 2.5}, + {"matrix": [4, 1], "x": 6.5, "y": 2.5}, + {"matrix": [4, 2], "x": 7.5, "y": 2.5}, + {"matrix": [4, 3], "x": 8.5, "y": 2.5}, + {"matrix": [4, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [4, 6], "x": 11.5, "y": 2.5}, + {"matrix": [4, 7], "x": 12.5, "y": 2.5}, + {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5}, - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, + {"matrix": [5, 0], "x": 15.25, "y": 2.5}, + {"matrix": [5, 1], "x": 16.25, "y": 2.5}, + {"matrix": [5, 2], "x": 17.25, "y": 2.5}, - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [5, 3], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [5, 4], "x": 1.75, "y": 3.5}, + {"matrix": [5, 5], "x": 2.75, "y": 3.5}, + {"matrix": [5, 6], "x": 3.75, "y": 3.5}, + {"matrix": [5, 7], "x": 4.75, "y": 3.5}, + {"matrix": [5, 8], "x": 5.75, "y": 3.5}, + {"matrix": [5, 9], "x": 6.75, "y": 3.5}, + {"matrix": [6, 0], "x": 7.75, "y": 3.5}, + {"matrix": [6, 1], "x": 8.75, "y": 3.5}, + {"matrix": [6, 2], "x": 9.75, "y": 3.5}, + {"matrix": [6, 3], "x": 10.75, "y": 3.5}, + {"matrix": [6, 4], "x": 11.75, "y": 3.5}, + {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25}, - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [6, 8], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 4.5}, + {"matrix": [7, 1], "x": 3.25, "y": 4.5}, + {"matrix": [7, 2], "x": 4.25, "y": 4.5}, + {"matrix": [7, 3], "x": 5.25, "y": 4.5}, + {"matrix": [7, 4], "x": 6.25, "y": 4.5}, + {"matrix": [7, 5], "x": 7.25, "y": 4.5}, + {"matrix": [7, 6], "x": 8.25, "y": 4.5}, + {"matrix": [7, 7], "x": 9.25, "y": 4.5}, + {"matrix": [7, 8], "x": 10.25, "y": 4.5}, + {"matrix": [7, 9], "x": 11.25, "y": 4.5}, + {"matrix": [8, 1], "x": 12.25, "y": 4.5, "w": 2.75}, - {"x": 16.25, "y": 4.5}, + {"matrix": [8, 3], "x": 16.25, "y": 4.5}, - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.25}, - {"x": 11.25, "y": 5.5, "w": 1.25}, - {"x": 12.5, "y": 5.5, "w": 1.25}, - {"x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [8, 4], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [8, 5], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [8, 6], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [8, 7], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [8, 8], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [8, 9], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [9, 0], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [9, 1], "x": 13.75, "y": 5.5, "w": 1.25}, - {"x": 15.25, "y": 5.5}, - {"x": 16.25, "y": 5.5}, - {"x": 17.25, "y": 5.5} + {"matrix": [9, 2], "x": 15.25, "y": 5.5}, + {"matrix": [9, 3], "x": 16.25, "y": 5.5}, + {"matrix": [9, 4], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c index 1a38a939f2..23a3895408 100644 --- a/keyboards/input_club/k_type/k_type.c +++ b/keyboards/input_club/k_type/k_type.c @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "k_type.h" - +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/input_club/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h deleted file mode 100644 index 077c013066..0000000000 --- a/keyboards/input_club/k_type/k_type.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2017 Input Club - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_tkl_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \ - k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k32, k33, k34, \ - k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, k51, k52, \ - k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k66, \ - k68, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k81, k83, \ - k84, k85, k86, k87, k88, k89, k90, k91, k92, k93, k94 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \ - { k60, k61, k62, k63, k64, XXX, k66, XXX, k68, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \ - { XXX, k81, XXX, k83, k84, k85, k86, k87, k88, k89 }, \ - { k90, k91, k92, k93, k94, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk index 3e5006cd5a..450eb9a023 100644 --- a/keyboards/input_club/k_type/rules.mk +++ b/keyboards/input_club/k_type/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output # RGB options RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = custom # Additional files for RGB lighting SRC += k_type-rgbdriver.c diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h index 7567d0ef50..067b7f4e59 100644 --- a/keyboards/input_club/whitefox/config.h +++ b/keyboards/input_club/whitefox/config.h @@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D4, D5, D6, D7, C1, C2 } -#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LED_BRIGHTNESS_LO 100 #define LED_BRIGHTNESS_HI 255 diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json index 0cd34f8312..02dd975752 100644 --- a/keyboards/input_club/whitefox/info.json +++ b/keyboards/input_club/whitefox/info.json @@ -7,545 +7,560 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "led_matrix": { + "driver": "IS31FL3731" + }, + "matrix_pins": { + "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"], + "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"], + "layout_aliases": { + "LAYOUT": "LAYOUT_all", + "LAYOUT_aria": "LAYOUT_65_ansi_blocker", + "LAYOUT_iso": "LAYOUT_65_iso", + "LAYOUT_truefox": "LAYOUT_65_ansi_blocker_split_bs", + "LAYOUT_vanilla": "LAYOUT_65_ansi" + }, "layouts": { "LAYOUT_all": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 2, "w": 1.25}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2}, + {"matrix": [4, 8], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 2], "x": 1.25, "y": 3}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4}, + {"matrix": [7, 3], "x": 11, "y": 4}, + {"matrix": [7, 4], "x": 12, "y": 4}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w": 2}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4}, + {"matrix": [7, 3], "x": 11, "y": 4}, + {"matrix": [7, 4], "x": 12, "y": 4}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w": 2}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4, "w": 1.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4, "w": 1.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_iso": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w": 2}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2}, + {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 2], "x": 1.25, "y": 3}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4}, + {"matrix": [7, 3], "x": 11, "y": 4}, + {"matrix": [7, 4], "x": 12, "y": 4}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w": 2}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2}, + {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y" :3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 2], "x": 1.25, "y": 3}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4, "w": 1.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker_split_bs": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 8], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [3, 0], "x": 11.5, "y": 1}, + {"matrix": [3, 1], "x": 12.5, "y": 1}, + {"matrix": [3, 3], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"x": 15, "y": 2}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [3, 8], "x": 4.75, "y": 2}, + {"matrix": [4, 0], "x": 5.75, "y": 2}, + {"matrix": [4, 1], "x": 6.75, "y": 2}, + {"matrix": [4, 2], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [4, 6], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2}, + {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [5, 0], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y" :3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 2], "x": 1.25, "y": 3}, + {"matrix": [5, 3], "x": 2.25, "y": 3}, + {"matrix": [5, 4], "x": 3.25, "y": 3}, + {"matrix": [5, 5], "x": 4.25, "y": 3}, + {"matrix": [5, 6], "x": 5.25, "y": 3}, + {"matrix": [5, 7], "x": 6.25, "y": 3}, + {"matrix": [5, 8], "x": 7.25, "y": 3}, + {"matrix": [6, 0], "x": 8.25, "y": 3}, + {"matrix": [6, 1], "x": 9.25, "y": 3}, + {"matrix": [6, 2], "x": 10.25, "y": 3}, + {"matrix": [6, 3], "x": 11.25, "y": 3}, + {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 14, "y": 3}, + {"matrix": [6, 6], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4, "w": 1.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 13, "y": 4}, + {"matrix": [7, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] } } diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk index 2a45fc02dd..9b9b2ed739 100644 --- a/keyboards/input_club/whitefox/rules.mk +++ b/keyboards/input_club/whitefox/rules.mk @@ -11,7 +11,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = IS31FL3731 # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c index 168eccbb12..4aa12586f3 100644 --- a/keyboards/input_club/whitefox/whitefox.c +++ b/keyboards/input_club/whitefox/whitefox.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "whitefox.h" +#include "quantum.h" #ifdef LED_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { diff --git a/keyboards/input_club/whitefox/whitefox.h b/keyboards/input_club/whitefox/whitefox.h deleted file mode 100644 index 7e6648e5e7..0000000000 --- a/keyboards/input_club/whitefox/whitefox.h +++ /dev/null @@ -1,238 +0,0 @@ -/* -Copyright 2014 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \ - k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_65_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k48, k50, \ - k51, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \ - { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ -#define LAYOUT_65_ansi_blocker( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k48, k50, \ - k51, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \ - { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ -#define LAYOUT_65_ansi_blocker_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k48, k50, \ - k51, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \ - { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_65_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \ - k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ -#define LAYOUT_65_iso_blocker( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \ - k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \ -} - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ -#define LAYOUT_65_iso_blocker_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \ - k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k33, \ - k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \ - k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k70, k71, k72, k73, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \ -} - -#define LAYOUT LAYOUT_all -#define LAYOUT_aria LAYOUT_65_ansi_blocker -#define LAYOUT_iso LAYOUT_65_iso -#define LAYOUT_truefox LAYOUT_65_ansi_blocker_split_bs -#define LAYOUT_vanilla LAYOUT_65_ansi |