diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-03-28 23:17:16 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-28 23:17:16 -0400 |
| commit | 8bbc1dcf4f52ecd675f23a9b7d4b4d812dd3ee79 (patch) | |
| tree | abd8b4fcd545d247736347c8b5e31a28ef9688b4 /tmk_core/common | |
| parent | 1f86e8da090b2f085f40f4f5d034fc23ffe1e8f9 (diff) | |
| parent | 1d13aa933bbb57bf0c1fe0196981b81233c3df97 (diff) | |
| download | qmk_firmware-8bbc1dcf4f52ecd675f23a9b7d4b4d812dd3ee79.tar.gz qmk_firmware-8bbc1dcf4f52ecd675f23a9b7d4b4d812dd3ee79.zip | |
Merge pull request #219 from IBNobody/master
Master
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 5 | ||||
| -rw-r--r-- | tmk_core/common/keyboard.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index caf0b06254..c07c2801d5 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -66,9 +66,12 @@ static void power_down(uint8_t wdto) wdt_intr_enable(wdto); #ifdef BACKLIGHT_ENABLE -backlight_set(0); + backlight_set(0); #endif + // Turn off LED indicators + led_set(0); + // TODO: more power saving // See PicoPower application note // - I/O port input with pullup diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index e668084858..302b3ec87c 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -92,7 +92,7 @@ void keyboard_init(void) backlight_init(); #endif -#ifdef FORCE_NKRO +#if defined(NKRO_ENABLE) && defined(FORCE_NKRO) keyboard_nkro = true; #endif |