Merge branch 'develop' into acars

owrx/aeronautical.py

@@ -49,7 +49,7 @@ class AcarsProcessor(JsonParser, metaclass=ABCMeta):
         if "flight" in acars:
             flight_id = acars["flight"]
         elif "reg" in acars:
-            flight_id = acars['reg']
+            flight_id = acars['reg'].lstrip(".")
         else:
             return
 

owrx/modes.py

@@ -197,6 +197,7 @@ class Modes(object):
             underlying=["empty"],
             bandpass=Bandpass(-12500, 12500),
             requirements=["dumpvdl2"],
+            service=True,
             squelch=False,
         ),
         DigitalMode(

owrx/service/__init__.py

@@ -318,6 +318,9 @@ class ServiceHandler(SdrSourceEventClient):
         elif mod == "hfdl":
             from csdr.chain.dumphfdl import DumpHFDL
             return DumpHFDL()
+        elif mod == "vdl2":
+            from csdr.chain.dumpvdl2 import DumpVDL2
+            return DumpVDL2()
 
         raise ValueError("unsupported service modulation: {}".format(mod))
 

owrx/vdl2/dumpvdl2.py

@@ -38,7 +38,7 @@ class VDL2MessageParser(AcarsProcessor):
                     src = avlc["src"]["addr"]
                     if avlc["frame_type"] == "I":
                         if "acars" in avlc:
-                            self.processAcars(avlc["acars"])
+                            self.processAcars(avlc["acars"], icao=src)
                         elif "x25" in avlc:
                             x25 = avlc["x25"]
                             if "clnp" in x25: