diff options
24 files changed, 88 insertions, 177 deletions
| diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index 46510c48c0..47260572e6 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json @@ -5,6 +5,7 @@    "height": 5,    "width": 4,    "diode_direction": "COL2ROW", +  "processor": "atmega32u4",    "features": {      "backlight": true,      "bootmagic": false, @@ -25,11 +26,11 @@      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "10", -    "led_count": "4", +    "brightness_steps": 17, +    "hue_steps": 10, +    "led_count": 4,      "pin": "F6", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "url": "",    "usb": { diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk index 75fb718e33..d2e52d56b5 100644 --- a/keyboards/clueboard/17/rules.mk +++ b/keyboards/clueboard/17/rules.mk @@ -1,15 +1,2 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu -  # Build Options  BACKLIGHT_DRIVER = custom diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json index b671174076..878b24ce17 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/info.json @@ -4,7 +4,9 @@    "maintainer": "skullydazed",    "height": 6.5,    "width": 24, -  "debounce": "5", +  "processor": "at90usb1286", +  "bootloader": "halfkay", +  "debounce": 5,    "diode_direction": "ROW2COL",    "features": {      "audio": true, @@ -24,18 +26,18 @@      "scroll_lock": "B6"    },    "matrix_pins": { -    "cols": ["D2", " D3", " D4", " D5", " D7", " E0", " E1", " B0", " E6", " B3", " B2"], -    "rows": ["C0", " C1", " C2", " C3", " C7", " F7", " B1", " F2", " F3", " F4", " F5", " F6"] +    "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"], +    "rows": ["C0", "C1", "C2", "C3", "C7", "F7", "B1", "F2", "F3", "F4", "F5", "F6"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "8", -    "hue_steps": "8", -    "led_count": "16", +    "brightness_steps": 8, +    "hue_steps": 8, +    "led_count": 16,      "pin": "C6", -    "saturation_steps": "8" +    "saturation_steps": 8    },    "usb": {      "pid": "0x23A0" diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk index c421eb862e..6e7633bfe0 100644 --- a/keyboards/clueboard/2x1800/2018/rules.mk +++ b/keyboards/clueboard/2x1800/2018/rules.mk @@ -1,12 +1 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = halfkay +# This file intentionally left blank diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json index 96af671a8b..26185b7a48 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/info.json @@ -4,7 +4,9 @@    "maintainer": "skullydazed",    "height": 8,    "width": 24, -  "debounce": "5", +  "debounce": 5, +  "processor": "at90usb1286", +  "bootloader": "halfkay",    "diode_direction": "ROW2COL",    "features": {      "audio": true, diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk index c421eb862e..6e7633bfe0 100644 --- a/keyboards/clueboard/2x1800/2019/rules.mk +++ b/keyboards/clueboard/2x1800/2019/rules.mk @@ -1,12 +1 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = halfkay +# This file intentionally left blank diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index 1df0512ad3..2da993437c 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 15, -  "debounce": "6", +  "debounce": 6, +  "processor": "STM32F303",    "diode_direction": "COL2ROW",    "features": {      "audio": true, diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk index 7e85acec65..6bc7eb7619 100644 --- a/keyboards/clueboard/60/rules.mk +++ b/keyboards/clueboard/60/rules.mk @@ -1,5 +1,3 @@ -# MCU name -MCU = STM32F303  BOARD = QMK_PROTON_C  # project specific files diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json index f67e5baf75..beb83b5e65 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "processor": "atmega32u4", +  "debounce": 5,    "diode_direction": "COL2ROW",    "features": {      "audio": false, @@ -24,18 +25,18 @@      "caps_lock": "F0"    },    "matrix_pins": { -    "cols": ["B3", " F1", " F4", " F5", " F6", " C7", " C6", " B6", " B5", " B4", " D7", " D6", " D4", " F7", " B0", " B1"], -    "rows": ["D1", " D0", " D2", " D5", " D3"] +    "cols": ["B3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "F7", "B0", "B1"], +    "rows": ["D1", "D0", "D2", "D5", "D3"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "10", -    "led_count": "14", +    "brightness_steps": 17, +    "hue_steps": 10, +    "led_count": 14,      "pin": "B2", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk index 2f20507d4d..6e7633bfe0 100644 --- a/keyboards/clueboard/66/rev1/rules.mk +++ b/keyboards/clueboard/66/rev1/rules.mk @@ -1,12 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu +# This file intentionally left blank diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index 4560ec7e8d..603558de82 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "processor": "atmega32u4", +  "debounce": 5,    "diode_direction": "COL2ROW",    "features": {      "audio": false, @@ -24,18 +25,18 @@      "caps_lock": "B4"    },    "matrix_pins": { -    "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], -    "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] +    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], +    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "32", -    "led_count": "14", +    "brightness_steps": 17, +    "hue_steps": 32, +    "led_count": 14,      "pin": "D7", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk index 75fb718e33..d2e52d56b5 100644 --- a/keyboards/clueboard/66/rev2/rules.mk +++ b/keyboards/clueboard/66/rev2/rules.mk @@ -1,15 +1,2 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu -  # Build Options  BACKLIGHT_DRIVER = custom diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index 4b9694a2bf..d3b13bed7a 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "processor": "atmega32u4", +  "debounce": 5,    "diode_direction": "COL2ROW",    "features": {      "audio": false, @@ -24,18 +25,18 @@      "caps_lock": "B4"    },    "matrix_pins": { -    "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], -    "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] +    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], +    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "32", -    "led_count": "18", +    "brightness_steps": 17, +    "hue_steps": 32, +    "led_count": 18,      "pin": "D7", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk index 76e161e36b..56d1ab011f 100644 --- a/keyboards/clueboard/66/rev3/rules.mk +++ b/keyboards/clueboard/66/rev3/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu -  # Build Options  #   comment out to disable the options.  # diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index 90c721e31f..aef1dee7aa 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "debounce": 5, +  "processor": "STM32F303",    "diode_direction": "COL2ROW",    "features": {      "audio": true, @@ -21,18 +22,18 @@      "unicode": false    },    "matrix_pins": { -    "cols": ["B10", " B2", " B1", " B0", " A7", " B4", " B3", " B5"], -    "rows": ["B11", " A6", " A3", " A2", " A1", " B7", " B6", " C15", " C14", " C13"] +    "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B5"], +    "rows": ["B11", "A6", "A3", "A2", "A1", "B7", "B6", "C15", "C14", "C13"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "32", -    "led_count": "18", +    "brightness_steps": 17, +    "hue_steps": 32, +    "led_count": 18,      "pin": "D7", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk index 4e157baeda..14a7fa7b71 100644 --- a/keyboards/clueboard/66/rev4/rules.mk +++ b/keyboards/clueboard/66/rev4/rules.mk @@ -1,3 +1,2 @@ -# MCU name -MCU = STM32F303  BOARD = QMK_PROTON_C +# This file intentionally left blank diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json index 76352b0771..18afe54126 100644 --- a/keyboards/clueboard/66_hotswap/gen1/info.json +++ b/keyboards/clueboard/66_hotswap/gen1/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "debounce": 5, +  "processor": "STM32F303",    "diode_direction": "COL2ROW",    "features": {      "audio": true, @@ -12,13 +13,16 @@      "command": true,      "console": true,      "extrakey": true, -    "led_matrix": "IS31FL3731", +    "led_matrix": true,      "mousekey": true,      "nkro": true    }, +  "led_matrix": { +    "driver": "IS31FL3731" +  },    "matrix_pins": { -    "cols": ["B10", " B2", " B1", " B0", " A7", " B4", " B3", " B7"], -    "rows": ["B11", " A6", " A3", " A2", " A1", " B5", " B6", " C15", " C14", " C13"] +    "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B7"], +    "rows": ["B11", "A6", "A3", "A2", "A1", "B5", "B6", "C15", "C14", "C13"]    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk index f298df1677..e23f9a4b3c 100644 --- a/keyboards/clueboard/66_hotswap/gen1/rules.mk +++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk @@ -1,5 +1,3 @@ -# MCU name -MCU = STM32F303  BOARD = QMK_PROTON_C  LED_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index 1572223592..0b55b3b638 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json @@ -4,8 +4,9 @@    "maintainer": "skullydazed",    "height": 5,    "width": 16.5, -  "debounce": "5", +  "debounce": 5,    "diode_direction": "COL2ROW", +  "processor": "atmega32u4",    "features": {      "audio": true,      "backlight": true, @@ -24,18 +25,18 @@      "caps_lock": "B4"    },    "matrix_pins": { -    "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], -    "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] +    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], +    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]    },    "rgblight": {      "animations": {        "all": true      }, -    "brightness_steps": "17", -    "hue_steps": "32", -    "led_count": "26", +    "brightness_steps": 17, +    "hue_steps": 32, +    "led_count": 26,      "pin": "D7", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk index 63dd64f7c1..f144042edd 100644 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu -  # Build Options  #   comment out to disable the options.  # diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json index f376643cdd..02c06ce513 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/info.json @@ -2,6 +2,7 @@      "keyboard_name": "Clueboard California",      "url": "",      "maintainer": "skullydazed", +    "processor": "STM32F303",      "matrix_pins": {          "direct": [              ["A10", "A9"], @@ -12,6 +13,13 @@              [null, "B2"]          ]      }, +    "features": { +        "mousekey": true, +	"extrakey": true, +	"console": true, +	"command": true, +	"audio": true +    },      "usb": {"pid": "0x23B0"},      "layouts": {          "LAYOUT": { diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk index 11719015e9..14a7fa7b71 100644 --- a/keyboards/clueboard/california/rules.mk +++ b/keyboards/clueboard/california/rules.mk @@ -1,12 +1,2 @@ -# MCU name -MCU = STM32F303  BOARD = QMK_PROTON_C - -## Features -MOUSEKEY_ENABLE = yes  # Mouse keys -EXTRAKEY_ENABLE = yes  # Audio control and System control -CONSOLE_ENABLE = yes   # Console for debug -COMMAND_ENABLE = no    # Commands for debug and configuration -NKRO_ENABLE = yes      # USB Nkey Rollover -RGBLIGHT_ENABLE = no -AUDIO_ENABLE = yes +# This file intentionally left blank diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index e46237175a..67830c4235 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json @@ -4,7 +4,8 @@    "maintainer": "skullydazed",    "height": 8,    "width": 10, -  "debounce": "20", +  "debounce": 20, +  "processor": "atmega32u4",    "diode_direction": "ROW2COL",    "features": {      "audio": true, @@ -22,15 +23,15 @@      "unicode": false    },    "matrix_pins": { -    "cols": ["F1", " F7", " F6"], -    "rows": ["F0", " F5", " F4", " B4"] +    "cols": ["F1", "F7", "F6"], +    "rows": ["F0", "F5", "F4", "B4"]    },    "rgblight": { -    "brightness_steps": "17", -    "hue_steps": "10", -    "led_count": "4", +    "brightness_steps": 17, +    "hue_steps": 10, +    "led_count": 4,      "pin": "E6", -    "saturation_steps": "17" +    "saturation_steps": 17    },    "usb": {      "device_ver": "0x0001", diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk index 75fb718e33..d2e52d56b5 100644 --- a/keyboards/clueboard/card/rules.mk +++ b/keyboards/clueboard/card/rules.mk @@ -1,15 +1,2 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp -BOOTLOADER = atmel-dfu -  # Build Options  BACKLIGHT_DRIVER = custom | 
