diff options
author | Zach White <skullydazed@gmail.com> | 2020-12-01 12:52:26 -0800 |
---|---|---|
committer | Zach White <skullydazed@drpepper.org> | 2021-01-07 21:21:12 -0800 |
commit | 0d3aca062e3fd7a4b351a9edc42c6b36686abd4f (patch) | |
tree | 850e7dcfbdb3b6d4ecb82c53fab1f8b698bd32b4 | |
parent | ededff8556daff544633cb143cb6d939afd09014 (diff) | |
download | qmk_firmware-0d3aca062e3fd7a4b351a9edc42c6b36686abd4f.tar.gz qmk_firmware-0d3aca062e3fd7a4b351a9edc42c6b36686abd4f.zip |
cleanup clueboard based on latest validation work
24 files changed, 88 insertions, 177 deletions
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index 46510c48c..47260572e 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json | |||
@@ -5,6 +5,7 @@ | |||
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 4, | 6 | "width": 4, |
7 | "diode_direction": "COL2ROW", | 7 | "diode_direction": "COL2ROW", |
8 | "processor": "atmega32u4", | ||
8 | "features": { | 9 | "features": { |
9 | "backlight": true, | 10 | "backlight": true, |
10 | "bootmagic": false, | 11 | "bootmagic": false, |
@@ -25,11 +26,11 @@ | |||
25 | "animations": { | 26 | "animations": { |
26 | "all": true | 27 | "all": true |
27 | }, | 28 | }, |
28 | "brightness_steps": "17", | 29 | "brightness_steps": 17, |
29 | "hue_steps": "10", | 30 | "hue_steps": 10, |
30 | "led_count": "4", | 31 | "led_count": 4, |
31 | "pin": "F6", | 32 | "pin": "F6", |
32 | "saturation_steps": "17" | 33 | "saturation_steps": 17 |
33 | }, | 34 | }, |
34 | "url": "", | 35 | "url": "", |
35 | "usb": { | 36 | "usb": { |
diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk index 75fb718e3..d2e52d56b 100644 --- a/keyboards/clueboard/17/rules.mk +++ b/keyboards/clueboard/17/rules.mk | |||
@@ -1,15 +1,2 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
13 | |||
14 | # Build Options | 1 | # Build Options |
15 | BACKLIGHT_DRIVER = custom | 2 | BACKLIGHT_DRIVER = custom |
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json index b67117407..878b24ce1 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/info.json | |||
@@ -4,7 +4,9 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 6.5, | 5 | "height": 6.5, |
6 | "width": 24, | 6 | "width": 24, |
7 | "debounce": "5", | 7 | "processor": "at90usb1286", |
8 | "bootloader": "halfkay", | ||
9 | "debounce": 5, | ||
8 | "diode_direction": "ROW2COL", | 10 | "diode_direction": "ROW2COL", |
9 | "features": { | 11 | "features": { |
10 | "audio": true, | 12 | "audio": true, |
@@ -24,18 +26,18 @@ | |||
24 | "scroll_lock": "B6" | 26 | "scroll_lock": "B6" |
25 | }, | 27 | }, |
26 | "matrix_pins": { | 28 | "matrix_pins": { |
27 | "cols": ["D2", " D3", " D4", " D5", " D7", " E0", " E1", " B0", " E6", " B3", " B2"], | 29 | "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"], |
28 | "rows": ["C0", " C1", " C2", " C3", " C7", " F7", " B1", " F2", " F3", " F4", " F5", " F6"] | 30 | "rows": ["C0", "C1", "C2", "C3", "C7", "F7", "B1", "F2", "F3", "F4", "F5", "F6"] |
29 | }, | 31 | }, |
30 | "rgblight": { | 32 | "rgblight": { |
31 | "animations": { | 33 | "animations": { |
32 | "all": true | 34 | "all": true |
33 | }, | 35 | }, |
34 | "brightness_steps": "8", | 36 | "brightness_steps": 8, |
35 | "hue_steps": "8", | 37 | "hue_steps": 8, |
36 | "led_count": "16", | 38 | "led_count": 16, |
37 | "pin": "C6", | 39 | "pin": "C6", |
38 | "saturation_steps": "8" | 40 | "saturation_steps": 8 |
39 | }, | 41 | }, |
40 | "usb": { | 42 | "usb": { |
41 | "pid": "0x23A0" | 43 | "pid": "0x23A0" |
diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk index c421eb862..6e7633bfe 100644 --- a/keyboards/clueboard/2x1800/2018/rules.mk +++ b/keyboards/clueboard/2x1800/2018/rules.mk | |||
@@ -1,12 +1 @@ | |||
1 | # MCU name | # This file intentionally left blank | |
2 | MCU = at90usb1286 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = halfkay | ||
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json index 96af671a8..26185b7a4 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/info.json | |||
@@ -4,7 +4,9 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 8, | 5 | "height": 8, |
6 | "width": 24, | 6 | "width": 24, |
7 | "debounce": "5", | 7 | "debounce": 5, |
8 | "processor": "at90usb1286", | ||
9 | "bootloader": "halfkay", | ||
8 | "diode_direction": "ROW2COL", | 10 | "diode_direction": "ROW2COL", |
9 | "features": { | 11 | "features": { |
10 | "audio": true, | 12 | "audio": true, |
diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk index c421eb862..6e7633bfe 100644 --- a/keyboards/clueboard/2x1800/2019/rules.mk +++ b/keyboards/clueboard/2x1800/2019/rules.mk | |||
@@ -1,12 +1 @@ | |||
1 | # MCU name | # This file intentionally left blank | |
2 | MCU = at90usb1286 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = halfkay | ||
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index 1df0512ad..2da993437 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 15, | 6 | "width": 15, |
7 | "debounce": "6", | 7 | "debounce": 6, |
8 | "processor": "STM32F303", | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": true, | 11 | "audio": true, |
diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk index 7e85acec6..6bc7eb761 100644 --- a/keyboards/clueboard/60/rules.mk +++ b/keyboards/clueboard/60/rules.mk | |||
@@ -1,5 +1,3 @@ | |||
1 | # MCU name | ||
2 | MCU = STM32F303 | ||
3 | BOARD = QMK_PROTON_C | 1 | BOARD = QMK_PROTON_C |
4 | 2 | ||
5 | # project specific files | 3 | # project specific files |
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json index f67e5baf7..beb83b5e6 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "processor": "atmega32u4", |
8 | "debounce": 5, | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": false, | 11 | "audio": false, |
@@ -24,18 +25,18 @@ | |||
24 | "caps_lock": "F0" | 25 | "caps_lock": "F0" |
25 | }, | 26 | }, |
26 | "matrix_pins": { | 27 | "matrix_pins": { |
27 | "cols": ["B3", " F1", " F4", " F5", " F6", " C7", " C6", " B6", " B5", " B4", " D7", " D6", " D4", " F7", " B0", " B1"], | 28 | "cols": ["B3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "F7", "B0", "B1"], |
28 | "rows": ["D1", " D0", " D2", " D5", " D3"] | 29 | "rows": ["D1", "D0", "D2", "D5", "D3"] |
29 | }, | 30 | }, |
30 | "rgblight": { | 31 | "rgblight": { |
31 | "animations": { | 32 | "animations": { |
32 | "all": true | 33 | "all": true |
33 | }, | 34 | }, |
34 | "brightness_steps": "17", | 35 | "brightness_steps": 17, |
35 | "hue_steps": "10", | 36 | "hue_steps": 10, |
36 | "led_count": "14", | 37 | "led_count": 14, |
37 | "pin": "B2", | 38 | "pin": "B2", |
38 | "saturation_steps": "17" | 39 | "saturation_steps": 17 |
39 | }, | 40 | }, |
40 | "usb": { | 41 | "usb": { |
41 | "device_ver": "0x0001", | 42 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk index 2f20507d4..6e7633bfe 100644 --- a/keyboards/clueboard/66/rev1/rules.mk +++ b/keyboards/clueboard/66/rev1/rules.mk | |||
@@ -1,12 +1 @@ | |||
1 | # MCU name | # This file intentionally left blank | |
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index 4560ec7e8..603558de8 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "processor": "atmega32u4", |
8 | "debounce": 5, | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": false, | 11 | "audio": false, |
@@ -24,18 +25,18 @@ | |||
24 | "caps_lock": "B4" | 25 | "caps_lock": "B4" |
25 | }, | 26 | }, |
26 | "matrix_pins": { | 27 | "matrix_pins": { |
27 | "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], | 28 | "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], |
28 | "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] | 29 | "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"] |
29 | }, | 30 | }, |
30 | "rgblight": { | 31 | "rgblight": { |
31 | "animations": { | 32 | "animations": { |
32 | "all": true | 33 | "all": true |
33 | }, | 34 | }, |
34 | "brightness_steps": "17", | 35 | "brightness_steps": 17, |
35 | "hue_steps": "32", | 36 | "hue_steps": 32, |
36 | "led_count": "14", | 37 | "led_count": 14, |
37 | "pin": "D7", | 38 | "pin": "D7", |
38 | "saturation_steps": "17" | 39 | "saturation_steps": 17 |
39 | }, | 40 | }, |
40 | "usb": { | 41 | "usb": { |
41 | "device_ver": "0x0001", | 42 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk index 75fb718e3..d2e52d56b 100644 --- a/keyboards/clueboard/66/rev2/rules.mk +++ b/keyboards/clueboard/66/rev2/rules.mk | |||
@@ -1,15 +1,2 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
13 | |||
14 | # Build Options | 1 | # Build Options |
15 | BACKLIGHT_DRIVER = custom | 2 | BACKLIGHT_DRIVER = custom |
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index 4b9694a2b..d3b13bed7 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "processor": "atmega32u4", |
8 | "debounce": 5, | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": false, | 11 | "audio": false, |
@@ -24,18 +25,18 @@ | |||
24 | "caps_lock": "B4" | 25 | "caps_lock": "B4" |
25 | }, | 26 | }, |
26 | "matrix_pins": { | 27 | "matrix_pins": { |
27 | "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], | 28 | "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], |
28 | "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] | 29 | "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"] |
29 | }, | 30 | }, |
30 | "rgblight": { | 31 | "rgblight": { |
31 | "animations": { | 32 | "animations": { |
32 | "all": true | 33 | "all": true |
33 | }, | 34 | }, |
34 | "brightness_steps": "17", | 35 | "brightness_steps": 17, |
35 | "hue_steps": "32", | 36 | "hue_steps": 32, |
36 | "led_count": "18", | 37 | "led_count": 18, |
37 | "pin": "D7", | 38 | "pin": "D7", |
38 | "saturation_steps": "17" | 39 | "saturation_steps": 17 |
39 | }, | 40 | }, |
40 | "usb": { | 41 | "usb": { |
41 | "device_ver": "0x0001", | 42 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk index 76e161e36..56d1ab011 100644 --- a/keyboards/clueboard/66/rev3/rules.mk +++ b/keyboards/clueboard/66/rev3/rules.mk | |||
@@ -1,16 +1,3 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
13 | |||
14 | # Build Options | 1 | # Build Options |
15 | # comment out to disable the options. | 2 | # comment out to disable the options. |
16 | # | 3 | # |
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index 90c721e31..aef1dee7a 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "debounce": 5, |
8 | "processor": "STM32F303", | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": true, | 11 | "audio": true, |
@@ -21,18 +22,18 @@ | |||
21 | "unicode": false | 22 | "unicode": false |
22 | }, | 23 | }, |
23 | "matrix_pins": { | 24 | "matrix_pins": { |
24 | "cols": ["B10", " B2", " B1", " B0", " A7", " B4", " B3", " B5"], | 25 | "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B5"], |
25 | "rows": ["B11", " A6", " A3", " A2", " A1", " B7", " B6", " C15", " C14", " C13"] | 26 | "rows": ["B11", "A6", "A3", "A2", "A1", "B7", "B6", "C15", "C14", "C13"] |
26 | }, | 27 | }, |
27 | "rgblight": { | 28 | "rgblight": { |
28 | "animations": { | 29 | "animations": { |
29 | "all": true | 30 | "all": true |
30 | }, | 31 | }, |
31 | "brightness_steps": "17", | 32 | "brightness_steps": 17, |
32 | "hue_steps": "32", | 33 | "hue_steps": 32, |
33 | "led_count": "18", | 34 | "led_count": 18, |
34 | "pin": "D7", | 35 | "pin": "D7", |
35 | "saturation_steps": "17" | 36 | "saturation_steps": 17 |
36 | }, | 37 | }, |
37 | "usb": { | 38 | "usb": { |
38 | "device_ver": "0x0001", | 39 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk index 4e157baed..14a7fa7b7 100644 --- a/keyboards/clueboard/66/rev4/rules.mk +++ b/keyboards/clueboard/66/rev4/rules.mk | |||
@@ -1,3 +1,2 @@ | |||
1 | # MCU name | ||
2 | MCU = STM32F303 | ||
3 | BOARD = QMK_PROTON_C | 1 | BOARD = QMK_PROTON_C |
2 | # This file intentionally left blank | ||
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json index 76352b077..18afe5412 100644 --- a/keyboards/clueboard/66_hotswap/gen1/info.json +++ b/keyboards/clueboard/66_hotswap/gen1/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "debounce": 5, |
8 | "processor": "STM32F303", | ||
8 | "diode_direction": "COL2ROW", | 9 | "diode_direction": "COL2ROW", |
9 | "features": { | 10 | "features": { |
10 | "audio": true, | 11 | "audio": true, |
@@ -12,13 +13,16 @@ | |||
12 | "command": true, | 13 | "command": true, |
13 | "console": true, | 14 | "console": true, |
14 | "extrakey": true, | 15 | "extrakey": true, |
15 | "led_matrix": "IS31FL3731", | 16 | "led_matrix": true, |
16 | "mousekey": true, | 17 | "mousekey": true, |
17 | "nkro": true | 18 | "nkro": true |
18 | }, | 19 | }, |
20 | "led_matrix": { | ||
21 | "driver": "IS31FL3731" | ||
22 | }, | ||
19 | "matrix_pins": { | 23 | "matrix_pins": { |
20 | "cols": ["B10", " B2", " B1", " B0", " A7", " B4", " B3", " B7"], | 24 | "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B7"], |
21 | "rows": ["B11", " A6", " A3", " A2", " A1", " B5", " B6", " C15", " C14", " C13"] | 25 | "rows": ["B11", "A6", "A3", "A2", "A1", "B5", "B6", "C15", "C14", "C13"] |
22 | }, | 26 | }, |
23 | "usb": { | 27 | "usb": { |
24 | "device_ver": "0x0001", | 28 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk index f298df167..e23f9a4b3 100644 --- a/keyboards/clueboard/66_hotswap/gen1/rules.mk +++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk | |||
@@ -1,5 +1,3 @@ | |||
1 | # MCU name | ||
2 | MCU = STM32F303 | ||
3 | BOARD = QMK_PROTON_C | 1 | BOARD = QMK_PROTON_C |
4 | LED_MATRIX_DRIVER = IS31FL3731 | 2 | LED_MATRIX_DRIVER = IS31FL3731 |
5 | 3 | ||
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index 157222359..0b55b3b63 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json | |||
@@ -4,8 +4,9 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 5, | 5 | "height": 5, |
6 | "width": 16.5, | 6 | "width": 16.5, |
7 | "debounce": "5", | 7 | "debounce": 5, |
8 | "diode_direction": "COL2ROW", | 8 | "diode_direction": "COL2ROW", |
9 | "processor": "atmega32u4", | ||
9 | "features": { | 10 | "features": { |
10 | "audio": true, | 11 | "audio": true, |
11 | "backlight": true, | 12 | "backlight": true, |
@@ -24,18 +25,18 @@ | |||
24 | "caps_lock": "B4" | 25 | "caps_lock": "B4" |
25 | }, | 26 | }, |
26 | "matrix_pins": { | 27 | "matrix_pins": { |
27 | "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"], | 28 | "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"], |
28 | "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"] | 29 | "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"] |
29 | }, | 30 | }, |
30 | "rgblight": { | 31 | "rgblight": { |
31 | "animations": { | 32 | "animations": { |
32 | "all": true | 33 | "all": true |
33 | }, | 34 | }, |
34 | "brightness_steps": "17", | 35 | "brightness_steps": 17, |
35 | "hue_steps": "32", | 36 | "hue_steps": 32, |
36 | "led_count": "26", | 37 | "led_count": 26, |
37 | "pin": "D7", | 38 | "pin": "D7", |
38 | "saturation_steps": "17" | 39 | "saturation_steps": 17 |
39 | }, | 40 | }, |
40 | "usb": { | 41 | "usb": { |
41 | "device_ver": "0x0001", | 42 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk index 63dd64f7c..f144042ed 100644 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk | |||
@@ -1,16 +1,3 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
13 | |||
14 | # Build Options | 1 | # Build Options |
15 | # comment out to disable the options. | 2 | # comment out to disable the options. |
16 | # | 3 | # |
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json index f376643cd..02c06ce51 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/info.json | |||
@@ -2,6 +2,7 @@ | |||
2 | "keyboard_name": "Clueboard California", | 2 | "keyboard_name": "Clueboard California", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "processor": "STM32F303", | ||
5 | "matrix_pins": { | 6 | "matrix_pins": { |
6 | "direct": [ | 7 | "direct": [ |
7 | ["A10", "A9"], | 8 | ["A10", "A9"], |
@@ -12,6 +13,13 @@ | |||
12 | [null, "B2"] | 13 | [null, "B2"] |
13 | ] | 14 | ] |
14 | }, | 15 | }, |
16 | "features": { | ||
17 | "mousekey": true, | ||
18 | "extrakey": true, | ||
19 | "console": true, | ||
20 | "command": true, | ||
21 | "audio": true | ||
22 | }, | ||
15 | "usb": {"pid": "0x23B0"}, | 23 | "usb": {"pid": "0x23B0"}, |
16 | "layouts": { | 24 | "layouts": { |
17 | "LAYOUT": { | 25 | "LAYOUT": { |
diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk index 11719015e..14a7fa7b7 100644 --- a/keyboards/clueboard/california/rules.mk +++ b/keyboards/clueboard/california/rules.mk | |||
@@ -1,12 +1,2 @@ | |||
1 | # MCU name | ||
2 | MCU = STM32F303 | ||
3 | BOARD = QMK_PROTON_C | 1 | BOARD = QMK_PROTON_C |
4 | 2 | # This file intentionally left blank | |
5 | ## Features | ||
6 | MOUSEKEY_ENABLE = yes # Mouse keys | ||
7 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
8 | CONSOLE_ENABLE = yes # Console for debug | ||
9 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
10 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
11 | RGBLIGHT_ENABLE = no | ||
12 | AUDIO_ENABLE = yes | ||
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index e46237175..67830c423 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json | |||
@@ -4,7 +4,8 @@ | |||
4 | "maintainer": "skullydazed", | 4 | "maintainer": "skullydazed", |
5 | "height": 8, | 5 | "height": 8, |
6 | "width": 10, | 6 | "width": 10, |
7 | "debounce": "20", | 7 | "debounce": 20, |
8 | "processor": "atmega32u4", | ||
8 | "diode_direction": "ROW2COL", | 9 | "diode_direction": "ROW2COL", |
9 | "features": { | 10 | "features": { |
10 | "audio": true, | 11 | "audio": true, |
@@ -22,15 +23,15 @@ | |||
22 | "unicode": false | 23 | "unicode": false |
23 | }, | 24 | }, |
24 | "matrix_pins": { | 25 | "matrix_pins": { |
25 | "cols": ["F1", " F7", " F6"], | 26 | "cols": ["F1", "F7", "F6"], |
26 | "rows": ["F0", " F5", " F4", " B4"] | 27 | "rows": ["F0", "F5", "F4", "B4"] |
27 | }, | 28 | }, |
28 | "rgblight": { | 29 | "rgblight": { |
29 | "brightness_steps": "17", | 30 | "brightness_steps": 17, |
30 | "hue_steps": "10", | 31 | "hue_steps": 10, |
31 | "led_count": "4", | 32 | "led_count": 4, |
32 | "pin": "E6", | 33 | "pin": "E6", |
33 | "saturation_steps": "17" | 34 | "saturation_steps": 17 |
34 | }, | 35 | }, |
35 | "usb": { | 36 | "usb": { |
36 | "device_ver": "0x0001", | 37 | "device_ver": "0x0001", |
diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk index 75fb718e3..d2e52d56b 100644 --- a/keyboards/clueboard/card/rules.mk +++ b/keyboards/clueboard/card/rules.mk | |||
@@ -1,15 +1,2 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | # Teensy halfkay | ||
6 | # Pro Micro caterina | ||
7 | # Atmel DFU atmel-dfu | ||
8 | # LUFA DFU lufa-dfu | ||
9 | # QMK DFU qmk-dfu | ||
10 | # ATmega32A bootloadHID | ||
11 | # ATmega328P USBasp | ||
12 | BOOTLOADER = atmel-dfu | ||
13 | |||
14 | # Build Options | 1 | # Build Options |
15 | BACKLIGHT_DRIVER = custom | 2 | BACKLIGHT_DRIVER = custom |