From d0e1d36144e1c1b2269be171c748a01f15ec32f2 Mon Sep 17 00:00:00 2001 From: James Young Date: Thu, 18 Apr 2024 17:49:15 -0700 Subject: Data-Driven Keyboard Conversions: J (#23547) --- keyboards/jones/v03/info.json | 10 +++ keyboards/jones/v03/rules.mk | 19 +----- keyboards/jones/v03_1/info.json | 11 ++++ keyboards/jones/v03_1/rules.mk | 19 +----- keyboards/jones/v1/info.json | 122 ----------------------------------- keyboards/jones/v1/keyboard.json | 133 +++++++++++++++++++++++++++++++++++++++ keyboards/jones/v1/rules.mk | 15 ----- 7 files changed, 156 insertions(+), 173 deletions(-) delete mode 100644 keyboards/jones/v1/info.json create mode 100644 keyboards/jones/v1/keyboard.json delete mode 100644 keyboards/jones/v1/rules.mk (limited to 'keyboards/jones') diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index 2f8a7803d2..f5b18c9d2f 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -28,6 +28,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk index 0afd3b816a..30ce5d293b 100644 --- a/keyboards/jones/v03/rules.mk +++ b/keyboards/jones/v03/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # 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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 9e46cdd40a..ae89012884 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -29,6 +29,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk index eff64d9a58..30ce5d293b 100644 --- a/keyboards/jones/v03_1/rules.mk +++ b/keyboards/jones/v03_1/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # 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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json deleted file mode 100644 index 54496d3164..0000000000 --- a/keyboards/jones/v1/info.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "keyboard_name": "Jones", - "manufacturer": "jpskenn", - "url": "https://github.com/jpskenn/Jones", - "maintainer": "jpskenn", - "usb": { - "vid": "0xB9DD", - "pid": "0x175A", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], - "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 4 - }, - "ws2812": { - "pin": "F1" - }, - "diode_direction": "COL2ROW", - "dynamic_keymap": { - "layer_count": 6 - }, - "eeprom": { - "driver": "i2c" - }, - "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F4"}, - {"pin_a": "D2", "pin_b": "D3"} - ] - }, - "bootmagic": { - "matrix": [0, 9] - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0}, - {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0}, - {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0}, - {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0}, - {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0}, - {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0}, - {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0}, - {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0}, - {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0}, - {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0}, - {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0}, - {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0}, - {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0}, - {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0}, - - {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5}, - {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1}, - {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1}, - {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1}, - {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1}, - {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1}, - {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1}, - {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1}, - {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1}, - {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1}, - {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1}, - {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1}, - {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5}, - - {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5}, - {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2}, - {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2}, - {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2}, - {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2}, - {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2}, - {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2}, - {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2}, - {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2}, - {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2}, - {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2}, - {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2}, - {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2}, - {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5}, - - {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3}, - {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3}, - {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3}, - {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3}, - {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, - {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3}, - {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3}, - {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3}, - {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3}, - {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3}, - {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3}, - {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3}, - {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3}, - {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3}, - {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3}, - - {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4}, - {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4}, - {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25}, - {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25}, - {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5}, - {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, - {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4}, - {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4}, - {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5}, - {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, - {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25}, - {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4}, - {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4} - ] - } - } -} diff --git a/keyboards/jones/v1/keyboard.json b/keyboards/jones/v1/keyboard.json new file mode 100644 index 0000000000..df30c596d4 --- /dev/null +++ b/keyboards/jones/v1/keyboard.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "Jones", + "manufacturer": "jpskenn", + "url": "https://github.com/jpskenn/Jones", + "maintainer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0x175A", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], + "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 4 + }, + "ws2812": { + "pin": "F1" + }, + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, + "eeprom": { + "driver": "i2c" + }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4"}, + {"pin_a": "D2", "pin_b": "D3"} + ] + }, + "bootmagic": { + "matrix": [0, 9] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0}, + {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0}, + {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0}, + {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0}, + {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0}, + {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0}, + {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0}, + {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0}, + {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0}, + {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0}, + + {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5}, + {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1}, + {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1}, + {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1}, + {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1}, + {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1}, + {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1}, + {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1}, + {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1}, + {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1}, + {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5}, + + {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5}, + {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2}, + {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2}, + {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2}, + {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2}, + {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2}, + {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2}, + {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2}, + {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2}, + {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2}, + {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2}, + {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5}, + + {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3}, + {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3}, + {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3}, + {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3}, + {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3}, + {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3}, + {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3}, + {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3}, + {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3}, + {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3}, + {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3}, + {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3}, + {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3}, + + {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4}, + {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4}, + {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25}, + {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25}, + {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5}, + {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, + {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4}, + {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4}, + {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5}, + {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, + {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25}, + {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4}, + {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk deleted file mode 100644 index 6f522a4365..0000000000 --- a/keyboards/jones/v1/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # 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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes # Rotary Encoder - -LTO_ENABLE = yes -- cgit v1.2.3