From 888dd850f3ab8040cb12ac0b2567ec91b545d372 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 25 Mar 2026 05:59:58 +0100 Subject: [PATCH] refactored --- a_backend.py | 2 +- msg/__init__.py | 0 msg_container.py => msg/container.py | 0 msg_listener.py => msg/listener.py | 2 +- msg_talker.py => msg/talker.py | 4 ++-- network_backend.py | 2 +- nmea/listener.py | 4 ++-- nmea/messages/GGA.py | 2 +- nmea/messages/GLL.py | 2 +- nmea/messages/GSA.py | 2 +- nmea/messages/GSV.py | 2 +- nmea/messages/RMC.py | 2 +- nmea/packetizer.py | 6 +++--- transceiver.py | 4 ++-- ubx/listener.py | 4 ++-- ubx/packetizer.py | 6 +++--- ubx/query.py | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 msg/__init__.py rename msg_container.py => msg/container.py (100%) rename msg_listener.py => msg/listener.py (84%) rename msg_talker.py => msg/talker.py (78%) diff --git a/a_backend.py b/a_backend.py index ff5306b..7514617 100644 --- a/a_backend.py +++ b/a_backend.py @@ -1,5 +1,5 @@ from abc import ABC -from msg_container import MsgContainer + class ABackend(ABC): def send(self, name: str, data: bytes): diff --git a/msg/__init__.py b/msg/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/msg_container.py b/msg/container.py similarity index 100% rename from msg_container.py rename to msg/container.py diff --git a/msg_listener.py b/msg/listener.py similarity index 84% rename from msg_listener.py rename to msg/listener.py index 2533463..4203b67 100644 --- a/msg_listener.py +++ b/msg/listener.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from msg_container import MsgContainer +from msg.container import MsgContainer class MsgListener(ABC): def __init__(self): diff --git a/msg_talker.py b/msg/talker.py similarity index 78% rename from msg_talker.py rename to msg/talker.py index 80071ea..187b394 100644 --- a/msg_talker.py +++ b/msg/talker.py @@ -1,6 +1,6 @@ from abc import ABC -from msg_container import MsgContainer -from msg_listener import MsgListener +from msg.container import MsgContainer +from msg.listener import MsgListener class MsgTalker(ABC): def __init__(self): diff --git a/network_backend.py b/network_backend.py index d4988f3..d5edc83 100644 --- a/network_backend.py +++ b/network_backend.py @@ -5,7 +5,7 @@ import signal from threading import Thread from queue import Queue -from msg_container import MsgContainer +from msg.container import MsgContainer from transceiver import Transceiver from a_backend import ABackend diff --git a/nmea/listener.py b/nmea/listener.py index 11a00f3..4b07956 100644 --- a/nmea/listener.py +++ b/nmea/listener.py @@ -1,5 +1,5 @@ -from msg_container import MsgContainer -from msg_listener import MsgListener +from msg.container import MsgContainer +from msg.listener import MsgListener import re class AsciiListener(MsgListener): diff --git a/nmea/messages/GGA.py b/nmea/messages/GGA.py index 099f374..ec8517b 100644 --- a/nmea/messages/GGA.py +++ b/nmea/messages/GGA.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from nmea.listener import NmeaListener diff --git a/nmea/messages/GLL.py b/nmea/messages/GLL.py index af7fcd9..0a53089 100644 --- a/nmea/messages/GLL.py +++ b/nmea/messages/GLL.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from nmea.listener import NmeaListener diff --git a/nmea/messages/GSA.py b/nmea/messages/GSA.py index ef56f53..11bd0b9 100644 --- a/nmea/messages/GSA.py +++ b/nmea/messages/GSA.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from nmea.listener import NmeaListener diff --git a/nmea/messages/GSV.py b/nmea/messages/GSV.py index 5459879..878fec3 100644 --- a/nmea/messages/GSV.py +++ b/nmea/messages/GSV.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from nmea.listener import NmeaListener diff --git a/nmea/messages/RMC.py b/nmea/messages/RMC.py index 5f4a3dc..959c914 100644 --- a/nmea/messages/RMC.py +++ b/nmea/messages/RMC.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from nmea.listener import NmeaListener diff --git a/nmea/packetizer.py b/nmea/packetizer.py index c486523..80f0087 100644 --- a/nmea/packetizer.py +++ b/nmea/packetizer.py @@ -1,6 +1,6 @@ -from msg_container import MsgContainer -from msg_listener import MsgListener -from msg_talker import MsgTalker +from msg.container import MsgContainer +from msg.listener import MsgListener +from msg.talker import MsgTalker from struct import pack class NmeaPacketizer(MsgListener, MsgTalker): diff --git a/transceiver.py b/transceiver.py index 2f8342f..fc6dec8 100644 --- a/transceiver.py +++ b/transceiver.py @@ -1,6 +1,6 @@ -from msg_talker import MsgTalker +from msg.talker import MsgTalker from a_backend import ABackend -from msg_container import * +from msg.container import * class Transceiver(MsgTalker): def __init__(self, backend: ABackend, name: str): diff --git a/ubx/listener.py b/ubx/listener.py index eb9c2e9..337913f 100644 --- a/ubx/listener.py +++ b/ubx/listener.py @@ -1,5 +1,5 @@ -from msg_container import MsgContainer -from msg_listener import MsgListener +from msg.container import MsgContainer +from msg.listener import MsgListener from ubx.ubx import frame_parse, frame_parse_hdr from ubx.messages.msg import UbxMsg diff --git a/ubx/packetizer.py b/ubx/packetizer.py index d26388b..1f47cbb 100644 --- a/ubx/packetizer.py +++ b/ubx/packetizer.py @@ -1,7 +1,7 @@ import struct -from msg_container import MsgContainer -from msg_listener import MsgListener -from msg_talker import MsgTalker +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 ubx.listener import UbxListener diff --git a/ubx/query.py b/ubx/query.py index ea70056..53d6a42 100644 --- a/ubx/query.py +++ b/ubx/query.py @@ -1,4 +1,4 @@ -from msg_container import MsgContainer +from msg.container import MsgContainer from ubx.ubx import frame_parse, frame_create from ubx.messages.msg import UbxMsg from transceiver import Transceiver