dronecot 2.2.1__tar.gz → 2.2.3__tar.gz

{dronecot-2.2.1 → dronecot-2.2.3}/CHANGELOG.md

@@ -1,3 +1,14 @@
+## DroneCOT 2.2.3
+
+- SerialWorker: handle MAVLink **ADSB_VEHICLE** messages (in addition to
+  OPEN_DRONE_ID_MESSAGE_PACK), so Remote ID receivers that emit ADS-B-style
+  frames — e.g. the **BlueMark DroneScout Bridge (DS101)** in ADS-B output mode
+  — are decoded to CoT. Adds a test for the ADSB_VEHICLE -> RID conversion.
+
+## DroneCOT 2.2.2
+
+- Fix UTC timestamp handling on Python 3.9 and 3.10.
+
 ## DroneCOT 2.2.1
 
 - Use PyTAK shared CoT event, point, detail, remarks, and serialization helpers.

{dronecot-2.2.1/dronecot.egg-info → dronecot-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dronecot
-Version: 2.2.1
+Version: 2.2.3
 Summary: Display Drones in Team Awareness Kit (TAK).
 Home-page: https://github.com/snstac/dronecot
 Maintainer: Greg Albrecht <oss@undef.net>

{dronecot-2.2.1 → dronecot-2.2.3/dronecot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dronecot
-Version: 2.2.1
+Version: 2.2.3
 Summary: Display Drones in Team Awareness Kit (TAK).
 Home-page: https://github.com/snstac/dronecot
 Maintainer: Greg Albrecht <oss@undef.net>

{dronecot-2.2.1 → dronecot-2.2.3}/dronecot.egg-info/SOURCES.txt

@@ -27,5 +27,6 @@ src/dronecot/rid_normalize.py
 src/dronecot/udp_rid.py
 src/dronecot/wifi_capture.py
 src/dronecot/wifi_parse.py
+tests/test_adsb_vehicle.py
 tests/test_functions.py
 tests/test_rid_normalize.py

dronecot-2.2.3/src/dronecot/VERSION

@@ -0,0 +1 @@
+2.2.3

{dronecot-2.2.1 → dronecot-2.2.3}/src/dronecot/classes.py

@@ -87,6 +87,35 @@ class SerialWorker(pytak.QueueWorker):
         parsed = dronecot.odid.message_pack_to_dict(messages, pack_size)
         return dronecot.rid_normalize.odid_parsed_to_rid_dict(parsed)
 
+    @staticmethod
+    def _adsb_vehicle_to_rid_dict(msg) -> dict:
+        """Convert a MAVLink ADSB_VEHICLE to a RIDWorker dict.
+
+        The DroneScout Bridge (and similar Remote ID receivers) can emit detected
+        Remote ID as MAVLink ADSB_VEHICLE instead of OPEN_DRONE_ID_MESSAGE_PACK.
+        Units: lat/lon 1e-7 deg, altitude mm, hor/ver velocity cm/s, heading cdeg.
+        Returns {} when there is no position.
+        """
+        lat = getattr(msg, "lat", 0) / 1e7
+        lon = getattr(msg, "lon", 0) / 1e7
+        if not lat and not lon:
+            return {}
+        callsign = getattr(msg, "callsign", "") or ""
+        if isinstance(callsign, bytes):
+            callsign = callsign.decode("ascii", "ignore")
+        callsign = callsign.replace("\x00", "").strip()
+        icao = int(getattr(msg, "ICAO_address", 0) or 0)
+        return {
+            "BasicID": callsign or f"ICAO-{icao:06X}",
+            "Latitude": lat,
+            "Longitude": lon,
+            "AltitudeGeo": getattr(msg, "altitude", 0) / 1000.0,  # mm -> m
+            "SpeedHorizontal": getattr(msg, "hor_velocity", 0) / 100.0,  # cm/s -> m/s
+            "SpeedVertical": getattr(msg, "ver_velocity", 0) / 100.0,
+            "Direction": getattr(msg, "heading", 0) / 100.0,  # cdeg -> deg
+            "data": {"type": "MAVLink ADSB_VEHICLE"},
+        }
+
     async def run(self, _=-1) -> None:
         """Read MAVLink messages from serial and enqueue decoded ODID payloads."""
         self._logger.info("Running SerialWorker")
@@ -154,6 +183,10 @@ class SerialWorker(pytak.QueueWorker):
                         msg.messages, msg.msg_pack_size
                     )
                     await self.put_queue(parsed_payload)
+                elif msg_type == "ADSB_VEHICLE":
+                    rid = self._adsb_vehicle_to_rid_dict(msg)
+                    if rid:
+                        await self.put_queue(rid)
                 elif msg_type == "HEARTBEAT":
                     self._logger.debug(
                         "MAVLink heartbeat received at %s",

{dronecot-2.2.1 → dronecot-2.2.3}/src/dronecot/open_drone_id.py

@@ -354,7 +354,7 @@ def parse_System(payload):
     if Timestamp != float("NaN") and Timestamp != 0:
         pl["Timestamp"] = (
             datetime.datetime.fromtimestamp(
-                (int(Timestamp) + 1546300800), datetime.UTC
+                (int(Timestamp) + 1546300800), datetime.timezone.utc
             ).strftime("%Y-%m-%d %H:%M %Z"),
         )
     pl["TimestampRaw"] = Timestamp
@@ -409,7 +409,7 @@ def parse_AuthPage(payload, page):
 
         if Timestamp != float("NaN") and Timestamp != 0:
             pl["Timestamp"] = datetime.datetime.fromtimestamp(
-                (int(Timestamp) + 1546300800), datetime.UTC
+                (int(Timestamp) + 1546300800), datetime.timezone.utc
             ).strftime("%Y-%m-%d %H:%M %Z")
 
         AuthData = payload[AuthPage_start_byte + 16 : AuthPage_start_byte + 16 + 17]

dronecot-2.2.3/tests/test_adsb_vehicle.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# Copyright Sensors & Signals LLC https://www.snstac.com/
+# SPDX-License-Identifier: Apache-2.0
+"""Tests for SerialWorker MAVLink ADSB_VEHICLE -> RID dict (DroneScout Bridge)."""
+
+import types
+import unittest
+
+from dronecot.classes import SerialWorker
+
+
+def _adsb(**kw):
+    return types.SimpleNamespace(**kw)
+
+
+class AdsbVehicleTestCase(unittest.TestCase):
+    def test_full_conversion(self):
+        rid = SerialWorker._adsb_vehicle_to_rid_dict(
+            _adsb(
+                lat=407128000, lon=-740060000, altitude=120500,
+                hor_velocity=825, ver_velocity=-50, heading=27000,
+                callsign="DRONE1\x00\x00", ICAO_address=0x123456,
+            )
+        )
+        self.assertAlmostEqual(rid["Latitude"], 40.7128, places=6)
+        self.assertAlmostEqual(rid["Longitude"], -74.0060, places=6)
+        self.assertEqual(rid["AltitudeGeo"], 120.5)          # mm -> m
+        self.assertEqual(rid["SpeedHorizontal"], 8.25)       # cm/s -> m/s
+        self.assertEqual(rid["Direction"], 270.0)            # cdeg -> deg
+        self.assertEqual(rid["BasicID"], "DRONE1")
+
+    def test_no_callsign_falls_back_to_icao(self):
+        rid = SerialWorker._adsb_vehicle_to_rid_dict(
+            _adsb(lat=407128000, lon=-740060000, callsign="", ICAO_address=0x123456)
+        )
+        self.assertEqual(rid["BasicID"], "ICAO-123456")
+
+    def test_no_position_dropped(self):
+        self.assertEqual(SerialWorker._adsb_vehicle_to_rid_dict(_adsb(lat=0, lon=0)), {})
+
+
+if __name__ == "__main__":
+    unittest.main()

dronecot-2.2.1/src/dronecot/VERSION

@@ -1 +0,0 @@
-2.2.1