Rename TICK to TICK_EVENT to prevent naming conflicts (#16649)

master
Stefan Kerkmann 2022-03-14 21:06:21 +01:00 committed by GitHub
parent 2648a7a125
commit 7e669421f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -489,7 +489,7 @@ bool matrix_scan_task(void) {
// we can get here with some keys processed now. // we can get here with some keys processed now.
if (!keys_processed) if (!keys_processed)
#endif #endif
action_exec(TICK); action_exec(TICK_EVENT);
MATRIX_LOOP_END: MATRIX_LOOP_END:

View File

@ -74,7 +74,7 @@ static inline bool IS_RELEASED(keyevent_t event) {
#define MAKE_KEYEVENT(row_num, col_num, press) ((keyevent_t){.key = MAKE_KEYPOS((row_num), (col_num)), .pressed = (press), .time = (timer_read() | 1)}) #define MAKE_KEYEVENT(row_num, col_num, press) ((keyevent_t){.key = MAKE_KEYPOS((row_num), (col_num)), .pressed = (press), .time = (timer_read() | 1)})
/* Tick event */ /* Tick event */
#define TICK MAKE_KEYEVENT(KEYLOC_TICK, KEYLOC_TICK, false) #define TICK_EVENT MAKE_KEYEVENT(KEYLOC_TICK, KEYLOC_TICK, false)
#ifdef ENCODER_MAP_ENABLE #ifdef ENCODER_MAP_ENABLE
/* Encoder events */ /* Encoder events */