From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/work_louder/loop/config.h | 2 +- keyboards/work_louder/micro/config.h | 2 +- keyboards/work_louder/nano/config.h | 2 +- keyboards/work_louder/work_board/config.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 32856ecebf..fc1ce6c902 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -79,7 +79,7 @@ along with this program. If not, see . //#endif #define RGB_DI_PIN F1 -#define DRIVER_LED_TOTAL 9 +#define RGB_MATRIX_LED_COUNT 9 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index a4d5ca2c93..0f1c76ff41 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -11,7 +11,7 @@ */ #define RGB_DI_PIN D1 -#define DRIVER_LED_TOTAL 12 +#define RGB_MATRIX_LED_COUNT 12 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_MATRIX_DISABLE_KEYCODES #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index 7a7d03b8a3..8d3732e825 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -80,7 +80,7 @@ along with this program. If not, see . //#endif #define RGB_DI_PIN F6 -#define DRIVER_LED_TOTAL 2 +#define RGB_MATRIX_LED_COUNT 2 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index 512c282794..28cc82e412 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -69,7 +69,7 @@ along with this program. If not, see . //#endif #define RGB_DI_PIN D1 -#define DRIVER_LED_TOTAL 49 +#define RGB_MATRIX_LED_COUNT 49 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES #define RGB_DISABLE_WHEN_USB_SUSPENDED -- cgit v1.2.3 From 5abb125b025750d7015d1a9cafc5a861cedfa9b3 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 25 Sep 2022 13:04:00 -0700 Subject: [Keymap] develop updates for Drashna Keymaps (#18472) --- keyboards/work_louder/work_board/keymaps/drashna/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk index 6cccd5f8d2..6a98d14daf 100644 --- a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk +++ b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk @@ -6,5 +6,5 @@ NKRO_ENABLE = yes RGBLIGHT_STARTUP_ANIMATION = yes ENCODER_MAP_ENABLE = yes -AUTOCORRECTION_ENABLE = no +AUTOCORRECT_ENABLE = no CUSTOM_UNICODE_ENABLE = no -- cgit v1.2.3 From 64b1ed45507a15d5594b1f90b936c2096918f5a4 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 4 Oct 2022 15:24:22 -0700 Subject: Fix Per Key LED Indicator Callbacks (#18450) Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel --- keyboards/work_louder/work_board/work_board.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c index bd969f3009..928a8abd89 100644 --- a/keyboards/work_louder/work_board/work_board.c +++ b/keyboards/work_louder/work_board/work_board.c @@ -106,7 +106,10 @@ bool via_layout_2u = false; void via_set_layout_options_kb(uint32_t value) { via_layout_2u = (bool)value; } # endif // VIA_ENABLE -__attribute__((weak)) void rgb_matrix_indicators_user(void) { +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } # ifdef VIA_ENABLE if (via_layout_2u) { rgb_matrix_set_color(5, 0, 0, 0); @@ -118,6 +121,7 @@ __attribute__((weak)) void rgb_matrix_indicators_user(void) { rgb_matrix_set_color(5, 0, 0, 0); rgb_matrix_set_color(7, 0, 0, 0); # endif + return true; } void keyboard_pre_init_kb(void) { -- cgit v1.2.3 From be1c9af209c491c13331fa1da895ce196ba2fcda Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 15 Oct 2022 09:54:52 -0700 Subject: Update info.json configs to explicitly list RGBLIGHT animations (#18730) --- keyboards/work_louder/micro/info.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index 3905f226f8..aee775e3d2 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -22,7 +22,16 @@ "processor": "atmega32u4", "rgblight": { "animations": { - "all": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true }, "brightness_steps": 8, "hue_steps": 8, -- cgit v1.2.3 From 4d33f356a62c195f5498ed2fe8dd3ea434d5a689 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 5 Nov 2022 23:22:11 +1100 Subject: Macro keycode name refactoring (#18958) --- keyboards/work_louder/work_board/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c index d39c5f405d..0ffdd8b494 100644 --- a/keyboards/work_louder/work_board/keymaps/via/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - _______, _______, _______, MACRO_1, _______, MACRO_0, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + _______, _______, _______, MC_1, _______, MC_0, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_RAISE] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, -- cgit v1.2.3 From 81a6407dcaf32e4b2115daccc7c0658add4de7d4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 16 Nov 2022 05:59:09 +1100 Subject: Update more `DRIVER_LED_TOTAL` defines to `RGB_MATRIX_LED_COUNT` (#19089) --- keyboards/work_louder/numpad/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/numpad/config.h b/keyboards/work_louder/numpad/config.h index 7cf84a7d18..762e5e654b 100644 --- a/keyboards/work_louder/numpad/config.h +++ b/keyboards/work_louder/numpad/config.h @@ -21,8 +21,7 @@ // #define RGB_DI_PIN D1 -#define DRIVER_LED_TOTAL 16 -#define RGB_MATRIX_LED_COUNT DRIVER_LED_TOTAL +#define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_MATRIX_DISABLE_KEYCODES #define RGB_DISABLE_WHEN_USB_SUSPENDED -- cgit v1.2.3 From 3b11e98215f1528287a28158837125408cbf3d9b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 22 Nov 2022 11:07:47 +0000 Subject: Update use of legacy keycodes (#19120) --- keyboards/work_louder/work_board/keymaps/default/keymap.c | 4 ++-- keyboards/work_louder/work_board/keymaps/via/keymap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c index 3489274fea..14fb5014c7 100644 --- a/keyboards/work_louder/work_board/keymaps/default/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c @@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG, - _______, _______, MU_MOD, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, + _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG, + _______, _______, MU_NEXT, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c index 0ffdd8b494..9ae3b36262 100644 --- a/keyboards/work_louder/work_board/keymaps/via/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL, R_M_TOG, - _______, _______, MU_MOD, R_M_TOG, R_M_MOD, _______, _______, _______, _______, R_M_SAI, R_M_HUI, R_M_MOD, + _______, _______, MU_NEXT, R_M_TOG, R_M_MOD, _______, _______, _______, _______, R_M_SAI, R_M_HUI, R_M_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, R_M_SAD, R_M_HUD, R_M_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) -- cgit v1.2.3 From e12ca14af8fc1799357bbfffd156d53b4a51001c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 27 Nov 2022 04:18:24 +1100 Subject: Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079) --- keyboards/work_louder/loop/config.h | 2 +- keyboards/work_louder/work_board/config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index fc1ce6c902..9ad0e83a2c 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -82,7 +82,7 @@ along with this program. If not, see . #define RGB_MATRIX_LED_COUNT 9 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES -#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set #define RGB_DISABLE_WHEN_USB_SUSPENDED // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index de72eaf20a..6dea07c518 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -124,8 +124,8 @@ along with this program. If not, see . #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set -#define RGB_MATRIX_STARTUP_HUE 191 // Sets the default hue value, if none has been set +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set +#define RGB_MATRIX_DEFAULT_HUE 191 // Sets the default hue value, if none has been set /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -- cgit v1.2.3