diff options
author | Simon Arlott <70171+nomis@users.noreply.github.com> | 2021-06-09 08:23:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 17:23:21 +1000 |
commit | b829a1d2648abd0751e9d3505554547faf643425 (patch) | |
tree | 35ba811a62feffd88759d0a53c1d6353d5d6d88a /tmk_core | |
parent | f287597c19dc926c7c28cefa32ffc3f0b4fdba7f (diff) | |
download | qmk_firmware-b829a1d2648abd0751e9d3505554547faf643425.tar.gz qmk_firmware-b829a1d2648abd0751e9d3505554547faf643425.zip |
Avoid 8-bit timer overflows in debounce algorithms (#12240)
* Add fast_timer_t that is 16-bit or 32-bit based on architecture
A 16-bit timer will overflow sooner but be faster to compare on AVR.
* Avoid 8-bit timer overflows in debounce algorithms
Count down remaining elapsed time instead of trying to do 8-bit timer
comparisons.
Add a "none" implementation that is automatically used if DEBOUNCE is
0 otherwise it will break the _pk/_pr count down.
* Avoid unnecessary polling of the entire matrix in sym_eager_pk
The matrix only needs to be updated when a debounce timer expires.
* Avoid unnecessary polling of the entire matrix in sym_eager_pr
The matrix only needs to be updated when a debounce timer expires.
The use of the "needed_update" variable is trying to do what
"matrix_need_update" was added to fix but didn't work because it only
applied when all keys finished debouncing.
* Fix sym_defer_g timing inconsistency compared to other debounce algorithms
DEBOUNCE=5 should process the key after 5ms, not 6ms
* Add debounce tests
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/arm_atsam/_timer.h | 19 | ||||
-rw-r--r-- | tmk_core/common/avr/_timer.h | 19 | ||||
-rw-r--r-- | tmk_core/common/chibios/_timer.h | 19 | ||||
-rw-r--r-- | tmk_core/common/timer.h | 24 |
4 files changed, 77 insertions, 4 deletions
diff --git a/tmk_core/common/arm_atsam/_timer.h b/tmk_core/common/arm_atsam/_timer.h new file mode 100644 index 000000000..77402b612 --- /dev/null +++ b/tmk_core/common/arm_atsam/_timer.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* Copyright 2021 Simon Arlott | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | // The platform is 32-bit, so prefer 32-bit timers to avoid overflow | ||
19 | #define FAST_TIMER_T_SIZE 32 | ||
diff --git a/tmk_core/common/avr/_timer.h b/tmk_core/common/avr/_timer.h new file mode 100644 index 000000000..b81e0f68b --- /dev/null +++ b/tmk_core/common/avr/_timer.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* Copyright 2021 Simon Arlott | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | // The platform is 8-bit, so prefer 16-bit timers to reduce code size | ||
19 | #define FAST_TIMER_T_SIZE 16 | ||
diff --git a/tmk_core/common/chibios/_timer.h b/tmk_core/common/chibios/_timer.h new file mode 100644 index 000000000..77402b612 --- /dev/null +++ b/tmk_core/common/chibios/_timer.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* Copyright 2021 Simon Arlott | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | // The platform is 32-bit, so prefer 32-bit timers to avoid overflow | ||
19 | #define FAST_TIMER_T_SIZE 32 | ||
diff --git a/tmk_core/common/timer.h b/tmk_core/common/timer.h index 58f637dd9..928811a2b 100644 --- a/tmk_core/common/timer.h +++ b/tmk_core/common/timer.h | |||
@@ -1,5 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | Copyright 2011 Jun Wako <wakojun@gmail.com> | 2 | Copyright 2011 Jun Wako <wakojun@gmail.com> |
3 | Copyright 2021 Simon Arlott | ||
3 | 4 | ||
4 | This program is free software: you can redistribute it and/or modify | 5 | This program is free software: you can redistribute it and/or modify |
5 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
@@ -17,13 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
17 | 18 | ||
18 | #pragma once | 19 | #pragma once |
19 | 20 | ||
21 | #if __has_include_next("_timer.h") | ||
22 | # include_next "_timer.h" /* Include the platform's _timer.h */ | ||
23 | #endif | ||
24 | |||
20 | #include <stdint.h> | 25 | #include <stdint.h> |
21 | #include <stdbool.h> | 26 | #include <stdbool.h> |
22 | 27 | ||
23 | #if defined(__AVR__) | ||
24 | # include "avr/timer_avr.h" | ||
25 | #endif | ||
26 | |||
27 | #define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a))))) | 28 | #define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a))))) |
28 | #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) | 29 | #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) |
29 | #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) | 30 | #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) |
@@ -47,6 +48,21 @@ uint32_t timer_elapsed32(uint32_t last); | |||
47 | #define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2) | 48 | #define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2) |
48 | #define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2) | 49 | #define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2) |
49 | 50 | ||
51 | // Use an appropriate timer integer size based on architecture (16-bit will overflow sooner) | ||
52 | #if FAST_TIMER_T_SIZE < 32 | ||
53 | # define TIMER_DIFF_FAST(a, b) TIMER_DIFF_16(a, b) | ||
54 | # define timer_expired_fast(current, future) timer_expired(current, future) | ||
55 | typedef uint16_t fast_timer_t; | ||
56 | fast_timer_t inline timer_read_fast(void) { return timer_read(); } | ||
57 | fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed(last); } | ||
58 | #else | ||
59 | # define TIMER_DIFF_FAST(a, b) TIMER_DIFF_32(a, b) | ||
60 | # define timer_expired_fast(current, future) timer_expired32(current, future) | ||
61 | typedef uint32_t fast_timer_t; | ||
62 | fast_timer_t inline timer_read_fast(void) { return timer_read32(); } | ||
63 | fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed32(last); } | ||
64 | #endif | ||
65 | |||
50 | #ifdef __cplusplus | 66 | #ifdef __cplusplus |
51 | } | 67 | } |
52 | #endif | 68 | #endif |