diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-03 15:50:31 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 15:50:31 +1000 |
| commit | 2d9140af53e4e5bbc5cd50a2b6f3eda20ed8f71e (patch) | |
| tree | f3d0e760913e9334f25389c8afd60411d625a36f | |
| parent | 46844347c4f4b5f8b50ea22dd06c7555a86fc94b (diff) | |
Fix a handful of CLI errors (#20321)
23 files changed, 154 insertions, 186 deletions
diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json index 4b2d928775..c7702ee3e8 100644 --- a/keyboards/frobiac/redtilt/info.json +++ b/keyboards/frobiac/redtilt/info.json | |||
| @@ -34,59 +34,59 @@ | |||
| 34 | "layouts": { | 34 | "layouts": { |
| 35 | "LAYOUT": { | 35 | "LAYOUT": { |
| 36 | "layout": [ | 36 | "layout": [ |
| 37 | {"matrix": [0, 0], "label":"", "x":0, "y":2}, | 37 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 38 | {"matrix": [0, 1], "label":"K", "x":1, "y":2}, | 38 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| 39 | {"matrix": [0, 2], "label":"U", "x":2, "y":1.5}, | 39 | {"matrix": [0, 2], "x": 2, "y": 0.5}, |
| 40 | {"matrix": [0, 3], "label":"Q", "x":3, "y":1}, | 40 | {"matrix": [0, 3], "x": 3, "y": 0}, |
| 41 | {"matrix": [0, 4], "label":".", "x":4, "y":1}, | 41 | {"matrix": [0, 4], "x": 4, "y": 0}, |
| 42 | {"matrix": [0, 5], "label":"J", "x":5, "y":1}, | 42 | {"matrix": [0, 5], "x": 5, "y": 0}, |
| 43 | 43 | ||
| 44 | {"matrix": [4, 0], "label":"P", "x":8, "y":1}, | 44 | {"matrix": [4, 0], "x": 7, "y": 0}, |
| 45 | {"matrix": [4, 1], "label":"C", "x":9, "y":1}, | 45 | {"matrix": [4, 1], "x": 8, "y": 0}, |
| 46 | {"matrix": [4, 2], "label":"L", "x":10, "y":1}, | 46 | {"matrix": [4, 2], "x": 9, "y": 0}, |
| 47 | {"matrix": [4, 3], "label":"M", "x":11, "y":1.5}, | 47 | {"matrix": [4, 3], "x": 10, "y": 0.5}, |
| 48 | {"matrix": [4, 4], "label":"F", "x":12, "y":2}, | 48 | {"matrix": [4, 4], "x": 11, "y": 0}, |
| 49 | {"matrix": [4, 5], "label":"", "x":13, "y":2}, | 49 | {"matrix": [4, 5], "x": 12, "y": 0}, |
| 50 | 50 | ||
| 51 | {"matrix": [1, 0], "label":" ", "x":0, "y":3}, | 51 | {"matrix": [1, 0], "x": 0, "y": 1}, |
| 52 | {"matrix": [1, 1], "label":"H", "x":1, "y":3}, | 52 | {"matrix": [1, 1], "x": 1, "y": 1}, |
| 53 | {"matrix": [1, 2], "label":"I", "x":2, "y":2.5}, | 53 | {"matrix": [1, 2], "x": 2, "y": 1.5}, |
| 54 | {"matrix": [1, 3], "label":"E", "x":3, "y":2}, | 54 | {"matrix": [1, 3], "x": 3, "y": 1}, |
| 55 | {"matrix": [1, 4], "label":"A", "x":4, "y":2}, | 55 | {"matrix": [1, 4], "x": 4, "y": 1}, |
| 56 | {"matrix": [1, 5], "label":"O", "x":5, "y":2}, | 56 | {"matrix": [1, 5], "x": 5, "y": 1}, |
| 57 | 57 | ||
| 58 | {"matrix": [5, 0], "label":"D", "x":8, "y":2}, | 58 | {"matrix": [5, 0], "x": 7, "y": 1}, |
| 59 | {"matrix": [5, 1], "label":"T", "x":9, "y":2}, | 59 | {"matrix": [5, 1], "x": 8, "y": 1}, |
| 60 | {"matrix": [5, 2], "label":"R", "x":10, "y":2}, | 60 | {"matrix": [5, 2], "x": 9, "y": 1}, |
| 61 | {"matrix": [5, 3], "label":"N", "x":11, "y":2.5}, | 61 | {"matrix": [5, 3], "x": 10, "y": 1.5}, |
| 62 | {"matrix": [5, 4], "label":"S", "x":12, "y":3}, | 62 | {"matrix": [5, 4], "x": 11, "y": 1}, |
| 63 | {"matrix": [5, 5], "label":"", "x":13, "y":3}, | 63 | {"matrix": [5, 5], "x": 12, "y": 1}, |
| 64 | 64 | ||
| 65 | {"matrix": [2, 0], "label":"", "x":0, "y":4}, | 65 | {"matrix": [2, 0], "x": 0, "y": 2}, |
| 66 | {"matrix": [2, 1], "label":"X", "x":1, "y":4}, | 66 | {"matrix": [2, 1], "x": 1, "y": 2}, |
| 67 | {"matrix": [2, 2], "label":"Y", "x":2, "y":3.5}, | 67 | {"matrix": [2, 2], "x": 2, "y": 2.5}, |
| 68 | {"matrix": [2, 3], "label":"-", "x":3, "y":3}, | 68 | {"matrix": [2, 3], "x": 3, "y": 2}, |
| 69 | {"matrix": [2, 4], "label":",", "x":4, "y":3}, | 69 | {"matrix": [2, 4], "x": 4, "y": 2}, |
| 70 | {"matrix": [2, 5], "label":"/", "x":5, "y":3}, | 70 | {"matrix": [2, 5], "x": 5, "y": 2}, |
| 71 | 71 | ||
| 72 | {"matrix": [6, 0], "label":"B", "x":8, "y":3}, | 72 | {"matrix": [6, 0], "x": 7, "y": 2}, |
| 73 | {"matrix": [6, 1], "label":"G", "x":9, "y":3}, | 73 | {"matrix": [6, 1], "x": 8, "y": 2}, |
| 74 | {"matrix": [6, 2], "label":"W", "x":10, "y":3}, | 74 | {"matrix": [6, 2], "x": 9, "y": 2}, |
| 75 | {"matrix": [6, 3], "label":"V", "x":11, "y":3.5}, | 75 | {"matrix": [6, 3], "x": 10, "y": 2.5}, |
| 76 | {"matrix": [6, 4], "label":"Z", "x":12, "y":4}, | 76 | {"matrix": [6, 4], "x": 11, "y": 2}, |
| 77 | {"matrix": [6, 5], "label":"", "x":13, "y":4}, | 77 | {"matrix": [6, 5], "x": 12, "y": 2}, |
| 78 | 78 | ||
| 79 | {"matrix": [3, 0], "label":"", "x":0, "y":1}, | 79 | {"matrix": [3, 0], "x": 0, "y": 3}, |
| 80 | {"matrix": [3, 1], "label":"", "x":1, "y":1}, | 80 | {"matrix": [3, 1], "x": 1, "y": 3}, |
| 81 | {"matrix": [3, 3], "label":"Gui", "x":3, "y":4}, | 81 | {"matrix": [3, 3], "x": 3, "y": 3}, |
| 82 | {"matrix": [3, 4], "label":"Tab", "x":4, "y":4}, | 82 | {"matrix": [3, 4], "x": 4, "y": 3}, |
| 83 | {"matrix": [3, 5], "label":"Spc", "x":5, "y":4}, | 83 | {"matrix": [3, 5], "x": 5, "y": 3}, |
| 84 | 84 | ||
| 85 | {"matrix": [7, 0], "label":"L2", "x":8, "y":4}, | 85 | {"matrix": [7, 0], "x": 7, "y": 3}, |
| 86 | {"matrix": [7, 1], "label":"Sh", "x":9, "y":4}, | 86 | {"matrix": [7, 1], "x": 8, "y": 3}, |
| 87 | {"matrix": [7, 2], "label":"L3", "x":10, "y":4}, | 87 | {"matrix": [7, 2], "x": 9, "y": 3}, |
| 88 | {"matrix": [7, 4], "label":"Fx", "x":12, "y":1}, | 88 | {"matrix": [7, 4], "x": 11, "y": 3}, |
| 89 | {"matrix": [7, 5], "label":"", "x":13, "y":1} | 89 | {"matrix": [7, 5], "x": 12, "y": 3} |
| 90 | ] | 90 | ] |
| 91 | } | 91 | } |
| 92 | } | 92 | } |
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 8eff4ae0df..194874b5cf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h | |||
| @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | 18 | ||
| 19 | #pragma once | 19 | #pragma once |
| 20 | 20 | ||
| 21 | |||
| 22 | #define DIODE_DIRECTION COL2ROW | ||
| 23 | |||
| 24 | #define ROTATIONAL_TRANSFORM_ANGLE -25 | 21 | #define ROTATIONAL_TRANSFORM_ANGLE -25 |
| 25 | #define POINTING_DEVICE_INVERT_X | 22 | #define POINTING_DEVICE_INVERT_X |
| 26 | 23 | ||
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h index 46db66470b..78343dc888 100644 --- a/keyboards/lfkeyboards/lfk78/revj/config.h +++ b/keyboards/lfkeyboards/lfk78/revj/config.h | |||
| @@ -1,16 +1,3 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | /* | ||
| 4 | * Keyboard Matrix Assignments | ||
| 5 | * | ||
| 6 | * Change this to how you wired your keyboard | ||
| 7 | * COLS: AVR pins used for columns, left to right | ||
| 8 | * ROWS: AVR pins used for rows, top to bottom | ||
| 9 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
| 10 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | #define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 } | ||
| 14 | #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 } | ||
| 15 | |||
| 16 | #define RGBLED_NUM 27 | 3 | #define RGBLED_NUM 27 |
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 01bd6835ff..47911a04a2 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json | |||
| @@ -8,6 +8,11 @@ | |||
| 8 | "pid": "0x0059", | 8 | "pid": "0x0059", |
| 9 | "device_version": "1.0.0" | 9 | "device_version": "1.0.0" |
| 10 | }, | 10 | }, |
| 11 | "features": { | ||
| 12 | "encoder": true, | ||
| 13 | "oled": true, | ||
| 14 | "rgblight": true | ||
| 15 | }, | ||
| 11 | "matrix_pins": { | 16 | "matrix_pins": { |
| 12 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], | 17 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], |
| 13 | "rows": ["C6", "D7", "E6", "B4", "B5"] | 18 | "rows": ["C6", "D7", "E6", "B4", "B5"] |
| @@ -19,6 +24,7 @@ | |||
| 19 | ] | 24 | ] |
| 20 | }, | 25 | }, |
| 21 | "split": { | 26 | "split": { |
| 27 | "enabled": true, | ||
| 22 | "soft_serial_pin": "D2", | 28 | "soft_serial_pin": "D2", |
| 23 | "encoder": { | 29 | "encoder": { |
| 24 | "right": { | 30 | "right": { |
diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk index 3d80190eb2..4da205a168 100644 --- a/keyboards/lily58/glow_enc/rules.mk +++ b/keyboards/lily58/glow_enc/rules.mk | |||
| @@ -1,8 +1 @@ | |||
| 1 | ENCODER_ENABLE = yes # ENables the use of one or more encoders | LTO_ENABLE = yes | |
| 2 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB light | ||
| 3 | LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features | ||
| 4 | BOOTMAGIC_ENABLE = no | ||
| 5 | RGB_MATRIX_ENABLE = no # Per key rgb leds | ||
| 6 | |||
| 7 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 8 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file | ||
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 0ab0bd68d2..fcbae26163 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json | |||
| @@ -8,6 +8,12 @@ | |||
| 8 | "pid": "0x4C4C", | 8 | "pid": "0x4C4C", |
| 9 | "device_version": "1.0.0" | 9 | "device_version": "1.0.0" |
| 10 | }, | 10 | }, |
| 11 | "features": { | ||
| 12 | "bootmagic": true, | ||
| 13 | "encoder": true, | ||
| 14 | "oled": true, | ||
| 15 | "rgblight": true | ||
| 16 | }, | ||
| 11 | "matrix_pins": { | 17 | "matrix_pins": { |
| 12 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], | 18 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], |
| 13 | "rows": ["C6", "D7", "E6", "B4", "B5"] | 19 | "rows": ["C6", "D7", "E6", "B4", "B5"] |
| @@ -19,6 +25,7 @@ | |||
| 19 | ] | 25 | ] |
| 20 | }, | 26 | }, |
| 21 | "split": { | 27 | "split": { |
| 28 | "enabled": true, | ||
| 22 | "soft_serial_pin": "D2", | 29 | "soft_serial_pin": "D2", |
| 23 | "encoder": { | 30 | "encoder": { |
| 24 | "right": { | 31 | "right": { |
diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk index d4957d98e4..4da205a168 100644 --- a/keyboards/lily58/light/rules.mk +++ b/keyboards/lily58/light/rules.mk | |||
| @@ -1,3 +1 @@ | |||
| 1 | ENCODER_ENABLE = yes # ENables the use of one or more encoders | LTO_ENABLE = yes | |
| 2 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB light | ||
| 3 | LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features | ||
diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 373fd0c5c8..a484904923 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json | |||
| @@ -8,12 +8,16 @@ | |||
| 8 | "pid": "0xEB2D", | 8 | "pid": "0xEB2D", |
| 9 | "device_version": "1.0.0" | 9 | "device_version": "1.0.0" |
| 10 | }, | 10 | }, |
| 11 | "features": { | ||
| 12 | "oled": true | ||
| 13 | }, | ||
| 11 | "matrix_pins": { | 14 | "matrix_pins": { |
| 12 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], | 15 | "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], |
| 13 | "rows": ["C6", "D7", "E6", "B4", "B5"] | 16 | "rows": ["C6", "D7", "E6", "B4", "B5"] |
| 14 | }, | 17 | }, |
| 15 | "diode_direction": "COL2ROW", | 18 | "diode_direction": "COL2ROW", |
| 16 | "split": { | 19 | "split": { |
| 20 | "enabled": true, | ||
| 17 | "soft_serial_pin": "D2" | 21 | "soft_serial_pin": "D2" |
| 18 | }, | 22 | }, |
| 19 | "processor": "atmega32u4", | 23 | "processor": "atmega32u4", |
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index 2fca52967d..76ce166170 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk | |||
| @@ -1,17 +1,3 @@ | |||
| 1 | # Build Options | 1 | OLED_DRIVER = SSD1306 |
| 2 | # change yes to no to disable | ||
| 3 | # | ||
| 4 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite | ||
| 5 | MOUSEKEY_ENABLE = no # Mouse keys | ||
| 6 | EXTRAKEY_ENABLE = no # Audio control and System control | ||
| 7 | CONSOLE_ENABLE = no # Console for debug | ||
| 8 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 9 | NKRO_ENABLE = no # Enable N-Key Rollover | ||
| 10 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| 11 | AUDIO_ENABLE = no # Audio output | ||
| 12 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | ||
| 13 | OLED_ENABLE = yes | ||
| 14 | OLED_DRIVER = SSD1306 # OLED display | ||
| 15 | SPLIT_KEYBOARD = yes | ||
| 16 | 2 | ||
| 17 | DEFAULT_FOLDER = lily58/rev1 | 3 | DEFAULT_FOLDER = lily58/rev1 |
diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 3192143e77..49b31f1edf 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h | |||
| @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 16 | */ | 16 | */ |
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | |||
| 20 | /* COL2ROW or ROW2COL */ | ||
| 21 | #define DIODE_DIRECTION COL2ROW | ||
| 22 | |||
| 23 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 19 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 24 | #define LOCKING_SUPPORT_ENABLE | 20 | #define LOCKING_SUPPORT_ENABLE |
| 25 | /* Locking resynchronize hack */ | 21 | /* Locking resynchronize hack */ |
diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index bc4eacf9a3..b9449c4714 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h | |||
| @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | |||
| 21 | /* COL2ROW or ROW2COL */ | ||
| 22 | #define DIODE_DIRECTION COL2ROW | ||
| 23 | |||
| 24 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 20 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 25 | #define LOCKING_SUPPORT_ENABLE | 21 | #define LOCKING_SUPPORT_ENABLE |
| 26 | /* Locking resynchronize hack */ | 22 | /* Locking resynchronize hack */ |
| @@ -41,7 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 41 | //#define NO_ACTION_LAYER | 37 | //#define NO_ACTION_LAYER |
| 42 | //#define NO_ACTION_TAPPING | 38 | //#define NO_ACTION_TAPPING |
| 43 | //#define NO_ACTION_ONESHOT | 39 | //#define NO_ACTION_ONESHOT |
| 44 | |||
| 45 | #ifdef SUBPROJECT_rev1 | ||
| 46 | #include "rev1/config.h" | ||
| 47 | #endif | ||
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 671e700ce3..1183cd7d49 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h | |||
| @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | /* COL2ROW, ROW2COL*/ | ||
| 21 | #define DIODE_DIRECTION COL2ROW | ||
| 22 | |||
| 23 | #define RGB_DI_PIN B4 | 20 | #define RGB_DI_PIN B4 |
| 24 | #define RGBLED_NUM 12 | 21 | #define RGBLED_NUM 12 |
| 25 | #define RGBLIGHT_EFFECT_BREATHING | 22 | #define RGBLIGHT_EFFECT_BREATHING |
diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/info.json index c701f0b795..bc35967537 100644 --- a/keyboards/skme/zeno/info.json +++ b/keyboards/skme/zeno/info.json | |||
| @@ -27,72 +27,81 @@ | |||
| 27 | "layouts": { | 27 | "layouts": { |
| 28 | "LAYOUT_default": { | 28 | "LAYOUT_default": { |
| 29 | "layout": [ | 29 | "layout": [ |
| 30 | {"matrix":[0,0], "x":0.6, "y":0.25}, | 30 | {"matrix": [0, 0], "x": 0.75, "y": 0}, |
| 31 | {"matrix":[0,1], "x":1.6, "y":0.25}, | 31 | {"matrix": [0, 1], "x": 1.75, "y": 0}, |
| 32 | {"matrix":[0,2], "x":2.6, "y":0.235}, | 32 | {"matrix": [0, 2], "x": 2.75, "y": 0}, |
| 33 | {"matrix":[0,3], "x":0, "y":1.3001}, | 33 | {"matrix": [0, 3], "x": 3.75, "y": 0}, |
| 34 | {"matrix":[0,4], "x":1, "y":1.3001}, | 34 | {"matrix": [0, 4], "x": 4.75, "y": 0}, |
| 35 | {"matrix":[0,5], "x":2, "y":1.3001}, | 35 | {"matrix": [0, 5], "x": 5.75, "y": 0}, |
| 36 | {"matrix":[0,6], "x":3, "y":1.3001}, | 36 | {"matrix": [0, 6], "x": 6.75, "y": 0}, |
| 37 | {"matrix":[0,7], "x":-3.75, "y":3.3}, | 37 | |
| 38 | {"matrix":[0,8], "x":-2.75, "y":3.3}, | 38 | {"matrix": [0, 7], "x": 9, "y": 0}, |
| 39 | {"matrix":[0,9], "x":-1.75, "y":3.3}, | 39 | {"matrix": [0, 8], "x": 10, "y": 0}, |
| 40 | {"matrix":[0,10], "x":-0.75, "y":3.3}, | 40 | {"matrix": [0, 9], "x": 11, "y": 0}, |
| 41 | {"matrix":[0,11], "x":12.75, "y":0.28}, | 41 | {"matrix": [0, 10], "x": 12, "y": 0}, |
| 42 | {"matrix":[0,12], "x":13.75, "y":0.3001}, | 42 | {"matrix": [0, 11], "x": 13, "y": 0}, |
| 43 | {"matrix":[0,13], "x":14.75, "y":0.3001}, | 43 | {"matrix": [0, 12], "x": 14, "y": 0}, |
| 44 | {"matrix":[1,14], "x":15.75, "y":0.3001}, | 44 | {"matrix": [0, 13], "x": 15, "y": 0}, |
| 45 | {"matrix":[1,0], "x":0.5, "y":1.25, "w":1.5}, | 45 | {"matrix": [1, 14], "x": 16, "y": 0}, |
| 46 | {"matrix":[1,1], "x":2, "y":1.25}, | 46 | |
| 47 | {"matrix":[1,2], "x":-0.5, "y":2.3001}, | 47 | {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, |
| 48 | {"matrix":[1,3], "x":0.5, "y":2.3001}, | 48 | {"matrix": [1, 1], "x": 2, "y": 1}, |
| 49 | {"matrix":[1,4], "x":1.5, "y":2.3001}, | 49 | {"matrix": [1, 2], "x": 3, "y": 1}, |
| 50 | {"matrix":[1,5], "x":2.5, "y":2.3001}, | 50 | {"matrix": [1, 3], "x": 4, "y": 1}, |
| 51 | {"matrix":[1,6], "x":-4.25, "y":4.3}, | 51 | {"matrix": [1, 4], "x": 5, "y": 1}, |
| 52 | {"matrix":[1,7], "x":-3.25, "y":4.3}, | 52 | {"matrix": [1, 5], "x": 6, "y": 1}, |
| 53 | {"matrix":[1,8], "x":-2.25, "y":4.3}, | 53 | |
| 54 | {"matrix":[1,9], "x":-1.25, "y":4.3}, | 54 | {"matrix": [1, 6], "x": 8.75, "y": 1}, |
| 55 | {"matrix":[1,10], "x":12.4, "y":1.28}, | 55 | {"matrix": [1, 7], "x": 9.75, "y": 1}, |
| 56 | {"matrix":[1,11], "x":13.4, "y":1.3}, | 56 | {"matrix": [1, 8], "x": 10.75, "y": 1}, |
| 57 | {"matrix":[1,12], "x":14.4, "y":1.3}, | 57 | {"matrix": [1, 9], "x": 11.75, "y": 1}, |
| 58 | {"matrix":[1,13], "x":15.4, "y":1.3, "w":1.5}, | 58 | {"matrix": [1, 10], "x": 12.75, "y": 1}, |
| 59 | {"matrix":[2,0], "x":0.4, "y":2.25, "w":1.75}, | 59 | {"matrix": [1, 11], "x": 13.75, "y": 1}, |
| 60 | {"matrix":[2,1], "x":2.15, "y":2.25}, | 60 | {"matrix": [1, 12], "x": 14.75, "y": 1}, |
| 61 | {"matrix":[2,2], "x":-0.25, "y":3.3001}, | 61 | {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5}, |
| 62 | {"matrix":[2,3], "x":0.75, "y":3.3001}, | 62 | |
| 63 | {"matrix":[2,4], "x":1.75, "y":3.3001}, | 63 | {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, |
| 64 | {"matrix":[2,5], "x":2.75, "y":3.3001}, | 64 | {"matrix": [2, 1], "x": 2, "y": 2}, |
| 65 | {"matrix":[2,6], "x":-3.95, "y":5.3}, | 65 | {"matrix": [2, 2], "x": 3, "y": 2}, |
| 66 | {"matrix":[2,7], "x":-2.95, "y":5.3}, | 66 | {"matrix": [2, 3], "x": 4, "y": 2}, |
| 67 | {"matrix":[2,8], "x":-1.9501, "y":5.3}, | 67 | {"matrix": [2, 4], "x": 5, "y": 2}, |
| 68 | {"matrix":[2,9], "x":-0.9501, "y":5.3}, | 68 | {"matrix": [2, 5], "x": 6, "y": 2}, |
| 69 | {"matrix":[2,10], "x":12.8, "y":2.3001}, | 69 | |
| 70 | {"matrix":[2,11], "x":13.8, "y":2.3001}, | 70 | {"matrix": [2, 6], "x": 9.25, "y": 2}, |
| 71 | {"matrix":[2,12], "x":14.8, "y":2.3001, "w":2.25}, | 71 | {"matrix": [2, 7], "x": 10.25, "y": 2}, |
| 72 | {"matrix":[3,0], "x":0.25, "y":3.25, "w":2.25}, | 72 | {"matrix": [2, 8], "x": 11.25, "y": 2}, |
| 73 | {"matrix":[3,1], "x":2.5, "y":3.25}, | 73 | {"matrix": [2, 9], "x": 12.25, "y": 2}, |
| 74 | {"matrix":[3,2], "x":0.25, "y":4.3}, | 74 | {"matrix": [2, 10], "x": 13.25, "y": 2}, |
| 75 | {"matrix":[3,3], "x":1.25, "y":4.3}, | 75 | {"matrix": [2, 11], "x": 14.25, "y": 2}, |
| 76 | {"matrix":[3,4], "x":2.25, "y":4.3}, | 76 | {"matrix": [2, 12], "x": 15.25, "y": 2, "w": 2.25}, |
| 77 | {"matrix":[3,5], "x":3.25, "y":4.3}, | 77 | |
| 78 | {"matrix":[3,6], "x":-4.45, "y":6.3}, | 78 | {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, |
| 79 | {"matrix":[3,7], "x":-3.45, "y":6.3}, | 79 | {"matrix": [3, 1], "x": 2.25, "y": 3}, |
| 80 | {"matrix":[3,8], "x":-2.45, "y":6.3}, | 80 | {"matrix": [3, 2], "x": 3.25, "y": 3}, |
| 81 | {"matrix":[3,9], "x":-1.4501, "y":6.3}, | 81 | {"matrix": [3, 3], "x": 4.25, "y": 3}, |
| 82 | {"matrix":[3,10], "x":12.4, "y":3.3001}, | 82 | {"matrix": [3, 4], "x": 5.25, "y": 3}, |
| 83 | {"matrix":[3,11], "x":13.4, "y":3.3001}, | 83 | {"matrix": [3, 5], "x": 6.25, "y": 3}, |
| 84 | {"matrix":[3,12], "x":14.4, "y":3.3001, "w":1.75}, | 84 | |
| 85 | {"matrix":[3,14], "x":16.15, "y":3.3001}, | 85 | {"matrix": [3, 6], "x": 9, "y": 3}, |
| 86 | {"matrix":[4,0], "x":0.25, "y":4.3, "w":1.25}, | 86 | {"matrix": [3, 7], "x": 10, "y": 3}, |
| 87 | {"matrix":[4,1], "x":1.5, "y":4.3, "w":1.25}, | 87 | {"matrix": [3, 8], "x": 11, "y": 3}, |
| 88 | {"matrix":[4,3], "x":0.5, "y":5.3}, | 88 | {"matrix": [3, 9], "x": 12, "y": 3}, |
| 89 | {"matrix":[4,5], "x":-7.8, "y":8.45, "w":2.75}, | 89 | {"matrix": [3, 10], "x": 13, "y": 3}, |
| 90 | {"matrix":[4,7], "x":-4.45, "y":7.3, "w":2}, | 90 | {"matrix": [3, 11], "x": 14, "y": 3}, |
| 91 | {"matrix":[4,8], "x":-2.45, "y":7.3}, | 91 | {"matrix": [3, 12], "x": 15, "y": 3, "w": 1.75}, |
| 92 | {"matrix":[4,9], "x":-1.4501, "y":7.3, "w":1.25}, | 92 | {"matrix": [3, 14], "x": 16.75, "y": 3}, |
| 93 | {"matrix":[4,12], "x":14.65, "y":4.3, "w":1.25}, | 93 | |
| 94 | {"matrix":[4,14], "x":15.9, "y":4.3, "w":1.25} | 94 | {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, |
| 95 | ] | 95 | {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, |
| 96 | {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.5}, | ||
| 97 | {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25}, | ||
| 98 | |||
| 99 | {"matrix": [4, 7], "x": 9, "y": 4, "w": 2}, | ||
| 100 | {"matrix": [4, 8], "x": 11, "y": 4}, | ||
| 101 | {"matrix": [4, 9], "x": 12, "y": 4, "w": 1.25}, | ||
| 102 | {"matrix": [4, 12], "x": 15.25, "y": 4, "w": 1.25}, | ||
| 103 | {"matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.25} | ||
| 104 | ] | ||
| 96 | } | 105 | } |
| 97 | } | 106 | } |
| 98 | } | 107 | } |
diff --git a/keyboards/splitkb/kyria/info.json b/keyboards/splitkb/kyria/info.json index f70e8e3bb2..7249007962 100644 --- a/keyboards/splitkb/kyria/info.json +++ b/keyboards/splitkb/kyria/info.json | |||
| @@ -9,8 +9,5 @@ | |||
| 9 | "development_board": "elite_c", | 9 | "development_board": "elite_c", |
| 10 | "split": { | 10 | "split": { |
| 11 | "enabled": true | 11 | "enabled": true |
| 12 | }, | ||
| 13 | "build": { | ||
| 14 | "lto": true | ||
| 15 | } | 12 | } |
| 16 | } | 13 | } |
diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/info.json new file mode 100644 index 0000000000..9f75b9c218 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/info.json | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | { | ||
| 2 | "build": { | ||
| 3 | "lto": true | ||
| 4 | } | ||
| 5 | } | ||
diff --git a/keyboards/splitkb/kyria/rev1/base/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/rules.mk | |||
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk index bf6a9bf97f..a58b20c575 100644 --- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk | |||
| @@ -1,4 +1,2 @@ | |||
| 1 | SERIAL_DRIVER = usart | 1 | SERIAL_DRIVER = usart |
| 2 | AUDIO_ENABLE = no | ||
| 3 | LTO_ENABLE = no | ||
| 4 | CONVERT_TO = proton_c | 2 | CONVERT_TO = proton_c |
diff --git a/keyboards/splitkb/kyria/rev2/base/info.json b/keyboards/splitkb/kyria/rev2/base/info.json new file mode 100644 index 0000000000..9f75b9c218 --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/base/info.json | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | { | ||
| 2 | "build": { | ||
| 3 | "lto": true | ||
| 4 | } | ||
| 5 | } | ||
diff --git a/keyboards/splitkb/kyria/rev2/base/rules.mk b/keyboards/splitkb/kyria/rev2/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/base/rules.mk | |||
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk index bf6a9bf97f..a58b20c575 100644 --- a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk | |||
| @@ -1,4 +1,2 @@ | |||
| 1 | SERIAL_DRIVER = usart | 1 | SERIAL_DRIVER = usart |
| 2 | AUDIO_ENABLE = no | ||
| 3 | LTO_ENABLE = no | ||
| 4 | CONVERT_TO = proton_c | 2 | CONVERT_TO = proton_c |
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json index 71191323a6..96bf65847f 100644 --- a/keyboards/splitkb/kyria/rev3/info.json +++ b/keyboards/splitkb/kyria/rev3/info.json | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | "bootmagic": { | 6 | "bootmagic": { |
| 7 | "matrix": [0, 6] | 7 | "matrix": [0, 6] |
| 8 | }, | 8 | }, |
| 9 | "build": { | ||
| 10 | "lto": true | ||
| 11 | }, | ||
| 9 | "features": { | 12 | "features": { |
| 10 | "mousekey": true, | 13 | "mousekey": true, |
| 11 | "bootmagic": true, | 14 | "bootmagic": true, |
diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json index 2291c6de12..a6b200ed7e 100644 --- a/keyboards/wilba_tech/wt60_h1/info.json +++ b/keyboards/wilba_tech/wt60_h1/info.json | |||
| @@ -15,11 +15,6 @@ | |||
| 15 | "diode_direction": "COL2ROW", | 15 | "diode_direction": "COL2ROW", |
| 16 | "processor": "atmega32u4", | 16 | "processor": "atmega32u4", |
| 17 | "bootloader": "atmel-dfu", | 17 | "bootloader": "atmel-dfu", |
| 18 | "diode_direction": "COL2ROW", | ||
| 19 | "matrix_pins": { | ||
| 20 | "rows": ["F0", "F1", "F4", "F6", "F7"], | ||
| 21 | "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] | ||
| 22 | }, | ||
| 23 | "community_layouts": ["60_ansi_split_bs_rshift"], | 18 | "community_layouts": ["60_ansi_split_bs_rshift"], |
| 24 | "layout_aliases": { | 19 | "layout_aliases": { |
| 25 | "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" | 20 | "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" |
diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json index 11ffd919bb..167de96a03 100644 --- a/keyboards/wilba_tech/wt60_h3/info.json +++ b/keyboards/wilba_tech/wt60_h3/info.json | |||
| @@ -15,11 +15,6 @@ | |||
| 15 | "diode_direction": "COL2ROW", | 15 | "diode_direction": "COL2ROW", |
| 16 | "processor": "atmega32u4", | 16 | "processor": "atmega32u4", |
| 17 | "bootloader": "atmel-dfu", | 17 | "bootloader": "atmel-dfu", |
| 18 | "diode_direction": "COL2ROW", | ||
| 19 | "matrix_pins": { | ||
| 20 | "rows": ["F0", "F1", "F4", "F6", "F7"], | ||
| 21 | "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] | ||
| 22 | }, | ||
| 23 | "community_layouts": ["60_iso_split_bs_rshift"], | 18 | "community_layouts": ["60_iso_split_bs_rshift"], |
| 24 | "layout_aliases": { | 19 | "layout_aliases": { |
| 25 | "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" | 20 | "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" |
