Merge pull request #341 from UltimateHackingKeyboard/fix_commit_state…

…_race Fix a possible race on key commitment.
UltimateHackingKeyboard · Oct 23, 2024 · 64c668d · 64c668d
2 parents 9c1ce33 + ebad54d
commit 64c668d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
@@ -465,14 +465,16 @@ static void commitKeyState(key_state_t *keyState, bool active)
 static inline void preprocessKeyState(key_state_t *keyState)
 {
     uint8_t debounceTime = keyState->previous ? Cfg.DebounceTimePress : Cfg.DebounceTimeRelease;
-    if (keyState->debouncing && (uint8_t)(CurrentTime - keyState->timestamp) > debounceTime) {
+    if (keyState->debouncing && (uint8_t)(CurrentTime - keyState->timestamp) >= debounceTime) {
         keyState->debouncing = false;
     }
 
-    if (!keyState->debouncing && keyState->debouncedSwitchState != keyState->hardwareSwitchState) {
+    // read just once! Otherwise the key might get stuck
+    bool hardwareState = keyState->hardwareSwitchState;
+    if (!keyState->debouncing && keyState->debouncedSwitchState != hardwareState) {
         keyState->timestamp = CurrentTime;
         keyState->debouncing = true;
-        keyState->debouncedSwitchState = keyState->hardwareSwitchState;
+        keyState->debouncedSwitchState = hardwareState;
 
         commitKeyState(keyState, keyState->debouncedSwitchState);
     }