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

macovsky · Mar 14, 2022 · 7e66942 · 7e66942
1 parent 2648a7a
commit 7e66942
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
@@ -489,7 +489,7 @@ bool matrix_scan_task(void) {
     // we can get here with some keys processed now.
     if (!keys_processed)
 #endif
-        action_exec(TICK);
+        action_exec(TICK_EVENT);
 
 MATRIX_LOOP_END:
 

diff --git a/quantum/keyboard.h b/quantum/keyboard.h
@@ -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)})
 
 /* 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
 /* Encoder events */