diff options
author | Ryan <[email protected]> | 2024-10-13 03:43:50 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-10-12 18:43:50 +0200 |
commit | 6fa11bf21913b5ccb531acc3c2baec963f4d384a (patch) | |
tree | aaf6188a4579949cc1fbac61d0fee5234b97996a /keyboards/kprepublic | |
parent | 5c97a78ce6ab45643dcb420ba2ad20c30dcd5b8a (diff) | |
download | qmk_firmware-6fa11bf21913b5ccb531acc3c2baec963f4d384a.tar.gz qmk_firmware-6fa11bf21913b5ccb531acc3c2baec963f4d384a.zip |
Separate RGBLight/RGB Matrix keycode handling (#23679)
* Separate RGBLight/RGB Matrix keycode handling
* Remove `_DISABLE_KEYCODES` handling
* Update RGB Matrix keycode docs
* Update underglow keycodes for previously migrated boards
* Update keycodes for boards with custom handling
* Fix typos
* Fix bad merge
Diffstat (limited to 'keyboards/kprepublic')
5 files changed, 4 insertions, 129 deletions
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h index a8010af152..98858cd164 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h @@ -18,10 +18,6 @@ #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 diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h index 5edcec6eb4..b58434efec 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h @@ -16,7 +16,3 @@ #pragma once #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND - -#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) - #define RGB_MATRIX_DISABLE_KEYCODES -#endif diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c index 2aea24ff66..5e5e0d6758 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c @@ -14,63 +14,6 @@ */ #include QMK_KEYBOARD_H -enum my_keycodes { - RMT = SAFE_RANGE, - RMS, - RMIH, - RMDH, - RMIS, - RMDS, - RMIV, - RMDV -}; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case RMT: - if (record->event.pressed) - {rgb_matrix_toggle(); - } - return false; - case RMS: - if (record->event.pressed) - {rgb_matrix_step(); - } - return false; - case RMIH: - if (record->event.pressed) - {rgb_matrix_increase_hue(); - } - return false; - case RMDH: - if (record->event.pressed) - {rgb_matrix_decrease_hue(); - } - return false; - case RMIS: - if (record->event.pressed) - {rgb_matrix_increase_sat(); - } - return false; - case RMDS: - if (record->event.pressed) - {rgb_matrix_decrease_sat(); - } - return false; - case RMIV: - if (record->event.pressed) - {rgb_matrix_increase_val(); - } - return false; - case RMDV: - if (record->event.pressed) - {rgb_matrix_decrease_val(); - } - return true; - default: - return true; - } -} - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_PGUP, KC_PGDN, @@ -81,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, 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, _______, _______, _______, _______, _______, - _______, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, + _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______, _______, _______, + _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h index df6f089922..f35697b992 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h @@ -17,7 +17,3 @@ #pragma once #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND - -#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) - #define RGB_MATRIX_DISABLE_KEYCODES -#endif diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c index 1be0806771..0481046f45 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c @@ -14,62 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H -enum my_keycodes { - RMT = SAFE_RANGE, - RMS, - RMIH, - RMDH, - RMIS, - RMDS, - RMIV, - RMDV -}; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case RMT: - if (record->event.pressed) - {rgb_matrix_toggle(); - } - return false; - case RMS: - if (record->event.pressed) - {rgb_matrix_step(); - } - return false; - case RMIH: - if (record->event.pressed) - {rgb_matrix_increase_hue(); - } - return false; - case RMDH: - if (record->event.pressed) - {rgb_matrix_decrease_hue(); - } - return false; - case RMIS: - if (record->event.pressed) - {rgb_matrix_increase_sat(); - } - return false; - case RMDS: - if (record->event.pressed) - {rgb_matrix_decrease_sat(); - } - return false; - case RMIV: - if (record->event.pressed) - {rgb_matrix_increase_val(); - } - return false; - case RMDV: - if (record->event.pressed) - {rgb_matrix_decrease_val(); - } - return true; - default: - return true; - } -} const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_65_ansi( @@ -81,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, - KC_CAPS, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, _______, + _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, UG_SPDU, UG_SPDD, _______, _______, _______, _______, + KC_CAPS, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ ), |