diff options
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 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "label":"", "x":0, "y":2}, - {"matrix": [0, 1], "label":"K", "x":1, "y":2}, - {"matrix": [0, 2], "label":"U", "x":2, "y":1.5}, - {"matrix": [0, 3], "label":"Q", "x":3, "y":1}, - {"matrix": [0, 4], "label":".", "x":4, "y":1}, - {"matrix": [0, 5], "label":"J", "x":5, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [4, 0], "label":"P", "x":8, "y":1}, - {"matrix": [4, 1], "label":"C", "x":9, "y":1}, - {"matrix": [4, 2], "label":"L", "x":10, "y":1}, - {"matrix": [4, 3], "label":"M", "x":11, "y":1.5}, - {"matrix": [4, 4], "label":"F", "x":12, "y":2}, - {"matrix": [4, 5], "label":"", "x":13, "y":2}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.5}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, - {"matrix": [1, 0], "label":" ", "x":0, "y":3}, - {"matrix": [1, 1], "label":"H", "x":1, "y":3}, - {"matrix": [1, 2], "label":"I", "x":2, "y":2.5}, - {"matrix": [1, 3], "label":"E", "x":3, "y":2}, - {"matrix": [1, 4], "label":"A", "x":4, "y":2}, - {"matrix": [1, 5], "label":"O", "x":5, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [5, 0], "label":"D", "x":8, "y":2}, - {"matrix": [5, 1], "label":"T", "x":9, "y":2}, - {"matrix": [5, 2], "label":"R", "x":10, "y":2}, - {"matrix": [5, 3], "label":"N", "x":11, "y":2.5}, - {"matrix": [5, 4], "label":"S", "x":12, "y":3}, - {"matrix": [5, 5], "label":"", "x":13, "y":3}, + {"matrix": [5, 0], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.5}, + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 5], "x": 12, "y": 1}, - {"matrix": [2, 0], "label":"", "x":0, "y":4}, - {"matrix": [2, 1], "label":"X", "x":1, "y":4}, - {"matrix": [2, 2], "label":"Y", "x":2, "y":3.5}, - {"matrix": [2, 3], "label":"-", "x":3, "y":3}, - {"matrix": [2, 4], "label":",", "x":4, "y":3}, - {"matrix": [2, 5], "label":"/", "x":5, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [6, 0], "label":"B", "x":8, "y":3}, - {"matrix": [6, 1], "label":"G", "x":9, "y":3}, - {"matrix": [6, 2], "label":"W", "x":10, "y":3}, - {"matrix": [6, 3], "label":"V", "x":11, "y":3.5}, - {"matrix": [6, 4], "label":"Z", "x":12, "y":4}, - {"matrix": [6, 5], "label":"", "x":13, "y":4}, + {"matrix": [6, 0], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2.5}, + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 5], "x": 12, "y": 2}, - {"matrix": [3, 0], "label":"", "x":0, "y":1}, - {"matrix": [3, 1], "label":"", "x":1, "y":1}, - {"matrix": [3, 3], "label":"Gui", "x":3, "y":4}, - {"matrix": [3, 4], "label":"Tab", "x":4, "y":4}, - {"matrix": [3, 5], "label":"Spc", "x":5, "y":4}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [7, 0], "label":"L2", "x":8, "y":4}, - {"matrix": [7, 1], "label":"Sh", "x":9, "y":4}, - {"matrix": [7, 2], "label":"L3", "x":10, "y":4}, - {"matrix": [7, 4], "label":"Fx", "x":12, "y":1}, - {"matrix": [7, 5], "label":"", "x":13, "y":1} + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3} ] } } 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/>. #pragma once - -#define DIODE_DIRECTION COL2ROW - #define ROTATIONAL_TRANSFORM_ANGLE -25 #define POINTING_DEVICE_INVERT_X 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 @@ #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 { D2, D3, D4, D5, D6 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 } - #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 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "features": { + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +24,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "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 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features -BOOTMAGIC_ENABLE = no -RGB_MATRIX_ENABLE = no # Per key rgb leds - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
\ No newline at end of file +LTO_ENABLE = yes 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 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +25,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "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 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features +LTO_ENABLE = yes 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 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "features": { + "oled": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "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 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # OLED display -SPLIT_KEYBOARD = yes +OLED_DRIVER = SSD1306 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/>. */ #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* 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/>. #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -41,7 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#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/>. #pragma once -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B4 #define RGBLED_NUM 12 #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 @@ "layouts": { "LAYOUT_default": { "layout": [ - {"matrix":[0,0], "x":0.6, "y":0.25}, - {"matrix":[0,1], "x":1.6, "y":0.25}, - {"matrix":[0,2], "x":2.6, "y":0.235}, - {"matrix":[0,3], "x":0, "y":1.3001}, - {"matrix":[0,4], "x":1, "y":1.3001}, - {"matrix":[0,5], "x":2, "y":1.3001}, - {"matrix":[0,6], "x":3, "y":1.3001}, - {"matrix":[0,7], "x":-3.75, "y":3.3}, - {"matrix":[0,8], "x":-2.75, "y":3.3}, - {"matrix":[0,9], "x":-1.75, "y":3.3}, - {"matrix":[0,10], "x":-0.75, "y":3.3}, - {"matrix":[0,11], "x":12.75, "y":0.28}, - {"matrix":[0,12], "x":13.75, "y":0.3001}, - {"matrix":[0,13], "x":14.75, "y":0.3001}, - {"matrix":[1,14], "x":15.75, "y":0.3001}, - {"matrix":[1,0], "x":0.5, "y":1.25, "w":1.5}, - {"matrix":[1,1], "x":2, "y":1.25}, - {"matrix":[1,2], "x":-0.5, "y":2.3001}, - {"matrix":[1,3], "x":0.5, "y":2.3001}, - {"matrix":[1,4], "x":1.5, "y":2.3001}, - {"matrix":[1,5], "x":2.5, "y":2.3001}, - {"matrix":[1,6], "x":-4.25, "y":4.3}, - {"matrix":[1,7], "x":-3.25, "y":4.3}, - {"matrix":[1,8], "x":-2.25, "y":4.3}, - {"matrix":[1,9], "x":-1.25, "y":4.3}, - {"matrix":[1,10], "x":12.4, "y":1.28}, - {"matrix":[1,11], "x":13.4, "y":1.3}, - {"matrix":[1,12], "x":14.4, "y":1.3}, - {"matrix":[1,13], "x":15.4, "y":1.3, "w":1.5}, - {"matrix":[2,0], "x":0.4, "y":2.25, "w":1.75}, - {"matrix":[2,1], "x":2.15, "y":2.25}, - {"matrix":[2,2], "x":-0.25, "y":3.3001}, - {"matrix":[2,3], "x":0.75, "y":3.3001}, - {"matrix":[2,4], "x":1.75, "y":3.3001}, - {"matrix":[2,5], "x":2.75, "y":3.3001}, - {"matrix":[2,6], "x":-3.95, "y":5.3}, - {"matrix":[2,7], "x":-2.95, "y":5.3}, - {"matrix":[2,8], "x":-1.9501, "y":5.3}, - {"matrix":[2,9], "x":-0.9501, "y":5.3}, - {"matrix":[2,10], "x":12.8, "y":2.3001}, - {"matrix":[2,11], "x":13.8, "y":2.3001}, - {"matrix":[2,12], "x":14.8, "y":2.3001, "w":2.25}, - {"matrix":[3,0], "x":0.25, "y":3.25, "w":2.25}, - {"matrix":[3,1], "x":2.5, "y":3.25}, - {"matrix":[3,2], "x":0.25, "y":4.3}, - {"matrix":[3,3], "x":1.25, "y":4.3}, - {"matrix":[3,4], "x":2.25, "y":4.3}, - {"matrix":[3,5], "x":3.25, "y":4.3}, - {"matrix":[3,6], "x":-4.45, "y":6.3}, - {"matrix":[3,7], "x":-3.45, "y":6.3}, - {"matrix":[3,8], "x":-2.45, "y":6.3}, - {"matrix":[3,9], "x":-1.4501, "y":6.3}, - {"matrix":[3,10], "x":12.4, "y":3.3001}, - {"matrix":[3,11], "x":13.4, "y":3.3001}, - {"matrix":[3,12], "x":14.4, "y":3.3001, "w":1.75}, - {"matrix":[3,14], "x":16.15, "y":3.3001}, - {"matrix":[4,0], "x":0.25, "y":4.3, "w":1.25}, - {"matrix":[4,1], "x":1.5, "y":4.3, "w":1.25}, - {"matrix":[4,3], "x":0.5, "y":5.3}, - {"matrix":[4,5], "x":-7.8, "y":8.45, "w":2.75}, - {"matrix":[4,7], "x":-4.45, "y":7.3, "w":2}, - {"matrix":[4,8], "x":-2.45, "y":7.3}, - {"matrix":[4,9], "x":-1.4501, "y":7.3, "w":1.25}, - {"matrix":[4,12], "x":14.65, "y":4.3, "w":1.25}, - {"matrix":[4,14], "x":15.9, "y":4.3, "w":1.25} - ] + {"matrix": [0, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [1, 14], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + + {"matrix": [1, 6], "x": 8.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + + {"matrix": [2, 6], "x": 9.25, "y": 2}, + {"matrix": [2, 7], "x": 10.25, "y": 2}, + {"matrix": [2, 8], "x": 11.25, "y": 2}, + {"matrix": [2, 9], "x": 12.25, "y": 2}, + {"matrix": [2, 10], "x": 13.25, "y": 2}, + {"matrix": [2, 11], "x": 14.25, "y": 2}, + {"matrix": [2, 12], "x": 15.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 9, "y": 3}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 8], "x": 11, "y": 3}, + {"matrix": [3, 9], "x": 12, "y": 3}, + {"matrix": [3, 10], "x": 13, "y": 3}, + {"matrix": [3, 11], "x": 14, "y": 3}, + {"matrix": [3, 12], "x": 15, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 16.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 9, "y": 4, "w": 2}, + {"matrix": [4, 8], "x": 11, "y": 4}, + {"matrix": [4, 9], "x": 12, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.25} + ] } } } 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 @@ "development_board": "elite_c", "split": { "enabled": true - }, - "build": { - "lto": true } } 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 @@ +{ + "build": { + "lto": true + } +} 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 @@ SERIAL_DRIVER = usart -AUDIO_ENABLE = no -LTO_ENABLE = no 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 @@ +{ + "build": { + "lto": true + } +} 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 @@ SERIAL_DRIVER = usart -AUDIO_ENABLE = no -LTO_ENABLE = no 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 @@ "bootmagic": { "matrix": [0, 6] }, + "build": { + "lto": true + }, "features": { "mousekey": true, "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 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F6", "F7"], - "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] - }, "community_layouts": ["60_ansi_split_bs_rshift"], "layout_aliases": { "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 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F6", "F7"], - "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] - }, "community_layouts": ["60_iso_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" |