clang-format changes
This commit is contained in:
skullY
skullydazed
parent
61af76a10d
commit
b624f32f94
502 changed files with 32259 additions and 39062 deletions
|
|
@ -13,37 +13,36 @@
|
|||
#include "rgblight_reconfig.h"
|
||||
|
||||
#ifdef PROTOCOL_LUFA
|
||||
#include "lufa.h"
|
||||
# include "lufa.h"
|
||||
#endif
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
# include "audio.h"
|
||||
#endif /* AUDIO_ENABLE */
|
||||
|
||||
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
||||
#include "rgblight.h"
|
||||
extern rgblight_config_t rgblight_config;
|
||||
static bool rgblight_enabled;
|
||||
static bool is_suspended;
|
||||
# include "rgblight.h"
|
||||
extern rgblight_config_t rgblight_config;
|
||||
static bool rgblight_enabled;
|
||||
static bool is_suspended;
|
||||
#endif
|
||||
|
||||
|
||||
#define wdt_intr_enable(value) \
|
||||
__asm__ __volatile__ ( \
|
||||
"in __tmp_reg__,__SREG__" "\n\t" \
|
||||
"cli" "\n\t" \
|
||||
"wdr" "\n\t" \
|
||||
"sts %0,%1" "\n\t" \
|
||||
"out __SREG__,__tmp_reg__" "\n\t" \
|
||||
"sts %0,%2" "\n\t" \
|
||||
: /* no outputs */ \
|
||||
: "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
|
||||
"r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \
|
||||
"r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \
|
||||
_BV(WDIE) | (value & 0x07)) ) \
|
||||
: "r0" \
|
||||
)
|
||||
|
||||
#define wdt_intr_enable(value) \
|
||||
__asm__ __volatile__("in __tmp_reg__,__SREG__" \
|
||||
"\n\t" \
|
||||
"cli" \
|
||||
"\n\t" \
|
||||
"wdr" \
|
||||
"\n\t" \
|
||||
"sts %0,%1" \
|
||||
"\n\t" \
|
||||
"out __SREG__,__tmp_reg__" \
|
||||
"\n\t" \
|
||||
"sts %0,%2" \
|
||||
"\n\t" \
|
||||
: /* no outputs */ \
|
||||
: "M"(_SFR_MEM_ADDR(_WD_CONTROL_REG)), "r"(_BV(_WD_CHANGE_BIT) | _BV(WDE)), "r"((uint8_t)((value & 0x08 ? _WD_PS3_MASK : 0x00) | _BV(WDIE) | (value & 0x07))) \
|
||||
: "r0")
|
||||
|
||||
/** \brief Suspend idle
|
||||
*
|
||||
|
|
@ -58,23 +57,18 @@ void suspend_idle(uint8_t time) {
|
|||
sleep_disable();
|
||||
}
|
||||
|
||||
|
||||
// TODO: This needs some cleanup
|
||||
|
||||
/** \brief Run keyboard level Power down
|
||||
*
|
||||
* FIXME: needs doc
|
||||
*/
|
||||
__attribute__ ((weak))
|
||||
void suspend_power_down_user (void) { }
|
||||
__attribute__((weak)) void suspend_power_down_user(void) {}
|
||||
/** \brief Run keyboard level Power down
|
||||
*
|
||||
* FIXME: needs doc
|
||||
*/
|
||||
__attribute__ ((weak))
|
||||
void suspend_power_down_kb(void) {
|
||||
suspend_power_down_user();
|
||||
}
|
||||
__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
|
||||
|
||||
#ifndef NO_SUSPEND_POWER_DOWN
|
||||
/** \brief Power down MCU with watchdog timer
|
||||
|
|
@ -98,43 +92,43 @@ static uint8_t wdt_timeout = 0;
|
|||
* FIXME: needs doc
|
||||
*/
|
||||
static void power_down(uint8_t wdto) {
|
||||
#ifdef PROTOCOL_LUFA
|
||||
if (USB_DeviceState == DEVICE_STATE_Configured) return;
|
||||
#endif
|
||||
wdt_timeout = wdto;
|
||||
# ifdef PROTOCOL_LUFA
|
||||
if (USB_DeviceState == DEVICE_STATE_Configured) return;
|
||||
# endif
|
||||
wdt_timeout = wdto;
|
||||
|
||||
// Watchdog Interrupt Mode
|
||||
wdt_intr_enable(wdto);
|
||||
// Watchdog Interrupt Mode
|
||||
wdt_intr_enable(wdto);
|
||||
|
||||
#ifdef BACKLIGHT_ENABLE
|
||||
backlight_set(0);
|
||||
#endif
|
||||
# ifdef BACKLIGHT_ENABLE
|
||||
backlight_set(0);
|
||||
# endif
|
||||
|
||||
// Turn off LED indicators
|
||||
uint8_t leds_off = 0;
|
||||
#if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
|
||||
if (is_backlight_enabled()) {
|
||||
// Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
|
||||
leds_off |= (1<<USB_LED_CAPS_LOCK);
|
||||
}
|
||||
#endif
|
||||
led_set(leds_off);
|
||||
// Turn off LED indicators
|
||||
uint8_t leds_off = 0;
|
||||
# if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
|
||||
if (is_backlight_enabled()) {
|
||||
// Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
|
||||
leds_off |= (1 << USB_LED_CAPS_LOCK);
|
||||
}
|
||||
# endif
|
||||
led_set(leds_off);
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
// This sometimes disables the start-up noise, so it's been disabled
|
||||
// stop_all_notes();
|
||||
#endif /* AUDIO_ENABLE */
|
||||
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
||||
#ifdef RGBLIGHT_ANIMATIONS
|
||||
rgblight_timer_disable();
|
||||
#endif
|
||||
if (!is_suspended) {
|
||||
is_suspended = true;
|
||||
rgblight_enabled = rgblight_config.enable;
|
||||
rgblight_disable_noeeprom();
|
||||
}
|
||||
#endif
|
||||
suspend_power_down_kb();
|
||||
# ifdef AUDIO_ENABLE
|
||||
// This sometimes disables the start-up noise, so it's been disabled
|
||||
// stop_all_notes();
|
||||
# endif /* AUDIO_ENABLE */
|
||||
# if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
||||
# ifdef RGBLIGHT_ANIMATIONS
|
||||
rgblight_timer_disable();
|
||||
# endif
|
||||
if (!is_suspended) {
|
||||
is_suspended = true;
|
||||
rgblight_enabled = rgblight_config.enable;
|
||||
rgblight_disable_noeeprom();
|
||||
}
|
||||
# endif
|
||||
suspend_power_down_kb();
|
||||
|
||||
// TODO: more power saving
|
||||
// See PicoPower application note
|
||||
|
|
@ -158,40 +152,36 @@ static void power_down(uint8_t wdto) {
|
|||
* FIXME: needs doc
|
||||
*/
|
||||
void suspend_power_down(void) {
|
||||
suspend_power_down_kb();
|
||||
suspend_power_down_kb();
|
||||
|
||||
#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) {
|
||||
__attribute__((weak)) void matrix_power_up(void) {}
|
||||
__attribute__((weak)) void matrix_power_down(void) {}
|
||||
bool suspend_wakeup_condition(void) {
|
||||
matrix_power_up();
|
||||
matrix_scan();
|
||||
matrix_power_down();
|
||||
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
|
||||
if (matrix_get_row(r)) return true;
|
||||
}
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
/** \brief run user level code immediately after wakeup
|
||||
*
|
||||
* FIXME: needs doc
|
||||
*/
|
||||
__attribute__ ((weak))
|
||||
void suspend_wakeup_init_user(void) { }
|
||||
__attribute__((weak)) void suspend_wakeup_init_user(void) {}
|
||||
|
||||
/** \brief run keyboard level code immediately after wakeup
|
||||
*
|
||||
* FIXME: needs doc
|
||||
*/
|
||||
__attribute__ ((weak))
|
||||
void suspend_wakeup_init_kb(void) {
|
||||
suspend_wakeup_init_user();
|
||||
}
|
||||
__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
|
||||
/** \brief run immediately after wakeup
|
||||
*
|
||||
* FIXME: needs doc
|
||||
|
|
@ -202,18 +192,18 @@ void suspend_wakeup_init(void) {
|
|||
#ifdef BACKLIGHT_ENABLE
|
||||
backlight_init();
|
||||
#endif
|
||||
led_set(host_keyboard_leds());
|
||||
led_set(host_keyboard_leds());
|
||||
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
||||
is_suspended = false;
|
||||
if (rgblight_enabled) {
|
||||
#ifdef BOOTLOADER_TEENSY
|
||||
wait_ms(10);
|
||||
#endif
|
||||
rgblight_enable_noeeprom();
|
||||
}
|
||||
#ifdef RGBLIGHT_ANIMATIONS
|
||||
rgblight_timer_enable();
|
||||
#endif
|
||||
is_suspended = false;
|
||||
if (rgblight_enabled) {
|
||||
# ifdef BOOTLOADER_TEENSY
|
||||
wait_ms(10);
|
||||
# endif
|
||||
rgblight_enable_noeeprom();
|
||||
}
|
||||
# ifdef RGBLIGHT_ANIMATIONS
|
||||
rgblight_timer_enable();
|
||||
# endif
|
||||
#endif
|
||||
suspend_wakeup_init_kb();
|
||||
}
|
||||
|
|
@ -226,8 +216,7 @@ ISR(WDT_vect) {
|
|||
case WDTO_15MS:
|
||||
timer_count += 15 + 2; // WDTO_15MS + 2(from observation)
|
||||
break;
|
||||
default:
|
||||
;
|
||||
default:;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue