refactored MsgSink and MsgSource

This commit is contained in:
2026-03-25 05:29:59 +01:00
parent 83e5867983
commit 3a85765347
8 changed files with 33 additions and 33 deletions
+9 -9
View File
@@ -1,7 +1,7 @@
import struct
from msg_container import MsgContainer
from msg_sink import MsgSink
from msg_source import MsgSource
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
@@ -10,10 +10,10 @@ def ubx_pkt_debug(s: str):
if UBX_PKT_DEBUG:
print(s)
class UbxPacketizer(MsgSink, MsgSource):
class UbxPacketizer(MsgListener, MsgTalker):
def __init__(self, sync_bytes: bytes = UBX_SYNC_WORD):
MsgSink.__init__(self)
MsgSource.__init__(self)
MsgListener.__init__(self)
MsgTalker.__init__(self)
self.sync_bytes = sync_bytes
self.packet = b''
self.wait_sync = True
@@ -51,7 +51,7 @@ class UbxPacketizer(MsgSink, MsgSource):
data, hdr = frame_parse(self.packet)
if data is not None:
if hdr.length == len(data):
self.call_sinks(MsgContainer(msg.name, self.timestamp, self.packet))
self.call_listener(MsgContainer(msg.name, self.timestamp, self.packet))
self.packet = b''
self.wait_sync = True
@@ -61,9 +61,9 @@ class UbxPacketizer(MsgSink, MsgSource):
if __name__ == "__main__":
UBX_PKT_DEBUG = True
class MySink(MsgSink):
class MySink(MsgListener):
def __init__(self):
MsgSink.__init__(self)
MsgListener.__init__(self)
def on_recv(self, msg: MsgContainer):
print(msg)
@@ -74,7 +74,7 @@ if __name__ == "__main__":
ubx_rx = UbxReceiver('test', 1, 2)
pkt = UbxPacketizer()
pkt.register_recv(ubx_rx)
pkt.register_listener(ubx_rx)
pkt.reset()
frame = frame_create(_class=1, _id=2, _data=b'Hallo' + b'\xb5' + b',\x62Welt') + frame_create(_class=1, _id=2, _data=b',') + frame_create(_class=1, _id=2, _data=b'UBX') + frame_create(_class=1, _id=2, _data=b'World')