Merge remote-tracking branch 'upstream/master' into develop

2021-01-28 10:52:59 +11:00
parent 99f3df2893 bad9592a18
commit d65db68f9f
7 changed files with 30 additions and 2 deletions
--- a/tmk_core/common/keyboard.h
+++ b/tmk_core/common/keyboard.h
@ -82,6 +82,8 @@ uint32_t last_matrix_activity_elapsed(void);  // Number of milliseconds since th
 uint32_t last_encoder_activity_time(void);     // Timestamp of the last encoder activity
 uint32_t last_encoder_activity_elapsed(void);  // Number of milliseconds since the last encoder activity

+uint32_t get_matrix_scan_rate(void);
+
 #ifdef __cplusplus
 }
 #endif