dbbab40981
* 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>
131 lines
3.1 KiB
C
131 lines
3.1 KiB
C
/* TODO */
|
|
|
|
#include "ch.h"
|
|
#include "hal.h"
|
|
|
|
#include "matrix.h"
|
|
#include "action.h"
|
|
#include "action_util.h"
|
|
#include "mousekey.h"
|
|
#include "host.h"
|
|
#include "suspend.h"
|
|
#include "wait.h"
|
|
|
|
#ifdef BACKLIGHT_ENABLE
|
|
# include "backlight.h"
|
|
#endif
|
|
|
|
#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) {
|
|
// TODO: this is not used anywhere - what units is 'time' in?
|
|
wait_ms(time);
|
|
}
|
|
|
|
/** \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(); }
|
|
|
|
/** \brief suspend power down
|
|
*
|
|
* FIXME: needs doc
|
|
*/
|
|
void suspend_power_down(void) {
|
|
// TODO: figure out what to power down and how
|
|
// shouldn't power down TPM/FTM if we want a breathing LED
|
|
// also shouldn't power down USB
|
|
#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();
|
|
// on AVR, this enables the watchdog for 15ms (max), and goes to
|
|
// SLEEP_MODE_PWR_DOWN
|
|
|
|
wait_ms(17);
|
|
}
|
|
|
|
/** \brief suspend wakeup condition
|
|
*
|
|
* FIXME: needs doc
|
|
*/
|
|
__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 suspend wakeup condition
|
|
*
|
|
* run immediately after wakeup
|
|
* FIXME: needs doc
|
|
*/
|
|
void suspend_wakeup_init(void) {
|
|
// clear keyboard state
|
|
// need to do it manually, because we're running from ISR
|
|
// and clear_keyboard() calls print
|
|
// so only clear the variables in memory
|
|
// the reports will be sent from main.c afterwards
|
|
// or if the PC asks for GET_REPORT
|
|
clear_mods();
|
|
clear_weak_mods();
|
|
clear_keys();
|
|
#ifdef MOUSEKEY_ENABLE
|
|
mousekey_clear();
|
|
#endif /* MOUSEKEY_ENABLE */
|
|
#ifdef EXTRAKEY_ENABLE
|
|
host_system_send(0);
|
|
host_consumer_send(0);
|
|
#endif /* EXTRAKEY_ENABLE */
|
|
#ifdef BACKLIGHT_ENABLE
|
|
backlight_init();
|
|
#endif /* BACKLIGHT_ENABLE */
|
|
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
|
is_suspended = false;
|
|
if (rgblight_enabled) {
|
|
rgblight_enable_noeeprom();
|
|
}
|
|
rgblight_timer_enable();
|
|
#endif
|
|
suspend_wakeup_init_kb();
|
|
}
|