refactored

network_backend.py

@@ -2,21 +2,21 @@ import socket
 import selectors
 import time
 import signal
-
-from msg_container import MsgContainer
-from nmea import NmeaPacketizer
-from nmea import Gll, Gsa, Gsv, Gga, Rmc
-
-from receiver.ubx_packetizer import UbxPacketizer
-from receiver.ubx_listener import UbxListener
-from transceiver import Transceiver
-from a_backend import ABackend
 from threading import Thread
 from queue import Queue
+
+from msg_container import MsgContainer
+from transceiver import Transceiver
+from a_backend import ABackend
+
+from nmea import NmeaPacketizer
+from nmea.messages import Gll, Gsa, Gsv, Gga, Rmc
+
 from ubx.ubx import frame_create
-from ubx.msg import UbxMsg
+from ubx.packetizer import UbxPacketizer
-from ubx.messages.nav import Sig, Sat
+from ubx.messages import Sig, Sat, RawX, UbxMsg
-from ubx.messages.rxm import RawX
+from ubx.listener import UbxListener
+
 
 class NetworkBackend(ABackend):
 	def __init__(self, servers: list[dict]):

nmea/__init__.py

@@ -1,6 +1 @@
 from nmea.packetizer import NmeaPacketizer
-from nmea.GGA import Gga
-from nmea.GLL import Gll
-from nmea.GSA import Gsa
-from nmea.GSV import Gsv
-from nmea.RMC import Rmc

nmea/messages/__init__.py

@@ -0,0 +1,5 @@
+from nmea.messages.GGA import Gga
+from nmea.messages.GLL import Gll
+from nmea.messages.GSA import Gsa
+from nmea.messages.GSV import Gsv
+from nmea.messages.RMC import Rmc

ubx/listener.py

@@ -1,7 +1,7 @@
 from msg_container import MsgContainer
 from msg_listener import MsgListener
 from ubx.ubx import frame_parse, frame_parse_hdr
-from ubx.msg import UbxMsg
+from ubx.messages.msg import UbxMsg
 
 class UbxListener(MsgListener):
 	def __init__(self, parser: UbxMsg, mclass: int|None = None, mid: int|None = None):

ubx/messages/__init__.py

@@ -0,0 +1,3 @@
+from ubx.messages.msg import UbxMsg
+from ubx.messages.nav import Sig, Sat
+from ubx.messages.rxm import RawX

ubx/messages/nav.py

@@ -1,7 +1,7 @@
 import struct
-import ubx.msg
+from ubx.messages.msg import UbxMsg
 
-class Sig(ubx.msg.UbxMsg):
+class Sig(UbxMsg):
 	class Group1:
 		@classmethod
 		def from_bytes(cls, data: bytes):
@@ -38,7 +38,7 @@ class Sig(ubx.msg.UbxMsg):
 			obj.signals.append(signal)
 		return obj.__dict__
 
-class Sat(ubx.msg.UbxMsg):
+class Sat(UbxMsg):
 	class Group1:
 		@classmethod
 		def from_bytes(cls, data: bytes):

ubx/messages/rxm.py

@@ -1,7 +1,7 @@
 import struct
-import ubx.msg
+from ubx.messages.msg import UbxMsg
 
-class RawX(ubx.msg.UbxMsg):
+class RawX(UbxMsg):
 	class Group1:
 		@classmethod
 		def from_bytes(cls, data: bytes):

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_listener import UbxListener
+from ubx.listener import UbxListener
 
 UBX_PKT_DEBUG = False
 def ubx_pkt_debug(s: str):

ubx/query.py

@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from ubx.ubx import frame_parse, frame_parse_hdr, frame_create
+from ubx.ubx import frame_parse, frame_create
-from ubx.msg import UbxMsg
+from ubx.messages.msg import UbxMsg
 from transceiver import Transceiver
-from receiver.ubx_listener import UbxListener
+from ubx.listener import UbxListener
 from threading import BoundedSemaphore
 
 class UbxQuery(UbxListener):