From 31ab01dce077d1788974505a4781f1cbdb3a6e5d Mon Sep 17 00:00:00 2001 From: Aidan Smith Date: Tue, 7 Mar 2023 16:06:00 -0500 Subject: Change aidansmithdotdev/fine40 to use Encoder Map (#19912) Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/aidansmithdotdev/fine40/fine40.c | 20 ++++++++++---------- keyboards/aidansmithdotdev/fine40/info.json | 2 +- .../aidansmithdotdev/fine40/keymaps/default/keymap.c | 9 +++++++++ .../aidansmithdotdev/fine40/keymaps/default/rules.mk | 1 + .../aidansmithdotdev/fine40/keymaps/via/keymap.c | 9 +++++++++ .../aidansmithdotdev/fine40/keymaps/via/rules.mk | 3 ++- 6 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk (limited to 'keyboards/aidansmithdotdev/fine40') diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c index 73c453b6c0..0bd190321a 100644 --- a/keyboards/aidansmithdotdev/fine40/fine40.c +++ b/keyboards/aidansmithdotdev/fine40/fine40.c @@ -71,15 +71,15 @@ bool oled_task_kb(void) { #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - // Volume control - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return false; + if (!encoder_update_user(index, clockwise)) { + return false; + } + // Volume control + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; } #endif \ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index c41557a920..eb0ec8f143 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -27,7 +27,7 @@ }, "encoder": { "rotary": [ - {"pin_a": "D5", "pin_b": "B7", "resolution": 2} + {"pin_a": "B7", "pin_b": "D5", "resolution": 2} ] }, "layouts": { diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c index d157d9db31..69b9dacd27 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c @@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______ ), }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c index d157d9db31..69b9dacd27 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c @@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______ ), }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk index 036bd6d1c3..f1adcab005 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk +++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes -- cgit v1.2.3 From 36ab0c0aaa613fe0946e10133315b071c0d87012 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Mon, 3 Apr 2023 10:18:17 -0600 Subject: Add core/fallback encoder behaviour (#20320) --- keyboards/aidansmithdotdev/fine40/fine40.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'keyboards/aidansmithdotdev/fine40') diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c index 0bd190321a..2e60e7c921 100644 --- a/keyboards/aidansmithdotdev/fine40/fine40.c +++ b/keyboards/aidansmithdotdev/fine40/fine40.c @@ -68,18 +68,3 @@ bool oled_task_kb(void) { return(true); } #endif - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - // Volume control - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} -#endif \ No newline at end of file -- cgit v1.2.3 From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Apr 2023 01:18:44 +1000 Subject: Encodermap direction define. (#20454) --- keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c | 2 +- keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/aidansmithdotdev/fine40') diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c index 69b9dacd27..0010c9f97b 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c index 69b9dacd27..0010c9f97b 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c +++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/aidansmithdotdev/fine40/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/aidansmithdotdev/fine40') diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index eb0ec8f143..b7f34b0c12 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -15,8 +15,8 @@ "nkro": true }, "matrix_pins": { - "cols": [ "B3", "E6", "B1", "D7", "F7", "C6" ], - "rows": [ "F5", "F6", "B2", "B5", "F4", "D4", "B4", "B6" ] + "cols": ["B3", "E6", "B1", "D7", "F7", "C6"], + "rows": ["F5", "F6", "B2", "B5", "F4", "D4", "B4", "B6"] }, "processor": "atmega32u4", "url": "https://aidansmith.dev", -- cgit v1.2.3 From ef6a712899f4ac3cf75f989221351c1cfb57f3b9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 May 2023 19:09:59 +1000 Subject: Even more `info.json` whitespace cleanups (#20703) --- keyboards/aidansmithdotdev/fine40/info.json | 370 ++++++++++++++-------------- 1 file changed, 185 insertions(+), 185 deletions(-) (limited to 'keyboards/aidansmithdotdev/fine40') diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index b7f34b0c12..9663106607 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -33,203 +33,203 @@ "layouts": { "LAYOUT_2u_single_space": { "layout": [ - { "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": [4, 5], "x": 6, "y": 0 }, - { "matrix": [4, 4], "x": 7, "y": 0 }, - { "matrix": [4, 3], "x": 8, "y": 0 }, - { "matrix": [4, 2], "x": 9, "y": 0 }, - { "matrix": [4, 1], "x": 10, "y": 0 }, - { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 }, - { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 }, - { "matrix": [1, 1], "x": 1.25, "y": 1 }, - { "matrix": [1, 2], "x": 2.25, "y": 1 }, - { "matrix": [1, 3], "x": 3.25, "y": 1 }, - { "matrix": [1, 4], "x": 4.25, "y": 1 }, - { "matrix": [1, 5], "x": 5.25, "y": 1 }, - { "matrix": [5, 5], "x": 6.25, "y": 1 }, - { "matrix": [5, 4], "x": 7.25, "y": 1 }, - { "matrix": [5, 3], "x": 8.25, "y": 1 }, - { "matrix": [5, 2], "x": 9.25, "y": 1 }, - { "matrix": [5, 1], "x": 10.25, "y": 1 }, - { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 }, - { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "matrix": [6, 5], "x": 6.5, "y": 2 }, - { "matrix": [6, 4], "x": 7.5, "y": 2 }, - { "matrix": [6, 3], "x": 8.5, "y": 2 }, - { "matrix": [6, 2], "x": 9.5, "y": 2 }, - { "matrix": [6, 1], "x": 10.5, "y": 2 }, - { "matrix": [6, 0], "x": 11.5, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3 }, - { "matrix": [3, 4], "x": 4, "y": 3, "w": 1.25 }, - { "matrix": [3, 5], "x": 5.25, "y": 3, "w": 2 }, - { "matrix": [7, 5], "x": 7.25, "y": 3, "w": 1.25 }, - { "matrix": [7, 4], "x": 8.5, "y": 3 }, - { "matrix": [7, 3], "x": 9.5, "y": 3 }, - { "matrix": [7, 2], "x": 10.5, "y": 3 }, - { "matrix": [7, 1], "x": 11.5, "y": 3 }, - { "matrix": [7, 0], "x": 13, "y": 3 } + {"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": [4, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [5, 5], "x": 6.25, "y": 1}, + {"matrix": [5, 4], "x": 7.25, "y": 1}, + {"matrix": [5, 3], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 1], "x": 10.25, "y": 1}, + {"matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [6, 5], "x": 6.5, "y": 2}, + {"matrix": [6, 4], "x": 7.5, "y": 2}, + {"matrix": [6, 3], "x": 8.5, "y": 2}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 1], "x": 10.5, "y": 2}, + {"matrix": [6, 0], "x": 11.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2}, + {"matrix": [7, 5], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [7, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 2], "x": 10.5, "y": 3}, + {"matrix": [7, 1], "x": 11.5, "y": 3}, + {"matrix": [7, 0], "x": 13, "y": 3} ] }, "LAYOUT_2u_split_space": { "layout": [ - { "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": [4, 5], "x": 6, "y": 0 }, - { "matrix": [4, 4], "x": 7, "y": 0 }, - { "matrix": [4, 3], "x": 8, "y": 0 }, - { "matrix": [4, 2], "x": 9, "y": 0 }, - { "matrix": [4, 1], "x": 10, "y": 0 }, - { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 }, - { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 }, - { "matrix": [1, 1], "x": 1.25, "y": 1 }, - { "matrix": [1, 2], "x": 2.25, "y": 1 }, - { "matrix": [1, 3], "x": 3.25, "y": 1 }, - { "matrix": [1, 4], "x": 4.25, "y": 1 }, - { "matrix": [1, 5], "x": 5.25, "y": 1 }, - { "matrix": [5, 5], "x": 6.25, "y": 1 }, - { "matrix": [5, 4], "x": 7.25, "y": 1 }, - { "matrix": [5, 3], "x": 8.25, "y": 1 }, - { "matrix": [5, 2], "x": 9.25, "y": 1 }, - { "matrix": [5, 1], "x": 10.25, "y": 1 }, - { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 }, - { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "matrix": [6, 5], "x": 6.5, "y": 2 }, - { "matrix": [6, 4], "x": 7.5, "y": 2 }, - { "matrix": [6, 3], "x": 8.5, "y": 2 }, - { "matrix": [6, 2], "x": 9.5, "y": 2 }, - { "matrix": [6, 1], "x": 10.5, "y": 2 }, - { "matrix": [6, 0], "x": 11.5, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3, "w": 1.25 }, - { "matrix": [3, 4], "x": 4.25, "y": 3, "w": 2 }, - { "matrix": [7, 5], "x": 6.25, "y": 3, "w": 2 }, - { "matrix": [7, 4], "x": 8.25, "y": 3, "w": 1.25 }, - { "matrix": [7, 3], "x": 9.5, "y": 3 }, - { "matrix": [7, 2], "x": 10.5, "y": 3 }, - { "matrix": [7, 1], "x": 11.5, "y": 3 }, - { "matrix": [7, 0], "x": 13, "y": 3 } + {"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": [4, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [5, 5], "x": 6.25, "y": 1}, + {"matrix": [5, 4], "x": 7.25, "y": 1}, + {"matrix": [5, 3], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 1], "x": 10.25, "y": 1}, + {"matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [6, 5], "x": 6.5, "y": 2}, + {"matrix": [6, 4], "x": 7.5, "y": 2}, + {"matrix": [6, 3], "x": 8.5, "y": 2}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 1], "x": 10.5, "y": 2}, + {"matrix": [6, 0], "x": 11.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 2}, + {"matrix": [7, 5], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [7, 4], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 2], "x": 10.5, "y": 3}, + {"matrix": [7, 1], "x": 11.5, "y": 3}, + {"matrix": [7, 0], "x": 13, "y": 3} ] }, "LAYOUT_225u_split_space": { "layout": [ - { "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": [4, 5], "x": 6, "y": 0 }, - { "matrix": [4, 4], "x": 7, "y": 0 }, - { "matrix": [4, 3], "x": 8, "y": 0 }, - { "matrix": [4, 2], "x": 9, "y": 0 }, - { "matrix": [4, 1], "x": 10, "y": 0 }, - { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 }, - { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 }, - { "matrix": [1, 1], "x": 1.25, "y": 1 }, - { "matrix": [1, 2], "x": 2.25, "y": 1 }, - { "matrix": [1, 3], "x": 3.25, "y": 1 }, - { "matrix": [1, 4], "x": 4.25, "y": 1 }, - { "matrix": [1, 5], "x": 5.25, "y": 1 }, - { "matrix": [5, 5], "x": 6.25, "y": 1 }, - { "matrix": [5, 4], "x": 7.25, "y": 1 }, - { "matrix": [5, 3], "x": 8.25, "y": 1 }, - { "matrix": [5, 2], "x": 9.25, "y": 1 }, - { "matrix": [5, 1], "x": 10.25, "y": 1 }, - { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 }, - { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "matrix": [6, 5], "x": 6.5, "y": 2 }, - { "matrix": [6, 4], "x": 7.5, "y": 2 }, - { "matrix": [6, 3], "x": 8.5, "y": 2 }, - { "matrix": [6, 2], "x": 9.5, "y": 2 }, - { "matrix": [6, 1], "x": 10.5, "y": 2 }, - { "matrix": [6, 0], "x": 11.5, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3 }, - { "matrix": [3, 4], "x": 4, "y": 3, "w": 2.25 }, - { "matrix": [7, 5], "x": 6.25, "y": 3, "w": 2.25 }, - { "matrix": [7, 4], "x": 8.5, "y": 3 }, - { "matrix": [7, 3], "x": 9.5, "y": 3 }, - { "matrix": [7, 2], "x": 10.5, "y": 3 }, - { "matrix": [7, 1], "x": 11.5, "y": 3 }, - { "matrix": [7, 0], "x": 13, "y": 3 } + {"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": [4, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [5, 5], "x": 6.25, "y": 1}, + {"matrix": [5, 4], "x": 7.25, "y": 1}, + {"matrix": [5, 3], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 1], "x": 10.25, "y": 1}, + {"matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [6, 5], "x": 6.5, "y": 2}, + {"matrix": [6, 4], "x": 7.5, "y": 2}, + {"matrix": [6, 3], "x": 8.5, "y": 2}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 1], "x": 10.5, "y": 2}, + {"matrix": [6, 0], "x": 11.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [7, 5], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [7, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 2], "x": 10.5, "y": 3}, + {"matrix": [7, 1], "x": 11.5, "y": 3}, + {"matrix": [7, 0], "x": 13, "y": 3} ] }, "LAYOUT_7u_space": { "layout": [ - { "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": [4, 5], "x": 6, "y": 0 }, - { "matrix": [4, 4], "x": 7, "y": 0 }, - { "matrix": [4, 3], "x": 8, "y": 0 }, - { "matrix": [4, 2], "x": 9, "y": 0 }, - { "matrix": [4, 1], "x": 10, "y": 0 }, - { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 }, - { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 }, - { "matrix": [1, 1], "x": 1.25, "y": 1 }, - { "matrix": [1, 2], "x": 2.25, "y": 1 }, - { "matrix": [1, 3], "x": 3.25, "y": 1 }, - { "matrix": [1, 4], "x": 4.25, "y": 1 }, - { "matrix": [1, 5], "x": 5.25, "y": 1 }, - { "matrix": [5, 5], "x": 6.25, "y": 1 }, - { "matrix": [5, 4], "x": 7.25, "y": 1 }, - { "matrix": [5, 3], "x": 8.25, "y": 1 }, - { "matrix": [5, 2], "x": 9.25, "y": 1 }, - { "matrix": [5, 1], "x": 10.25, "y": 1 }, - { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 }, - { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "matrix": [6, 5], "x": 6.5, "y": 2 }, - { "matrix": [6, 4], "x": 7.5, "y": 2 }, - { "matrix": [6, 3], "x": 8.5, "y": 2 }, - { "matrix": [6, 2], "x": 9.5, "y": 2 }, - { "matrix": [6, 1], "x": 10.5, "y": 2 }, - { "matrix": [6, 0], "x": 11.5, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 }, - { "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25 }, - { "matrix": [3, 5], "x": 2.5, "y": 3, "w": 7 }, - { "matrix": [7, 3], "x": 9.5, "y": 3 }, - { "matrix": [7, 2], "x": 10.5, "y": 3 }, - { "matrix": [7, 1], "x": 11.5, "y": 3 }, - { "matrix": [7, 0], "x": 13, "y": 3 } + {"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": [4, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [5, 5], "x": 6.25, "y": 1}, + {"matrix": [5, 4], "x": 7.25, "y": 1}, + {"matrix": [5, 3], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 1], "x": 10.25, "y": 1}, + {"matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [6, 5], "x": 6.5, "y": 2}, + {"matrix": [6, 4], "x": 7.5, "y": 2}, + {"matrix": [6, 3], "x": 8.5, "y": 2}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 1], "x": 10.5, "y": 2}, + {"matrix": [6, 0], "x": 11.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 2.5, "y": 3, "w": 7}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 2], "x": 10.5, "y": 3}, + {"matrix": [7, 1], "x": 11.5, "y": 3}, + {"matrix": [7, 0], "x": 13, "y": 3} ] } } -- cgit v1.2.3