From 1b49f128a96197bd11d47feba203d1029e022a50 Mon Sep 17 00:00:00 2001 From: Hemna Date: Thu, 15 Dec 2022 20:13:40 -0500 Subject: [PATCH] cleanup webchat --- aprsd/cmds/webchat.py | 6 ++---- aprsd/packets/core.py | 3 --- aprsd/threads/rx.py | 8 -------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/aprsd/cmds/webchat.py b/aprsd/cmds/webchat.py index fcd5fd7..e79763c 100644 --- a/aprsd/cmds/webchat.py +++ b/aprsd/cmds/webchat.py @@ -381,12 +381,10 @@ class SendMessageNamespace(Namespace): from_call=self._config["aprs"]["login"], to_call="APDW16", raw=txt, + latitude=lat, + longitude=long, ) beacon.send_direct() - #beacon_msg = messaging.RawMessage(txt) - #beacon_msg.fromcall = self._config["aprs"]["login"] - #beacon_msg.tocall = "APDW16" - #beacon_msg.send_direct() def handle_message(self, data): LOG.debug(f"WS Data {data}") diff --git a/aprsd/packets/core.py b/aprsd/packets/core.py index 383f039..b9d9736 100644 --- a/aprsd/packets/core.py +++ b/aprsd/packets/core.py @@ -147,12 +147,9 @@ class Packet(metaclass=abc.ABCMeta): def send(self): """Method to send a packet.""" - LOG.warning("send() called!") self._init_for_send() thread = tx.SendPacketThread(packet=self) - LOG.warning(f"Starting thread to TX {self}") thread.start() - LOG.warning("Thread started") def send_direct(self, aprsis_client=None): """Send the message in the same thread as caller.""" diff --git a/aprsd/threads/rx.py b/aprsd/threads/rx.py index fad4096..478a7ee 100644 --- a/aprsd/threads/rx.py +++ b/aprsd/threads/rx.py @@ -135,15 +135,7 @@ class APRSDProcessPacketThread(APRSDThread): to_call=from_call, msgNo=msg_id, ) - LOG.warning(f"Send AckPacket {ack_pkt}") ack_pkt.send() - LOG.warning("Send ACK called Continue on") - #ack = messaging.AckMessage( - # self.config["aprsd"]["callsign"], - # from_call, - # msg_id=msg_id, - #) - #ack.send() self.process_our_message_packet(packet) else: