diff options
Diffstat (limited to 'keyboards/lfkeyboards/mini1800')
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/mini1800.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c index 7d6e267611..6b632faf77 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c @@ -69,10 +69,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------------' */ [SETTINGS] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, - MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP, BL_TOGG, UG_TOGG, UG_VALU, XXXXXXX, XXXXXXX, + MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_NEXT, UG_VALD, XXXXXXX, XXXXXXX, AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_HUEU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_SATD, UG_HUED, UG_SATU, XXXXXXX, XXXXXXX ) }; diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index 6ac615f871..1d07ea7b0d 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -24,12 +24,10 @@ void matrix_init_kb(void) #endif } -void matrix_scan_kb(void) -{ +void housekeeping_task_kb(void) { #ifdef WATCHDOG_ENABLE wdt_reset(); #endif - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -49,17 +47,19 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) if (click_toggle && record->event.pressed){ click(click_hz, click_time); } - if (keycode == QK_BOOT) { - reset_keyboard_kb(); - } return process_record_user(keycode, record); } -void reset_keyboard_kb(void){ +bool shutdown_kb(bool jump_to_bootloader) { #ifdef WATCHDOG_ENABLE + // Unconditionally run so shutdown_user can't mess up watchdog MCUSR = 0; wdt_disable(); wdt_reset(); #endif - reset_keyboard(); + + if (!shutdown_user(jump_to_bootloader)) { + return false; + } + return true; } |