diff options
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 11 | ||||
| -rw-r--r-- | tmk_core/common/backlight.c | 4 | ||||
| -rw-r--r-- | tmk_core/common/command.c | 6 | 
3 files changed, 11 insertions, 10 deletions
| diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 8a7272bbc5..0c81e83612 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 diff --git a/tmk_core/common/backlight.c b/tmk_core/common/backlight.c index c9e8fd3fd2..0e0ad2d154 100644 --- a/tmk_core/common/backlight.c +++ b/tmk_core/common/backlight.c @@ -36,9 +36,9 @@ void backlight_increase(void)      if(backlight_config.level < BACKLIGHT_LEVELS)      {          backlight_config.level++; -        backlight_config.enable = 1; -        eeconfig_update_backlight(backlight_config.raw);      } +    backlight_config.enable = 1; +    eeconfig_update_backlight(backlight_config.raw);      dprintf("backlight increase: %u\n", backlight_config.level);      backlight_set(backlight_config.level);  } diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index f3e1bf6234..5f29bc0b4e 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -379,11 +379,11 @@ static bool command_common(uint8_t code)              debug_enable = !debug_enable;              if (debug_enable) {                  print("\ndebug: on\n"); -                debug_matrix   = true; -                debug_keyboard = true; -                debug_mouse    = true;              } else {                  print("\ndebug: off\n"); +                debug_matrix   = false; +                debug_keyboard = false; +                debug_mouse    = false;              }              break; | 
