diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2023-01-13 12:42:14 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2023-02-22 11:34:36 -0500 |
| commit | d8811717391cb9ac11eaebf342387edd7404fdd0 (patch) | |
| tree | 2fd2c0f9030f5c7cd88f5156934952cd413b158f /klippy/mcu.py | |
| parent | 69dcda1696a04e303f70632a09869f3cc57bb94f (diff) | |
| download | kutter-d8811717391cb9ac11eaebf342387edd7404fdd0.tar.gz kutter-d8811717391cb9ac11eaebf342387edd7404fdd0.tar.xz kutter-d8811717391cb9ac11eaebf342387edd7404fdd0.zip | |
mcu: Move lookup_command_tag() to CommandWrapper class
Use mcu.lookup_command().get_command_tag() instead of
mcu.lookup_command_tag(). This improves error reporting on a protocol
mismatch. It also enables support for a msgtag that is negative.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
| -rw-r--r-- | klippy/mcu.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index fbd0b5a4..76c70506 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -80,13 +80,17 @@ class CommandQueryWrapper: class CommandWrapper: def __init__(self, serial, msgformat, cmd_queue=None): self._serial = serial - self._cmd = serial.get_msgparser().lookup_command(msgformat) + msgparser = serial.get_msgparser() + self._cmd = msgparser.lookup_command(msgformat) if cmd_queue is None: cmd_queue = serial.get_default_command_queue() self._cmd_queue = cmd_queue + self._msgtag = msgparser.lookup_msgtag(msgformat) & 0xffffffff def send(self, data=(), minclock=0, reqclock=0): cmd = self._cmd.encode(data) self._serial.raw_send(cmd, minclock, reqclock, self._cmd_queue) + def get_command_tag(self): + return self._msgtag ###################################################################### @@ -148,11 +152,13 @@ class MCU_trsync: self._stepper_stop_cmd = mcu.lookup_command( "stepper_stop_on_trigger oid=%c trsync_oid=%c", cq=self._cmd_queue) # Create trdispatch_mcu object - set_timeout_tag = mcu.lookup_command_tag( - "trsync_set_timeout oid=%c clock=%u") - trigger_tag = mcu.lookup_command_tag("trsync_trigger oid=%c reason=%c") - state_tag = mcu.lookup_command_tag( + set_timeout_tag = mcu.lookup_command( + "trsync_set_timeout oid=%c clock=%u").get_command_tag() + trigger_cmd = mcu.lookup_command("trsync_trigger oid=%c reason=%c") + trigger_tag = trigger_cmd.get_command_tag() + state_cmd = mcu.lookup_command( "trsync_state oid=%c can_trigger=%c trigger_reason=%c clock=%u") + state_tag = state_cmd.get_command_tag() ffi_main, ffi_lib = chelper.get_ffi() self._trdispatch_mcu = ffi_main.gc(ffi_lib.trdispatch_mcu_alloc( self._trdispatch, mcu._serial.get_serialqueue(), # XXX @@ -874,9 +880,6 @@ class MCU: return self.lookup_command(msgformat) except self._serial.get_msgparser().error as e: return None - def lookup_command_tag(self, msgformat): - all_msgs = self._serial.get_msgparser().get_messages() - return {fmt: msgtag for msgtag, msgtype, fmt in all_msgs}[msgformat] def get_enumerations(self): return self._serial.get_msgparser().get_enumerations() def get_constants(self): |