From 81da5379d406236b8284921d34f23e877464db63 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 4 Feb 2021 16:33:03 -0500 Subject: buildcommands: Extend number of available mcu messages from 96 to 128 Some internal code treats the message ids as encoded "variable length quantities", while other internal code assumes the message id is always one byte long. Continue using this scheme, but convert the VLQ users to use the name "msgtag" while the 1-byte users use "msgid". Increase the number of available msgids from 96 to 127 - the higher values get encoded as negative "msgtags". Signed-off-by: Kevin O'Connor --- klippy/msgproto.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'klippy/msgproto.py') diff --git a/klippy/msgproto.py b/klippy/msgproto.py index d1f461b8..c3c0cda9 100644 --- a/klippy/msgproto.py +++ b/klippy/msgproto.py @@ -357,14 +357,17 @@ class MessageParser: start_value, count = value for i in range(count): enums[enum_root + str(start_enum + i)] = start_value + i - def _init_messages(self, messages, command_ids=[], output_ids=[]): - for msgformat, msgid in messages.items(): + def _init_messages(self, messages, command_tags=[], output_tags=[]): + for msgformat, msgtag in messages.items(): msgtype = 'response' - if msgid in command_ids: + if msgtag in command_tags: msgtype = 'command' - elif msgid in output_ids: + elif msgtag in output_tags: msgtype = 'output' - self.messages.append((msgid, msgtype, msgformat)) + self.messages.append((msgtag, msgtype, msgformat)) + if msgtag < -32 or msgtag > 95: + raise error("Multi-byte msgtag not supported") + msgid = msgtag & 0x7f if msgtype == 'output': self.messages_by_id[msgid] = OutputFormat(msgid, msgformat) else: -- cgit v1.2.3-70-g09d2