浏览代码

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

Stefan Kerkmann 3 年之前
父节点
当前提交
7e669421f8
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      quantum/keyboard.c
  2. 1 1
      quantum/keyboard.h

+ 1 - 1
quantum/keyboard.c

@@ -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:
 
 

+ 1 - 1
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)})
 #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 */