Make modem transmit queue item format more explicit

DJ2LS · Nov 25, 2023 · dea1322 · dea1322
1 parent cf50e69
commit dea1322
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/modem/command.py b/modem/command.py
@@ -32,7 +32,12 @@ def get_c2_mode(self):
 
     def transmit(self, tx_frame_queue):
         frame = self.build_frame()
-        tx_queue_item = [self.get_c2_mode(), 1, 0, frame]
+        tx_queue_item = {
+            'mode': self.get_c2_mode(),
+            'repeat': 1,
+            'repeat_delay': 0,
+            'frame': frame
+        }
         tx_frame_queue.put(tx_queue_item)
 
     def run(self, event_queue: queue.Queue, tx_frame_queue: queue.Queue):

diff --git a/modem/modem.py b/modem/modem.py
@@ -1145,14 +1145,12 @@ def worker_transmit(self) -> None:
             # we could do a cleanup after a transmission so theres no reason sending twice
             queuesize = self.modem_transmit_queue.qsize()
             self.log.debug("[MDM] self.modem_transmit_queue", qsize=queuesize)
-            data = self.modem_transmit_queue.get()
+            tx = self.modem_transmit_queue.get()
 
-            if data[0] in ["morse"]:
-                self.transmit_morse(repeats=data[1], repeat_delay=data[2], frames=data[3])
+            if tx['mode'] in ["morse"]:
+                self.transmit_morse(tx['repeat'], tx['repeat_delay'], tx['frame'])
             else:
-                self.transmit(
-                    mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3]
-                )
+                self.transmit(tx['mode'], tx['repeat'], tx['repeat_delay'], tx['frame'])
             # self.modem_transmit_queue.task_done()
 
     def worker_received(self) -> None: