dronecot 2.2.4__tar.gz → 2.2.5__tar.gz

{dronecot-2.2.4/dronecot.egg-info → dronecot-2.2.5}/PKG-INFO

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

{dronecot-2.2.4 → dronecot-2.2.5/dronecot.egg-info}/PKG-INFO

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

{dronecot-2.2.4 → dronecot-2.2.5}/dronecot.egg-info/SOURCES.txt

@@ -30,4 +30,5 @@ src/dronecot/wifi_parse.py
 tests/test_adsb_vehicle.py
 tests/test_functions.py
 tests/test_rid_normalize.py
+tests/test_sensor_detail.py
 tests/test_wifi_parse.py

dronecot-2.2.5/src/dronecot/VERSION

@@ -0,0 +1 @@
+2.2.5

{dronecot-2.2.4 → dronecot-2.2.5}/src/dronecot/__init__.py

@@ -32,6 +32,8 @@ from .constants import (  # NOQA
     DEFAULT_GPS_INFO_CMD,
     DEFAULT_SENSOR_ID,
     DEFAULT_SENSOR_PAYLOAD_TYPE,
+    DEFAULT_SENSOR_MODEL,
+    DEFAULT_SENSOR_TYPE,
     DEFAULT_SENSOR_COT_TYPE,
     DEFAULT_OP_COT_TYPE,
     DEFAULT_HOME_COT_TYPE,

{dronecot-2.2.4 → dronecot-2.2.5}/src/dronecot/constants.py

@@ -41,6 +41,11 @@ DEFAULT_SENSOR_ID: str = f"dronecot_{hostname}"
 
 DEFAULT_SENSOR_PAYLOAD_TYPE: str = "Unknown-Sensor-Payload-Type"
 
+# Receiver hardware model (e.g. "Atheros AR9271") and detection method /
+# capability (e.g. "Wi-Fi Open Drone ID"). Set via SENSOR_MODEL / SENSOR_TYPE.
+DEFAULT_SENSOR_MODEL: str = "Unknown-Sensor"
+DEFAULT_SENSOR_TYPE: str = "Remote ID"
+
 DEFAULT_SENSOR_COT_TYPE: str = "a-f-G-E-S-E"
 DEFAULT_OP_COT_TYPE: str = "a-n-G"
 DEFAULT_UAS_COT_TYPE: str = "a-n-A-M-H-Q"

{dronecot-2.2.4 → dronecot-2.2.5}/src/dronecot/functions.py

@@ -74,6 +74,19 @@ def _pacific_timestamp() -> str:
     return datetime.now(tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
 
 
+def _rf_band(channel) -> str:
+    """Map a Wi-Fi channel number to its RF band label (for SIGINT detail)."""
+    try:
+        ch = int(channel)
+    except (TypeError, ValueError):
+        return ""
+    if 1 <= ch <= 14:
+        return "2.4 GHz"
+    if 32 <= ch <= 196:
+        return "5 GHz"
+    return ""
+
+
 def _dji_feed_uses_text(config, feed_url: str, parsed) -> bool:
     """Return True if the configured DJI feed uses AntSDR text CSV format."""
     feed_format = str(config.get("FEED_FORMAT", "")).lower()
@@ -341,10 +354,19 @@ def rid_uas_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branche
     sensor_type = str(src_data.get("type", dronecot.DEFAULT_SENSOR_PAYLOAD_TYPE))
     rssi = str(src_data.get("RSSI"))
 
+    # Receiver / SIGINT detail: what hardware saw this, how, and on what RF band.
+    sensor_model = str(config.get("SENSOR_MODEL", dronecot.DEFAULT_SENSOR_MODEL))
+    sensor_method = str(config.get("SENSOR_TYPE", dronecot.DEFAULT_SENSOR_TYPE))
+    channel = src_data.get("channel")
+    band = _rf_band(channel)
+
     cuas: ET.Element = ET.Element("__cuas")
     cuas.set("sensor_id", sensor_id)
+    cuas.set("sensor_model", sensor_model)
+    cuas.set("sensor_method", sensor_method)
     cuas.set("rssi", rssi)
-    cuas.set("channel", str(src_data.get("channel")))
+    cuas.set("channel", str(channel))
+    cuas.set("band", band)
     cuas.set("timestamp", str(src_data.get("timestamp")))
     cuas.set("mac_address", mac_address_text)
     cuas.set("type", sensor_type)
@@ -374,6 +396,11 @@ def rid_uas_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branche
     else:
         callsign = f"{uasid[0:4]}...{uasid[-4:]}"
 
+    if rssi and rssi not in ("None", ""):
+        remarks_fields.append(f"RSSI: {rssi} dBm")
+    if channel is not None:
+        remarks_fields.append(f"Channel: {channel}{f' ({band})' if band else ''}")
+    remarks_fields.append(f"Receiver: {sensor_model} — {sensor_method}")
     remarks_fields.append(f"Sensor: {sensor_id}")
 
     contact: ET.Element = ET.Element("contact")

dronecot-2.2.5/tests/test_sensor_detail.py

@@ -0,0 +1,54 @@
+"""Tests for the enriched sensor / SIGINT detail in the RID CoT payload."""
+
+import xml.etree.ElementTree as ET
+
+from dronecot.functions import _rf_band, rid_uas_to_cot_xml
+
+
+def test_rf_band():
+    assert _rf_band(6) == "2.4 GHz"
+    assert _rf_band("6") == "2.4 GHz"
+    assert _rf_band(44) == "5 GHz"
+    assert _rf_band(None) == ""
+    assert _rf_band("nope") == ""
+
+
+def _rid_data():
+    return {
+        "Latitude": 37.76,
+        "Longitude": -122.49,
+        "BasicID": "1787F04BM24010011195",
+        "SpeedHorizontal": 0,
+        "Direction": 0,
+        "AltitudeGeo": 10.0,
+        "data": {
+            "MAC address": "AA:BB:CC:DD:EE:FF",
+            "RSSI": -42,
+            "channel": 6,
+            "sensor_id": "wifi-rid",
+        },
+    }
+
+
+def test_rid_cot_carries_sensor_detail():
+    config = {
+        "SENSOR_MODEL": "Atheros AR9271",
+        "SENSOR_TYPE": "Wi-Fi Open Drone ID",
+    }
+    event = rid_uas_to_cot_xml(_rid_data(), config)
+    assert event is not None
+    xml = ET.tostring(event, encoding="unicode")
+
+    cuas = event.find(".//__cuas")
+    assert cuas is not None
+    assert cuas.get("sensor_model") == "Atheros AR9271"
+    assert cuas.get("sensor_method") == "Wi-Fi Open Drone ID"
+    assert cuas.get("band") == "2.4 GHz"
+    assert cuas.get("rssi") == "-42"
+    assert cuas.get("channel") == "6"
+
+    remarks = event.find(".//remarks")
+    assert remarks is not None and remarks.text
+    assert "RSSI: -42 dBm" in remarks.text
+    assert "2.4 GHz" in remarks.text
+    assert "Atheros AR9271" in remarks.text

dronecot-2.2.4/src/dronecot/VERSION

@@ -1 +0,0 @@
-2.2.4