sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kbscan: Return early if debouncing

Browse Source 
A single timer is used for debouncing all keys, so there is no reason to
perform any operations if the matrix is being debounced. Just return
early and remove some of the convoluted logic.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2023-07-24 17:17:49 -06:00
committed by Jeremy Soller
parent 8a1adc2bdc
commit 546458e368
1 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/board/system76/common/kbscan.c
View File

@ -328,8 +328,11 @@ void kbscan_event(void) {
if (debounce) { if (debounce) {
uint32_t time = time_get(); uint32_t time = time_get();
if ((time - debounce_time) >= DEBOUNCE_DELAY) { if ((time - debounce_time) >= DEBOUNCE_DELAY) {
// Finish debounce // Debounce time elapsed: Read new state
debounce = false; debounce = false;
} else {
// If still debouncing, don't do anything.
return;
} }
} }
@ -338,11 +341,11 @@ void kbscan_event(void) {
uint8_t last = kbscan_matrix[i]; uint8_t last = kbscan_matrix[i];
if (new != last) { if (new != last) {
if (kbscan_has_ghost_in_row(i, new)) { if (kbscan_has_ghost_in_row(i, new)) {
kbscan_ghost[i] = true;
continue; continue;
} else if (kbscan_ghost[i]) { }
kbscan_ghost[i] = false;
// Debounce to allow remaining ghosts to settle. // Some key has changed state: Start debounce
if (!debounce) {
debounce = true; debounce = true;
debounce_time = time_get(); debounce_time = time_get();
} }
@ -356,49 +359,39 @@ void kbscan_event(void) {
if (new_b != last_b) { if (new_b != last_b) {
bool reset = false; bool reset = false;
// If debouncing // Check keys used for config reset
if (debounce) { if (matrix_position_is_esc(i, j))
// Debounce presses and releases kbscan_esc_held = new_b;
reset = true; if (matrix_position_is_fn(i, j))
} else { kbscan_fn_held = new_b;
// Begin debounce
debounce = true;
debounce_time = time_get();
// Check keys used for config reset // Handle key press/release
if (matrix_position_is_esc(i, j)) if (new_b) {
kbscan_esc_held = new_b; // On a press, cache the layer the key was pressed on
if (matrix_position_is_fn(i, j)) kbscan_last_layer[i][j] = kbscan_layer;
kbscan_fn_held = new_b; }
uint8_t key_layer = kbscan_last_layer[i][j];
uint16_t key = 0;
keymap_get(key_layer, i, j, &key);
if (key) {
DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, key_layer, key, new_b);
if (!kbscan_press(key, new_b, &layer)) {
// In the case of ignored key press/release, reset bit
reset = true;
}
// Handle key press/release
if (new_b) { if (new_b) {
// On a press, cache the layer the key was pressed on // New key pressed, update last key
kbscan_last_layer[i][j] = kbscan_layer; repeat_key = key;
} repeat_key_time = time_get();
uint8_t key_layer = kbscan_last_layer[i][j]; repeat = false;
uint16_t key = 0; } else if (key == repeat_key) {
keymap_get(key_layer, i, j, &key); // Repeat key was released
if (key) { repeat_key = 0;
DEBUG("KB %d, %d, %d = 0x%04X, %d\n", i, j, key_layer, key, new_b); repeat = false;
if (!kbscan_press(key, new_b, &layer)) {
// In the case of ignored key press/release, reset bit
reset = true;
}
if (new_b) {
// New key pressed, update last key
repeat_key = key;
repeat_key_time = time_get();
repeat = false;
} else if (key == repeat_key) {
// Repeat key was released
repeat_key = 0;
repeat = false;
}
} else {
WARN("KB %d, %d, %d missing\n", i, j, kbscan_layer);
} }
} else {
WARN("KB %d, %d, %d missing\n", i, j, kbscan_layer);
} }
// Reset bit to last state // Reset bit to last state