summaryrefslogtreecommitdiffstats
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/adelie/config.h5
-rw-r--r--keyboards/cannonkeys/adelie/info.json6
-rw-r--r--keyboards/cannonkeys/aella/rules.mk2
-rw-r--r--keyboards/cannonkeys/an_c/config.h1
-rw-r--r--keyboards/cannonkeys/an_c/info.json3
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk2
-rw-r--r--keyboards/cannonkeys/atlas/config.h1
-rw-r--r--keyboards/cannonkeys/atlas/info.json3
-rw-r--r--keyboards/cannonkeys/atlas_alps/config.h4
-rw-r--r--keyboards/cannonkeys/atlas_alps/info.json4
-rw-r--r--keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk2
-rw-r--r--keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk2
-rw-r--r--keyboards/cannonkeys/balance/config.h2
-rw-r--r--keyboards/cannonkeys/balance/info.json3
-rw-r--r--keyboards/cannonkeys/balance/rules.mk2
-rw-r--r--keyboards/cannonkeys/brutalv2_65/rules.mk2
-rw-r--r--keyboards/cannonkeys/chimera65/rules.mk2
-rw-r--r--keyboards/cannonkeys/chimera65_hs/rules.mk2
-rw-r--r--keyboards/cannonkeys/cloudline/config.h1
-rw-r--r--keyboards/cannonkeys/cloudline/info.json3
-rw-r--r--keyboards/cannonkeys/cloudline/rules.mk2
-rw-r--r--keyboards/cannonkeys/crin/rules.mk2
-rw-r--r--keyboards/cannonkeys/db60/config.h1
-rw-r--r--keyboards/cannonkeys/db60/info.json3
-rw-r--r--keyboards/cannonkeys/db60/rules.mk2
-rw-r--r--keyboards/cannonkeys/devastatingtkl/config.h1
-rw-r--r--keyboards/cannonkeys/devastatingtkl/info.json3
-rw-r--r--keyboards/cannonkeys/devastatingtkl/rules.mk2
-rw-r--r--keyboards/cannonkeys/gentoo/rules.mk2
-rw-r--r--keyboards/cannonkeys/gentoo_hs/rules.mk2
-rw-r--r--keyboards/cannonkeys/hoodrowg/config.h1
-rw-r--r--keyboards/cannonkeys/hoodrowg/info.json3
-rw-r--r--keyboards/cannonkeys/instant60/config.h1
-rw-r--r--keyboards/cannonkeys/instant60/info.json3
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk2
-rw-r--r--keyboards/cannonkeys/instant65/config.h1
-rw-r--r--keyboards/cannonkeys/instant65/info.json3
-rw-r--r--keyboards/cannonkeys/instant65/rules.mk2
-rw-r--r--keyboards/cannonkeys/iron165/rules.mk2
-rw-r--r--keyboards/cannonkeys/leviatan/rules.mk2
-rw-r--r--keyboards/cannonkeys/malicious_ergo/config.h1
-rw-r--r--keyboards/cannonkeys/malicious_ergo/info.json3
-rw-r--r--keyboards/cannonkeys/malicious_ergo/rules.mk2
-rw-r--r--keyboards/cannonkeys/obliterated75/config.h1
-rw-r--r--keyboards/cannonkeys/obliterated75/info.json3
-rw-r--r--keyboards/cannonkeys/obliterated75/rules.mk2
-rw-r--r--keyboards/cannonkeys/onyx/rules.mk2
-rw-r--r--keyboards/cannonkeys/ortho48/config.h1
-rw-r--r--keyboards/cannonkeys/ortho48/info.json3
-rw-r--r--keyboards/cannonkeys/ortho48/rules.mk2
-rw-r--r--keyboards/cannonkeys/ortho60/config.h1
-rw-r--r--keyboards/cannonkeys/ortho60/info.json3
-rw-r--r--keyboards/cannonkeys/ortho60/rules.mk2
-rw-r--r--keyboards/cannonkeys/ortho75/config.h1
-rw-r--r--keyboards/cannonkeys/ortho75/info.json3
-rw-r--r--keyboards/cannonkeys/ortho75/rules.mk2
-rw-r--r--keyboards/cannonkeys/practice60/config.h1
-rw-r--r--keyboards/cannonkeys/practice60/info.json3
-rw-r--r--keyboards/cannonkeys/practice60/rules.mk2
-rw-r--r--keyboards/cannonkeys/practice65/config.h1
-rw-r--r--keyboards/cannonkeys/practice65/info.json3
-rw-r--r--keyboards/cannonkeys/practice65/rules.mk2
-rw-r--r--keyboards/cannonkeys/rekt1800/rules.mk2
-rw-r--r--keyboards/cannonkeys/ripple/rules.mk2
-rw-r--r--keyboards/cannonkeys/ripple_hs/rules.mk2
-rw-r--r--keyboards/cannonkeys/sagittarius/config.h1
-rw-r--r--keyboards/cannonkeys/sagittarius/info.json3
-rw-r--r--keyboards/cannonkeys/sagittarius/rules.mk2
-rw-r--r--keyboards/cannonkeys/satisfaction75/rules.mk2
-rw-r--r--keyboards/cannonkeys/satisfaction75/satisfaction75.c8
-rw-r--r--keyboards/cannonkeys/savage65/config.h1
-rw-r--r--keyboards/cannonkeys/savage65/info.json3
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk2
-rw-r--r--keyboards/cannonkeys/tmov2/config.h1
-rw-r--r--keyboards/cannonkeys/tmov2/info.json3
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk2
-rw-r--r--keyboards/cannonkeys/tsukuyomi/config.h1
-rw-r--r--keyboards/cannonkeys/tsukuyomi/info.json3
-rw-r--r--keyboards/cannonkeys/tsukuyomi/rules.mk2
-rw-r--r--keyboards/cannonkeys/vicious40/rules.mk2
80 files changed, 74 insertions, 104 deletions
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 4333289e82..9435a66e79 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 3
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index 717bf3f3f8..8f2a0f71be 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -8,6 +8,12 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 3,
+ "sleep": true
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk
index f56120695a..480e866179 100644
--- a/keyboards/cannonkeys/aella/rules.mk
+++ b/keyboards/cannonkeys/aella/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index aced1f333c..e84ffc5e99 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index d3b73e3109..370fb9caf4 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -18,6 +18,9 @@
"levels": 6,
"breathing": true
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index b7ab91a339..8d3de1b8b2 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 1296ad8dcc..b5bcb93ba7 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_SPI SPID2
-#define RGBLED_NUM 22
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index 6fc7724b2b..873c1c0c4d 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,6 +8,9 @@
"pid": "0xA7A5",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 22
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 7e6ce9cdb9..1129e4261b 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -34,7 +34,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 36
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index ee584b24d2..c3e03db701 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -12,6 +12,10 @@
"pin": "D4"
},
"rgblight": {
+ "hue_steps": 12,
+ "saturation_steps": 12,
+ "brightness_steps": 12,
+ "led_count": 36,
"max_brightness": 230
},
"matrix_pins": {
diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk b/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
index 2a5031cd32..6dd24d8e06 100644
--- a/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
+++ b/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
@@ -1,5 +1,3 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk b/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
index 2a5031cd32..6dd24d8e06 100644
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
@@ -1,5 +1,3 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index f9c629dad8..0f2582901b 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define TAP_CODE_DELAY 25
-
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
/*
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index 8be2cee0c5..9565795169 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -18,6 +18,9 @@
{"pin_a": "B5", "pin_b": "B6", "resolution": 2}
]
},
+ "qmk": {
+ "tap_keycode_delay": 25
+ },
"indicators": {
"caps_lock": "B12",
"num_lock": "B14",
diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk
index aa1b707d43..5afdd3772f 100644
--- a/keyboards/cannonkeys/balance/rules.mk
+++ b/keyboards/cannonkeys/balance/rules.mk
@@ -15,5 +15,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk
index f56120695a..480e866179 100644
--- a/keyboards/cannonkeys/brutalv2_65/rules.mk
+++ b/keyboards/cannonkeys/brutalv2_65/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
index 09c801a849..9bdf6b8093 100644
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/chimera65_hs/rules.mk b/keyboards/cannonkeys/chimera65_hs/rules.mk
index 2a5031cd32..6dd24d8e06 100644
--- a/keyboards/cannonkeys/chimera65_hs/rules.mk
+++ b/keyboards/cannonkeys/chimera65_hs/rules.mk
@@ -1,5 +1,3 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index a3fc30fc3d..62e3dd37aa 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -12,7 +12,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGBLED_NUM 20
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index 37fc5470f9..a84a6f6a06 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,9 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B15",
"driver": "spi"
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 42e73a4650..86794ca0f7 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk
index e58c511435..a5906b6a90 100644
--- a/keyboards/cannonkeys/crin/rules.mk
+++ b/keyboards/cannonkeys/crin/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 20f73d95a2..e84ffc5e99 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define WS2812_SPI SPID2
-#define RGBLED_NUM 20
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 99a4425752..4c653de1be 100644
--- a/