From c4b18f0b2a713dececd986c49879eb962d093cb9 Mon Sep 17 00:00:00 2001 From: Danny Oh Date: Fri, 12 Jul 2024 19:38:36 -0500 Subject: [PATCH] Fix RGB matrix sleep - also adjusted layer hue of trackball --- keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h | 2 +- .../crkbd/qmk/qmk_firmware/rev4_1_right/config.h | 2 +- .../crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h index 46d2a585..78de90b4 100644 --- a/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h +++ b/keyboards/crkbd/qmk/qmk_firmware/rev4_1/config.h @@ -10,7 +10,7 @@ #define I2C1_SDA_PIN GP6 #define I2C1_SCL_PIN GP7 -#define RGB_MATRIX_SLEEP +#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4_1_right/config.h b/keyboards/crkbd/qmk/qmk_firmware/rev4_1_right/config.h index ee4526e8..3252c6f8 100644 --- a/keyboards/crkbd/qmk/qmk_firmware/rev4_1_right/config.h +++ b/keyboards/crkbd/qmk/qmk_firmware/rev4_1_right/config.h @@ -10,7 +10,7 @@ #define I2C1_SDA_PIN GP26 #define I2C1_SCL_PIN GP27 -#define RGB_MATRIX_SLEEP +#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c index 25d962ea..bcae7890 100644 --- a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/keymap.c @@ -182,12 +182,10 @@ void eeconfig_init_user(void) { } void suspend_power_down_user(void) { - rgb_matrix_set_suspend_state(true); trackball_set_hsv(0, 0, 0); } void suspend_wakeup_init_user(void) { - rgb_matrix_set_suspend_state(false); trackball_set_hsv(tb_hue, tb_saturation,tb_value); } @@ -198,6 +196,10 @@ bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record) { case BALL_SAT: case BALL_VAL: case BALL_SPEED: + case C(KC_PAGE_UP): // for changing tabs + case C(KC_PAGE_DOWN): // for changing tabs + case A(KC_LEFT): // for back nav + case A(KC_RIGHT): // for forward nav return true; default: return false; @@ -293,26 +295,26 @@ layer_state_t layer_state_set_user(layer_state_t state) { switch (layer) { case 1: - trackball_set_hsv(tb_hue + 20, tb_saturation, tb_value > 40 ? tb_value - 40 : 0); + trackball_set_hsv(tb_hue + 40, tb_saturation, tb_value > 60 ? tb_value - 60 : 0); break; case 2: // numbers + nav - trackball_set_hsv(tb_hue + 40, tb_saturation, tb_value > 40 ? tb_value - 40 : 0); + trackball_set_hsv(tb_hue + 80, tb_saturation, tb_value > 60 ? tb_value - 60 : 0); break; case 3: // symbols - trackball_set_hsv(tb_hue + 40, tb_saturation, tb_value > 40 ? tb_value - 40 : 0); + trackball_set_hsv(tb_hue + 80, tb_saturation, tb_value > 60 ? tb_value - 60 : 0); break; case 4: // media - trackball_set_hsv(tb_hue + 40, tb_saturation, tb_value > 40 ? tb_value - 40 : 0); + trackball_set_hsv(tb_hue + 80, tb_saturation, tb_value > 60 ? tb_value - 60 : 0); break; case 5: // mouse layer trackball_set_hsv(tb_hue, tb_saturation, tb_value); break; default: - trackball_set_hsv(tb_hue, tb_saturation, tb_value > 40 ? tb_value - 40 : 0); + trackball_set_hsv(tb_hue, tb_saturation, tb_value > 60 ? tb_value - 60 : 0); break; }