g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile error if ONESHOT_TIMEOUT defined but oneshot disabled (#8100) 

* Compile error if ONESHOT_TIMEOUT defined but oneshot disabled

When ONESHOT_TIMEOUT and NO_ACTION_ONESHOT are both defined, this code
fails to compile.

Wrap the one usage of ONESHOT_TIMEOUT that is inconsistent with the
rest so all usages are properly wrapped by a check of NO_ACTION_ONESHOT.

* Run file through clang-format

Co-authored-by: Ted M Lin <tedmlin@gmail.com>
daktil_manuform
Ted Lin 2020-02-09 23:50:45 -05:00 committed by GitHub
parent 6052aa499e
commit c3200aa8fc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/common/action.c
View File

@ -90,13 +90,15 @@ void action_exec(keyevent_t event) {
keyrecord_t record = {.event = event};
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
#ifndef NO_ACTION_ONESHOT
# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (has_oneshot_layer_timed_out()) {
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
}
if (has_oneshot_mods_timed_out()) {
clear_oneshot_mods();
}
# endif
#endif
#ifndef NO_ACTION_TAPPING