ka9q-python 3.26.0__py3-none-any.whl → 3.26.2__py3-none-any.whl

ka9q/control.py

@@ -910,7 +910,11 @@ class RadiodControl:
     Sends TLV-encoded commands to radiod's control socket to create
     and configure channels.
     """
-    
+
+    # ensure_channel(): pause between status polls while waiting for radiod
+    # to report the requested OUTPUT_ENCODING.
+    _ENCODING_SETTLE_POLL_S = 0.1
+
     def __init__(self, status_address: str, max_commands_per_sec: int = 100,
                  interface: Optional[str] = None,
                  client_id: Optional[str] = None):
@@ -2072,9 +2076,40 @@ class RadiodControl:
                 f"Channel SSRC {ssrc} not verified within {timeout}s. "
                 f"Requested: {frequency_hz/1e6:.3f} MHz, {preset}, {sample_rate} Hz"
             )
-        # radiod may grant a different encoding (e.g. F32->S16 for some IQ
-        # configs); the returned ChannelInfo carries the granted value, which
-        # consumers use authoritatively.  A rate/preset divergence is logged
+        # create_channel() sends OUTPUT_ENCODING as a separate command after
+        # the create, so the first status can predate it and report the
+        # preset's encoding.  Streams pick their decoder from
+        # ChannelInfo.encoding; a stale S16 on an F32 stream decodes 4-byte
+        # floats as 2-byte ints — noise-like garbage at "100% completeness".
+        # Keep polling until radiod reports the requested encoding.  If it
+        # still differs at the deadline, return what radiod reports (the
+        # stream must decode what is on the wire) and say so loudly.
+        if encoding != 0 and channel.encoding != encoding:
+            deadline = time.monotonic() + timeout
+            stale = channel.encoding
+            while time.monotonic() < deadline:
+                time.sleep(self._ENCODING_SETTLE_POLL_S)
+                fresh = self.poll_channel(
+                    ssrc, expected_freq=frequency_hz,
+                    timeout=max(0.1, min(1.0, deadline - time.monotonic())),
+                    frequency_tolerance=frequency_tolerance,
+                )
+                if fresh is not None:
+                    channel = fresh
+                    if channel.encoding == encoding:
+                        break
+            if channel.encoding == encoding:
+                logger.info(
+                    "ensure_channel: SSRC %s encoding settled %s -> %s",
+                    ssrc, stale, channel.encoding,
+                )
+            else:
+                logger.error(
+                    "ensure_channel: SSRC %s still reports encoding %s after "
+                    "%.1fs (requested %s); returning radiod's value",
+                    ssrc, channel.encoding, timeout, encoding,
+                )
+        # A rate/preset divergence is logged
         # but not fatal — the channel exists at the requested frequency.
         # An ABSENT preset is not a divergence.  radiod may decline to echo
         # PRESET at all (write-only from the nopreset branch on), and a label

ka9q/status.py

@@ -88,16 +88,20 @@ class FrontendStatus:
         """Absolute input power in dBm if the front-end is calibrated."""
         if self.if_power is None or self.rf_level_cal is None:
             return None
-        # control.c: dBm = if_power (dBFS) + rf_level_cal + analog gain chain
-        analog = 0.0
+        if not math.isfinite(self.rf_level_cal):  # radiod's "not calibrated"
+            return None
+        # Term for term what radiod's control.c displays as "Input":
+        #   if_power + lna + mixer + if_gain + |rf_atten| - rf_gain + rf_level_cal
+        # Keep it identical to control.c, even where a sign looks odd.
+        dbm = self.if_power + self.rf_level_cal
         for v in (self.lna_gain, self.mixer_gain, self.if_gain):
             if v is not None:
-                analog += v
+                dbm += v
         if self.rf_atten is not None:
-            analog += self.rf_atten  # attenuation is signed positive
+            dbm += abs(self.rf_atten)
         if self.rf_gain is not None:
-            analog -= self.rf_gain
-        return self.if_power + self.rf_level_cal - analog
+            dbm -= self.rf_gain
+        return dbm
 
 
 @dataclass

ka9q/stream.py

@@ -129,11 +129,12 @@ def parse_rtp_samples(
         if floats is None:
             return None
         if is_iq:
-            # radiod silently downgrades F32 → S16 for some IQ-channel
-            # configurations (high sample rate + wide filter); confirmed on
-            # bee1 2026-05-15 for T6/TSL3 BPSK PPS channel (encoding=4
-            # requested, encoding=2 granted, decoded as F32LE → NaN-poisoned
-            # input, TSL3 dark). Honor the granted encoding above.
+            # Decode with the encoding the channel reports.  A wrong value
+            # here corrupts silently: the bee1 2026-05-15 T6/TSL3 "F32→S16
+            # downgrade" and codar-sounder's 2026-11-01 garbage IQ were both
+            # a stale encoding from ensure_channel (status read before the
+            # separate OUTPUT_ENCODING command landed), not radiod changing
+            # the encoding.  ensure_channel now waits for it to settle.
             if len(floats) % 2 != 0:
                 logger.warning(f"Odd number of samples in IQ payload: {len(floats)}")
                 return None

{ka9q_python-3.26.0.dist-info → ka9q_python-3.26.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ka9q-python
-Version: 3.26.0
+Version: 3.26.2
 Summary: Python interface for ka9q-radio control and monitoring
 Author-email: Michael Hauan AC0G <ac0g@hauan.org>
 License: MIT

{ka9q_python-3.26.0.dist-info → ka9q_python-3.26.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ ka9q/_multicast.py,sha256=U6pCiH1ruy3i5yv7B_rRhkakokwnetu1Nd3009nAI5w,3343
 ka9q/addressing.py,sha256=GaHLeTwRpsmJawRAROoj-AqALcVkqO6Jq4_th9u7fjE,2681
 ka9q/cli.py,sha256=nfU4hqScqjJtuWBBraPxUb-37cvjY_qtZkNIxr9GzRU,15040
 ka9q/compat.py,sha256=uiU-wkQ1p88fcfPYRdqU1QxHiunmQPIhM5CXkW_5GMs,436
-ka9q/control.py,sha256=twKMbLjXmkAp2P2Pi51QKCj1W8zrv4wE-4RYSSeL7Zk,156426
+ka9q/control.py,sha256=RbiK9Wwn6E9tNQZX6rbJyPRM3YJXwDSpDaBd3QkXyKw,158132
 ka9q/discovery.py,sha256=-jGcDczuwEQmmJRogc2hR22PUKT2qxWkPgy_ffd9Cdk,28615
 ka9q/exceptions.py,sha256=_P8rok_tTmRMu-lLRhS95kv8FRK5PEY80_6jIux2mWM,474
 ka9q/managed_stream.py,sha256=gHvGcQgJF5FCOzVp7V6vcIp75NLGnOHgClGR24i9_No,18842
@@ -15,16 +15,16 @@ ka9q/resequencer.py,sha256=m_OWattFpqIugSqWr6aadsmUeoJIPkfINKfPi6gp_sg,17300
 ka9q/rtp_recorder.py,sha256=-YpG9mleoGjEd5voPSxnGcdVsFvyxSgOJ8f7ZaXGcT0,23210
 ka9q/slot_clock.py,sha256=9OuE1qMHJ5YBHfNPtQSguj_KHgkU9iAXfhOLEk-1B78,13468
 ka9q/spectrum_stream.py,sha256=utMhpH8hkkwOSD1WpKb4r0YHm3isDF0TvYMq-jJJFwY,11458
-ka9q/status.py,sha256=Tep1FW4bgg80v0qn18Biulg6g0S1F2LmbrDXVu2HXSg,28224
+ka9q/status.py,sha256=ufrw-8pPvOs9YjRlR3W8cWWsfA23utdR-eMddyuokKU,28421
 ka9q/status_listener.py,sha256=20l9aHii263myYlO8mmSgI_tUcchUwLwgh69Dx-1UQY,20045
-ka9q/stream.py,sha256=s1Xl4Njia9DwXxsSF2XSon1plFjJoDXXXCGeLZdF734,33111
+ka9q/stream.py,sha256=TvEcQorlRWZ9_MoyN0apXlrZaLtlheU7V2RP0yR-hIk,33197
 ka9q/stream_quality.py,sha256=YrKa07PzDi4xeF5tubwpDvSTs5eHu0G7mOa12iIINrs,8222
 ka9q/tui.py,sha256=ryL5CxfYkVzXhsCy1hw9GP3ya8hDbZTccfkc_uJtrDQ,27182
 ka9q/types.py,sha256=woWL_ShotZnYUYsR4RBL2wu13S1MTkkJC9_-9IVh14g,7514
 ka9q/utils.py,sha256=fFR_sYIpeDyPaFlXzN6jCiGhYlssvrMMVx4z6vyhqcc,7107
-ka9q_python-3.26.0.dist-info/licenses/LICENSE,sha256=mjz-l5TVsO9j7Jqt1gfLvTWtZK_HL9sZRRpsHaq4Qv8,1074
-ka9q_python-3.26.0.dist-info/METADATA,sha256=6Bj7pdfXVJebxW24J-3bInOyKsh32qjMzz16_hirSq0,14637
-ka9q_python-3.26.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-ka9q_python-3.26.0.dist-info/entry_points.txt,sha256=Wt5Q4OMUKHaf4KdsZXWsjSBpbHVuTtt3pypVIHi7eRk,39
-ka9q_python-3.26.0.dist-info/top_level.txt,sha256=FUTLZDtQpJGenGPPlN34E5QpQi_oaiLB6LuzgHblBNE,5
-ka9q_python-3.26.0.dist-info/RECORD,,
+ka9q_python-3.26.2.dist-info/licenses/LICENSE,sha256=mjz-l5TVsO9j7Jqt1gfLvTWtZK_HL9sZRRpsHaq4Qv8,1074
+ka9q_python-3.26.2.dist-info/METADATA,sha256=s80doU296SSsQAQg8UBa2rYHI5nBGwGOzIYhW561_Qo,14637
+ka9q_python-3.26.2.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+ka9q_python-3.26.2.dist-info/entry_points.txt,sha256=Wt5Q4OMUKHaf4KdsZXWsjSBpbHVuTtt3pypVIHi7eRk,39
+ka9q_python-3.26.2.dist-info/top_level.txt,sha256=FUTLZDtQpJGenGPPlN34E5QpQi_oaiLB6LuzgHblBNE,5
+ka9q_python-3.26.2.dist-info/RECORD,,

{ka9q_python-3.26.0.dist-info → ka9q_python-3.26.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any