aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-05-18 17:02:28 +1000
committerGitHub <noreply@github.com>2021-05-18 17:02:28 +1000
commit58142f0726147d538167ff3ab793743348f40dcd (patch)
treee3db28a5c97c75c101af821283c56ce4dc017a3a /tmk_core/common
parent6cdc996e0b40e9cd9a368e5ac2be2341aa9d6747 (diff)
downloadqmk_firmware-58142f0726147d538167ff3ab793743348f40dcd.tar.gz
qmk_firmware-58142f0726147d538167ff3ab793743348f40dcd.zip
Fixup housekeeping from being invoked twice per loop. (#12933)
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/keyboard.c12
-rw-r--r--tmk_core/common/keyboard.h5
2 files changed, 12 insertions, 5 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 24baf41c0..3d6092e71 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -280,6 +280,15 @@ __attribute__((weak)) void housekeeping_task_kb(void) {}
280 */ 280 */
281__attribute__((weak)) void housekeeping_task_user(void) {} 281__attribute__((weak)) void housekeeping_task_user(void) {}
282 282
283/** \brief housekeeping_task
284 *
285 * Invokes hooks for executing code after QMK is done after each loop iteration.
286 */
287void housekeeping_task(void) {
288 housekeeping_task_kb();
289 housekeeping_task_user();
290}
291
283/** \brief keyboard_init 292/** \brief keyboard_init
284 * 293 *
285 * FIXME: needs doc 294 * FIXME: needs doc
@@ -374,9 +383,6 @@ void keyboard_task(void) {
374 bool encoders_changed = false; 383 bool encoders_changed = false;
375#endif 384#endif
376 385
377 housekeeping_task_kb();
378 housekeeping_task_user();
379
380 uint8_t matrix_changed = matrix_scan(); 386 uint8_t matrix_changed = matrix_scan();
381 if (matrix_changed) last_matrix_activity_trigger(); 387 if (matrix_changed) last_matrix_activity_trigger();
382 388
diff --git a/tmk_core/common/keyboard.h b/tmk_core/common/keyboard.h
index eaf74bac5..779973f1d 100644
--- a/tmk_core/common/keyboard.h
+++ b/tmk_core/common/keyboard.h
@@ -70,8 +70,9 @@ void keyboard_pre_init_user(void);
70void keyboard_post_init_kb(void); 70void keyboard_post_init_kb(void);
71void keyboard_post_init_user(void); 71void keyboard_post_init_user(void);
72 72
73void housekeeping_task_kb(void); 73void housekeeping_task(void); // To be executed by the main loop in each backend TMK protocol
74void housekeeping_task_user(void); 74void housekeeping_task_kb(void); // To be overridden by keyboard-level code
75void housekeeping_task_user(void); // To be overridden by user/keymap-level code
75 76
76uint32_t last_input_activity_time(void); // Timestamp of the last matrix or encoder activity 77uint32_t last_input_activity_time(void); // Timestamp of the last matrix or encoder activity
77uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder activity 78uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder activity