ka9q-python 3.26.0__tar.gz → 3.26.1__tar.gz

{ka9q_python-3.26.0 → ka9q_python-3.26.1}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.26.1 (2026-10-01)
+
+### Fixed
+
+- **`FrontendStatus.input_power_dbm` now matches radiod's `control.c` term
+  for term:** `if_power + lna + mixer + if_gain + |rf_atten| - rf_gain +
+  rf_level_cal`. The property had every analog sign inverted. It added
+  `rf_gain`, subtracted `rf_atten` and subtracted the LNA/mixer/IF gains. On
+  B4's RX888 it read about -5 dBm where `control` shows about -34 dBm, and the
+  error swung with the AGC. It also returns `None` when radiod sends
+  `rf_level_cal = NaN` (uncalibrated), where `control` shows no dBm figure.
+
 ## 3.25.2 (2026-08-22)
 
 ### Fixed

{ka9q_python-3.26.0/ka9q_python.egg-info → ka9q_python-3.26.1}/PKG-INFO

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

{ka9q_python-3.26.0 → ka9q_python-3.26.1}/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_python-3.26.0 → ka9q_python-3.26.1/ka9q_python.egg-info}/PKG-INFO

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

{ka9q_python-3.26.0 → ka9q_python-3.26.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ka9q-python"
-version = "3.26.0"
+version = "3.26.1"
 description = "Python interface for ka9q-radio control and monitoring"
 readme = "README.md"
 authors = [

{ka9q_python-3.26.0 → ka9q_python-3.26.1}/tests/test_status_decoder.py

@@ -102,8 +102,34 @@ def test_decode_frontend_and_gpsdo():
     assert fe.lna_gain == 20
     assert fe.rf_level_cal == pytest.approx(-50.0)
     assert fe.if_power == pytest.approx(-3.0)
-    # input_power_dbm = if_power + rf_level_cal - (lna+mix+if) = -3 - 50 - 35
-    assert fe.input_power_dbm == pytest.approx(-88.0)
+    # control.c ADDS the analog gains: -3 - 50 + (20 + 10 + 5) = -18
+    assert fe.input_power_dbm == pytest.approx(-18.0)
+
+
+@pytest.mark.parametrize("rf_gain, rf_atten, expected", [
+    # B4's RX888, 2026-09-29 01:22Z: radiod's control shows -25.9 dBm.
+    (1.4664, 0.0, -25.8197 + 1.4 - 1.4664),
+    # More VGA gain means a WEAKER input for the same IF level.
+    (14.2, 0.0, -25.8197 + 1.4 - 14.2),
+    # Attenuation ahead of the ADC means a STRONGER input.
+    (0.0, 10.0, -25.8197 + 1.4 + 10.0),
+])
+def test_input_power_dbm_rf_gain_and_atten_signs(rf_gain, rf_atten, expected):
+    """Mirror radiod control.c: dBm = if_power + |rf_atten| - rf_gain + rf_level_cal.
+
+    (control.c also adds lna/mixer/if gain; test_decode_frontend_and_gpsdo pins that.)
+
+    The property once ADDED rf_gain and SUBTRACTED rf_atten, so B4's input read
+    about -5 dBm when it was near -34 dBm.
+    """
+    pkt = _build_packet(
+        ("float", StatusType.RF_GAIN, rf_gain),
+        ("float", StatusType.RF_ATTEN, rf_atten),
+        ("float", StatusType.RF_LEVEL_CAL, 1.4),
+        ("float", StatusType.IF_POWER, -25.8197),
+    )
+    fe: FrontendStatus = decode_status_packet(pkt).frontend
+    assert fe.input_power_dbm == pytest.approx(expected, abs=1e-4)
 
 
 def test_decode_pll_fm_spectrum():
@@ -223,3 +249,12 @@ class TestFilterDropsBothDecoders:
     def test_zero_is_preserved_not_dropped(self):
         from ka9q.control import decode_status_dict
         assert decode_status_dict(self._pkt(0))["filter_drops"] == 0
+
+
+def test_input_power_dbm_none_when_uncalibrated_nan():
+    """radiod sends rf_level_cal = NaN when uncalibrated; control.c then shows no dBm."""
+    pkt = _build_packet(
+        ("float", StatusType.RF_LEVEL_CAL, float("nan")),
+        ("float", StatusType.IF_POWER, -25.0),
+    )
+    assert decode_status_packet(pkt).frontend.input_power_dbm is None