From e5da1b663b775226bb3a7c5004180b7d09cd4e02 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 25 Mar 2026 05:53:06 +0100 Subject: [PATCH] refactored --- network_backend.py | 24 +++++++++---------- nmea/__init__.py | 5 ---- nmea/{ => messages}/GGA.py | 0 nmea/{ => messages}/GLL.py | 0 nmea/{ => messages}/GSA.py | 0 nmea/{ => messages}/GSV.py | 0 nmea/{ => messages}/RMC.py | 0 nmea/messages/__init__.py | 5 ++++ ubx/__init__.py | 0 receiver/ubx_listener.py => ubx/listener.py | 2 +- ubx/messages/__init__.py | 3 +++ ubx/{ => messages}/msg.py | 0 ubx/messages/nav.py | 6 ++--- ubx/messages/rxm.py | 4 ++-- .../ubx_packetizer.py => ubx/packetizer.py | 2 +- ubx/query.py | 6 ++--- 16 files changed, 30 insertions(+), 27 deletions(-) rename nmea/{ => messages}/GGA.py (100%) rename nmea/{ => messages}/GLL.py (100%) rename nmea/{ => messages}/GSA.py (100%) rename nmea/{ => messages}/GSV.py (100%) rename nmea/{ => messages}/RMC.py (100%) create mode 100644 nmea/messages/__init__.py create mode 100644 ubx/__init__.py rename receiver/ubx_listener.py => ubx/listener.py (95%) rename ubx/{ => messages}/msg.py (100%) rename receiver/ubx_packetizer.py => ubx/packetizer.py (98%) diff --git a/network_backend.py b/network_backend.py index 42a031f..d4988f3 100644 --- a/network_backend.py +++ b/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.messages.nav import Sig, Sat -from ubx.messages.rxm import RawX +from ubx.packetizer import UbxPacketizer +from ubx.messages import Sig, Sat, RawX, UbxMsg +from ubx.listener import UbxListener + class NetworkBackend(ABackend): def __init__(self, servers: list[dict]): diff --git a/nmea/__init__.py b/nmea/__init__.py index f2435a9..e9563dc 100644 --- a/nmea/__init__.py +++ b/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 diff --git a/nmea/GGA.py b/nmea/messages/GGA.py similarity index 100% rename from nmea/GGA.py rename to nmea/messages/GGA.py diff --git a/nmea/GLL.py b/nmea/messages/GLL.py similarity index 100% rename from nmea/GLL.py rename to nmea/messages/GLL.py diff --git a/nmea/GSA.py b/nmea/messages/GSA.py similarity index 100% rename from nmea/GSA.py rename to nmea/messages/GSA.py diff --git a/nmea/GSV.py b/nmea/messages/GSV.py similarity index 100% rename from nmea/GSV.py rename to nmea/messages/GSV.py diff --git a/nmea/RMC.py b/nmea/messages/RMC.py similarity index 100% rename from nmea/RMC.py rename to nmea/messages/RMC.py diff --git a/nmea/messages/__init__.py b/nmea/messages/__init__.py new file mode 100644 index 0000000..8f6a16f --- /dev/null +++ b/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 diff --git a/ubx/__init__.py b/ubx/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/receiver/ubx_listener.py b/ubx/listener.py similarity index 95% rename from receiver/ubx_listener.py rename to ubx/listener.py index 4d94a81..eb9c2e9 100644 --- a/receiver/ubx_listener.py +++ b/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): diff --git a/ubx/messages/__init__.py b/ubx/messages/__init__.py index e69de29..04ab0fa 100644 --- a/ubx/messages/__init__.py +++ b/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 \ No newline at end of file diff --git a/ubx/msg.py b/ubx/messages/msg.py similarity index 100% rename from ubx/msg.py rename to ubx/messages/msg.py diff --git a/ubx/messages/nav.py b/ubx/messages/nav.py index 2887a7a..6a9555f 100644 --- a/ubx/messages/nav.py +++ b/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): diff --git a/ubx/messages/rxm.py b/ubx/messages/rxm.py index 767da03..1d90644 100644 --- a/ubx/messages/rxm.py +++ b/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): diff --git a/receiver/ubx_packetizer.py b/ubx/packetizer.py similarity index 98% rename from receiver/ubx_packetizer.py rename to ubx/packetizer.py index 75a1025..d26388b 100644 --- a/receiver/ubx_packetizer.py +++ b/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): diff --git a/ubx/query.py b/ubx/query.py index 4d822fa..ea70056 100644 --- a/ubx/query.py +++ b/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.msg import UbxMsg +from ubx.ubx import frame_parse, frame_create +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):