Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix RGBLIGHT_SLEEP function (#4865)

Browse source 
* Only re-enable RGBLIGHT if it was on when going to sleep

* Reformat file to follow QMK Standards

* Fix check, since this is a loop, whoops

Much thanks to @Rockman18 for catching this and posting the additional code!
This commit is contained in:
Drashna Jaelre 2019-01-25 17:11:49 -08:00 committed by MechMerlin
parent 569ed9db9d
commit 7aba1fd176
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tmk_core/common/avr/suspend.c
View file

@ -11,6 +11,9 @@
#include "led.h" #include "led.h"
#include "host.h" #include "host.h"
#include "rgblight_reconfig.h" #include "rgblight_reconfig.h"
#ifdef SPLIT_KEYBOARD
#include "split_flags.h"
#endif
#ifdef PROTOCOL_LUFA #ifdef PROTOCOL_LUFA
#include "lufa.h" #include "lufa.h"
@ -22,6 +25,9 @@
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
#include "rgblight.h" #include "rgblight.h"
extern rgblight_config_t rgblight_config;
static bool rgblight_enabled;
static bool is_suspended;
#endif #endif
@ -46,8 +52,7 @@ __asm__ __volatile__ ( \
* *
* FIXME: needs doc * FIXME: needs doc
*/ */
void suspend_idle(uint8_t time) void suspend_idle(uint8_t time) {
{
cli(); cli();
set_sleep_mode(SLEEP_MODE_IDLE); set_sleep_mode(SLEEP_MODE_IDLE);
sleep_enable(); sleep_enable();
@ -95,8 +100,7 @@ static uint8_t wdt_timeout = 0;
* *
* FIXME: needs doc * FIXME: needs doc
*/ */
static void power_down(uint8_t wdto) static void power_down(uint8_t wdto) {
{
#ifdef PROTOCOL_LUFA #ifdef PROTOCOL_LUFA
if (USB_DeviceState == DEVICE_STATE_Configured) return; if (USB_DeviceState == DEVICE_STATE_Configured) return;
#endif #endif
@ -120,7 +124,14 @@ static void power_down(uint8_t wdto)
#ifdef RGBLIGHT_ANIMATIONS #ifdef RGBLIGHT_ANIMATIONS
rgblight_timer_disable(); rgblight_timer_disable();
#endif #endif
rgblight_disable_noeeprom(); if (!is_suspended) {
is_suspended = true;
rgblight_enabled = rgblight_config.enable;
rgblight_disable_noeeprom();
#ifdef SPLIT_KEYBOARD
RGB_DIRTY = true;
#endif
}
#endif #endif
suspend_power_down_kb(); suspend_power_down_kb();
@ -145,8 +156,7 @@ static void power_down(uint8_t wdto)
* *
* FIXME: needs doc * FIXME: needs doc
*/ */
void suspend_power_down(void) void suspend_power_down(void) {
{
suspend_power_down_kb(); suspend_power_down_kb();
#ifndef NO_SUSPEND_POWER_DOWN #ifndef NO_SUSPEND_POWER_DOWN
@ -156,8 +166,7 @@ void suspend_power_down(void)
__attribute__ ((weak)) void matrix_power_up(void) {} __attribute__ ((weak)) void matrix_power_up(void) {}
__attribute__ ((weak)) void matrix_power_down(void) {} __attribute__ ((weak)) void matrix_power_down(void) {}
bool suspend_wakeup_condition(void) bool suspend_wakeup_condition(void) {
{
matrix_power_up(); matrix_power_up();
matrix_scan(); matrix_scan();
matrix_power_down(); matrix_power_down();
@ -186,8 +195,7 @@ void suspend_wakeup_init_kb(void) {
* *
* FIXME: needs doc * FIXME: needs doc
*/ */
void suspend_wakeup_init(void) void suspend_wakeup_init(void) {
{
// clear keyboard state // clear keyboard state
clear_keyboard(); clear_keyboard();
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
@ -195,10 +203,16 @@ void suspend_wakeup_init(void)
#endif #endif
led_set(host_keyboard_leds()); led_set(host_keyboard_leds());
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
#ifdef BOOTLOADER_TEENSY is_suspended = false;
wait_ms(10); if (rgblight_enabled) {
#endif #ifdef BOOTLOADER_TEENSY
rgblight_enable_noeeprom(); wait_ms(10);
#endif
rgblight_enable_noeeprom();
#ifdef SPLIT_KEYBOARD
RGB_DIRTY = true;
#endif
}
#ifdef RGBLIGHT_ANIMATIONS #ifdef RGBLIGHT_ANIMATIONS
rgblight_timer_enable(); rgblight_timer_enable();
#endif #endif
@ -208,8 +222,7 @@ void suspend_wakeup_init(void)
#ifndef NO_SUSPEND_POWER_DOWN #ifndef NO_SUSPEND_POWER_DOWN
/* watchdog timeout */ /* watchdog timeout */
ISR(WDT_vect) ISR(WDT_vect) {
{
// compensate timer for sleep // compensate timer for sleep
switch (wdt_timeout) { switch (wdt_timeout) {
case WDTO_15MS: case WDTO_15MS: