And implement

Author: bouwew

plugwise_usb/nodes/node.py

@@ -315,13 +315,10 @@ def switch(self) -> bool:
     @raise_not_loaded
     def sense(self) -> SenseStatistics:
         """Sense statistics."""
-        if NodeFeature.TEMPERATURE not in self._features:
+        if NodeFeature.SENSE not in self._features:
             raise FeatureError(
-                f"Temperature state is not supported for node {self.mac}"
+                f"Sense statistics is not supported for node {self.mac}"
             )
-        if NodeFeature.HUMIDITY not in self._features:
-            raise FeatureError(f"Humidity state is not supported for node {self.mac}")
-        raise NotImplementedError()
 
     # endregion
 

plugwise_usb/nodes/sense.py

@@ -25,8 +25,7 @@
 
 SENSE_FEATURES: Final = (
     NodeFeature.INFO,
-    NodeFeature.TEMPERATURE,
-    NodeFeature.HUMIDITY,
+    NodeFeature.SENSE,
 )
 
 
@@ -61,7 +60,7 @@ async def load(self) -> bool:
         self._loaded = True
         self._setup_protocol(
             SENSE_FIRMWARE_SUPPORT,
-            (NodeFeature.INFO, NodeFeature.TEMPERATURE, NodeFeature.HUMIDITY),
+            (NodeFeature.INFO, NodeFeature.SENSE),
         )
         if await self.initialize():
             await self._loaded_callback(NodeEvent.LOADED, self.mac)
@@ -114,29 +113,26 @@ async def _sense_report(self, response: PlugwiseResponse) -> bool:
             raise MessageError(
                 f"Invalid response message type ({response.__class__.__name__}) received, expected SenseReportResponse"
             )
-        report_received = False
+        report_received_1 = report_received_2 = False
         await self._available_update_state(True, response.timestamp)
         if response.temperature.value != 65535:
             self._sense_statistics.temperature = float(
                 SENSE_TEMPERATURE_MULTIPLIER * (response.temperature.value / 65536)
                 - SENSE_TEMPERATURE_OFFSET
             )
-            await self.publish_feature_update_to_subscribers(
-                NodeFeature.TEMPERATURE, self._sense_statistics
-            )
-            report_received = True
+            report_received_1 = True
 
         if response.humidity.value != 65535:
             self._sense_statistics.humidity = float(
                 SENSE_HUMIDITY_MULTIPLIER * (response.humidity.value / 65536)
                 - SENSE_HUMIDITY_OFFSET
             )
             await self.publish_feature_update_to_subscribers(
-                NodeFeature.HUMIDITY, self._sense_statistics
+                NodeFeature.SENSE, self._sense_statistics
             )
-            report_received = True
+            report_received_2 = True
 
-        return report_received
+        return report_received_1 and report_received_2
 
     @raise_not_loaded
     async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any]:
@@ -154,12 +150,10 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
                 )
 
             match feature:
-                case NodeFeature.TEMPERATURE:
-                    states[NodeFeature.TEMPERATURE] = self._sense_statistics
-                case NodeFeature.HUMIDITY:
-                    states[NodeFeature.HUMIDITY] = self._sense_statistics
                 case NodeFeature.PING:
                     states[NodeFeature.PING] = await self.ping_update()
+                case NodeFeature.SENSE:
+                    states[NodeFeature.TEMPERATURE] = self._sense_statistics
                 case _:
                     state_result = await super().get_state((feature,))
                     states[feature] = state_result[feature]