From dfc37b143ff6322783d3fecf16338d7a9c9f17b4 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Fri, 25 Dec 2020 12:58:04 -0500 Subject: [PATCH] keyboard_comm: fix macro buffer size retrieval, fix unit tests --- src/main/python/keyboard_comm.py | 2 +- src/main/python/test/test_keyboard.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/python/keyboard_comm.py b/src/main/python/keyboard_comm.py index 8803540..6d3e775 100644 --- a/src/main/python/keyboard_comm.py +++ b/src/main/python/keyboard_comm.py @@ -170,7 +170,7 @@ class Keyboard: """ Loads macro information from the keyboard """ data = self.usb_send(self.dev, struct.pack("B", CMD_VIA_MACRO_GET_COUNT)) self.macro_count = data[1] - data = self.usb_send(self.dev, struct.pack(">H", CMD_VIA_MACRO_GET_BUFFER_SIZE)) + data = self.usb_send(self.dev, struct.pack("B", CMD_VIA_MACRO_GET_BUFFER_SIZE)) self.macro_memory = struct.unpack(">H", data[1:3])[0] def set_key(self, layer, row, col, code): diff --git a/src/main/python/test/test_keyboard.py b/src/main/python/test/test_keyboard.py index f031604..c4e5528 100644 --- a/src/main/python/test/test_keyboard.py +++ b/src/main/python/test/test_keyboard.py @@ -95,6 +95,10 @@ class TestKeyboard(unittest.TestCase): dev.expect_encoders(encoders) # layout options dev.expect("0202", "020200000000") + # macro count + dev.expect("0C", "0C00") + # macro buffer size + dev.expect("0D", "0D0000") kb = Keyboard(dev, dev.sim_send) # simulate old VIA keymap retrieval in tests for now