Change reporting of pmod to events

[loctrkd.git] / loctrkd / zx303proto.py

diff --git a/loctrkd/zx303proto.py b/loctrkd/zx303proto.py
index a7329c316326187c950580ec11a65843981ace2d..bc044ddc988b4c447dedc5eed4f6b4f574bb8385 100755 (executable)
--- a/loctrkd/zx303proto.py
+++ b/loctrkd/zx303proto.py
@@ -48,7 +48,7 @@ __all__ = (
     "Respond",
 )
 
-MODNAME = __name__.split(".")[-1]
+PMODNAME = __name__.split(".")[-1]
 PROTO_PREFIX: str = "ZX:"
 
 ### Deframer ###
@@ -370,8 +370,8 @@ class _GPS_POSITIONING(GPS303Pkt):
         ttup = (tup[0] % 100,) + tup[1:6]
         return pack("BBBBBB", *ttup)
 
-    def rectified(self) -> Tuple[str, CoordReport]:  # JSON-able dict
-        return MODNAME, CoordReport(
+    def rectified(self) -> CoordReport:  # JSON-able dict
+        return CoordReport(
             devtime=str(self.devtime),
             battery_percentage=None,
             accuracy=None,
@@ -420,8 +420,8 @@ class STATUS(GPS303Pkt):
     def out_encode(self) -> bytes:  # Set interval in minutes
         return pack("B", self.upload_interval)
 
-    def rectified(self) -> Tuple[str, StatusReport]:
-        return MODNAME, StatusReport(battery_percentage=self.batt)
+    def rectified(self) -> StatusReport:
+        return StatusReport(battery_percentage=self.batt)
 
 
 class HIBERNATION(GPS303Pkt):  # Server can send to send devicee to sleep
@@ -501,8 +501,8 @@ class _WIFI_POSITIONING(GPS303Pkt):
             ]
         )
 
-    def rectified(self) -> Tuple[str, HintReport]:
-        return MODNAME, HintReport(
+    def rectified(self) -> HintReport:
+        return HintReport(
             devtime=str(self.devtime),
             battery_percentage=None,
             mcc=self.mcc,