summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-17 13:14:29 +1100
committerGitHub <noreply@github.com>2023-02-17 13:14:29 +1100
commitf4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b (patch)
tree11fec680226404eb46d2c61305cf7e848450c4d9 /keyboards/cannonkeys
parentd784f78bd0a034c1d6085379615014fd701536ab (diff)
Move LED indicator config to data driven (#19800)
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/balance/config.h4
-rw-r--r--keyboards/cannonkeys/balance/info.json5
-rw-r--r--keyboards/cannonkeys/brutalv2_65/config.h3
-rw-r--r--keyboards/cannonkeys/brutalv2_65/info.json4
-rw-r--r--keyboards/cannonkeys/cloudline/config.h4
-rw-r--r--keyboards/cannonkeys/cloudline/info.json5
-rw-r--r--keyboards/cannonkeys/crin/config.h3
-rw-r--r--keyboards/cannonkeys/crin/info.json4
-rw-r--r--keyboards/cannonkeys/gentoo/config.h3
-rw-r--r--keyboards/cannonkeys/gentoo/info.json4
-rw-r--r--keyboards/cannonkeys/gentoo_hs/config.h4
-rw-r--r--keyboards/cannonkeys/gentoo_hs/info.json4
-rw-r--r--keyboards/cannonkeys/hoodrowg/config.h3
-rw-r--r--keyboards/cannonkeys/hoodrowg/info.json4
-rw-r--r--keyboards/cannonkeys/malicious_ergo/config.h8
-rw-r--r--keyboards/cannonkeys/malicious_ergo/info.json6
-rw-r--r--keyboards/cannonkeys/sagittarius/config.h4
-rw-r--r--keyboards/cannonkeys/sagittarius/info.json5
18 files changed, 41 insertions, 36 deletions
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index b2e06ee900..fba90c0628 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 }
#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B12
-#define LED_NUM_LOCK_PIN B14
-#define LED_PIN_ON_STATE 0
-
/* 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/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index ea4daaad01..13eb96a62f 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -8,6 +8,11 @@
"pid": "0xBA77",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B12",
+ "num_lock": "B14",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h
index 66024143d7..57c691d1d6 100644
--- a/keyboards/cannonkeys/brutalv2_65/config.h
+++ b/keyboards/cannonkeys/brutalv2_65/config.h
@@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
-
/* 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/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 54b6f40618..000e541557 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -8,6 +8,10 @@
"pid": "0x0008",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B3",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index fd61a01918..a81791b0d6 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -18,10 +18,6 @@
#define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 6
-#define LED_CAPS_LOCK_PIN B9
-#define LED_SCROLL_LOCK_PIN F0
-#define LED_PIN_ON_STATE 0
-
/* 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/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index 62cbb402a0..86d126255d 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,11 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B9",
+ "scroll_lock": "F0",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h
index 4a41687813..2843df3da7 100644
--- a/keyboards/cannonkeys/crin/config.h
+++ b/keyboards/cannonkeys/crin/config.h
@@ -33,9 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 6
-#define LED_CAPS_LOCK_PIN F1
-#define LED_PIN_ON_STATE 0
-
/* 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/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index 27eaa226d7..372eab0d48 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -8,6 +8,10 @@
"pid": "0x0012",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "F1",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layout_aliases": {
diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h
index 66024143d7..57c691d1d6 100644
--- a/keyboards/cannonkeys/gentoo/config.h
+++ b/keyboards/cannonkeys/gentoo/config.h
@@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
-
/* 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/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index c67484efdc..6b0c9399be 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -8,6 +8,10 @@
"pid": "0x000F",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B3",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h
index 67a264ed40..18509fede6 100644
--- a/keyboards/cannonkeys/gentoo_hs/config.h
+++ b/keyboards/cannonkeys/gentoo_hs/config.h
@@ -30,10 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN B14
-#define LED_PIN_ON_STATE 0
-
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index a9c0e2a66f..8595a321b2 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -8,6 +8,10 @@
"pid": "0x0010",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B14",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 475ce865c5..690f136945 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -38,9 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B2
-
/* 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/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 45e5c0b9b2..4d0adb731a 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -8,6 +8,10 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B6",
+ "scroll_lock": "B2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 8a653035c4..8e18a9bb94 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -57,14 +57,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
-// Indicator LEDs
-#define LED_CAPS_LOCK_PIN A8
-#define LED_NUM_LOCK_PIN A9
-#define LED_SCROLL_LOCK_PIN B12
-#define LED_PIN_ON_STATE 0
-
-
-
// 2 bits for 4 layout options
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index b2600e866c..d9979a3462 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -8,6 +8,12 @@
"pid": "0x0009",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "A8",
+ "num_lock": "A9",
+ "scroll_lock": "B12",
+ "on_state": 0
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index a10b9bd822..846742d758 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 }
#define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN A15
-
#define BACKLIGHT_PIN A6
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 17423c0fbe..76b52ab4bd 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B3",
+ "num_lock": "B4",
+ "scroll_lock": "A15"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {