diff options
| author | Drashna Jaelre <drashna@live.com> | 2022-08-28 12:55:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 12:55:19 -0700 |
| commit | fa08cb2478e8c13a9f1c785956c95cb49bbebba3 (patch) | |
| tree | 82de917cdbf9221db824843a85bb7925ff905fc0 /users/drashna/split/transport_sync.c | |
| parent | d4a6ee1cad73ab88ac3faecf2d40204c8e706b5a (diff) | |
[Keymap] Drashna keymap updates for 0.18.0 (#18184)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'users/drashna/split/transport_sync.c')
| -rw-r--r-- | users/drashna/split/transport_sync.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c index 2050d687ae..6b5c384480 100644 --- a/users/drashna/split/transport_sync.c +++ b/users/drashna/split/transport_sync.c @@ -4,9 +4,6 @@ #include "transport_sync.h" #include "transactions.h" #include <string.h> -#ifdef __AVR__ -# include <avr/wdt.h> -#endif #ifdef UNICODE_COMMON_ENABLE # include "process_unicode_common.h" @@ -18,6 +15,9 @@ extern unicode_config_t unicode_config; extern audio_config_t audio_config; extern bool delayed_tasks_run; #endif +#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER) +extern bool is_oled_enabled; +#endif #if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform) extern bool tap_toggling; #endif @@ -95,6 +95,9 @@ void user_transport_update(void) { user_state.audio_enable = is_audio_on(); user_state.audio_clicky_enable = is_clicky_on(); #endif +#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER) + user_state.is_oled_enabled = is_oled_enabled; +#endif #if defined(CUSTOM_POINTING_DEVICE) user_state.tap_toggling = tap_toggling; #endif @@ -116,6 +119,9 @@ void user_transport_update(void) { unicode_config.input_mode = user_state.unicode_mode; typing_mode = user_state.unicode_typing_mode; #endif +#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER) + is_oled_enabled = user_state.is_oled_enabled; +#endif #if defined(CUSTOM_POINTING_DEVICE) tap_toggling = user_state.tap_toggling; #endif @@ -226,7 +232,7 @@ void user_transport_sync(void) { } } else { if (timer_elapsed32(watchdog_timer) > 3500) { - software_reset(); + mcu_reset(); while (1) { } } |