Skip to content

A truly modular keyboard

C

firmware: KEY+ reports the Keybit firmware version (v=)

Nathan5c922066d6a1
diff --git a/firmware/Core/Src/keymap.c b/firmware/Core/Src/keymap.c
index a61c041..6fd5a11 100644
--- a/firmware/Core/Src/keymap.c
+++ b/firmware/Core/Src/keymap.c
@@ -232,7 +232,7 @@ static void Keys_Task(void)
const keybit_info_t *old = Find_Keybit(present, present_count, keybits[i].uid);
uint8_t was_down = old ? old->key_down : 0;
PROTO_FormatUid(uid, keybits[i].uid);
- if (!old) PROTO_Send("KEY+ uid=%s at=%c", uid, keybits[i].at);
+ if (!old) PROTO_Send("KEY+ uid=%s at=%c v=%u", uid, keybits[i].at, keybits[i].fw); /* v: Keybit reg 0x01 */
if (was_down != keybits[i].key_down)
{
PROTO_Send("PRESS uid=%s down=%d", uid, keybits[i].key_down);
diff --git a/firmware/Core/Src/proto.c b/firmware/Core/Src/proto.c
index b3df5f8..0154d94 100644
--- a/firmware/Core/Src/proto.c
+++ b/firmware/Core/Src/proto.c
@@ -131,7 +131,7 @@ static void Handle_Line(proto_port_t *port, char *cmd)
for (int i = 0; i < n; i++)
{
PROTO_FormatUid(uid_s, k[i].uid);
- Reply(port, "KEY+ uid=%s at=%c", uid_s, k[i].at);
+ Reply(port, "KEY+ uid=%s at=%c v=%u", uid_s, k[i].at, k[i].fw);
}
Reply(port, "KEYS END");
}
diff --git a/firmware/test/proto_test.c b/firmware/test/proto_test.c
index d34f112..a71e53d 100644
--- a/firmware/test/proto_test.c
+++ b/firmware/test/proto_test.c
@@ -61,6 +61,7 @@ int main(void)
PROTO_AddPort(&port2);
for (int i = 0; i < UID_LEN; i++) present[0].uid[i] = (uint8_t)(12 - i); /* prints as U */
present[0].at = 'L';
+ present[0].fw = 2;
memset(present[1].uid, 0xAB, UID_LEN);
present[1].at = 'T';
@@ -69,7 +70,7 @@ int main(void)
expect("HELLO\r", "KEYWORD v=" KEYWORD_FW_VERSION " proto=1\n"); /* terminal Enter */
expect("\r\n\r\n", "");
expect("SIDES?\n", "SIDES L=1 R=0 T=1\n");
- expect("KEYS?\n", "KEY+ uid=" U " at=L\nKEY+ uid=ABABABABABABABABABABABAB at=T\nKEYS END\n");
+ expect("KEYS?\n", "KEY+ uid=" U " at=L v=2\nKEY+ uid=ABABABABABABABABABABABAB at=T v=0\nKEYS END\n");
expect("MAP? uid=" U "\n", "MAP uid=" U " mods=00 key=00\n");
expect("MAP uid=" U " mods=02 key=04\n", "OK MAP uid=" U "\n");
assert(table[0].uid[0] == 0x0C && table[0].uid[11] == 0x01); /* stored little endian */