diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-25 04:20:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 04:20:08 +0100 |
| commit | 98d7ad6f497449634eb1a0037d2c21ac73da9841 (patch) | |
| tree | d426aa00833527e0c073630974496ea0bdbad83f | |
| parent | 2b3a3ca67867ecd02e100c6e2fbe1972af1abb84 (diff) | |
| parent | cf3926a8e13edb76193b8af25b497f9ef61161fd (diff) | |
| download | qmk_firmware-98d7ad6f497449634eb1a0037d2c21ac73da9841.tar.gz qmk_firmware-98d7ad6f497449634eb1a0037d2c21ac73da9841.tar.xz | |
Merge pull request #899 from Wilba6582/suspend_fix
Fixed NO_SUSPEND_POWER_DOWN handling
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 8a7272bbc..0c81e8361 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -47,6 +47,7 @@ void suspend_idle(uint8_t time) sleep_disable(); } +#ifndef NO_SUSPEND_POWER_DOWN /* Power down MCU with watchdog timer * wdto: watchdog timer timeout defined in <avr/wdt.h> * WDTO_15MS @@ -61,6 +62,7 @@ void suspend_idle(uint8_t time) * WDTO_8S */ static uint8_t wdt_timeout = 0; + static void power_down(uint8_t wdto) { #ifdef PROTOCOL_LUFA @@ -98,19 +100,19 @@ static void power_down(uint8_t wdto) // Disable watchdog after sleep wdt_disable(); } +#endif void suspend_power_down(void) { +#ifndef NO_SUSPEND_POWER_DOWN power_down(WDTO_15MS); +#endif } __attribute__ ((weak)) void matrix_power_up(void) {} __attribute__ ((weak)) void matrix_power_down(void) {} bool suspend_wakeup_condition(void) { -#ifdef BACKLIGHT_ENABLE - backlight_set(0); -#endif matrix_power_up(); matrix_scan(); matrix_power_down(); @@ -126,10 +128,9 @@ void suspend_wakeup_init(void) // clear keyboard state clear_keyboard(); #ifdef BACKLIGHT_ENABLE - backlight_set(0); backlight_init(); #endif -led_set(host_keyboard_leds()); + led_set(host_keyboard_leds()); } #ifndef NO_SUSPEND_POWER_DOWN |