diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keyboard.c | 5 | ||||
| -rw-r--r-- | quantum/led_matrix/led_matrix.c | 92 | ||||
| -rw-r--r-- | quantum/led_matrix/led_matrix.h | 24 | ||||
| -rw-r--r-- | quantum/led_matrix/led_matrix_drivers.c | 40 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix.c | 86 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix.h | 22 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix_drivers.c | 45 | ||||
| -rw-r--r-- | quantum/via.c | 12 |
8 files changed, 317 insertions, 9 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 37675ded0b..749ebb559c 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -256,7 +256,10 @@ __attribute__((weak)) void keyboard_post_init_kb(void) { void keyboard_setup(void) { print_set_sendchar(sendchar); #ifdef EEPROM_DRIVER - eeprom_driver_init(); + if (!eeprom_driver_init()) { + eeconfig_init(); + eeprom_driver_init(); + } #endif matrix_setup(); keyboard_pre_init_kb(); diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c index 577331d916..59bfbdf0db 100644 --- a/quantum/led_matrix/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -83,6 +83,9 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER; # define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2 #endif +#if defined(LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL) && (LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL >= LED_MATRIX_MAXIMUM_BRIGHTNESS) +# pragma error("LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL must be less than LED_MATRIX_MAXIMUM_BRIGHTNESS") +#endif // globals led_eeconfig_t led_matrix_eeconfig; // TODO: would like to prefix this with g_ for global consistancy, do this in another pr uint32_t g_led_timer; @@ -94,14 +97,18 @@ last_hit_t g_last_hit_tracker; #endif // LED_MATRIX_KEYREACTIVE_ENABLED // internals +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +static bool driver_shutdown = false; +#endif static bool suspend_state = false; static uint8_t led_last_enable = UINT8_MAX; static uint8_t led_last_effect = UINT8_MAX; static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false}; static led_task_states led_task_state = SYNCING; -#if LED_MATRIX_TIMEOUT > 0 +#if led_matrix_timeout > 0 static uint32_t led_anykey_timer; -#endif // LED_MATRIX_TIMEOUT > 0 +static uint32_t led_matrix_timeout = LED_MATRIX_TIMEOUT; +#endif // LED_MATRIX_TIMEOUT > 0 // double buffers static uint32_t led_timer_buffer; @@ -116,6 +123,8 @@ const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT; EECONFIG_DEBOUNCE_HELPER(led_matrix, EECONFIG_LED_MATRIX, led_matrix_eeconfig); +void led_matrix_increase_val_helper(bool write_to_eeprom); + void eeconfig_update_led_matrix(void) { eeconfig_flush_led_matrix(true); } @@ -223,12 +232,22 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) { #endif // defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_LED_MATRIX_TYPING_HEATMAP) } +void led_matrix_none_indicators(void) { + led_matrix_none_indicators_kb(); + led_matrix_none_indicators_user(); +} + +__attribute__((weak)) void led_matrix_none_indicators_kb(void) {} + +__attribute__((weak)) void led_matrix_none_indicators_user(void) {} + static bool led_matrix_none(effect_params_t *params) { if (!params->init) { return false; } led_matrix_set_value_all(0); + led_matrix_none_indicators(); return false; } @@ -339,10 +358,24 @@ static void led_task_flush(uint8_t effect) { // update last trackers after the first full render so we can init over several frames led_last_effect = effect; led_last_enable = led_matrix_eeconfig.enable; +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE + // exit from shutdown to if neccesary + if (driver_shutdown) { + led_matrix_driver.exit_shutdown(); + driver_shutdown = false; + } +#endif // update pwm buffers led_matrix_update_pwm_buffers(); +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE + // shutdown if neccesary + if (effect == LED_MATRIX_NONE && !driver_shutdown && led_matrix_driver_allow_shutdown()) { + led_matrix_driver_shutdown(); + } +#endif + // next task led_task_state = SYNCING; } @@ -354,8 +387,8 @@ void led_matrix_task(void) { // while suspended and just do a software shutdown. This is a cheap hack for now. bool suspend_backlight = suspend_state || #if LED_MATRIX_TIMEOUT > 0 - (led_anykey_timer > (uint32_t)LED_MATRIX_TIMEOUT) || -#endif // LED_MATRIX_TIMEOUT > 0 + (led_anykey_timer > led_matrix_timeout) || +#endif // led_matrix_timeout > 0 false; uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode; @@ -421,6 +454,9 @@ __attribute__((weak)) bool led_matrix_indicators_advanced_user(uint8_t led_min, void led_matrix_init(void) { led_matrix_driver.init(); +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE + driver_shutdown = false; +#endif #ifdef LED_MATRIX_KEYREACTIVE_ENABLED g_last_hit_tracker.count = 0; @@ -467,6 +503,11 @@ void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) { led_task_state = STARTING; eeconfig_flag_led_matrix(write_to_eeprom); dprintf("led matrix toggle [%s]: led_matrix_eeconfig.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.enable); +#ifdef LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (led_matrix_eeconfig.enable && led_matrix_eeconfig.val <= LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + led_matrix_increase_val_helper(write_to_eeprom); + } +#endif } void led_matrix_toggle_noeeprom(void) { led_matrix_toggle_eeprom_helper(false); @@ -478,11 +519,21 @@ void led_matrix_toggle(void) { void led_matrix_enable(void) { led_matrix_enable_noeeprom(); eeconfig_flag_led_matrix(true); +#ifdef LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (led_matrix_eeconfig.val <= LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + led_matrix_increase_val_helper(true); + } +#endif } void led_matrix_enable_noeeprom(void) { if (!led_matrix_eeconfig.enable) led_task_state = STARTING; led_matrix_eeconfig.enable = 1; +#ifdef LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (led_matrix_eeconfig.val <= LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + led_matrix_increase_val_helper(false); + } +#endif } void led_matrix_disable(void) { @@ -567,6 +618,12 @@ uint8_t led_matrix_get_val(void) { } void led_matrix_increase_val_helper(bool write_to_eeprom) { +#ifdef LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL + if (!led_matrix_eeconfig.enable) { + led_matrix_toggle_eeprom_helper(write_to_eeprom); + return; + } +#endif led_matrix_set_val_eeprom_helper(qadd8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); } void led_matrix_increase_val_noeeprom(void) { @@ -578,6 +635,11 @@ void led_matrix_increase_val(void) { void led_matrix_decrease_val_helper(bool write_to_eeprom) { led_matrix_set_val_eeprom_helper(qsub8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); +#ifdef LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL + if (led_matrix_eeconfig.enable && led_matrix_eeconfig.val <= LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + led_matrix_toggle_eeprom_helper(write_to_eeprom); + } +#endif } void led_matrix_decrease_val_noeeprom(void) { led_matrix_decrease_val_helper(false); @@ -639,3 +701,25 @@ void led_matrix_set_flags(led_flags_t flags) { void led_matrix_set_flags_noeeprom(led_flags_t flags) { led_matrix_set_flags_eeprom_helper(flags, false); } + +#if LED_MATRIX_TIMEOUT > 0 +void led_matrix_disable_timeout_set(uint32_t timeout) { + led_matrix_timeout = timeout; +} +void led_matrix_disable_time_reset(void){ + led_anykey_timer = 0; +} +#endif + +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +void led_matrix_driver_shutdown(void) { + led_matrix_driver.shutdown(); + driver_shutdown = true; +}; + +bool led_matrix_is_driver_shutdown(void) { + return driver_shutdown; +} + +__attribute__((weak)) bool led_matrix_driver_allow_shutdown(void) { return true; }; +#endif diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index c7d360f366..5f3088514c 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -78,6 +78,8 @@ #define LED_MATRIX_TEST_LED_FLAGS() \ if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue +#define LED_MATRIX_TIMEOUT_INFINITE (UINT32_MAX) + enum led_matrix_effects { LED_MATRIX_NONE = 0, @@ -117,6 +119,9 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed); void led_matrix_task(void); +void led_matrix_none_indicators_kb(void); +void led_matrix_none_indicators_user(void); + // This runs after another backlight effect and replaces // values already set void led_matrix_indicators(void); @@ -163,6 +168,19 @@ led_flags_t led_matrix_get_flags(void); void led_matrix_set_flags(led_flags_t flags); void led_matrix_set_flags_noeeprom(led_flags_t flags); +#ifdef LED_DISABLE_TIMEOUT +# if LED_DISABLE_TIMEOUT > 0 +void led_matrix_disable_timeout_set(uint32_t timeout); +void led_matrix_disable_time_reset(void); +# endif +#endif + +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +void led_matrix_driver_shutdown(void); +bool led_matrix_is_driver_shutdown(void); +bool led_matrix_driver_allow_shutdown(void); +#endif + typedef struct { /* Perform any initialisation required for the other driver functions to work. */ void (*init)(void); @@ -173,6 +191,12 @@ typedef struct { void (*set_value_all)(uint8_t value); /* Flush any buffered changes to the hardware. */ void (*flush)(void); +#ifdef LED_MATRIX_DRIVER_SHUTDOWN_ENABLE + /* Shutdown the driver. */ + void (*shutdown)(void); + /* Exit from shutdown state. */ + void (*exit_shutdown)(void); +#endif } led_matrix_driver_t; static inline bool led_matrix_check_finished_leds(uint8_t led_idx) { diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c index 2c09ba82b1..eb0f2e4ad5 100644 --- a/quantum/led_matrix/led_matrix_drivers.c +++ b/quantum/led_matrix/led_matrix_drivers.c @@ -237,11 +237,51 @@ static void flush(void) { # endif } +# if defined(LED_MATRIX_DRIVER_SHUTDOWN_ENABLE) +static void shutdown(void) { +# if defined(LED_DRIVER_SHUTDOWN_PIN) + writePinLow(LED_DRIVER_SHUTDOWN_PIN); +# else + CKLED2001_sw_shutdown(DRIVER_ADDR_1); +# if defined(DRIVER_ADDR_2) + CKLED2001_sw_shutdown(DRIVER_ADDR_2); +# if defined(DRIVER_ADDR_3) + CKLED2001_sw_shutdown(DRIVER_ADDR_3); +# if defined(DRIVER_ADDR_4) + CKLED2001_sw_shutdown(DRIVER_ADDR_4); +# endif +# endif +# endif +# endif +} + +static void exit_shutdown(void) { +# if defined(LED_DRIVER_SHUTDOWN_PIN) + writePinHigh(LED_DRIVER_SHUTDOWN_PIN); +# else + CKLED2001_sw_return_normal(DRIVER_ADDR_1); +# if defined(DRIVER_ADDR_2) + CKLED2001_sw_return_normal(DRIVER_ADDR_2); +# if defined(DRIVER_ADDR_3) + CKLED2001_sw_return_normal(DRIVER_ADDR_3); +# if defined(DRIVER_ADDR_4) + CKLED2001_sw_return_normal(DRIVER_ADDR_4); +# endif +# endif +# endif +# endif +} +# endif + const led_matrix_driver_t led_matrix_driver = { .init = init, .flush = flush, .set_value = CKLED2001_set_value, .set_value_all = CKLED2001_set_value_all, +# if defined(LED_MATRIX_DRIVER_SHUTDOWN_ENABLE) + .shutdown = shutdown, + .exit_shutdown = exit_shutdown +# endif }; # endif #endif diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index e7125bb87f..181199f235 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -106,6 +106,10 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { # define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2 #endif +#if defined(RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL) && (RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL >= RGB_MATRIX_MAXIMUM_BRIGHTNESS) +# pragma error("RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL must be less than RGB_MATRIX_MAXIMUM_BRIGHTNESS") +#endif + // globals rgb_config_t rgb_matrix_config; // TODO: would like to prefix this with g_ for global consistancy, do this in another pr uint32_t g_rgb_timer; @@ -117,6 +121,9 @@ last_hit_t g_last_hit_tracker; #endif // RGB_MATRIX_KEYREACTIVE_ENABLED // internals +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE +static bool driver_shutdown = false; +#endif static bool suspend_state = false; static uint8_t rgb_last_enable = UINT8_MAX; static uint8_t rgb_last_effect = UINT8_MAX; @@ -124,7 +131,8 @@ static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false}; static rgb_task_states rgb_task_state = SYNCING; #if RGB_MATRIX_TIMEOUT > 0 static uint32_t rgb_anykey_timer; -#endif // RGB_MATRIX_TIMEOUT > 0 +static uint32_t rgb_matrix_timeout = RGB_MATRIX_TIMEOUT; +#endif // RGB_MATRIX_TIMEOUT > 0 // double buffers static uint32_t rgb_timer_buffer; @@ -139,6 +147,8 @@ const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT; EECONFIG_DEBOUNCE_HELPER(rgb_matrix, EECONFIG_RGB_MATRIX, rgb_matrix_config); +void rgb_matrix_increase_val_helper(bool write_to_eeprom); + void eeconfig_update_rgb_matrix(void) { eeconfig_flush_rgb_matrix(true); } @@ -282,12 +292,22 @@ void rgb_matrix_test(void) { } } +void rgb_matrix_none_indicators(void) { + rgb_matrix_none_indicators_kb(); + rgb_matrix_none_indicators_user(); +} + +__attribute__((weak)) void rgb_matrix_none_indicators_kb(void) {} + +__attribute__((weak)) void rgb_matrix_none_indicators_user(void) {} + static bool rgb_matrix_none(effect_params_t *params) { if (!params->init) { return false; } rgb_matrix_set_color_all(0, 0, 0); + rgb_matrix_none_indicators(); return false; } @@ -401,9 +421,21 @@ static void rgb_task_flush(uint8_t effect) { // update last trackers after the first full render so we can init over several frames rgb_last_effect = effect; rgb_last_enable = rgb_matrix_config.enable; - +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + // exit from shutdown to if neccesary + if (driver_shutdown) { + rgb_matrix_driver.exit_shutdown(); + driver_shutdown = false; + } +#endif // update pwm buffers rgb_matrix_update_pwm_buffers(); +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + // shutdown to if neccesary + if (effect == RGB_MATRIX_NONE && !driver_shutdown && rgb_matrix_driver_allow_shutdown()) { + rgb_matrix_driver_shutdown(); + } +#endif // next task rgb_task_state = SYNCING; @@ -416,7 +448,7 @@ void rgb_matrix_task(void) { // while suspended and just do a software shutdown. This is a cheap hack for now. bool suspend_backlight = suspend_state || #if RGB_MATRIX_TIMEOUT > 0 - (rgb_anykey_timer > (uint32_t)RGB_MATRIX_TIMEOUT) || + (rgb_anykey_timer > rgb_matrix_timeout) || #endif // RGB_MATRIX_TIMEOUT > 0 false; @@ -481,6 +513,9 @@ __attribute__((weak)) bool rgb_matrix_indicators_advanced_user(uint8_t led_min, void rgb_matrix_init(void) { rgb_matrix_driver.init(); +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + driver_shutdown = false; +#endif #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED g_last_hit_tracker.count = 0; @@ -527,6 +562,11 @@ void rgb_matrix_toggle_eeprom_helper(bool write_to_eeprom) { rgb_task_state = STARTING; eeconfig_flag_rgb_matrix(write_to_eeprom); dprintf("rgb matrix toggle [%s]: rgb_matrix_config.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.enable); +#ifdef RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (rgb_matrix_config.enable && rgb_matrix_config.hsv.v < RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + rgb_matrix_increase_val_helper(write_to_eeprom); + } +#endif } void rgb_matrix_toggle_noeeprom(void) { rgb_matrix_toggle_eeprom_helper(false); @@ -538,11 +578,21 @@ void rgb_matrix_toggle(void) { void rgb_matrix_enable(void) { rgb_matrix_enable_noeeprom(); eeconfig_flag_rgb_matrix(true); +#ifdef RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (rgb_matrix_config.hsv.v < RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + rgb_matrix_increase_val_helper(true); + } +#endif } void rgb_matrix_enable_noeeprom(void) { if (!rgb_matrix_config.enable) rgb_task_state = STARTING; rgb_matrix_config.enable = 1; +#ifdef RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL + while (rgb_matrix_config.hsv.v < RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + rgb_matrix_increase_val_helper(false); + } +#endif } void rgb_matrix_disable(void) { @@ -678,6 +728,12 @@ void rgb_matrix_decrease_sat(void) { } void rgb_matrix_increase_val_helper(bool write_to_eeprom) { +#ifdef RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL + if (!rgb_matrix_config.enable) { + rgb_matrix_toggle_eeprom_helper(write_to_eeprom); + return; + } +#endif rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qadd8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); } void rgb_matrix_increase_val_noeeprom(void) { @@ -689,6 +745,11 @@ void rgb_matrix_increase_val(void) { void rgb_matrix_decrease_val_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qsub8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); +#ifdef RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL + if (rgb_matrix_config.enable && rgb_matrix_config.hsv.v <= RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL) { + rgb_matrix_toggle_eeprom_helper(write_to_eeprom); + } +#endif } void rgb_matrix_decrease_val_noeeprom(void) { rgb_matrix_decrease_val_helper(false); @@ -750,3 +811,22 @@ void rgb_matrix_set_flags(led_flags_t flags) { void rgb_matrix_set_flags_noeeprom(led_flags_t flags) { rgb_matrix_set_flags_eeprom_helper(flags, false); } + + +#if RGB_MATRIX_TIMEOUT > 0 +void rgb_matrix_disable_timeout_set(uint32_t timeout) { + rgb_matrix_timeout = timeout; +} +void rgb_matrix_disable_time_reset(void){ rgb_anykey_timer = 0; } +#endif + +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE +void rgb_matrix_driver_shutdown(void) { + rgb_matrix_driver.shutdown(); + driver_shutdown = true; +}; + +bool rgb_matrix_is_driver_shutdown(void) { return driver_shutdown; } + +__attribute__((weak)) bool rgb_matrix_driver_allow_shutdown(void) { return true; }; +#endif diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index 62078f6e60..8c6875bf54 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -88,6 +88,8 @@ #define RGB_MATRIX_TEST_LED_FLAGS() \ if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue +#define RGB_MATRIX_TIMEOUT_INFINITE (UINT32_MAX) + enum rgb_matrix_effects { RGB_MATRIX_NONE = 0, @@ -126,6 +128,9 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed); void rgb_matrix_task(void); +void rgb_matrix_none_indicators_kb(void); +void rgb_matrix_none_indicators_user(void); + // This runs after another backlight effect and replaces // colors already set void rgb_matrix_indicators(void); @@ -184,6 +189,17 @@ void rgb_matrix_decrease_speed_noeeprom(void); led_flags_t rgb_matrix_get_flags(void); void rgb_matrix_set_flags(led_flags_t flags); void rgb_matrix_set_flags_noeeprom(led_flags_t flags); +#ifdef RGB_MATRIX_TIMEOUT +# if RGB_MATRIX_TIMEOUT > 0 +void rgb_matrix_disable_timeout_set(uint32_t timeout); +void rgb_matrix_disable_time_reset(void); +# endif +#endif +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE +void rgb_matrix_driver_shutdown(void); +bool rgb_matrix_is_driver_shutdown(void); +bool rgb_matrix_driver_allow_shutdown(void); +#endif #ifndef RGBLIGHT_ENABLE # define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix @@ -238,6 +254,12 @@ typedef struct { void (*set_color_all)(uint8_t r, uint8_t g, uint8_t b); /* Flush any buffered changes to the hardware. */ void (*flush)(void); +#ifdef RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + /* Shutdown the driver. */ + void (*shutdown)(void); + /* Exit from shutdown state. */ + void (*exit_shutdown)(void); +#endif } rgb_matrix_driver_t; static inline bool rgb_matrix_check_finished_leds(uint8_t led_idx) { diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 5b81915845..86828020e4 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -100,6 +100,11 @@ static void init(void) { # endif # elif defined(CKLED2001) +# if defined(LED_DRIVER_SHUTDOWN_PIN) + setPinOutput(LED_DRIVER_SHUTDOWN_PIN); + writePinHigh(LED_DRIVER_SHUTDOWN_PIN); +# endif + CKLED2001_init(DRIVER_ADDR_1); # if defined(DRIVER_ADDR_2) CKLED2001_init(DRIVER_ADDR_2); @@ -313,11 +318,51 @@ static void flush(void) { # endif } +# if defined(RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE) +static void shutdown(void) { +# if defined(LED_DRIVER_SHUTDOWN_PIN) + writePinLow(LED_DRIVER_SHUTDOWN_PIN); +# else + CKLED2001_sw_shutdown(DRIVER_ADDR_1); +# if defined(DRIVER_ADDR_2) + CKLED2001_sw_shutdown(DRIVER_ADDR_2); +# if defined(DRIVER_ADDR_3) + CKLED2001_sw_shutdown(DRIVER_ADDR_3); +# if defined(DRIVER_ADDR_4) + CKLED2001_sw_shutdown(DRIVER_ADDR_4); +# endif +# endif +# endif +# endif +} + +static void exit_shutdown(void) { +# if defined(LED_DRIVER_SHUTDOWN_PIN) + writePinHigh(LED_DRIVER_SHUTDOWN_PIN); +# else + CKLED2001_sw_return_normal(DRIVER_ADDR_1); +# if defined(DRIVER_ADDR_2) + CKLED2001_sw_return_normal(DRIVER_ADDR_2); +# if defined(DRIVER_ADDR_3) + CKLED2001_sw_return_normal(DRIVER_ADDR_3); +# if defined(DRIVER_ADDR_4) + CKLED2001_sw_return_normal(DRIVER_ADDR_4); +# endif +# endif +# endif +# endif +} +# endif + const rgb_matrix_driver_t rgb_matrix_driver = { .init = init, .flush = flush, .set_color = CKLED2001_set_color, .set_color_all = CKLED2001_set_color_all, +# if defined(RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE) + .shutdown = shutdown, + .exit_shutdown = exit_shutdown +# endif }; # endif diff --git a/quantum/via.c b/quantum/via.c index 12ef6c6b2f..0f7361a2a3 100644 --- a/quantum/via.c +++ b/quantum/via.c @@ -690,8 +690,18 @@ void via_qmk_rgb_matrix_set_value(uint8_t *data) { uint8_t *value_id = &(data[0]); uint8_t *value_data = &(data[1]); switch (*value_id) { - case id_qmk_rgb_matrix_brightness: { + case id_qmk_rgblight_brightness: { +#ifdef RGB_MATRIX_TURN_OFF_VAL + if (!rgb_matrix_is_enabled() && value_data[0] >= RGB_MATRIX_TURN_OFF_VAL) { + rgb_matrix_toggle_noeeprom(); + } +#endif rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS)); +#ifdef RGB_MATRIX_TURN_OFF_VAL + if (rgb_matrix_is_enabled() && value_data[0] < RGB_MATRIX_TURN_OFF_VAL) { + rgb_matrix_toggle_noeeprom(); + } +#endif break; } case id_qmk_rgb_matrix_effect: { |