mcu: Move SerialCommand from serialhdl.py to mcu.py

Move the serial command wrapper class from serialhdl.py to mcu.py.
This will allow that class to better support higher level
functionality.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 2 insertions, 19 deletions

diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py
index 020a3f27..99fd5e94 100644
--- a/klippy/serialhdl.py
+++ b/klippy/serialhdl.py
@@ -134,6 +134,8 @@ class SerialReader:
         return self.ffi_main.string(self.stats_buf)
     def get_msgparser(self):
         return self.msgparser
+    def get_default_command_queue(self):
+        return self.default_cmd_queue
     # Serial response callbacks
     def register_response(self, callback, name, oid=None):
         with self.lock:
@@ -152,11 +154,6 @@ class SerialReader:
         cmd = self.msgparser.create_command(msg)
         src = SerialRetryCommand(self, cmd, response)
         return src.get_response()
-    def lookup_command(self, msgformat, cq=None):
-        if cq is None:
-            cq = self.default_cmd_queue
-        cmd = self.msgparser.lookup_command(msgformat)
-        return SerialCommand(self, cq, cmd)
     def alloc_command_queue(self):
         return self.ffi_main.gc(self.ffi_lib.serialqueue_alloc_commandqueue(),
                                 self.ffi_lib.serialqueue_free_commandqueue)
@@ -198,20 +195,6 @@ class SerialReader:
     def __del__(self):
         self.disconnect()
 
-# Wrapper around command sending
-class SerialCommand:
-    def __init__(self, serial, cmd_queue, cmd):
-        self.serial = serial
-        self.cmd_queue = cmd_queue
-        self.cmd = cmd
-    def send(self, data=(), minclock=0, reqclock=0):
-        cmd = self.cmd.encode(data)
-        self.serial.raw_send(cmd, minclock, reqclock, self.cmd_queue)
-    def send_with_response(self, data=(), response=None, response_oid=None):
-        cmd = self.cmd.encode(data)
-        src = SerialRetryCommand(self.serial, cmd, response, response_oid)
-        return src.get_response()
-
 # Class to retry sending of a query command until a given response is received
 class SerialRetryCommand:
     TIMEOUT_TIME = 5.0