From e7178efa2393c8338ade4a3b5c4f1264567d1f8c Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 25 Mar 2026 05:32:21 +0100 Subject: [PATCH] refactored UbxReceiver --- network_backend.py | 12 ++++++------ receiver/{ubx_receiver.py => ubx_listener.py} | 2 +- receiver/ubx_packetizer.py | 4 ++-- ubx/query.py | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename receiver/{ubx_receiver.py => ubx_listener.py} (96%) diff --git a/network_backend.py b/network_backend.py index e8882f8..7586c70 100644 --- a/network_backend.py +++ b/network_backend.py @@ -6,7 +6,7 @@ import signal, os from msg_container import MsgContainer from receiver.nmea_packetizer import NmeaPacketizer from receiver.ubx_packetizer import UbxPacketizer -from receiver.ubx_receiver import UbxReceiver +from receiver.ubx_listener import UbxListener from transceiver import Transceiver from a_backend import ABackend from nmea.GLL import Gll @@ -148,12 +148,12 @@ if __name__ == "__main__": Gga(grm, 'GN'), ] ubx_rx_list = [ - UbxReceiver(Sig(), 0x01, 0x43), - UbxReceiver(Sat(), 0x01, 0x35), - UbxReceiver(RawX(), 0x02, 0x15), + UbxListener(Sig(), 0x01, 0x43), + UbxListener(Sat(), 0x01, 0x35), + UbxListener(RawX(), 0x02, 0x15), - UbxReceiver(UbxMsg(), 0x05, 0x01), - UbxReceiver(UbxMsg(), 0x05, 0x00), + UbxListener(UbxMsg(), 0x05, 0x01), + UbxListener(UbxMsg(), 0x05, 0x00), ] # Topology diff --git a/receiver/ubx_receiver.py b/receiver/ubx_listener.py similarity index 96% rename from receiver/ubx_receiver.py rename to receiver/ubx_listener.py index b381a07..4d94a81 100644 --- a/receiver/ubx_receiver.py +++ b/receiver/ubx_listener.py @@ -3,7 +3,7 @@ from msg_listener import MsgListener from ubx.ubx import frame_parse, frame_parse_hdr from ubx.msg import UbxMsg -class UbxReceiver(MsgListener): +class UbxListener(MsgListener): def __init__(self, parser: UbxMsg, mclass: int|None = None, mid: int|None = None): MsgListener.__init__(self) self.parser = parser diff --git a/receiver/ubx_packetizer.py b/receiver/ubx_packetizer.py index d7ce2d1..75a1025 100644 --- a/receiver/ubx_packetizer.py +++ b/receiver/ubx_packetizer.py @@ -3,7 +3,7 @@ from msg_container import MsgContainer from msg_listener import MsgListener from msg_talker import MsgTalker from ubx.ubx import UBX_SYNC_WORD, frame_parse, frame_create -from receiver.ubx_receiver import UbxReceiver +from receiver.ubx_listener import UbxListener UBX_PKT_DEBUG = False def ubx_pkt_debug(s: str): @@ -71,7 +71,7 @@ if __name__ == "__main__": def is_msg(self, msg: MsgContainer): return True - ubx_rx = UbxReceiver('test', 1, 2) + ubx_rx = UbxListener('test', 1, 2) pkt = UbxPacketizer() pkt.register_listener(ubx_rx) diff --git a/ubx/query.py b/ubx/query.py index ad94179..4d822fa 100644 --- a/ubx/query.py +++ b/ubx/query.py @@ -2,12 +2,12 @@ from msg_container import MsgContainer from ubx.ubx import frame_parse, frame_parse_hdr, frame_create from ubx.msg import UbxMsg from transceiver import Transceiver -from receiver.ubx_receiver import UbxReceiver +from receiver.ubx_listener import UbxListener from threading import BoundedSemaphore -class UbxQuery(UbxReceiver): +class UbxQuery(UbxListener): def __init__(self, transceiver: Transceiver, parser: UbxMsg, mclass: int|None = None, mid: int|None = None): - UbxReceiver.__init__(self, parser, mclass, mid) + UbxListener.__init__(self, parser, mclass, mid) self.transceiver = transceiver self.sema = BoundedSemaphore() self.msg = UbxMsg()