Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 10:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make modem transmit queue item format more explicit

Browse source
This commit is contained in:
Pedro 2023-11-25 23:39:35 +01:00
parent cf50e69e3a
commit dea132203b
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modem/command.py
View file

@ -32,7 +32,12 @@ class TxCommand():
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):

10
modem/modem.py
View file

@ -1145,14 +1145,12 @@ class RF:
# 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: