Skip to content

A truly modular keyboard

C

keyword: side bus I2C timeouts for 20 kHz, keep a Keybit through a missed scan

Nathan78d3b3c847d1
diff --git a/firmware/keyword/Core/Src/keybit_bus.c b/firmware/keyword/Core/Src/keybit_bus.c
index 4f4fa9c..3cb279e 100644
--- a/firmware/keyword/Core/Src/keybit_bus.c
+++ b/firmware/keyword/Core/Src/keybit_bus.c
@@ -1,7 +1,7 @@
#include "keybit_bus.h"
#include <string.h>
-#define I2C_TIMEOUT_MS 10
+#define I2C_TIMEOUT_MS 50 /* at 20 kHz a full 8-event relay read alone takes ~19 ms */
#define ADDR_FIRST 0x08
#define ADDR_LAST 0x77
#define CHARGER_ADDR 0x6A /* BQ25895 shares I2C3 */
diff --git a/firmware/keyword/Core/Src/main.c b/firmware/keyword/Core/Src/main.c
index 35f1c14..4b11e2b 100644
--- a/firmware/keyword/Core/Src/main.c
+++ b/firmware/keyword/Core/Src/main.c
@@ -45,6 +45,7 @@
#define KEYBIT_POLL_MS 250
#define KEYBIT_SCAN_MS 250
#define KEYBIT_KEYS_MS 5
+#define KEYBIT_MISSES_MAX 2 /* scans a Keybit may miss in a row before it counts as gone */
/* USER CODE END PD */
@@ -436,7 +437,24 @@ static void Keybit_Bus_Poll(void)
int fresh = keybit_bus_assign(&hi2c3);
int before = keybit_count;
- keybit_count = keybit_bus_scan(&hi2c3, keybits, KEYBIT_MAX);
+ /* A Keybit busy serving a link now and then misses a scan. Keep it
+ * through KEYBIT_MISSES_MAX scans in a row before calling it gone, or it
+ * flickers in and out. */
+ static uint8_t missed[KEYBIT_MAX];
+ keybit_info_t found[KEYBIT_MAX];
+ uint8_t found_missed[KEYBIT_MAX] = {0};
+ int n = keybit_bus_scan(&hi2c3, found, KEYBIT_MAX);
+ for (int i = 0; i < keybit_count && n < KEYBIT_MAX; i++) {
+ int here = 0;
+ for (int j = 0; j < n && !here; j++) here = memcmp(found[j].uid, keybits[i].uid, sizeof(found[j].uid)) == 0;
+ if (!here && missed[i] < KEYBIT_MISSES_MAX) {
+ found[n] = keybits[i];
+ found_missed[n++] = (uint8_t)(missed[i] + 1);
+ }
+ }
+ memcpy(keybits, found, n * sizeof(found[0]));
+ memcpy(missed, found_missed, sizeof(missed));
+ keybit_count = n;
if (fresh > 0 || keybit_count > before) white_until = HAL_GetTick() + WHITE_BLINK_MS;
}