forked from mfulz_github/qmk_firmware
		
	* Moved contents of rgblight_reconfig.h to rgblight_post_config.h. In #3582, rgblight_reconfig.h had to be newly created. Now, the build system of qmk_firmware has a post_cofig feature, so that what was done in rgblight_reconfig.h can now be realized in rgblight_post_config.h. **This commit does not change the build result.** Testing script ```shell # build on master git checkout master echo master > /tmp/master_md5.txt # RGBLIGHT_ENABLE = no make HELIX=verbose helix/rev2:default:clean make HELIX=verbose helix/rev2:default md5 helix_rev2_default.hex >> /tmp/master_md5.txt # RGBLIGHT_ENABLE = yes, with animations make HELIX=verbose helix/rev2/back:default:clean make HELIX=verbose helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt # RGBLIGHT_ENABLE = yes, without animations make HELIX=verbose,no_ani helix/rev2/back:default:clean make HELIX=verbose,no_ani helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt # build on refactor_rgblight_reconfig.h git checkout refactor_rgblight_reconfig.h echo refactor_rgblight_reconfig.h > /tmp/branch_md5.txt # RGBLIGHT_ENABLE = no make HELIX=verbose helix/rev2:default:clean make HELIX=verbose helix/rev2:default md5 helix_rev2_default.hex >> /tmp/branch_md5.txt # RGBLIGHT_ENABLE = yes, with animations make HELIX=verbose helix/rev2/back:default:clean make HELIX=verbose helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt # RGBLIGHT_ENABLE = yes, without animations make HELIX=verbose,no_ani helix/rev2/back:default:clean make HELIX=verbose,no_ani helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt diff -u /tmp/master_md5.txt /tmp/branch_md5.txt ``` Test result: ``` --- /tmp/master_md5.txt 2020-01-03 15:42:22.000000000 +0900 +++ /tmp/branch_md5.txt 2020-01-03 15:42:42.000000000 +0900 @@ -1,4 +1,4 @@ -master +refactor_rgblight_reconfig.h MD5 (helix_rev2_default.hex) = f360032edd522448366d471d8f4f8181 MD5 (helix_rev2_back_default.hex) = 0c663acc6cccc44476b3b969ad22a48f MD5 (helix_rev2_back_default.hex) = e66b1195ff6d38e6e22c975b8ae42fd3 ``` * Expressions that are too long are difficult to read, so wrap them. * Edit the expression again * remove `defined(RGBLIGHT_ANIMATIONS)` in `tmk_core/common/*/suspend.c`, `tmk_core/protocol/*/main.c` move contents of rgblight_reconfig.h to rgblight.h. The following changes were made to rgblight.h. ```diff +#ifdef RGBLIGHT_USE_TIMER void rgblight_task(void); void rgblight_timer_init(void); void rgblight_timer_enable(void); void rgblight_timer_disable(void); void rgblight_timer_toggle(void); +#else +#define rgblight_task() +#define rgblight_timer_init() +#define rgblight_timer_enable() +#define rgblight_timer_disable() +#define rgblight_timer_toggle() +#endif ``` The following changes were made to tmk_core/common/avr/suspend.c, tmk_core/common/chibios/suspend.c, tmk_core/protocol/chibios/main.c, tmk_core/protocol/lufa/lufa.c, tmk_core/protocol/vusb/main.c. ```diff -# ifdef RGBLIGHT_ANIMATIONS rgblight_timer_enable(); -# endif ``` ```diff -#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE) +#if defined(RGBLIGHT_ENABLE) rgblight_task(); #endif ``` * remove 'defined(RGBLIGHT_ANIMATIONS)' in tmk_core/common/keyboard.c Co-authored-by: Joel Challis <git@zvecr.com>
		
			
				
	
	
		
			204 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			204 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include <stdbool.h>
 | 
						|
#include <avr/sleep.h>
 | 
						|
#include <avr/wdt.h>
 | 
						|
#include <avr/interrupt.h>
 | 
						|
#include "matrix.h"
 | 
						|
#include "action.h"
 | 
						|
#include "suspend_avr.h"
 | 
						|
#include "suspend.h"
 | 
						|
#include "timer.h"
 | 
						|
#include "led.h"
 | 
						|
#include "host.h"
 | 
						|
 | 
						|
#ifdef PROTOCOL_LUFA
 | 
						|
#    include "lufa.h"
 | 
						|
#endif
 | 
						|
 | 
						|
#ifdef BACKLIGHT_ENABLE
 | 
						|
#    include "backlight.h"
 | 
						|
#endif
 | 
						|
 | 
						|
#ifdef AUDIO_ENABLE
 | 
						|
#    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;
 | 
						|
#endif
 | 
						|
 | 
						|
/** \brief Suspend idle
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
void suspend_idle(uint8_t time) {
 | 
						|
    cli();
 | 
						|
    set_sleep_mode(SLEEP_MODE_IDLE);
 | 
						|
    sleep_enable();
 | 
						|
    sei();
 | 
						|
    sleep_cpu();
 | 
						|
    sleep_disable();
 | 
						|
}
 | 
						|
 | 
						|
// TODO: This needs some cleanup
 | 
						|
 | 
						|
/** \brief Run keyboard level Power down
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
__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(); }
 | 
						|
 | 
						|
#ifndef NO_SUSPEND_POWER_DOWN
 | 
						|
/** \brief Power down MCU with watchdog timer
 | 
						|
 *
 | 
						|
 * wdto: watchdog timer timeout defined in <avr/wdt.h>
 | 
						|
 *          WDTO_15MS
 | 
						|
 *          WDTO_30MS
 | 
						|
 *          WDTO_60MS
 | 
						|
 *          WDTO_120MS
 | 
						|
 *          WDTO_250MS
 | 
						|
 *          WDTO_500MS
 | 
						|
 *          WDTO_1S
 | 
						|
 *          WDTO_2S
 | 
						|
 *          WDTO_4S
 | 
						|
 *          WDTO_8S
 | 
						|
 */
 | 
						|
static uint8_t wdt_timeout = 0;
 | 
						|
 | 
						|
/** \brief Power down
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
static void power_down(uint8_t wdto) {
 | 
						|
#    ifdef PROTOCOL_LUFA
 | 
						|
    if (USB_DeviceState == DEVICE_STATE_Configured) return;
 | 
						|
#    endif
 | 
						|
    wdt_timeout = wdto;
 | 
						|
 | 
						|
    // Watchdog Interrupt Mode
 | 
						|
    wdt_intr_enable(wdto);
 | 
						|
 | 
						|
#    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);
 | 
						|
 | 
						|
#    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)
 | 
						|
    rgblight_timer_disable();
 | 
						|
    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
 | 
						|
    // - I/O port input with pullup
 | 
						|
    // - prescale clock
 | 
						|
    // - BOD disable
 | 
						|
    // - Power Reduction Register PRR
 | 
						|
    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 | 
						|
    sleep_enable();
 | 
						|
    sei();
 | 
						|
    sleep_cpu();
 | 
						|
    sleep_disable();
 | 
						|
 | 
						|
    // Disable watchdog after sleep
 | 
						|
    wdt_disable();
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
/** \brief Suspend power down
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
void suspend_power_down(void) {
 | 
						|
    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) {
 | 
						|
    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;
 | 
						|
}
 | 
						|
 | 
						|
/** \brief run user level code immediately after wakeup
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
__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(); }
 | 
						|
/** \brief run immediately after wakeup
 | 
						|
 *
 | 
						|
 * FIXME: needs doc
 | 
						|
 */
 | 
						|
void suspend_wakeup_init(void) {
 | 
						|
    // clear keyboard state
 | 
						|
    clear_keyboard();
 | 
						|
#ifdef BACKLIGHT_ENABLE
 | 
						|
    backlight_init();
 | 
						|
#endif
 | 
						|
    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();
 | 
						|
    }
 | 
						|
    rgblight_timer_enable();
 | 
						|
#endif
 | 
						|
    suspend_wakeup_init_kb();
 | 
						|
}
 | 
						|
 | 
						|
#ifndef NO_SUSPEND_POWER_DOWN
 | 
						|
/* watchdog timeout */
 | 
						|
ISR(WDT_vect) {
 | 
						|
    // compensate timer for sleep
 | 
						|
    switch (wdt_timeout) {
 | 
						|
        case WDTO_15MS:
 | 
						|
            timer_count += 15 + 2;  // WDTO_15MS + 2(from observation)
 | 
						|
            break;
 | 
						|
        default:;
 | 
						|
    }
 | 
						|
}
 | 
						|
#endif
 |