refactored NmeaReceiver
This commit is contained in:
+3
-3
@@ -1,8 +1,8 @@
|
||||
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:
|
||||
def __init__(self):
|
||||
self.utc_time = None
|
||||
@@ -24,7 +24,7 @@ class Gga(NmeaReceiver):
|
||||
return f"{self.__dict__}"
|
||||
|
||||
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.data = Gga.Msg()
|
||||
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
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:
|
||||
def __init__(self):
|
||||
self.latitude = None
|
||||
@@ -18,7 +18,7 @@ class Gll(NmeaReceiver):
|
||||
return f"{self.__dict__}"
|
||||
|
||||
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.data = Gll.Msg()
|
||||
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
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:
|
||||
def __init__(self):
|
||||
self.mode = None
|
||||
@@ -18,7 +18,7 @@ class Gsa(NmeaReceiver):
|
||||
return f"{self.__dict__}"
|
||||
|
||||
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.data = Gsa.Msg()
|
||||
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
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:
|
||||
def __init__(self):
|
||||
self.number_of_msg = None
|
||||
@@ -19,7 +19,7 @@ class Gsv(NmeaReceiver):
|
||||
return f"{self.__dict__}"
|
||||
|
||||
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.data = Gsv.Msg()
|
||||
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
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:
|
||||
def __init__(self):
|
||||
pass
|
||||
@@ -11,7 +11,7 @@ class Rmc(NmeaReceiver):
|
||||
return f"{self.__dict__}"
|
||||
|
||||
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.data = Rmc.Msg()
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ from msg_container import MsgContainer
|
||||
from msg_listener import MsgListener
|
||||
import re
|
||||
|
||||
class AsciiReceiver(MsgListener):
|
||||
class AsciiListener(MsgListener):
|
||||
def __init__(self, name: str, filter: str):
|
||||
super().__init__()
|
||||
self.name = name
|
||||
@@ -20,9 +20,9 @@ class AsciiReceiver(MsgListener):
|
||||
print(f"{self.name}: {msg}")
|
||||
|
||||
|
||||
class NmeaReceiver(AsciiReceiver):
|
||||
class NmeaListener(AsciiListener):
|
||||
def __init__(self, name: str, tid: str, msg_type: str):
|
||||
if tid == "--":
|
||||
AsciiReceiver.__init__(self, name, filter=f"^\\$..{msg_type}.*")
|
||||
AsciiListener.__init__(self, name, filter=f"^\\$..{msg_type}.*")
|
||||
else:
|
||||
AsciiReceiver.__init__(self, name, filter=f"^\\${tid}{msg_type}.*")
|
||||
AsciiListener.__init__(self, name, filter=f"^\\${tid}{msg_type}.*")
|
||||
|
||||
Reference in New Issue
Block a user