diff --git a/repeater/sensors/openhop_modem.py b/repeater/sensors/openhop_modem.py index ea61818..f11eb0b 100644 --- a/repeater/sensors/openhop_modem.py +++ b/repeater/sensors/openhop_modem.py @@ -210,25 +210,6 @@ class OpenHopModemSensor(SensorBase): if out.get(key) is None and system.get(key) is not None: out[key] = system[key] - station_g3_fallbacks = { - "bus_voltage_v": ("bus_voltage_v", "station_g3_input_voltage_v"), - "current_ma": ("current_ma", "station_g3_current_ma"), - "power_mw": ("power_mw",), - } - for output_key, system_keys in station_g3_fallbacks.items(): - if out.get(output_key) is not None: - continue - for system_key in system_keys: - value = self._float(system.get(system_key)) - if value is not None: - out[output_key] = value - break - - if out.get("power_mw") is None: - power_w = self._float(system.get("station_g3_power_w")) - if power_w is not None: - out["power_mw"] = power_w * 1000.0 - if "battery_percent" not in out: battery_voltage_v = self._float(out.get("battery_voltage_v")) if battery_voltage_v is None: diff --git a/tests/test_openhop_modem_sensor.py b/tests/test_openhop_modem_sensor.py index d560dc0..be5d7f4 100644 --- a/tests/test_openhop_modem_sensor.py +++ b/tests/test_openhop_modem_sensor.py @@ -158,14 +158,11 @@ def test_openhop_modem_sensor_prefers_top_level_power_telemetry(): assert data["power_mw"] == 744.0 -def test_openhop_modem_sensor_falls_back_to_legacy_station_g3_power_fields(): +def test_openhop_modem_sensor_ignores_legacy_station_g3_power_fields(): sensor = OpenHopModemSensor("modem", {"settings": {"base_url": "http://modem.local"}}) data = sensor._normalize_payload( { - "bus_voltage_v": None, - "current_ma": None, - "power_mw": None, "system": { "station_g3_input_voltage_v": "12.46", "station_g3_current_ma": "-59.7", @@ -174,9 +171,9 @@ def test_openhop_modem_sensor_falls_back_to_legacy_station_g3_power_fields(): } ) - assert data["bus_voltage_v"] == 12.46 - assert data["current_ma"] == -59.7 - assert data["power_mw"] == -744.0 + assert "bus_voltage_v" not in data + assert "current_ma" not in data + assert "power_mw" not in data def test_openhop_modem_sensor_omits_invalid_power_telemetry():