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

keyboard_comm: error out if unsupported protocol

main
Ilya Zhuravlev 2021-05-22 14:52:45 -04:00
parent c384fb87c3
commit b717c58d68
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,9 @@ from macro_action import SS_TAP_CODE, SS_DOWN_CODE, SS_UP_CODE, ActionText, Acti
from unlocker import Unlocker from unlocker import Unlocker
from util import MSG_LEN, hid_send, chunks from util import MSG_LEN, hid_send, chunks
SUPPORTED_VIA_PROTOCOL = [-1, 9]
SUPPORTED_VIAL_PROTOCOL = [-1, 0, 1, 2, 3]
CMD_VIA_GET_PROTOCOL_VERSION = 0x01 CMD_VIA_GET_PROTOCOL_VERSION = 0x01
CMD_VIA_GET_KEYBOARD_VALUE = 0x02 CMD_VIA_GET_KEYBOARD_VALUE = 0x02
CMD_VIA_SET_KEYBOARD_VALUE = 0x03 CMD_VIA_SET_KEYBOARD_VALUE = 0x03
@ -53,6 +56,10 @@ CMD_VIAL_LOCK = 0x08
BUFFER_FETCH_CHUNK = 28 BUFFER_FETCH_CHUNK = 28
class ProtocolError(Exception):
pass
def macro_deserialize_v1(data): def macro_deserialize_v1(data):
""" """
Deserialize a single macro, protocol version 1 Deserialize a single macro, protocol version 1
@ -205,6 +212,10 @@ class Keyboard:
data = self.usb_send(self.dev, struct.pack("B", CMD_VIA_GET_PROTOCOL_VERSION), retries=20) 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.via_protocol = struct.unpack(">H", data[1:3])[0]
def check_protocol_version(self):
if self.via_protocol not in SUPPORTED_VIA_PROTOCOL or self.vial_protocol not in SUPPORTED_VIAL_PROTOCOL:
raise ProtocolError()
def reload_layout(self, sideload_json=None): def reload_layout(self, sideload_json=None):
""" Requests layout data from the current device """ """ Requests layout data from the current device """
@ -235,6 +246,8 @@ class Keyboard:
payload = json.loads(lzma.decompress(payload)) payload = json.loads(lzma.decompress(payload))
self.check_protocol_version()
self.definition = payload self.definition = payload
if "vial" in payload: if "vial" in payload:

17
src/main/python/main_window.py
View File

@ -10,6 +10,7 @@ from urllib.request import urlopen
from editor_container import EditorContainer from editor_container import EditorContainer
from firmware_flasher import FirmwareFlasher from firmware_flasher import FirmwareFlasher
from keyboard_comm import ProtocolError
from keymap_editor import KeymapEditor from keymap_editor import KeymapEditor
from keymaps import KEYMAPS from keymaps import KEYMAPS
from layout_editor import LayoutEditor from layout_editor import LayoutEditor
@ -216,12 +217,16 @@ class MainWindow(QMainWindow):
self.current_device = self.devices[idx] self.current_device = self.devices[idx]
if self.current_device is not None: if self.current_device is not None:
if self.current_device.sideload: try:
self.current_device.open(self.sideload_json) if self.current_device.sideload:
elif self.current_device.via_stack: self.current_device.open(self.sideload_json)
self.current_device.open(self.via_stack_json["definitions"][self.current_device.via_id]) elif self.current_device.via_stack:
else: self.current_device.open(self.via_stack_json["definitions"][self.current_device.via_id])
self.current_device.open(None) else:
self.current_device.open(None)
except ProtocolError:
QMessageBox.warning(self, "", "Unsupported protocol version!\n"
"Please download latest Vial from https://get.vial.today/")
if isinstance(self.current_device, VialKeyboard) \ if isinstance(self.current_device, VialKeyboard) \
and self.current_device.keyboard.keyboard_id in EXAMPLE_KEYBOARDS: and self.current_device.keyboard.keyboard_id in EXAMPLE_KEYBOARDS: