Flood sensor improvements: fix device classes, add RSSI sensor, translation strings, coordinator fix (#372)

disforw · web-flow · commit 589394ef7698 · 2026-04-08T19:57:26.000+10:00
* Flood sensor improvements: fix device classes, add RSSI sensor, translation strings, coordinator fix

- Fix temperature_alert binary sensor device class: HEAT -&gt; PROBLEM
  State text now shows 'Problem detected' / 'OK' matching the PROBLEM class

- Fix coordinator EVENT_FS_ALARM handler: replace blind status.update(event_data)
  with an explicit allowlist of meaningful flood sensor keys to prevent
  accidentally overwriting unrelated device-level data

- Add entity translation strings to strings.json and translations/en.json:
  binary_sensor.flood (Wet/Dry), binary_sensor.temperature_alert (Problem detected/OK),
  sensor.temperature, sensor.battery, sensor.signal_strength

- Guard temp_alarm_thresholds attributes_fn against non-dict values using
  walrus operator + isinstance check

- Add new RSSI signal strength diagnostic sensor (SensorDeviceClass.SIGNAL_STRENGTH,
  dBm, EntityCategory.DIAGNOSTIC) to SENSOR_TYPES_FLOOD for Orbit 71005 flood sensors

- Fix flood binary sensor attributes_fn: rename 'shutoff' -&gt; 'auto_shutoff' for
  clarity; remove 'rssi' (now its own dedicated sensor entity)

- Fix temperature sensor attributes_fn: remove 'rssi' (now its own sensor) and
  'temperature_alarm' (redundant, covered by temperature_alert binary sensor)

Affects flood sensor (Orbit 71005 B-hyve Smart Flood Sensor) entities only.
No sprinkler, timer, or other device code is touched.

* fix: update tests and lint for flood sensor improvements

---------

Co-authored-by: disforw &lt;disforw@users.noreply.github.com&gt;
diff --git a/custom_components/bhyve/binary_sensor.py b/custom_components/bhyve/binary_sensor.py
@@ -1,4 +1,4 @@
-"""Support for Orbit BHyve sensors."""
+"""Support for Orbit BHyve binary sensors."""
 
 from __future__ import annotations
 
@@ -53,21 +53,24 @@ class BHyveBinarySensorEntityDescription(BinarySensorEntityDescription):
         ),
         attributes_fn=lambda data: {
             "location": data.get("location_name"),
-            "shutoff": data.get("auto_shutoff"),
-            "rssi": data.get("status", {}).get("rssi"),
+            "auto_shutoff": data.get("auto_shutoff"),
         },
     ),
     BHyveBinarySensorEntityDescription(
         key="temperature_alert",
         translation_key="temperature_alert",
         name="Temperature alert",
-        device_class=BinarySensorDeviceClass.HEAT,
+        device_class=BinarySensorDeviceClass.PROBLEM,
         unique_id_suffix="tempalert",
         device_types=(DEVICE_FLOOD,),
         value_fn=lambda data: (
             "alarm" in data.get("status", {}).get("temp_alarm_status", "")
         ),
-        attributes_fn=lambda data: data.get("temp_alarm_thresholds", {}),
+        attributes_fn=lambda data: (
+            thresh
+            if isinstance(thresh := data.get("temp_alarm_thresholds"), dict)
+            else {}
+        ),
     ),
     BHyveBinarySensorEntityDescription(
         key="fault",
diff --git a/custom_components/bhyve/coordinator.py b/custom_components/bhyve/coordinator.py
@@ -270,10 +270,21 @@ async def async_handle_device_event(self, event_data: dict[str, Any]) -> None:
             )
 
         elif event == EVENT_FS_ALARM:
-            # Update flood sensor status
+            # Update flood sensor status with only meaningful flood sensor fields.
+            # Avoid a blind merge that could overwrite unrelated device-level keys.
             if "status" not in device_data:
                 device_data["status"] = {}
-            device_data["status"].update(event_data)
+            for key in (
+                "flood_alarm_status",
+                "temp_alarm_status",
+                "temp_f",
+                "rssi",
+                "last_flood_alarm_at",
+                "last_temp_alarm_at",
+                "status_updated_at",
+            ):
+                if key in event_data:
+                    device_data["status"][key] = event_data[key]
 
         elif event == EVENT_SET_MANUAL_PRESET_TIME:
             # Update manual preset runtime
diff --git a/custom_components/bhyve/sensor.py b/custom_components/bhyve/sensor.py
@@ -11,6 +11,7 @@
 from homeassistant.const import (
     ATTR_BATTERY_LEVEL,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
     UnitOfTemperature,
 )
@@ -121,11 +122,20 @@ class BHyveSensorEntityDescription(SensorEntityDescription):
         ),
         attributes_fn=lambda data: {
             "location": data.get("location_name"),
-            "rssi": data.get("status", {}).get("rssi"),
-            "temperature_alarm": data.get("status", {}).get("temp_alarm_status"),
         },
         available_fn=lambda _data, value: value is not None,
     ),
+    BHyveSensorEntityDescription(
+        key="rssi",
+        translation_key="signal_strength",
+        name="Signal strength",
+        unique_id_suffix="rssi",
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.get("status", {}).get("rssi"),
+    ),
 )
 
 SENSOR_TYPES_BATTERY: tuple[BHyveSensorEntityDescription, ...] = (
@@ -232,7 +242,7 @@ async def async_setup_entry(
                     sensors.append(BHyveSensor(coordinator, device, description))
 
         if device.get("type") == DEVICE_FLOOD:
-            # Add temperature sensor
+            # Add temperature and RSSI sensors
             for base_description in SENSOR_TYPES_FLOOD:
                 description = BHyveSensorEntityDescription(
                     key=base_description.key,
@@ -243,6 +253,7 @@ async def async_setup_entry(
                     device_class=base_description.device_class,
                     state_class=base_description.state_class,
                     native_unit_of_measurement=base_description.native_unit_of_measurement,
+                    entity_category=base_description.entity_category,
                     value_fn=base_description.value_fn,
                     attributes_fn=base_description.attributes_fn,
                     icon_fn=base_description.icon_fn,
diff --git a/custom_components/bhyve/strings.json b/custom_components/bhyve/strings.json
@@ -134,5 +134,34 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "flood": {
+        "name": "Flood sensor",
+        "state": {
+          "on": "Wet",
+          "off": "Dry"
+        }
+      },
+      "temperature_alert": {
+        "name": "Temperature alert",
+        "state": {
+          "on": "Problem detected",
+          "off": "OK"
+        }
+      }
+    },
+    "sensor": {
+      "temperature": {
+        "name": "Temperature"
+      },
+      "battery": {
+        "name": "Battery"
+      },
+      "signal_strength": {
+        "name": "Signal strength"
+      }
+    }
   }
 }
diff --git a/custom_components/bhyve/translations/en.json b/custom_components/bhyve/translations/en.json
@@ -134,5 +134,34 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "flood": {
+        "name": "Flood sensor",
+        "state": {
+          "on": "Wet",
+          "off": "Dry"
+        }
+      },
+      "temperature_alert": {
+        "name": "Temperature alert",
+        "state": {
+          "on": "Problem detected",
+          "off": "OK"
+        }
+      }
+    },
+    "sensor": {
+      "temperature": {
+        "name": "Temperature"
+      },
+      "battery": {
+        "name": "Battery"
+      },
+      "signal_strength": {
+        "name": "Signal strength"
+      }
+    }
   }
 }
diff --git a/tests/test_binary_sensor.py b/tests/test_binary_sensor.py
@@ -280,8 +280,7 @@ async def test_flood_sensor_normal_state(
         # Test attributes
         attrs = sensor.extra_state_attributes
         assert attrs["location"] == "Basement"
-        assert attrs["shutoff"] is True
-        assert attrs["rssi"] == TEST_RSSI_NORMAL
+        assert attrs["auto_shutoff"] is True
 
     async def test_flood_sensor_alarm_state(
         self,
@@ -329,13 +328,9 @@ async def test_flood_sensor_websocket_event(
         mock_coordinator.data["devices"]["test-flood-123"]["device"]["status"][
             "flood_alarm_status"
         ] = "alarm"
-        mock_coordinator.data["devices"]["test-flood-123"]["device"]["status"][
-            "rssi"
-        ] = TEST_RSSI_ALARM
 
         # State should be updated to alarm
         assert sensor.is_on is True
-        assert sensor.extra_state_attributes["rssi"] == TEST_RSSI_ALARM
 
     async def test_flood_sensor_event_filtering(
         self,
diff --git a/tests/test_sensor.py b/tests/test_sensor.py
@@ -369,8 +369,6 @@ async def test_temperature_sensor_state(
         # Test attributes
         attrs = sensor.extra_state_attributes
         assert attrs["location"] == "Basement"
-        assert attrs["rssi"] == -45
-        assert attrs["temperature_alarm"] == "ok"
 
 
 class TestBHyveZoneHistorySensor:
