diff options
author | Joel Challis <git@zvecr.com> | 2021-07-28 12:01:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 12:01:23 +0100 |
commit | 03d258c2226959480fc3ead1568ca2fe8ba37c59 (patch) | |
tree | 6a5f05f6017ec01ea68883749bc5af0e558a51cf /quantum/process_keycode | |
parent | c52c69d45f180e8ab677be4707ea2c8180a14254 (diff) | |
download | qmk_firmware-03d258c2226959480fc3ead1568ca2fe8ba37c59.tar.gz qmk_firmware-03d258c2226959480fc3ead1568ca2fe8ba37c59.zip |
matrix_scan_x -> x_task (#13748)
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r-- | quantum/process_keycode/process_combo.c | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_combo.h | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_music.c | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_music.h | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index f38d7d47a..9e1629248 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c | |||
@@ -184,7 +184,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) { | |||
184 | return !is_combo_key; | 184 | return !is_combo_key; |
185 | } | 185 | } |
186 | 186 | ||
187 | void matrix_scan_combo(void) { | 187 | void combo_task(void) { |
188 | if (b_combo_enable && is_active && timer && timer_elapsed(timer) > COMBO_TERM) { | 188 | if (b_combo_enable && is_active && timer && timer_elapsed(timer) > COMBO_TERM) { |
189 | /* This disables the combo, meaning key events for this | 189 | /* This disables the combo, meaning key events for this |
190 | * combo will be handled by the next processors in the chain | 190 | * combo will be handled by the next processors in the chain |
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h index e51a2f1f4..9af97588b 100644 --- a/quantum/process_keycode/process_combo.h +++ b/quantum/process_keycode/process_combo.h | |||
@@ -54,7 +54,7 @@ typedef struct { | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | bool process_combo(uint16_t keycode, keyrecord_t *record); | 56 | bool process_combo(uint16_t keycode, keyrecord_t *record); |
57 | void matrix_scan_combo(void); | 57 | void combo_task(void); |
58 | void process_combo_event(uint16_t combo_index, bool pressed); | 58 | void process_combo_event(uint16_t combo_index, bool pressed); |
59 | 59 | ||
60 | void combo_enable(void); | 60 | void combo_enable(void); |
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index eb06be96c..2beccbd8f 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c | |||
@@ -296,7 +296,7 @@ void music_mode_cycle(void) { | |||
296 | # endif | 296 | # endif |
297 | } | 297 | } |
298 | 298 | ||
299 | void matrix_scan_music(void) { | 299 | void music_task(void) { |
300 | if (music_sequence_playing) { | 300 | if (music_sequence_playing) { |
301 | if ((music_sequence_timer == 0) || (timer_elapsed(music_sequence_timer) > music_sequence_interval)) { | 301 | if ((music_sequence_timer == 0) || (timer_elapsed(music_sequence_timer) > music_sequence_interval)) { |
302 | music_sequence_timer = timer_read(); | 302 | music_sequence_timer = timer_read(); |
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h index 01014aa6c..e275cd9d2 100644 --- a/quantum/process_keycode/process_music.h +++ b/quantum/process_keycode/process_music.h | |||
@@ -44,7 +44,7 @@ void music_scale_user(void); | |||
44 | void music_all_notes_off(void); | 44 | void music_all_notes_off(void); |
45 | void music_mode_cycle(void); | 45 | void music_mode_cycle(void); |
46 | 46 | ||
47 | void matrix_scan_music(void); | 47 | void music_task(void); |
48 | 48 | ||
49 | bool music_mask(uint16_t keycode); | 49 | bool music_mask(uint16_t keycode); |
50 | bool music_mask_kb(uint16_t keycode); | 50 | bool music_mask_kb(uint16_t keycode); |
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 17dc540a6..c8712d919 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
@@ -161,7 +161,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { | |||
161 | return true; | 161 | return true; |
162 | } | 162 | } |
163 | 163 | ||
164 | void matrix_scan_tap_dance() { | 164 | void tap_dance_task() { |
165 | if (highest_td == -1) return; | 165 | if (highest_td == -1) return; |
166 | uint16_t tap_user_defined; | 166 | uint16_t tap_user_defined; |
167 | 167 | ||
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index a013c5cab..d9ffb1e73 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h | |||
@@ -85,7 +85,7 @@ extern qk_tap_dance_action_t tap_dance_actions[]; | |||
85 | 85 | ||
86 | void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record); | 86 | void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record); |
87 | bool process_tap_dance(uint16_t keycode, keyrecord_t *record); | 87 | bool process_tap_dance(uint16_t keycode, keyrecord_t *record); |
88 | void matrix_scan_tap_dance(void); | 88 | void tap_dance_task(void); |
89 | void reset_tap_dance(qk_tap_dance_state_t *state); | 89 | void reset_tap_dance(qk_tap_dance_state_t *state); |
90 | 90 | ||
91 | void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data); | 91 | void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data); |