aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/avr
diff options
context:
space:
mode:
authorWilba6582 <Wilba6582@users.noreply.github.com>2018-09-14 04:37:13 +1000
committerJack Humbert <jack.humb@gmail.com>2018-09-13 14:37:13 -0400
commit48a992f1c037658bbacccefd2709ffdcda8bb345 (patch)
treef1583b0eaef1c366b896a11db6f8dd17ce2da9b5 /tmk_core/common/avr
parent170de1273cde78d93b3f955aca133a4d690742b2 (diff)
downloadqmk_firmware-48a992f1c037658bbacccefd2709ffdcda8bb345.tar.gz
qmk_firmware-48a992f1c037658bbacccefd2709ffdcda8bb345.zip
Zeal60/Zeal65/M60-A implementation (#3879)
* Initial version of zeal60 * WIP * Fixes issue #900 * Adding RGB underglow functionality. Fixed a compile-time conflict caused by enabling RGB underglow functionality. * Refactor RPC protocol * Fix last merge * README for RGB underglow updated. * Additional README changes. * Adding RGBW strip software-based current-limiting functionality. * RGBW current-limiting functionality should be handled by RGBSTRIP_MAX_CURRENT_PER_LIGHT instead. * Updated README to reflect implementation of built-in current limiting. * Keymap readability improvements. * Minor keymap improvements. * Fixed LED driver init sequence, formatting * Dimming implementation tested, working. * Stab LEDs synced with spacebar hits in effects. * RGB underglow tested and functional. Simplified README for RGB underglow. * Undid accidental file deletion from previous merge conflict. Safer values for RGB underglow. * Improved arrow key positions in keymap. * Added functionality to correct uneven RGB underglow. Refactored related code. * Reverted to safer values for underglow. * Changes for v0.3 * Custom LED brightness scaling will take place after current adjustment in order to avoid being overridden. * Create keymap.c Added split backspace and split shift to ISO layout * Create config.h Turned on LEDs for new layout * Fixed bug where left spacebar stabilizer LED (LC06) would adopt color of row above. * Added hhkb_wilba keymap * Update keymap.c * Update keymap.c * Update keymap.c * Added indicators, full param setting via host * Added "mousekey" layout * Added Zeal65 support, factory test mode * Keycode safe range changed, caused bugs * Bumped EEPROM version due to change in QMK keycodes * Disable HHKB "blocked" LEDs if KC_NO in keymap * Added "disable_hhkb_blocker_leds" * Required overridden function for keymaps in EEPROM * Added polar coordinate mapping, effect speed * Force Raw HID interface number to 1 always * Fixed last merge from master * Added effect speed to default keymaps * add BACKLIGHT_ prefix to vars * add BACKLIGHT_ prefix to vars * Keymap speed effect; keymap improvements/fixes Readme updated to match changes * Refactored to use common IS31FL3731/I2C drivers * Fixed make rules, backlight disabled feature * Make split rightshift default for Zeal65 * Added M60-A as a "version" of Zeal60. * Renamed IS31FL3731 driver functions * Fix suspend_wakeup_init_kb() being defined twice * First pass refactor dynamic keymaps * Updated to changed I2C and ISSI drivers * Refactor zeal_color.* usage to quantum/color.* * Updated Zeal65, fixed dynamic_keymap * Major refactoring of Zeal60 backlight and API * Lots of little cleanups * Added readme.md * Added readme.md * Added LAYOUT_60*() macros, refactored and cleaned up default keymaps * Fix compile error in suspend.c * Added Zeal65 LAYOUT macros, info.json * Added rama/m60_a, deleted zeal60/keymaps/m60_a * Fixed rama/m60_a/keymaps/proto * Fixed compilation error for suspend.c * Requested changes for PR * Fixed readme.md images * Another readme.md fix * Added drashna's requested changes
Diffstat (limited to 'tmk_core/common/avr')
-rw-r--r--tmk_core/common/avr/suspend.c37
1 files changed, 21 insertions, 16 deletions
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index d7a7f049c..5bca64685 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -56,6 +56,24 @@ void suspend_idle(uint8_t time)
56 sleep_disable(); 56 sleep_disable();
57} 57}
58 58
59
60// TODO: This needs some cleanup
61
62/** \brief Run keyboard level Power down
63 *
64 * FIXME: needs doc
65 */
66__attribute__ ((weak))
67void suspend_power_down_user (void) { }
68/** \brief Run keyboard level Power down
69 *
70 * FIXME: needs doc
71 */
72__attribute__ ((weak))
73void suspend_power_down_kb(void) {
74 suspend_power_down_user();
75}
76
59#ifndef NO_SUSPEND_POWER_DOWN 77#ifndef NO_SUSPEND_POWER_DOWN
60/** \brief Power down MCU with watchdog timer 78/** \brief Power down MCU with watchdog timer
61 * 79 *
@@ -73,21 +91,6 @@ void suspend_idle(uint8_t time)
73 */ 91 */
74static uint8_t wdt_timeout = 0; 92static uint8_t wdt_timeout = 0;
75 93
76/** \brief Run keyboard level Power down
77 *
78 * FIXME: needs doc
79 */
80__attribute__ ((weak))
81void suspend_power_down_user (void) { }
82/** \brief Run keyboard level Power down
83 *
84 * FIXME: needs doc
85 */
86__attribute__ ((weak))
87void suspend_power_down_kb(void) {
88 suspend_power_down_user();
89}
90
91/** \brief Power down 94/** \brief Power down
92 * 95 *
93 * FIXME: needs doc 96 * FIXME: needs doc
@@ -144,6 +147,8 @@ static void power_down(uint8_t wdto)
144 */ 147 */
145void suspend_power_down(void) 148void suspend_power_down(void)
146{ 149{
150 suspend_power_down_kb();
151
147#ifndef NO_SUSPEND_POWER_DOWN 152#ifndef NO_SUSPEND_POWER_DOWN
148 power_down(WDTO_15MS); 153 power_down(WDTO_15MS);
149#endif 154#endif
@@ -198,7 +203,7 @@ void suspend_wakeup_init(void)
198 rgblight_timer_enable(); 203 rgblight_timer_enable();
199#endif 204#endif
200#endif 205#endif
201 suspend_wakeup_init_kb(); 206 suspend_wakeup_init_kb();
202} 207}
203 208
204#ifndef NO_SUSPEND_POWER_DOWN 209#ifndef NO_SUSPEND_POWER_DOWN