steven-y-e
/
vial
1
0
Fork 0
Code Pull Requests Releases Activity

keyboard: add backwards-compat for VIA keymap retrival

main
Ilya Zhuravlev 2020-12-21 02:30:43 -05:00
parent b9c10095e5
commit 03d853012e
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/python/keyboard.py
View File

@ -42,6 +42,7 @@ class Keyboard:
self.layout_options = -1 self.layout_options = -1
self.keys = [] self.keys = []
self.encoders = [] self.encoders = []
self.sideload = False
self.vial_protocol = self.keyboard_id = -1 self.vial_protocol = self.keyboard_id = -1
@ -67,6 +68,7 @@ class Keyboard:
if sideload_json is not None: if sideload_json is not None:
payload = sideload_json payload = sideload_json
self.sideload = True
else: else:
# get keyboard identification # get keyboard identification
data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_KEYBOARD_ID)) data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_KEYBOARD_ID))
@ -130,6 +132,14 @@ class Keyboard:
for layer in range(self.layers): for layer in range(self.layers):
for row, cols in self.rowcol.items(): for row, cols in self.rowcol.items():
# if this is a sideload, we have to assume it's a VIA keyboard
# and does not support fast keymap retrieval
if self.sideload:
for col in cols:
data = self.usb_send(self.dev, struct.pack("BBBB", CMD_VIA_GET_KEYCODE, layer, row, col))
keycode = struct.unpack(">H", data[4:6])[0]
self.layout[(layer, row, col)] = keycode
else:
for chunk in chunks(cols, 16): for chunk in chunks(cols, 16):
req = struct.pack("BBBB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_KEYMAP_FAST, layer, row) req = struct.pack("BBBB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_KEYMAP_FAST, layer, row)
for col in chunk: for col in chunk:

4
src/main/python/test/test_keyboard.py
View File

@ -93,8 +93,12 @@ class TestKeyboard(unittest.TestCase):
dev.expect_keymap(keymap) dev.expect_keymap(keymap)
if encoders is not None: if encoders is not None:
dev.expect_encoders(encoders) dev.expect_encoders(encoders)
# layout options
dev.expect("0202", "020200000000")
kb = Keyboard(dev, dev.sim_send) kb = Keyboard(dev, dev.sim_send)
# simulate old VIA keymap retrieval in tests for now
kb.sideload = True
kb.reload() kb.reload()
return kb, dev return kb, dev