Merge pull request #952 from plugwise/remove_diagn

Request: remove diagnostics category from climate-zone temperature sensors and more

Author: bouwew

CHANGELOG.md

@@ -4,6 +4,7 @@ Versions from 0.40 and up
 
 ## Ongoing
 
+- Revisit diagnostics category assignments based on [#810](https://github.com/plugwise/python-plugwise/issues/810) via PR [#952](https://github.com/plugwise/plugwise-beta/pull/952)
 - New feature: implement setting Adam zone profile via PR [#958](https://github.com/plugwise/plugwise-beta/pull/958)
 - Implement translation for added homeassistantError raise message via PR [#948](https://github.com/plugwise/plugwise-beta/pull/948)
 - Line up strings with Core Plugwise strings via PR [#954](https://github.com/plugwise/plugwise-beta/pull/954)

custom_components/plugwise/binary_sensor.py

@@ -71,7 +71,6 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=DHW_STATE,
         translation_key=DHW_STATE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=FLAME_STATE,
@@ -81,12 +80,10 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=HEATING_STATE,
         translation_key=HEATING_STATE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=COOLING_STATE,
         translation_key=COOLING_STATE,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=SECONDARY_BOILER_STATE,
@@ -96,7 +93,6 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=PLUGWISE_NOTIFICATION,
         translation_key=PLUGWISE_NOTIFICATION,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
 )
 

custom_components/plugwise/select.py

@@ -47,6 +47,7 @@ class PlugwiseSelectEntityDescription(SelectEntityDescription):
     PlugwiseSelectEntityDescription(
         key=SELECT_SCHEDULE,
         translation_key=SELECT_SCHEDULE,
+        entity_category=EntityCategory.CONFIG,
         options_key=AVAILABLE_SCHEDULES,
     ),
     PlugwiseSelectEntityDescription(

custom_components/plugwise/sensor.py

@@ -101,37 +101,32 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseSensorEntityDescription(
         key=TARGET_TEMP_HIGH,
         translation_key="cooling_setpoint",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseSensorEntityDescription(
         key=TARGET_TEMP_LOW,
         translation_key="heating_setpoint",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseSensorEntityDescription(
         key=ATTR_TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
         key=INTENDED_BOILER_TEMP,
         translation_key=INTENDED_BOILER_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -163,7 +158,6 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=WATER_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -399,15 +393,13 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
         key="illuminance",
         native_unit_of_measurement=LIGHT_LUX,
         device_class=SensorDeviceClass.ILLUMINANCE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseSensorEntityDescription(
         key=MOD_LEVEL,
@@ -419,7 +411,6 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
     PlugwiseSensorEntityDescription(
         key=VALVE_POS,
         translation_key=VALVE_POS,
-        entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -442,15 +433,13 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=DHW_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
         key=DHW_SETPOINT,
         translation_key=DHW_SETPOINT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
 )