aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kprepublic/bm60hsrgb
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-11-27 21:29:12 +1100
committerNick Brassel <[email protected]>2024-11-27 21:29:12 +1100
commit9f76541b29056150cf57d69569a14a59e13995c7 (patch)
tree66c7398d873fcda88aebe3090603aefe045ff52e /keyboards/kprepublic/bm60hsrgb
parent57be4871616ee9a8fe042f6186010d436ec7d4b1 (diff)
parenteb04b94eecbb9b3e64ca9c74f937b5f762440b17 (diff)
downloadqmk_firmware-9f76541b29056150cf57d69569a14a59e13995c7.tar.gz
qmk_firmware-9f76541b29056150cf57d69569a14a59e13995c7.zip
Merge branch 'develop'
Diffstat (limited to 'keyboards/kprepublic/bm60hsrgb')
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c2
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/config.h10
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c2
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rev2.c26
4 files changed, 13 insertions, 27 deletions
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c
index f89dd675a0..8ee2387bd8 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_60_ansi_arrow(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+ _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 1d2b071fc1..98858cd164 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -18,16 +18,12 @@
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define IS31FL3733_LED_COUNT 63
-#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
- #define RGB_MATRIX_DISABLE_KEYCODES
-#endif
-
// Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
// don't use those LEDs in RGB Matrix in that case.
#ifdef RGBLIGHT_ENABLE
-# define WS2812_LED_TOTAL 0
+# define WS2812_LED_COUNT 0
#else
-# define WS2812_LED_TOTAL 6
+# define WS2812_LED_COUNT 6
#endif
-#define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_COUNT)
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
index 51ac4708fc..7b6d1ae693 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_60_ansi_arrow(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT,
- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+ _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 5bd23a12b8..e7ff5a9ddc 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -110,7 +110,7 @@ led_config_t g_led_config = {
{ 18, 48 }, { 30, 48 }, { 45, 48 }, { 60, 48 }, { 75, 48 }, { 90, 48 }, { 105, 48 }, { 120, 48 }, { 135, 48 }, { 150, 48 }, { 165, 48 }, { 191, 48 }, { 210, 48 },
// Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
{ 3, 64 }, { 22, 64 }, { 33, 64 }, { 101, 64 }, { 135, 64 }, { 153, 64 }, { 195, 64 }, { 210, 64 }, { 225, 64 }
-# if WS2812_LED_TOTAL > 0
+# if WS2812_LED_COUNT > 0
,{ 28, 40}, { 62, 40}, { 96, 40}, {130, 40}, {164, 40}, {198, 40}
# endif
}, {
@@ -124,7 +124,7 @@ led_config_t g_led_config = {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4,
// Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
1, 1, 1, 4, 1, 1, 1, 1, 1
-# if WS2812_LED_TOTAL > 0
+# if WS2812_LED_COUNT > 0
,2, 2, 2, 2, 2, 2
# endif
}
@@ -147,10 +147,6 @@ bool rgb_matrix_indicators_kb(void) {
// Custom RGB Matrix driver that combines IS31FL3733 and WS2812
// ==========================================================================
-# if WS2812_LED_TOTAL > 0
-rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
-# endif
-
static void rgb_matrix_driver_init(void) {
i2c_init();
is31fl3733_init(0);
@@ -164,31 +160,25 @@ static void rgb_matrix_driver_init(void) {
static void rgb_matrix_driver_flush(void) {
is31fl3733_update_pwm_buffers(0);
-# if WS2812_LED_TOTAL > 0
- ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
+# if WS2812_LED_COUNT > 0
+ ws2812_flush();
# endif
}
static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
if (index < IS31FL3733_LED_COUNT) {
is31fl3733_set_color(index, red, green, blue);
+# if WS2812_LED_COUNT > 0
} else {
-# if WS2812_LED_TOTAL > 0
- rgb_matrix_ws2812_array[index - IS31FL3733_LED_COUNT].r = red;
- rgb_matrix_ws2812_array[index - IS31FL3733_LED_COUNT].g = green;
- rgb_matrix_ws2812_array[index - IS31FL3733_LED_COUNT].b = blue;
+ ws2812_set_color(index - IS31FL3733_LED_COUNT, red, green, blue);
# endif
}
}
static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
is31fl3733_set_color_all(red, green, blue);
-# if WS2812_LED_TOTAL > 0
- for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
- rgb_matrix_ws2812_array[i].r = red;
- rgb_matrix_ws2812_array[i].g = green;
- rgb_matrix_ws2812_array[i].b = blue;
- }
+# if WS2812_LED_COUNT > 0
+ ws2812_set_color_all(red, green, blue);
# endif
}