reverted introducing stream

ubx/packetizer.py

@@ -3,7 +3,6 @@ import time
 from msg.container import MsgContainer
 from msg.listener import MsgListener
 from msg.talker import MsgTalker
-from stream.listener import StreamListener
 from ubx.ubx import UBX_SYNC_WORD, frame_parse, frame_create
 from ubx.listener import UbxListener
 
@@ -12,9 +11,9 @@ def ubx_pkt_debug(s: str):
 	if UBX_PKT_DEBUG:
 		print(s)
 
-class UbxPacketizer(StreamListener, MsgTalker):
+class UbxPacketizer(MsgListener, MsgTalker):
 	def __init__(self, name: str, sync_bytes: bytes = UBX_SYNC_WORD):
-		StreamListener.__init__(self)
+		MsgListener.__init__(self)
 		MsgTalker.__init__(self)
 		self.name = name
 		self.sync_bytes = sync_bytes
@@ -28,8 +27,11 @@ class UbxPacketizer(StreamListener, MsgTalker):
 		self.wait_sync = True
 		self.sync_count = 0
 
-	def on_recv(self, rx_data: bytes):
-		for d in rx_data:
+	def is_msg(self, msg: MsgContainer):
+		return True
+
+	def on_recv(self, rx_data: MsgContainer):
+		for d in rx_data.data:
 			if d == self.sync_bytes[self.sync_count]:
 				self.d_save += struct.pack('B', d)
 				self.sync_count += 1
@@ -51,7 +53,7 @@ class UbxPacketizer(StreamListener, MsgTalker):
 					data, hdr = frame_parse(self.packet)
 					if data is not None:
 						if hdr.length == len(data):
-							self.call_listener(MsgContainer(self.name, time.time(), self.packet))
+							self.call_listener(MsgContainer(self.packet, self.name))
 							self.packet = b''
 							self.wait_sync = True