dronecot 2.3.8__tar.gz → 2.3.10__tar.gz

{dronecot-2.3.8 → dronecot-2.3.10}/CHANGELOG.md

@@ -1,3 +1,8 @@
+## DroneCOT 2.3.10
+
+- Add `SENSOR_BEACON=0` to disable the periodic receiver marker without
+  disabling drone tracks.
+
 ## DroneCOT 2.3.8
 
 - Add opt-in `SERIAL_CRLF_NORMALIZE` support for receivers that send binary

{dronecot-2.3.8/dronecot.egg-info → dronecot-2.3.10}/PKG-INFO

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

{dronecot-2.3.8 → dronecot-2.3.10/dronecot.egg-info}/PKG-INFO

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

dronecot-2.3.10/src/dronecot/VERSION

@@ -0,0 +1 @@
+2.3.10

{dronecot-2.3.8 → dronecot-2.3.10}/src/dronecot/classes.py

@@ -118,11 +118,18 @@ class _CRLFNormalizingReceiver:
         return self._normalizer.feed(self._receiver(size))
 
 
-def make_status(app_name: str, version: str):
+def make_status(app_name: str, version: str, path: Optional[str] = None):
     """Return a status writer, or a no-op if this pytak has none."""
     if _StatusWriter is None:
         return _NoStatus()
-    return _StatusWriter(app_name, version=version)
+    return _StatusWriter(app_name, path=path, version=version)
+
+
+def make_worker_status(config):
+    """Build the status writer for one independently managed instance."""
+    app_name = str(config.get("STATUS_APP", "dronecot") or "dronecot")
+    path = str(config.get("STATUS_PATH", "") or "") or None
+    return make_status(app_name, dronecot.__version__, path=path)
 
 
 class SerialWorker(pytak.QueueWorker):
@@ -832,7 +839,7 @@ class RIDWorker(pytak.QueueWorker):
         # every RF source (Wi-Fi, BLE, BlueZ, serial MAVLink, MQTT, UDP) funnels
         # through here. Instrumenting the capture workers instead would give N
         # writers racing on one path, and each would see only its own slice.
-        self.status = make_status("dronecot", dronecot.__version__)
+        self.status = make_worker_status(config)
 
     def _tracked(self) -> int:
         """Number of transmitters the aggregator is currently holding."""
@@ -990,10 +997,12 @@ class RXMockWorker(pytak.RXWorker):
 class DJIWorker(pytak.QueueWorker):
     """Process DJI Drone ID data from a net queue and emit CoT events."""
 
-    def __init__(self, tx_queue: asyncio.Queue, config, net_queue: asyncio.Queue) -> None:
+    def __init__(
+        self, tx_queue: asyncio.Queue, config, net_queue: asyncio.Queue
+    ) -> None:
         super().__init__(tx_queue, config)
         self.net_queue = net_queue
-        self.status = make_status("dronecot", dronecot.__version__)
+        self.status = make_worker_status(config)
 
     async def handle_data(self, data) -> None:
         if not data:

{dronecot-2.3.8 → dronecot-2.3.10}/src/dronecot/functions.py

@@ -65,6 +65,12 @@ _DJI_Logger = logging.getLogger(__name__)
 APP_NAME = "dronecot"
 
 
+def sensor_beacon_enabled(config: Union[dict, SectionProxy]) -> bool:
+    """Return whether the periodic receiver beacon is enabled."""
+    value = config.get("SENSOR_BEACON", "1")
+    return str(value).strip().lower() not in {"0", "false", "no", "off"}
+
+
 def _pacific_timestamp() -> str:
     """Return a human-readable last-seen timestamp, falling back if tzdata is absent."""
     try:
@@ -160,7 +166,8 @@ def create_tasks(config: SectionProxy, clitool: pytak.CLITool) -> Set[pytak.Work
     if config.get("ENABLE_RX_MOCK", "0") == "1":
         tasks.add(dronecot.RXMockWorker(clitool.rx_queue, config))
 
-    tasks.add(dronecot.SensorWorker(clitool.tx_queue, config))
+    if sensor_beacon_enabled(config):
+        tasks.add(dronecot.SensorWorker(clitool.tx_queue, config))
 
     return tasks
 

{dronecot-2.3.8 → dronecot-2.3.10}/tests/test_functions.py

@@ -16,9 +16,12 @@
 
 """DroneCOT Function Tests."""
 
+import asyncio
 import json
 import os
 import unittest
+from types import SimpleNamespace
+from unittest.mock import patch
 
 import xml.etree.ElementTree as ET
 
@@ -45,6 +48,33 @@ def load_sample_data(file_path, line=0):
 
 
 class FunctionsTestCase(unittest.TestCase):
+    def test_sensor_beacon_switch(self):
+        """Receiver beacons default on and accept common false values."""
+        enabled = dronecot.functions.sensor_beacon_enabled
+        self.assertTrue(enabled({}))
+        for value in ("0", "false", "False", "no", "off"):
+            with self.subTest(value=value):
+                self.assertFalse(enabled({"SENSOR_BEACON": value}))
+
+    def test_create_tasks_can_omit_sensor_beacon(self):
+        """Disabling the receiver beacon keeps drone processing enabled."""
+        clitool = SimpleNamespace(tx_queue=object())
+        config = {"FEED_URL": "serial:///dev/ttyACM0", "SENSOR_BEACON": "0"}
+        loop = asyncio.new_event_loop()
+        try:
+            asyncio.set_event_loop(loop)
+            with patch.object(dronecot, "SerialWorker", return_value="serial"):
+                with patch.object(dronecot, "RIDWorker", return_value="tracks"):
+                    with patch.object(
+                        dronecot, "SensorWorker", return_value="receiver"
+                    ) as sensor_worker:
+                        tasks = dronecot.functions.create_tasks(config, clitool)
+        finally:
+            asyncio.set_event_loop(None)
+            loop.close()
+        self.assertEqual(tasks, {"serial", "tracks"})
+        sensor_worker.assert_not_called()
+
     """
     Test class for functions... functions.
     """

{dronecot-2.3.8 → dronecot-2.3.10}/tests/test_status.py

@@ -216,7 +216,10 @@ class TestDJIStatusSurface:
     def _worker(self, tmp_path):
         worker = classes.DJIWorker.__new__(classes.DJIWorker)
         worker.config = {"FEED_URL": "tcp://172.31.100.2:52002"}
-        worker.net_queue = asyncio.Queue()
+        # handle_data does not consume net_queue. Keeping this synthetic worker
+        # loop-free also works on Python 3.9 after an earlier asyncio.run()
+        # closes and clears the process-wide default loop.
+        worker.net_queue = None
         worker._logger = logging.getLogger("test")
         worker.status = pytak.StatusWriter(
             "dronecot-test", path=str(tmp_path / "status.json")
@@ -330,3 +333,22 @@ class TestStatusDegradesVisibly:
         if classes._StatusWriter is None:
             pytest.skip("installed pytak has no StatusWriter")
         assert not isinstance(classes.make_status("x", "0"), classes._NoStatus)
+
+    def test_instance_status_uses_configured_app_and_path(self, monkeypatch, tmp_path):
+        captured = {}
+
+        def fake_writer(app_name, *, path=None, version=None):
+            captured.update(app_name=app_name, path=path, version=version)
+            return object()
+
+        monkeypatch.setattr(classes, "_StatusWriter", fake_writer)
+        path = str(tmp_path / "status.json")
+        classes.make_worker_status(
+            {"STATUS_APP": "dronecot-dronescout", "STATUS_PATH": path}
+        )
+
+        assert captured == {
+            "app_name": "dronecot-dronescout",
+            "path": path,
+            "version": classes.dronecot.__version__,
+        }

dronecot-2.3.8/src/dronecot/VERSION

@@ -1 +0,0 @@
-2.3.8