summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-27 04:03:42 +0000
committerQMK Bot <hello@qmk.fm>2021-05-27 04:03:42 +0000
commit17991629c136277aa66522cd3b1812812a29a3a6 (patch)
treee28978c4f9bcb08a90b3dd1dce9645694b1b5c4f /keyboards
parent513f5b065501795978af669bb4802fdb9bd5b3e7 (diff)
parent5962f05f568a241e4247922b3d8595ccb9d9a4b6 (diff)
downloadqmk_firmware-17991629c136277aa66522cd3b1812812a29a3a6.tar.gz
qmk_firmware-17991629c136277aa66522cd3b1812812a29a3a6.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/jacky_studio/bear_65/bear_65.c20
-rw-r--r--keyboards/jacky_studio/bear_65/config.h8
-rw-r--r--keyboards/jacky_studio/bear_65/rules.mk3
3 files changed, 31 insertions, 0 deletions
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c
index a2ae572b82..b4ed1318f0 100644
--- a/keyboards/jacky_studio/bear_65/bear_65.c
+++ b/keyboards/jacky_studio/bear_65/bear_65.c
@@ -15,3 +15,23 @@
*/
#include "bear_65.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+ // Key Matrix to LED Index
+ { NO_LED, 4 , 4 , 4 , 4 , 3 , 3 , 3 , 3 , 2 , 2 , 2 , 2 , 1 , NO_LED},
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 },
+ { 6 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 , 0 , 6 },
+ { 7 , 5 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 11 },
+ { 7 , NO_LED, NO_LED, 8 , NO_LED, 8 , 9 , NO_LED, 9 , 7 , 10 , 11 , 11 , 11 , 1 },
+}, {
+ // LED Index to Physical Position
+ {224, 32}, {224, 10}, {192, 10}, {128, 25},
+ {70, 10}, {16, 10}, {16, 32}, {16, 64},
+ {64, 64}, {112, 64}, {176, 64}, {224, 64}
+}, {
+ // LED Index to Flag
+ LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+ LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+} };
+#endif
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 476d119aff..a664099e80 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -73,3 +73,11 @@
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
+
+/* RGB matrix support */
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define DRIVER_LED_TOTAL 12 // Number of LEDs
+#endif
diff --git a/keyboards/jacky_studio/bear_65/rules.mk b/keyboards/jacky_studio/bear_65/rules.mk
index 339c37c7ee..6f70cbbd6f 100644
--- a/keyboards/jacky_studio/bear_65/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rules.mk
@@ -22,3 +22,6 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes # Use LTO flags to reduce firmware size
+
+RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support