diff options
| author | Stefan Kerkmann <karlk90@pm.me> | 2022-03-14 21:06:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 20:06:21 +0000 |
| commit | 7e669421f86843d398b41befe1950a2e2ce054a0 (patch) | |
| tree | d1c8aa30ad3312e6922ff8dcd013391bf2e09af3 | |
| parent | 2648a7a1254d84803273fc2c172329d9ffeb078d (diff) | |
Rename TICK to TICK_EVENT to prevent naming conflicts (#16649)
| -rw-r--r-- | quantum/keyboard.c | 2 | ||||
| -rw-r--r-- | quantum/keyboard.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c index ba5609f0aa..bb6463bf19 100644 --- 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 index 62661596c1..fe0736a515 100644 --- 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 */ |