diff --git a/network_backend.py b/network_backend.py index 7586c70..42a031f 100644 --- a/network_backend.py +++ b/network_backend.py @@ -1,19 +1,16 @@ import socket import selectors import time -import signal, os +import signal from msg_container import MsgContainer -from receiver.nmea_packetizer import NmeaPacketizer +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 nmea.GLL import Gll -from nmea.GSA import Gsa -from nmea.GSV import Gsv -from nmea.GGA import Gga -from nmea.RMC import Rmc from threading import Thread from queue import Queue from ubx.ubx import frame_create diff --git a/nmea/GGA.py b/nmea/GGA.py index 9956fba..099f374 100644 --- a/nmea/GGA.py +++ b/nmea/GGA.py @@ -1,5 +1,5 @@ from msg_container import MsgContainer -from receiver.nmea_listener import NmeaListener +from nmea.listener import NmeaListener class Gga(NmeaListener): diff --git a/nmea/GLL.py b/nmea/GLL.py index 6c18320..af7fcd9 100644 --- a/nmea/GLL.py +++ b/nmea/GLL.py @@ -1,5 +1,5 @@ from msg_container import MsgContainer -from receiver.nmea_listener import NmeaListener +from nmea.listener import NmeaListener class Gll(NmeaListener): diff --git a/nmea/GSA.py b/nmea/GSA.py index 23ea588..ef56f53 100644 --- a/nmea/GSA.py +++ b/nmea/GSA.py @@ -1,5 +1,5 @@ from msg_container import MsgContainer -from receiver.nmea_listener import NmeaListener +from nmea.listener import NmeaListener class Gsa(NmeaListener): diff --git a/nmea/GSV.py b/nmea/GSV.py index b8e5337..5459879 100644 --- a/nmea/GSV.py +++ b/nmea/GSV.py @@ -1,5 +1,5 @@ from msg_container import MsgContainer -from receiver.nmea_listener import NmeaListener +from nmea.listener import NmeaListener class Gsv(NmeaListener): diff --git a/nmea/RMC.py b/nmea/RMC.py index 5ca3557..5f4a3dc 100644 --- a/nmea/RMC.py +++ b/nmea/RMC.py @@ -1,5 +1,5 @@ from msg_container import MsgContainer -from receiver.nmea_listener import NmeaListener +from nmea.listener import NmeaListener class Rmc(NmeaListener): diff --git a/nmea/__init__.py b/nmea/__init__.py new file mode 100644 index 0000000..f2435a9 --- /dev/null +++ b/nmea/__init__.py @@ -0,0 +1,6 @@ +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/receiver/nmea_listener.py b/nmea/listener.py similarity index 100% rename from receiver/nmea_listener.py rename to nmea/listener.py diff --git a/receiver/nmea_packetizer.py b/nmea/packetizer.py similarity index 100% rename from receiver/nmea_packetizer.py rename to nmea/packetizer.py