refactored NmeaReceiver

This commit is contained in:
2026-03-25 05:34:49 +01:00
parent e7178efa23
commit 533e441d3e
6 changed files with 19 additions and 19 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_receiver import NmeaReceiver from receiver.nmea_receiver import NmeaListener
class Gga(NmeaReceiver): class Gga(NmeaListener):
class Msg: class Msg:
def __init__(self): def __init__(self):
self.utc_time = None self.utc_time = None
@@ -24,7 +24,7 @@ class Gga(NmeaReceiver):
return f"{self.__dict__}" return f"{self.__dict__}"
def __init__(self, name: str, tid: str): def __init__(self, name: str, tid: str):
NmeaReceiver.__init__(self, name, tid=tid, msg_type="GGA") NmeaListener.__init__(self, name, tid=tid, msg_type="GGA")
self.msg = None self.msg = None
self.data = Gga.Msg() self.data = Gga.Msg()
+3 -3
View File
@@ -1,8 +1,8 @@
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_receiver import NmeaReceiver from receiver.nmea_receiver import NmeaListener
class Gll(NmeaReceiver): class Gll(NmeaListener):
class Msg: class Msg:
def __init__(self): def __init__(self):
self.latitude = None self.latitude = None
@@ -18,7 +18,7 @@ class Gll(NmeaReceiver):
return f"{self.__dict__}" return f"{self.__dict__}"
def __init__(self, name: str, tid: str): def __init__(self, name: str, tid: str):
NmeaReceiver.__init__(self, name, tid=tid, msg_type="GLL") NmeaListener.__init__(self, name, tid=tid, msg_type="GLL")
self.msg = None self.msg = None
self.data = Gll.Msg() self.data = Gll.Msg()
+3 -3
View File
@@ -1,8 +1,8 @@
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_receiver import NmeaReceiver from receiver.nmea_receiver import NmeaListener
class Gsa(NmeaReceiver): class Gsa(NmeaListener):
class Msg: class Msg:
def __init__(self): def __init__(self):
self.mode = None self.mode = None
@@ -18,7 +18,7 @@ class Gsa(NmeaReceiver):
return f"{self.__dict__}" return f"{self.__dict__}"
def __init__(self, name: str, tid: str): def __init__(self, name: str, tid: str):
NmeaReceiver.__init__(self, name, tid=tid, msg_type="GSA") NmeaListener.__init__(self, name, tid=tid, msg_type="GSA")
self.msg = None self.msg = None
self.data = Gsa.Msg() self.data = Gsa.Msg()
+3 -3
View File
@@ -1,8 +1,8 @@
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_receiver import NmeaReceiver from receiver.nmea_receiver import NmeaListener
class Gsv(NmeaReceiver): class Gsv(NmeaListener):
class Msg: class Msg:
def __init__(self): def __init__(self):
self.number_of_msg = None self.number_of_msg = None
@@ -19,7 +19,7 @@ class Gsv(NmeaReceiver):
return f"{self.__dict__}" return f"{self.__dict__}"
def __init__(self, name: str, tid: str): def __init__(self, name: str, tid: str):
NmeaReceiver.__init__(self, name, tid=tid, msg_type="GSV") NmeaListener.__init__(self, name, tid=tid, msg_type="GSV")
self.msg = None self.msg = None
self.data = Gsv.Msg() self.data = Gsv.Msg()
+3 -3
View File
@@ -1,8 +1,8 @@
from msg_container import MsgContainer from msg_container import MsgContainer
from receiver.nmea_receiver import NmeaReceiver from receiver.nmea_receiver import NmeaListener
class Rmc(NmeaReceiver): class Rmc(NmeaListener):
class Msg: class Msg:
def __init__(self): def __init__(self):
pass pass
@@ -11,7 +11,7 @@ class Rmc(NmeaReceiver):
return f"{self.__dict__}" return f"{self.__dict__}"
def __init__(self, name: str, tid: str): def __init__(self, name: str, tid: str):
NmeaReceiver.__init__(self, name, tid=tid, msg_type="RMC") NmeaListener.__init__(self, name, tid=tid, msg_type="RMC")
self.msg = None self.msg = None
self.data = Rmc.Msg() self.data = Rmc.Msg()
+4 -4
View File
@@ -2,7 +2,7 @@ from msg_container import MsgContainer
from msg_listener import MsgListener from msg_listener import MsgListener
import re import re
class AsciiReceiver(MsgListener): class AsciiListener(MsgListener):
def __init__(self, name: str, filter: str): def __init__(self, name: str, filter: str):
super().__init__() super().__init__()
self.name = name self.name = name
@@ -20,9 +20,9 @@ class AsciiReceiver(MsgListener):
print(f"{self.name}: {msg}") print(f"{self.name}: {msg}")
class NmeaReceiver(AsciiReceiver): class NmeaListener(AsciiListener):
def __init__(self, name: str, tid: str, msg_type: str): def __init__(self, name: str, tid: str, msg_type: str):
if tid == "--": if tid == "--":
AsciiReceiver.__init__(self, name, filter=f"^\\$..{msg_type}.*") AsciiListener.__init__(self, name, filter=f"^\\$..{msg_type}.*")
else: else:
AsciiReceiver.__init__(self, name, filter=f"^\\${tid}{msg_type}.*") AsciiListener.__init__(self, name, filter=f"^\\${tid}{msg_type}.*")