summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron')
-rw-r--r--keyboards/keychron/k2_pro/ansi/rgb/config.h35
-rw-r--r--keyboards/keychron/k2_pro/ansi/white/config.h19
-rw-r--r--keyboards/keychron/k2_pro/iso/rgb/config.h35
-rw-r--r--keyboards/keychron/k2_pro/iso/rgb/info.json2
-rw-r--r--keyboards/keychron/k2_pro/iso/white/config.h19
-rw-r--r--keyboards/keychron/k2_pro/iso/white/info.json2
-rw-r--r--keyboards/keychron/k3_pro/iso/rgb/info.json2
-rw-r--r--keyboards/keychron/k4_pro/ansi/rgb/info.json2
-rw-r--r--keyboards/keychron/k4_pro/ansi/white/info.json2
-rw-r--r--keyboards/keychron/k6_pro/ansi/rgb/config.h37
-rw-r--r--keyboards/keychron/k6_pro/iso/rgb/config.h37
-rw-r--r--keyboards/keychron/k7_pro/ansi/rgb/config.h35
-rw-r--r--keyboards/keychron/k8_pro/ansi/rgb/config.h35
-rw-r--r--keyboards/keychron/k8_pro/iso/rgb/config.h37
-rwxr-xr-xkeyboards/keychron/q2_pro/q2_pro.c5
-rwxr-xr-xkeyboards/keychron/q3_pro/q3_pro.c5
16 files changed, 144 insertions, 165 deletions
diff --git a/keyboards/keychron/k2_pro/ansi/rgb/config.h b/keyboards/keychron/k2_pro/ansi/rgb/config.h
index ebb41a8bdd..d3e50c41fc 100644
--- a/keyboards/keychron/k2_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k2_pro/ansi/rgb/config.h
@@ -27,7 +27,7 @@
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
@@ -38,10 +38,6 @@
# define CAPS_LOCK_INDEX 46
# define LOW_BAT_IND_INDEX 77
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -71,14 +67,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -86,19 +82,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k2_pro/ansi/white/config.h b/keyboards/keychron/k2_pro/ansi/white/config.h
index 525448ea4d..c2b6af74e2 100644
--- a/keyboards/keychron/k2_pro/ansi/white/config.h
+++ b/keyboards/keychron/k2_pro/ansi/white/config.h
@@ -30,7 +30,7 @@
# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
# define DIM_CAPS_LOCK
-# define CAPS_LOCK_INDEX 46
+# define CAPS_LOCK_INDEX 46
# define LOW_BAT_IND_INDEX 77
/* LED Matrix Animation modes. Explicitly enabled
@@ -41,9 +41,9 @@
# define ENABLE_LED_MATRIX_NONE
# define ENABLE_LED_MATRIX_SOLID
-//# define ENABLE_LED_MATRIX_ALPHAS_MODS
+// # define ENABLE_LED_MATRIX_ALPHAS_MODS
# define ENABLE_LED_MATRIX_BREATHING
-//# define ENABLE_LED_MATRIX_BAND
+// # define ENABLE_LED_MATRIX_BAND
# define ENABLE_LED_MATRIX_BAND_PINWHEEL
# define ENABLE_LED_MATRIX_BAND_SPIRAL
# define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
@@ -52,14 +52,14 @@
# define ENABLE_LED_MATRIX_DUAL_BEACON
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_LED_MATRIX_SOLID_SPLASH
-//# define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
# define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
# define ENABLE_LED_MATRIX_WAVE_UP_DOWN
@@ -69,6 +69,7 @@
# define PHASE_CHANNEL MSKPHASE_6CHANNEL
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+# define CKLED2001_CURRENT_TUNE \
+ { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
#endif
diff --git a/keyboards/keychron/k2_pro/iso/rgb/config.h b/keyboards/keychron/k2_pro/iso/rgb/config.h
index 8d42a9d6e8..cfbb3a5079 100644
--- a/keyboards/keychron/k2_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k2_pro/iso/rgb/config.h
@@ -27,7 +27,7 @@
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
@@ -38,10 +38,6 @@
# define CAPS_LOCK_INDEX 46
# define LOW_BAT_IND_INDEX 78
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -71,14 +67,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -86,19 +82,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k2_pro/iso/rgb/info.json b/keyboards/keychron/k2_pro/iso/rgb/info.json
index d466a26af2..bd531d7621 100644
--- a/keyboards/keychron/k2_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k2_pro/iso/rgb/info.json
@@ -9,7 +9,7 @@
"device_version": "1.0.0"
},
"layouts": {
- "LAYOUT_ansi_85": {
+ "LAYOUT_iso_85": {
"layout": [
{"matrix":[0, 0], "x":0, "y":0},
{"matrix":[0, 1], "x":1, "y":0},
diff --git a/keyboards/keychron/k2_pro/iso/white/config.h b/keyboards/keychron/k2_pro/iso/white/config.h
index caa48fea2b..3cee94dfa4 100644
--- a/keyboards/keychron/k2_pro/iso/white/config.h
+++ b/keyboards/keychron/k2_pro/iso/white/config.h
@@ -30,7 +30,7 @@
# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
# define DIM_CAPS_LOCK
-# define CAPS_LOCK_INDEX 46
+# define CAPS_LOCK_INDEX 46
# define LOW_BAT_IND_INDEX 78
/* LED Matrix Animation modes. Explicitly enabled
@@ -41,9 +41,9 @@
# define ENABLE_LED_MATRIX_NONE
# define ENABLE_LED_MATRIX_SOLID
-//# define ENABLE_LED_MATRIX_ALPHAS_MODS
+// # define ENABLE_LED_MATRIX_ALPHAS_MODS
# define ENABLE_LED_MATRIX_BREATHING
-//# define ENABLE_LED_MATRIX_BAND
+// # define ENABLE_LED_MATRIX_BAND
# define ENABLE_LED_MATRIX_BAND_PINWHEEL
# define ENABLE_LED_MATRIX_BAND_SPIRAL
# define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
@@ -52,14 +52,14 @@
# define ENABLE_LED_MATRIX_DUAL_BEACON
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_LED_MATRIX_SOLID_SPLASH
-//# define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
# define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
# define ENABLE_LED_MATRIX_WAVE_UP_DOWN
@@ -69,6 +69,7 @@
# define PHASE_CHANNEL MSKPHASE_6CHANNEL
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+# define CKLED2001_CURRENT_TUNE \
+ { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
#endif
diff --git a/keyboards/keychron/k2_pro/iso/white/info.json b/keyboards/keychron/k2_pro/iso/white/info.json
index 9f09fc0d39..18937e3fce 100644
--- a/keyboards/keychron/k2_pro/iso/white/info.json
+++ b/keyboards/keychron/k2_pro/iso/white/info.json
@@ -9,7 +9,7 @@
"device_version": "1.0.0"
},
"layouts": {
- "LAYOUT_ansi_85": {
+ "LAYOUT_iso_85": {
"layout": [
{"matrix":[0, 0], "x":0, "y":0},
{"matrix":[0, 1], "x":1, "y":0},
diff --git a/keyboards/keychron/k3_pro/iso/rgb/info.json b/keyboards/keychron/k3_pro/iso/rgb/info.json
index d91b67a1ae..ce59afba62 100644
--- a/keyboards/keychron/k3_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k3_pro/iso/rgb/info.json
@@ -76,7 +76,7 @@
{"matrix":[3,15], "x":15, "y":3},
{"matrix":[4, 0], "x":0, "y":4, "w":1.25},
- {"matrix":[4, 1], "x":1.25, "y":4},
+ {"matrix":[4, 1], "x":1.25, "y":4},
{"matrix":[4, 2], "x":2.25, "y":4},
{"matrix":[4, 3], "x":3.25, "y":4},
{"matrix":[4, 4], "x":4.25, "y":4},
diff --git a/keyboards/keychron/k4_pro/ansi/rgb/info.json b/keyboards/keychron/k4_pro/ansi/rgb/info.json
index 2ddb6aa39d..22ccdfd072 100644
--- a/keyboards/keychron/k4_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k4_pro/ansi/rgb/info.json
@@ -9,7 +9,7 @@
"device_version": "1.0.0"
},
"layouts": {
- "LAYOUT_ansi_84": {
+ "LAYOUT_ansi_100": {
"layout": [
{"matrix":[0, 0], "x":0, "y":0},
{"matrix":[0, 1], "x":1, "y":0},
diff --git a/keyboards/keychron/k4_pro/ansi/white/info.json b/keyboards/keychron/k4_pro/ansi/white/info.json
index 42e020efe3..115894ea22 100644
--- a/keyboards/keychron/k4_pro/ansi/white/info.json
+++ b/keyboards/keychron/k4_pro/ansi/white/info.json
@@ -9,7 +9,7 @@
"device_version": "1.0.0"
},
"layouts": {
- "LAYOUT_ansi_84": {
+ "LAYOUT_ansi_100": {
"layout": [
{"matrix":[0, 0], "x":0, "y":0},
{"matrix":[0, 1], "x":1, "y":0},
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/config.h b/keyboards/keychron/k6_pro/ansi/rgb/config.h
index b184f4984f..d3254ec33b 100644
--- a/keyboards/keychron/k6_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k6_pro/ansi/rgb/config.h
@@ -28,20 +28,16 @@
/* Set to infinit, which is use in USB mode by default
*/
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
# define DIM_CAPS_LOCK
-# define CAPS_LOCK_INDEX 30
+# define CAPS_LOCK_INDEX 30
# define LOW_BAT_IND_INDEX 61
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -71,14 +67,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -86,19 +82,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k6_pro/iso/rgb/config.h b/keyboards/keychron/k6_pro/iso/rgb/config.h
index e36d9db175..af3eda73dd 100644
--- a/keyboards/keychron/k6_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k6_pro/iso/rgb/config.h
@@ -25,20 +25,16 @@
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
# define DIM_CAPS_LOCK
-# define CAPS_LOCK_INDEX 30
+# define CAPS_LOCK_INDEX 30
# define LOW_BAT_IND_INDEX 62
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -68,14 +64,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -83,19 +79,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k7_pro/ansi/rgb/config.h b/keyboards/keychron/k7_pro/ansi/rgb/config.h
index 3927710e51..cafbc88f38 100644
--- a/keyboards/keychron/k7_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k7_pro/ansi/rgb/config.h
@@ -28,7 +28,7 @@
/* Set to infinit, which is use in USB mode by default
*/
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
@@ -38,10 +38,6 @@
# define CAPS_LOCK_INDEX 30
# define LOW_BAT_IND_INDEX 61
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -71,14 +67,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -86,19 +82,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/config.h b/keyboards/keychron/k8_pro/ansi/rgb/config.h
index 23e8df870a..76cf4fea45 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k8_pro/ansi/rgb/config.h
@@ -27,17 +27,13 @@
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -67,14 +63,14 @@
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -82,19 +78,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/k8_pro/iso/rgb/config.h b/keyboards/keychron/k8_pro/iso/rgb/config.h
index c452dc5275..e304d6a7bb 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k8_pro/iso/rgb/config.h
@@ -25,16 +25,12 @@
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
-# ifdef VIA_ENABLE
-# define VIA_QMK_RGBLIGHT_ENABLE
-# endif
-
/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -62,15 +58,15 @@
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//# define ENABLE_RGB_MATRIX_RAINDROPS
+// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// # define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//# define ENABLE_RGB_MATRIX_HUE_BREATHING
-//# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-//# define ENABLE_RGB_MATRIX_HUE_WAVE
+// # define ENABLE_RGB_MATRIX_HUE_BREATHING
+// # define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// # define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
@@ -78,19 +74,20 @@
/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Set LED driver current */
-# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
+# define CKLED2001_CURRENT_TUNE \
+ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
diff --git a/keyboards/keychron/q2_pro/q2_pro.c b/keyboards/keychron/q2_pro/q2_pro.c
index 55551bbc58..38fee0566f 100755
--- a/keyboards/keychron/q2_pro/q2_pro.c
+++ b/keyboards/keychron/q2_pro/q2_pro.c
@@ -142,10 +142,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
}
#ifdef KC_BLUETOOTH_ENABLE
-void encoder0_pad_cb(void *param) {
+static void encoder0_pad_cb(void *param) {
(void)param;
-
- encoder_insert_state();
+ encoder_inerrupt_read(0);
}
#endif
diff --git a/keyboards/keychron/q3_pro/q3_pro.c b/keyboards/keychron/q3_pro/q3_pro.c
index a3437ff669..72e4392894 100755
--- a/keyboards/keychron/q3_pro/q3_pro.c
+++ b/keyboards/keychron/q3_pro/q3_pro.c
@@ -141,10 +141,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
}
#ifdef KC_BLUETOOTH_ENABLE
-void encoder0_pad_cb(void *param) {
+static void encoder0_pad_cb(void *param) {
(void)param;
-
- encoder_insert_state();
+ encoder_inerrupt_read(0);
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 18:08:16 +0000