cleanup clueboard based on latest validation work

sotoba · Jan 8, 2021 · 0d3aca0 · 0d3aca0
1 parent ededff8
commit 0d3aca0
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 177 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,21 +4,25 @@
   "maintainer": "skullydazed",
   "height": 5,
   "width": 16.5,
-  "debounce": "5",
+  "debounce": 5,
+  "processor": "STM32F303",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
     "bootmagic": true,
     "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
@@ -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
@@ -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",