jens/NmeaClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored UbxReceiver

Browse Source
This commit is contained in:
jens
2026-03-25 05:32:21 +01:00
parent 3a85765347
commit e7178efa23
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network_backend.py
+6 -6
View File
@@ -6,7 +6,7 @@ import signal, os
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_packetizer import NmeaPacketizer from receiver.nmea_packetizer import NmeaPacketizer
from receiver.ubx_packetizer import UbxPacketizer from receiver.ubx_packetizer import UbxPacketizer
from receiver.ubx_receiver import UbxReceiver from receiver.ubx_listener import UbxListener
from transceiver import Transceiver from transceiver import Transceiver
from a_backend import ABackend from a_backend import ABackend
from nmea.GLL import Gll from nmea.GLL import Gll
@@ -148,12 +148,12 @@ if __name__ == "__main__":
Gga(grm, 'GN'), Gga(grm, 'GN'),
] ]
ubx_rx_list = [ ubx_rx_list = [
UbxReceiver(Sig(), 0x01, 0x43), UbxListener(Sig(), 0x01, 0x43),
UbxReceiver(Sat(), 0x01, 0x35), UbxListener(Sat(), 0x01, 0x35),
UbxReceiver(RawX(), 0x02, 0x15), UbxListener(RawX(), 0x02, 0x15),
UbxReceiver(UbxMsg(), 0x05, 0x01), UbxListener(UbxMsg(), 0x05, 0x01),
UbxReceiver(UbxMsg(), 0x05, 0x00), UbxListener(UbxMsg(), 0x05, 0x00),
] ]
# Topology # Topology
receiver/ubx_receiver.py → receiver/ubx_listener.py
+1 -1
View File
@@ -3,7 +3,7 @@ from msg_listener import MsgListener
from ubx.ubx import frame_parse, frame_parse_hdr from ubx.ubx import frame_parse, frame_parse_hdr
from ubx.msg import UbxMsg from ubx.msg import UbxMsg
class UbxReceiver(MsgListener): class UbxListener(MsgListener):
def __init__(self, parser: UbxMsg, mclass: int|None = None, mid: int|None = None): def __init__(self, parser: UbxMsg, mclass: int|None = None, mid: int|None = None):
MsgListener.__init__(self) MsgListener.__init__(self)
self.parser = parser self.parser = parser
receiver/ubx_packetizer.py
+2 -2
View File
@@ -3,7 +3,7 @@ from msg_container import MsgContainer
from msg_listener import MsgListener from msg_listener import MsgListener
from msg_talker import MsgTalker from msg_talker import MsgTalker
from ubx.ubx import UBX_SYNC_WORD, frame_parse, frame_create 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 UBX_PKT_DEBUG = False
def ubx_pkt_debug(s: str): def ubx_pkt_debug(s: str):
@@ -71,7 +71,7 @@ if __name__ == "__main__":
def is_msg(self, msg: MsgContainer): def is_msg(self, msg: MsgContainer):
return True return True
ubx_rx = UbxReceiver('test', 1, 2) ubx_rx = UbxListener('test', 1, 2)
pkt = UbxPacketizer() pkt = UbxPacketizer()
pkt.register_listener(ubx_rx) pkt.register_listener(ubx_rx)
ubx/query.py
+3 -3
View File
@@ -2,12 +2,12 @@ from msg_container import MsgContainer
from ubx.ubx import frame_parse, frame_parse_hdr, frame_create from ubx.ubx import frame_parse, frame_parse_hdr, frame_create
from ubx.msg import UbxMsg from ubx.msg import UbxMsg
from transceiver import Transceiver from transceiver import Transceiver
from receiver.ubx_receiver import UbxReceiver from receiver.ubx_listener import UbxListener
from threading import BoundedSemaphore 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): 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.transceiver = transceiver
self.sema = BoundedSemaphore() self.sema = BoundedSemaphore()
self.msg = UbxMsg() self.msg = UbxMsg()