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

Empty implementation of has_onshot_mods_timed_out

Browse Source 
When the timeout is zero or not defined, the function now returns false.
Fixes a linker error when the visualizer is enabled
This commit is contained in:
Fred Sundvik 2017-03-28 09:59:29 +03:00
parent f5c8941652
commit 6039a4f6ed
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tmk_core/common/action_util.c
View File

@ -58,9 +58,13 @@ void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; }
void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; } void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
static int16_t oneshot_time = 0; static int16_t oneshot_time = 0;
inline bool has_oneshot_mods_timed_out() { bool has_oneshot_mods_timed_out(void) {
return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
} }
#else
bool has_oneshot_mods_timed_out(void) {
return false;
}
#endif #endif
#endif #endif