From aa59202b5ac0311226c2006376563dd01ec118e7 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sat, 8 May 2021 20:12:51 -0400 Subject: [PATCH] fix DummyKeyboard calling usb_send accidentally --- src/main/python/keyboard_comm.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/python/keyboard_comm.py b/src/main/python/keyboard_comm.py index c34201e..f2830ad 100644 --- a/src/main/python/keyboard_comm.py +++ b/src/main/python/keyboard_comm.py @@ -138,6 +138,7 @@ def macro_deserialize_v2(data): out.append(cls(args)) return out + class Keyboard: """ Low-level communication with a vial-enabled keyboard """ @@ -182,11 +183,14 @@ class Keyboard: self.layers = self.usb_send(self.dev, struct.pack("B", CMD_VIA_GET_LAYER_COUNT), retries=20)[1] + def reload_via_protocol(self): + data = self.usb_send(self.dev, struct.pack("B", CMD_VIA_GET_PROTOCOL_VERSION), retries=20) + self.via_protocol = struct.unpack(">H", data[1:3])[0] + def reload_layout(self, sideload_json=None): """ Requests layout data from the current device """ - data = self.usb_send(self.dev, struct.pack("B", CMD_VIA_GET_PROTOCOL_VERSION), retries=20) - self.via_protocol = struct.unpack(">H", data[1:3])[0] + self.reload_via_protocol() if sideload_json is not None: payload = sideload_json @@ -613,3 +617,6 @@ class DummyKeyboard(Keyboard): def lock(self): return + + def reload_via_protocol(self): + pass