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

keyboard_comm: backwards compat with via for keyboard unlock

main
Ilya Zhuravlev 2020-12-29 19:42:24 -05:00
parent 5d5126dc38
commit 86e4889dee
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/python/keyboard_comm.py
View File

@ -55,7 +55,6 @@ class Keyboard:
self.layout_options = -1 self.layout_options = -1
self.keys = [] self.keys = []
self.encoders = [] self.encoders = []
self.sideload = False
self.macro_count = 0 self.macro_count = 0
self.macro_memory = 0 self.macro_memory = 0
self.macro = b"" self.macro = b""
@ -86,7 +85,6 @@ 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))
@ -304,12 +302,20 @@ class Keyboard:
return keyboard_id return keyboard_id
def get_unlock_status(self): def get_unlock_status(self):
# VIA keyboards are always unlocked
if self.vial_protocol < 0:
return 1
data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_UNLOCK_STATUS)) data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_UNLOCK_STATUS))
return data[0] return data[0]
def get_unlock_keys(self): def get_unlock_keys(self):
""" Return keys users have to hold to unlock the keyboard as a list of rowcols """ """ Return keys users have to hold to unlock the keyboard as a list of rowcols """
# VIA keyboards don't have unlock keys
if self.vial_protocol < 0:
return []
data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_UNLOCK_STATUS)) data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_GET_UNLOCK_STATUS))
rowcol = [] rowcol = []
for x in range(15): for x in range(15):
@ -320,11 +326,20 @@ class Keyboard:
return rowcol return rowcol
def unlock_start(self): def unlock_start(self):
if self.vial_protocol < 0:
return
self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_UNLOCK_START)) self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_UNLOCK_START))
def unlock_poll(self): def unlock_poll(self):
if self.vial_protocol < 0:
return b""
data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_UNLOCK_POLL)) data = self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_UNLOCK_POLL))
return data return data
def lock(self): def lock(self):
if self.vial_protocol < 0:
return
self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_LOCK)) self.usb_send(self.dev, struct.pack("BB", CMD_VIA_VIAL_PREFIX, CMD_VIAL_LOCK))