feat(sensors): add state class measurement to many more sensors

State class measurement used to only influence the keeping of long
term statistics, so it was left off many less important sensors.
But now it is required for adding to the energy dashboard, so
basically all energy related sensors (other than totals) need it.

Mainly affects power, voltage, current sensors, and also ensured
temperature sensors have it as well, as these are useful to track
long term.

Also removed diagnostic device class from many sensors (including
battery sensors as well as the above) as sensors now have their
own category so most do not need marking as diagnostic.

Issue #5664

custom_components/tuya_local/devices/HCT-626_dual_water_timer.yaml

@@ -120,7 +120,6 @@ entities:
           - dps_val: "7"
             value: "7 days"
   - entity: sensor
-    category: diagnostic
     class: battery
     dps:
       - id: 47

custom_components/tuya_local/devices/afyeev_16a_evcharger.yaml

@@ -76,7 +76,6 @@ entities:
           - scale: 1000
   - entity: sensor
     class: voltage
-    category: diagnostic
     translation_key: voltage_x
     translation_placeholders:
       x: A
@@ -87,11 +86,11 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
     class: current
-    category: diagnostic
     translation_key: current_x
     translation_placeholders:
       x: A
@@ -102,11 +101,11 @@ entities:
         optional: true
         unit: A
         mask: "000000FFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
     class: power
-    category: diagnostic
     translation_key: power_x
     translation_placeholders:
       x: A
@@ -299,7 +298,6 @@ entities:
           max: 15
   - entity: sensor
     class: voltage
-    category: diagnostic
     hidden: unavailable
     translation_key: voltage_x
     translation_placeholders:
@@ -311,6 +309,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
       - id: 7
@@ -323,7 +322,6 @@ entities:
           - value: true
   - entity: sensor
     class: current
-    category: diagnostic
     hidden: unavailable
     translation_key: current_x
     translation_placeholders:
@@ -335,6 +333,7 @@ entities:
         optional: true
         unit: A
         mask: "000000FFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
       - id: 7
@@ -347,7 +346,6 @@ entities:
           - value: true
   - entity: sensor
     class: power
-    category: diagnostic
     hidden: unavailable
     translation_key: power_x
     translation_placeholders:
@@ -372,7 +370,6 @@ entities:
           - value: true
   - entity: sensor
     class: voltage
-    category: diagnostic
     hidden: unavailable
     translation_key: voltage_x
     translation_placeholders:
@@ -384,6 +381,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
       - id: 8
@@ -396,7 +394,6 @@ entities:
           - value: true
   - entity: sensor
     class: current
-    category: diagnostic
     hidden: unavailable
     translation_key: current_x
     translation_placeholders:
@@ -408,6 +405,7 @@ entities:
         optional: true
         unit: A
         mask: "000000FFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
       - id: 8
@@ -420,7 +418,6 @@ entities:
           - value: true
   - entity: sensor
     class: power
-    category: diagnostic
     hidden: unavailable
     translation_key: power_x
     translation_placeholders:

custom_components/tuya_local/devices/afyeev_32a7kw_evcharger.yaml

@@ -87,7 +87,6 @@ entities:
           - scale: 1000
   - entity: sensor
     class: voltage
-    category: diagnostic
     translation_key: voltage_x
     translation_placeholders:
       x: A
@@ -98,11 +97,11 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
     class: current
-    category: diagnostic
     translation_key: current_x
     translation_placeholders:
       x: A
@@ -113,11 +112,11 @@ entities:
         optional: true
         unit: A
         mask: "000000FFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
     class: power
-    category: diagnostic
     translation_key: power_x
     translation_placeholders:
       x: A

custom_components/tuya_local/devices/afyeev_evcharger.yaml

@@ -231,6 +231,7 @@ entities:
         name: sensor
         optional: true
         unit: V
+        class: measurement
         mask: "FFFF000000000000"
         mapping:
           - scale: 10
@@ -243,6 +244,7 @@ entities:
         name: sensor
         optional: true
         unit: A
+        class: measurement
         mask: "000000FFFF000000"
         mapping:
           - scale: 1000
@@ -255,6 +257,7 @@ entities:
         name: sensor
         optional: true
         unit: kW
+        class: measurement
         mask: "000000000000FFFF"
         mapping:
           - scale: 1000

custom_components/tuya_local/devices/aimiler_11kW_evcharger.yaml

@@ -206,6 +206,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -218,6 +219,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -245,6 +247,7 @@ entities:
         optional: true
         name: sensor
         unit: kWh
+        class: measurement
         mapping:
           - scale: 100
 

custom_components/tuya_local/devices/aimiler_40a_evcharger.yaml

@@ -231,6 +231,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -243,6 +244,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
 

custom_components/tuya_local/devices/airwoods_av_htpf_fresh_air_heat_pump.yaml

@@ -132,6 +132,7 @@ entities:
         type: integer
         name: sensor
         unit: ppm
+        class: measurement
         mapping:
           - dps_val: 0
             value: null
@@ -162,6 +163,7 @@ entities:
         type: integer
         name: sensor
         unit: "%"
+        class: measurement
         mapping:
           - dps_val: 0
             value: null
@@ -173,6 +175,7 @@ entities:
         type: integer
         name: sensor
         unit: µg/m³
+        class: measurement
         mapping:
           - dps_val: 0
             value: null
@@ -185,6 +188,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Supply air temperature
@@ -194,6 +198,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Exhaust air temperature
@@ -203,6 +208,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: binary_sensor
     class: problem
@@ -271,6 +277,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Compressor suction temperature
@@ -281,6 +288,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Evaporator temperature
@@ -291,6 +299,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Condenser temperature
@@ -301,6 +310,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: sensor
     name: Radiator temperature
@@ -311,6 +321,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
 
   - entity: binary_sensor
     translation_key: defrost

custom_components/tuya_local/devices/arida_eva_humidifier.yaml

@@ -56,6 +56,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: select
     name: Mist level
     icon: mdi:water-percent

custom_components/tuya_local/devices/arlec_apr005ha_air_purifier.yaml

@@ -88,6 +88,7 @@ entities:
         type: integer
         name: sensor
         unit: ugm3
+        class: measurement
   - entity: sensor
     class: duration
     category: diagnostic

custom_components/tuya_local/devices/arlec_smart_button.yaml

@@ -22,7 +22,6 @@ entities:
             value: double_click
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 10
         type: integer

custom_components/tuya_local/devices/asc_wifi_circuit_breaker.yaml

@@ -21,34 +21,34 @@ entities:
           max: 86400
   - entity: sensor
     class: current
-    category: diagnostic
     dps:
       - id: 21
         type: integer
         name: sensor
         unit: A
+        class: measurement
         mapping:
           - scale: 1000
         optional: true
   - entity: sensor
     class: voltage
-    category: diagnostic
     dps:
       - id: 22
         type: integer
         name: sensor
         unit: V
+        class: measurement
         mapping:
           - scale: 10
         optional: true
   - entity: sensor
     class: power
-    category: diagnostic
     dps:
       - id: 23
         type: integer
         name: sensor
         unit: W
         optional: true
+        class: measurement
         mapping:
           - scale: 10

custom_components/tuya_local/devices/atorch_at4pw_energymeter.yaml

@@ -355,6 +355,7 @@ entities:
         name: sensor
         type: integer
         unit: kWh
+        class: measurement
         mapping:
           - scale: 1000
   - entity: number

custom_components/tuya_local/devices/aubess_rainpoint_irrigation_system.yaml

@@ -82,7 +82,6 @@ entities:
         unit: s
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 108
         type: integer

custom_components/tuya_local/devices/aulifants_energymonitor_breaker.yaml

@@ -34,6 +34,7 @@ entities:
         name: sensor
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -44,6 +45,7 @@ entities:
         name: sensor
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: button

custom_components/tuya_local/devices/avidsen_soria_solarinverter.yaml

@@ -82,7 +82,6 @@ entities:
           - scale: 1000
   - entity: sensor
     name: PV power
-    category: diagnostic
     class: power
     dps:
       - id: 102
@@ -95,12 +94,12 @@ entities:
   - entity: sensor
     name: PV DC voltage
     class: voltage
-    category: diagnostic
     dps:
       - id: 3
         type: base64
         name: sensor
         unit: V
+        class: measurement
         mask: "FFFF00000000"
         optional: true
         mapping:
@@ -108,12 +107,12 @@ entities:
   - entity: sensor
     name: PV DC current
     class: current
-    category: diagnostic
     dps:
       - id: 3
         type: base64
         name: sensor
         unit: A
+        class: measurement
         optional: true
         mask: "0000FFFF0000"
         mapping:
@@ -121,12 +120,12 @@ entities:
   - entity: sensor
     name: PV DC power
     class: power
-    category: diagnostic
     dps:
       - id: 3
         type: base64
         name: sensor
         unit: W
+        class: measurement
         optional: true
         mask: "00000000FFFF"
         mapping:
@@ -134,12 +133,12 @@ entities:
   - entity: sensor
     name: AC voltage
     class: voltage
-    category: diagnostic
     dps:
       - id: 7
         type: base64
         name: sensor
         unit: V
+        class: measurement
         optional: true
         mask: "FFFF0000000000000000"
         mapping:
@@ -147,12 +146,12 @@ entities:
   - entity: sensor
     name: AC current
     class: current
-    category: diagnostic
     dps:
       - id: 7
         type: base64
         name: sensor
         unit: A
+        class: measurement
         optional: true
         mask: "0000FFFFFF0000000000"
         mapping:
@@ -160,19 +159,18 @@ entities:
   - entity: sensor
     name: AC active power
     class: power
-    category: diagnostic
     dps:
       - id: 7
         type: base64
         name: sensor
         unit: W
+        class: measurement
         optional: true
         mask: "0000000000FFFFFF0000"
         mapping:
           - scale: 1000
   - entity: sensor
     class: temperature
-    category: diagnostic
     dps:
       - id: 18
         name: sensor

custom_components/tuya_local/devices/ble_adaprox_fingerbot.yaml

@@ -11,7 +11,6 @@ entities:
         name: switch
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 12
         type: integer

custom_components/tuya_local/devices/ble_hct611_watertimer.yaml

@@ -50,7 +50,6 @@ entities:
         optional: true
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 7
         type: integer

custom_components/tuya_local/devices/ble_orion_lock.yaml

@@ -35,7 +35,6 @@ entities:
         sensitive: true
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 8
         type: integer

custom_components/tuya_local/devices/ble_smart_plant_moisture.yaml

@@ -12,6 +12,7 @@ entities:
       - id: 3
         name: sensor
         type: integer
+        class: measurement
         unit: "%"
   - entity: sensor
     name: Soil temperature
@@ -32,7 +33,6 @@ entities:
           - value: C
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 14
         type: string

custom_components/tuya_local/devices/ble_solar_light.yaml

@@ -210,7 +210,6 @@ entities:
             value: false
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 62
         type: string

custom_components/tuya_local/devices/ble_tcs024b_smart_plant_moisture.yaml

@@ -10,6 +10,7 @@ entities:
         name: sensor
         type: integer
         unit: "%"
+        class: measurement
   - entity: sensor
     class: temperature
     dps:
@@ -26,7 +27,6 @@ entities:
           - value: C
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 4
         type: integer

custom_components/tuya_local/devices/ble_water_valve.yaml

@@ -33,7 +33,6 @@ entities:
         optional: true
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 7
         type: integer

custom_components/tuya_local/devices/ble_yl01_watertester.yaml

@@ -24,7 +24,6 @@ entities:
         unit: "ppm"
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 7
         type: integer

custom_components/tuya_local/devices/bstuokey_invisible_lock.yaml

@@ -67,7 +67,6 @@ entities:
         name: ble_unlock_check
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 9
         type: string

custom_components/tuya_local/devices/casdon_kg1_waterdispenser.yaml

@@ -137,6 +137,7 @@ entities:
         type: integer
         name: sensor
         unit: mL
+        class: measurement
 
   - entity: binary_sensor
     class: problem

custom_components/tuya_local/devices/cbc_pool_bp_heatpump.yaml

@@ -57,6 +57,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     translation_key: ambient_temperature
     class: temperature
@@ -65,6 +66,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Compressor exhaust
     class: temperature
@@ -74,6 +76,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Heating coil temperature
     class: temperature
@@ -83,6 +86,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Outlet water temperature
     class: temperature
@@ -92,6 +96,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Return temperature
     class: temperature
@@ -101,6 +106,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Operating frequency
     class: frequency

custom_components/tuya_local/devices/cecotec_totalpure_purifier.yaml

@@ -66,6 +66,7 @@ entities:
         name: sensor
         type: integer
         unit: C
+        class: measurement
 
   - entity: sensor
     class: humidity
@@ -74,6 +75,7 @@ entities:
         type: integer
         name: sensor
         unit: "%"
+        class: measurement
 
   # -------------------------------------------------------
   # Timer

custom_components/tuya_local/devices/ceres_plus_petfeeder.yaml

@@ -116,7 +116,6 @@ entities:
         optional: true
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 238
         type: string

custom_components/tuya_local/devices/chtoocy_mc82_thermometer.yaml

@@ -10,6 +10,7 @@ entities:
       - id: 1
         type: integer
         name: sensor
+        class: measurement
         mapping:
           - scale: 10
         unit: C

custom_components/tuya_local/devices/cleanair_604b_humidifier.yaml

@@ -46,6 +46,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
   - entity: select
     translation_key: timer
     dps:

custom_components/tuya_local/devices/cleanair_605b_humidifier.yaml

@@ -40,6 +40,7 @@ entities:
         type: integer
         name: sensor
         unit: C
+        class: measurement
   - entity: switch
     translation_key: sleep
     dps:

custom_components/tuya_local/devices/clofte_duo_400_humidifier.yaml

@@ -80,6 +80,7 @@ entities:
         optional: true
         name: sensor
         unit: ugm3
+        class: measurement
   - entity: sensor
     translation_key: water_level
     class: enum

custom_components/tuya_local/devices/cpvan_cp2w_alarm.yaml

@@ -113,7 +113,6 @@ entities:
         name: sensor
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 16
         type: integer

custom_components/tuya_local/devices/create_fan_light.yaml

@@ -69,3 +69,11 @@ entities:
         type: boolean
         optional: true
         name: switch
+      - id: 66
+        type: boolean
+        optional: true
+        name: available
+        mapping:
+          - dps_val: null
+            value: false
+          - value: true

custom_components/tuya_local/devices/diivoo_dwv010.yaml

@@ -40,7 +40,6 @@ entities:
         unit: l
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 7
         type: integer

custom_components/tuya_local/devices/diivoo_wt05.yaml

@@ -41,7 +41,6 @@ entities:
         name: valve
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 11
         type: integer

custom_components/tuya_local/devices/djive_arc_portable_fan.yaml

@@ -70,10 +70,10 @@ entities:
         type: integer
         name: sensor
         unit: "μg/m³"
+        class: measurement
 
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 105
         type: integer
@@ -82,7 +82,6 @@ entities:
 
   - entity: binary_sensor
     class: battery_charging
-    category: diagnostic
     dps:
       - id: 106
         type: boolean

custom_components/tuya_local/devices/dongguan_electric_curtain.yaml

@@ -76,7 +76,6 @@ entities:
         name: fault_code
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 13
         type: integer

custom_components/tuya_local/devices/dowell_dchs-k7_32_7kw_ev_charger.yaml

@@ -47,7 +47,6 @@ entities:
         mapping:
           - scale: 100
   - entity: sensor
-    category: diagnostic
     class: battery
     dps:
       - id: 2    # battery_percentage
@@ -198,6 +197,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -212,6 +212,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -226,6 +227,7 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -241,6 +243,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -256,6 +259,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -271,6 +275,7 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -286,6 +291,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -301,6 +307,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -316,11 +323,11 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
     class: temperature
-    category: diagnostic
     dps:
       - id: 24    # temp_current
         type: integer
@@ -427,6 +434,7 @@ entities:
         name: sensor
         unit: A
         mask: "FFFF0000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -441,6 +449,7 @@ entities:
         name: sensor
         unit: A
         mask: "0000FFFF"
+        class: measurement
         mapping:
           - scale: 10
   - entity: button

custom_components/tuya_local/devices/earu_3phase_breaker.yaml

@@ -33,6 +33,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF0000000000000000"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -48,6 +49,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF0000000000"
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -63,6 +65,7 @@ entities:
         optional: true
         unit: W
         mask: "0000000000FFFFFF0000"
+        class: measurement
 
   - entity: sensor
     translation_key: voltage_x
@@ -77,6 +80,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF0000000000000000"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -93,6 +97,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF0000000000"
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -109,6 +114,7 @@ entities:
         optional: true
         unit: W
         mask: "0000000000FFFFFF0000"
+        class: measurement
 
   - entity: sensor
     translation_key: voltage_x
@@ -123,6 +129,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF0000000000000000"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -139,6 +146,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF0000000000"
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -155,6 +163,7 @@ entities:
         optional: true
         unit: W
         mask: "0000000000FFFFFF0000"
+        class: measurement
 
   - entity: number
     translation_key: sensor_threshold

custom_components/tuya_local/devices/earu_eaemp3c100_energymeter.yaml

@@ -56,6 +56,7 @@ entities:
         unit: A
         name: sensor
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
           - dps_val: null
@@ -80,6 +81,7 @@ entities:
         unit: kW
         name: sensor
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
           - dps_val: null
@@ -129,6 +131,7 @@ entities:
         unit: A
         name: sensor
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
           - dps_val: null
@@ -153,6 +156,7 @@ entities:
         unit: kW
         name: sensor
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
           - dps_val: null
@@ -201,6 +205,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "0000FFFFFF000000"
         mapping:
           - scale: 1000
@@ -226,6 +231,7 @@ entities:
         unit: kW
         name: sensor
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
           - dps_val: null
@@ -334,6 +340,7 @@ entities:
         type: integer
         name: sensor
         unit: kWh
+        class: measurement
         mapping:
           - scale: 100
   - entity: number

custom_components/tuya_local/devices/earu_multicircuit_energymeter.yaml

@@ -9,7 +9,6 @@ entities:
     translation_key: voltage_x
     translation_placeholders:
       x: A
-    category: diagnostic
     dps:
       - id: 101
         optional: true
@@ -26,7 +25,6 @@ entities:
     translation_key: voltage_x
     translation_placeholders:
       x: B
-    category: diagnostic
     dps:
       - id: 102
         optional: true
@@ -43,7 +41,6 @@ entities:
     translation_key: voltage_x
     translation_placeholders:
       x: C
-    category: diagnostic
     dps:
       - id: 103
         optional: true
@@ -60,7 +57,6 @@ entities:
     translation_key: current_x
     translation_placeholders:
       x: A
-    category: diagnostic
     dps:
       - id: 101
         optional: true
@@ -70,6 +66,7 @@ entities:
         mask: 0000000000FFFFFFFF00000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -77,7 +74,6 @@ entities:
     translation_key: current_x
     translation_placeholders:
       x: B
-    category: diagnostic
     dps:
       - id: 102
         optional: true
@@ -87,6 +83,7 @@ entities:
         mask: 0000000000FFFFFFFF00000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -94,7 +91,6 @@ entities:
     translation_key: current_x
     translation_placeholders:
       x: C
-    category: diagnostic
     dps:
       - id: 103
         optional: true
@@ -104,6 +100,7 @@ entities:
         mask: 0000000000FFFFFFFF00000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -111,7 +108,6 @@ entities:
     translation_key: current_x
     translation_placeholders:
       x: total
-    category: diagnostic
     dps:
       - id: 104
         optional: true
@@ -121,6 +117,7 @@ entities:
         mask: 0000000000FFFFFFFF
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -134,6 +131,7 @@ entities:
         optional: true
         type: base64
         unit: A
+        class: measurement
         name: sensor
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
@@ -153,6 +151,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                00000000000000000000000000000000FFFFFFFF00000000000000"
@@ -171,6 +170,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                0000000000000000000000FFFFFFFF000000000000000000000000"
@@ -189,6 +189,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000FFFFFFFF0000000000000000000000000000000000"
@@ -207,6 +208,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                00FFFFFFFF00000000000000000000000000000000000000000000"
@@ -225,6 +227,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                0000000000000000000000000000000000000000000000FFFFFFFF\
                000000000000000000000000000000000000000000000000000000"
@@ -243,6 +246,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000FFFFFFFF0000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -261,6 +265,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                00000000000000000000000000FFFFFFFF00000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -279,6 +284,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                0000000000000000FFFFFFFF000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -297,6 +303,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000000000000000000000000000\
                000000FFFFFFFF0000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -315,6 +322,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "00000000000000000000000000000000000000000000000000FFFF\
                FFFF00000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -333,6 +341,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "0000000000000000000000000000000000000000FFFFFFFF000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -351,6 +360,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "000000000000000000000000000000FFFFFFFF0000000000000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -369,6 +379,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "00000000000000000000FFFFFFFF00000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -387,6 +398,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "0000000000FFFFFFFF000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -405,6 +417,7 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "FFFFFFFF0000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
@@ -416,7 +429,6 @@ entities:
     translation_key: power_x
     translation_placeholders:
       x: A
-    category: diagnostic
     dps:
       - id: 101
         optional: true
@@ -426,6 +438,7 @@ entities:
         mask: 00FFFFFFFF0000000000000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -433,7 +446,6 @@ entities:
     translation_key: power_x
     translation_placeholders:
       x: B
-    category: diagnostic
     dps:
       - id: 102
         optional: true
@@ -443,6 +455,7 @@ entities:
         mask: 00FFFFFFFF0000000000000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -450,7 +463,6 @@ entities:
     translation_key: power_x
     translation_placeholders:
       x: C
-    category: diagnostic
     dps:
       - id: 103
         optional: true
@@ -460,6 +472,7 @@ entities:
         mask: 00FFFFFFFF0000000000000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -467,7 +480,6 @@ entities:
     translation_key: power_x
     translation_placeholders:
       x: total
-    category: diagnostic
     dps:
       - id: 104
         optional: true
@@ -477,6 +489,7 @@ entities:
         mask: 00FFFFFFFF00000000
         endianness: little
         mask_signed: true
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -495,6 +508,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000FFFFFFFF0000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -513,6 +527,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                00000000000000000000000000000000FFFFFFFF00000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -531,6 +546,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                0000000000000000000000FFFFFFFF000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -549,6 +565,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000FFFFFFFF0000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -567,6 +584,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                00FFFFFFFF00000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -585,6 +603,7 @@ entities:
                0000000000000000000000000000000000000000000000FFFFFFFF\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -603,6 +622,7 @@ entities:
                000000000000000000000000000000000000FFFFFFFF0000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -621,6 +641,7 @@ entities:
                00000000000000000000000000FFFFFFFF00000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -639,6 +660,7 @@ entities:
                0000000000000000FFFFFFFF000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -657,6 +679,7 @@ entities:
                000000FFFFFFFF0000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -675,6 +698,7 @@ entities:
                FFFF00000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -693,6 +717,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -711,6 +736,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -729,6 +755,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -747,6 +774,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -765,6 +793,7 @@ entities:
                000000000000000000000000000000000000000000000000000000\
                000000000000000000000000000000000000000000000000000000"
         endianness: little
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor

custom_components/tuya_local/devices/earu_smart_wifi_circuit_breaker_with_energy_monitor.yaml

@@ -46,7 +46,6 @@ entities:
           - scale: 10
   - entity: sensor
     class: current
-    category: diagnostic
     dps:
       - id: 6
         optional: true
@@ -54,18 +53,19 @@ entities:
         type: base64
         unit: A
         name: sensor
+        class: measurement
         mask: "0000FFFFFF000000"
         mapping:
           - scale: 1000
   - entity: sensor
     class: power
-    category: diagnostic
     dps:
       - id: 6
         optional: true
         force: true
         type: base64
         unit: kW
+        class: measurement
         name: sensor
         mask: "0000000000FFFFFF"
         mapping:

custom_components/tuya_local/devices/ecopoint_ev_charger.yaml

@@ -164,6 +164,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -178,6 +179,7 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -192,6 +194,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -206,6 +209,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -220,6 +224,7 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -234,6 +239,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -248,6 +254,7 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -262,11 +269,11 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
     class: temperature
-    category: diagnostic
     dps:
       - id: 24
         type: integer
@@ -353,6 +360,7 @@ entities:
         name: sensor
         unit: A
         mask: "FFFF0000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -366,5 +374,6 @@ entities:
         name: sensor
         unit: A
         mask: "0000FFFF"
+        class: measurement
         mapping:
           - scale: 10

custom_components/tuya_local/devices/eeese_thor_dehumidifier.yaml

@@ -123,6 +123,7 @@ entities:
   - entity: sensor
     translation_key: time_remaining
     class: duration
+    category: diagnostic
     dps:
       - id: 18
         type: integer

custom_components/tuya_local/devices/elitech_ecs974t_thermostat.yaml

@@ -53,6 +53,7 @@ entities:
         name: sensor
         optional: true
         unit: C
+        class: measurement
         mapping:
           - scale: 10
   - entity: binary_sensor

custom_components/tuya_local/devices/emini_16a_public_evcharger.yaml

@@ -57,7 +57,6 @@ entities:
           max: 16
   - entity: sensor  # phase_a -6- raw (voltage, bytes 0-1, 0.1V)
     class: voltage
-    category: diagnostic
     translation_key: voltage_x
     translation_placeholders:
       x: A
@@ -68,11 +67,11 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor  # phase_a -6- raw (current, bytes 2-4, 0.001A)
     class: current
-    category: diagnostic
     translation_key: current_x
     translation_placeholders:
       x: A
@@ -83,11 +82,11 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor  # phase_a -6- raw (power, bytes 5-7, 0.001kW)
     class: power
-    category: diagnostic
     translation_key: power_x
     translation_placeholders:
       x: A

custom_components/tuya_local/devices/emylo_energy_meter.yaml

@@ -94,7 +94,6 @@ entities:
         optional: true
   - entity: sensor
     class: voltage
-    category: diagnostic
     dps:
       - id: 6
         type: base64
@@ -102,11 +101,11 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
     class: current
-    category: diagnostic
     dps:
       - id: 6
         type: base64
@@ -114,11 +113,11 @@ entities:
         optional: true
         unit: A
         mask: "0000FFFFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
     class: power
-    category: diagnostic
     dps:
       - id: 6
         type: base64
@@ -126,5 +125,6 @@ entities:
         optional: true
         unit: kW
         mask: "0000000000FFFFFF"
+        class: measurement
         mapping:
           - scale: 1000

custom_components/tuya_local/devices/engo_e901wifi_thermostat.yaml

@@ -71,7 +71,6 @@ entities:
         type: boolean
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 35
         name: sensor

custom_components/tuya_local/devices/engo_efan230_thermostat.yaml

@@ -68,6 +68,7 @@ entities:
       - id: 108
         name: sensor
         type: integer
+        class: measurement
         unit: "%"
 
   - entity: lock

custom_components/tuya_local/devices/essentials_wall_thermostat.yaml

@@ -90,13 +90,13 @@ entities:
   - entity: sensor
     name: Floor temperature
     class: temperature
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 103
         name: sensor
         type: integer
         unit: C
+        class: measurement
         mapping:
           - scale: 10
       - id: 103

custom_components/tuya_local/devices/eurom_sani_bathroom_towel_radiator.yaml

@@ -104,7 +104,6 @@ entities:
   - entity: sensor
     name: Surface temperature
     class: temperature
-    category: diagnostic
     icon: "mdi:thermometer-lines"
     dps:
       - id: 105
@@ -112,16 +111,17 @@ entities:
         optional: true
         name: sensor
         unit: C
+        class: measurement
   - entity: sensor
     name: Room temperature
     class: temperature
-    category: diagnostic
     icon: "mdi:home-thermometer-outline"
     dps:
       - id: 3
         type: integer
         name: sensor
         unit: C
+        class: measurement
   - entity: binary_sensor
     class: problem
     category: diagnostic

custom_components/tuya_local/devices/evsun_evcharger.yaml

@@ -305,6 +305,7 @@ entities:
         optional: true
         name: sensor
         unit: kWh
+        class: measurement
         mapping:
           - scale: 100
   - entity: switch

custom_components/tuya_local/devices/ezaiot_r9lite_thermostat.yaml

@@ -197,11 +197,11 @@ entities:
   - entity: sensor
     name: External temperature
     class: temperature
-    category: diagnostic
     dps:
       - id: 115
         name: sensor
         type: integer
         unit: C
+        class: measurement
         mapping:
           - scale: 10

custom_components/tuya_local/devices/fairland_rmic06_heatpump.yaml

@@ -74,6 +74,7 @@ entities:
       - id: 120
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean
@@ -132,6 +133,7 @@ entities:
       - id: 122
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean
@@ -147,6 +149,7 @@ entities:
       - id: 124
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean
@@ -179,6 +182,7 @@ entities:
       - id: 127
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean

custom_components/tuya_local/devices/fairland_x20_poolheatpump.yaml

@@ -136,7 +136,6 @@ entities:
         optional: true
         name: fault_code_2
   - entity: sensor
-    category: diagnostic
     hidden: unavailable
     class: power
     dps:
@@ -144,6 +143,7 @@ entities:
         name: sensor
         type: integer
         unit: W
+        class: measurement
         optional: true
       - id: 113
         name: available

custom_components/tuya_local/devices/faroro_pet_feeder.yaml

@@ -68,7 +68,6 @@ entities:
           - dps_val: false
             icon: "mdi:lightbulb-outline"
   - entity: sensor
-    category: diagnostic
     class: battery
     dps:
       - id: 101

custom_components/tuya_local/devices/feyree_43_evcharger.yaml

@@ -208,6 +208,7 @@ entities:
         type: integer
         name: sensor
         unit: kW
+        class: measurement
         mapping:
           - scale: 10
 
@@ -219,6 +220,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
         mapping:
           - scale: 10
 
@@ -239,6 +241,7 @@ entities:
         type: integer
         name: sensor
         unit: kWh
+        class: total_increasing
         mapping:
           - scale: 10
 

custom_components/tuya_local/devices/fisher_summer_air_conditioner.yaml

@@ -264,6 +264,7 @@ entities:
       - id: 101
         name: sensor
         type: integer
+        class: measurement
         optional: true
       - id: 110
         type: bitfield

custom_components/tuya_local/devices/frienhund_acf180wa_dualfeeder.yaml

@@ -235,7 +235,6 @@ entities:
         unit: portions
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 210
         optional: true

custom_components/tuya_local/devices/fuers_videodoorbell.yaml

@@ -115,7 +115,6 @@ entities:
         name: message
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 145
         type: integer

custom_components/tuya_local/devices/funai_erw150_ventilation.yaml

@@ -91,6 +91,7 @@ entities:
         type: integer
         name: sensor
         unit: "µg/m³"
+        class: measurement
 
   - entity: sensor
     class: carbon_dioxide
@@ -99,6 +100,7 @@ entities:
         type: integer
         name: sensor
         unit: "ppm"
+        class: measurement
 
   - entity: sensor
     class: volatile_organic_compounds
@@ -107,6 +109,7 @@ entities:
         type: integer
         name: sensor
         unit: "ppb"
+        class: measurement
 
   - entity: sensor
     class: temperature
@@ -115,6 +118,7 @@ entities:
         type: integer
         name: sensor
         unit: "C"
+        class: measurement
 
   - entity: sensor
     translation_key: air_quality

custom_components/tuya_local/devices/holman_wx1_taptimer.yaml

@@ -31,13 +31,13 @@ entities:
   - entity: sensor
     name: Soil temperature
     class: temperature
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 101
         name: sensor
         type: integer
         optional: true
+        class: measurement
         unit: C
       - id: 115
         name: available
@@ -49,13 +49,13 @@ entities:
   - entity: sensor
     name: Soil moisture
     class: moisture
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 102
         name: sensor
         type: integer
         optional: true
+        class: measurement
         unit: "%"
       - id: 102
         type: integer
@@ -72,16 +72,15 @@ entities:
   - entity: sensor
     name: Water flow
     class: water
-    category: diagnostic
     icon: "mdi:water"
     dps:
       - id: 103
         name: sensor
         type: integer
+        class: measurement
         unit: L
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 105
         type: integer

custom_components/tuya_local/devices/holman_wx2_taptimer.yaml

@@ -34,34 +34,33 @@ entities:
   - entity: sensor
     name: Soil temperature 1
     class: temperature
-    category: diagnostic
     dps:
       - id: 101
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Soil moisture 1
     class: moisture
-    category: diagnostic
     dps:
       - id: 102
         name: sensor
         type: integer
         unit: "%"
+        class: measurement
   - entity: sensor
     name: Last water flow 1
     class: water
-    category: diagnostic
     icon: "mdi:water"
     dps:
       - id: 103
         name: sensor
         type: integer
         unit: L
+        class: measurement
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 105
         type: integer
@@ -462,31 +461,31 @@ entities:
   - entity: sensor
     name: Soil temperature 2
     class: temperature
-    category: diagnostic
     dps:
       - id: 150
         name: sensor
         type: integer
         unit: C
+        class: measurement
   - entity: sensor
     name: Soil moisture 2
     class: moisture
-    category: diagnostic
     dps:
       - id: 151
         name: sensor
         type: integer
         unit: "%"
+        class: measurement
   - entity: sensor
     name: Last water flow 2
     class: water
-    category: diagnostic
     icon: "mdi:water"
     dps:
       - id: 152
         name: sensor
         type: integer
         unit: L
+        class: measurement
   - entity: sensor
     name: Timer status 2
     class: enum

custom_components/tuya_local/devices/holman_wx8_irrigation_controller.yaml

@@ -98,34 +98,34 @@ entities:
   - entity: sensor
     class: voltage
     name: Power supply voltage
-    category: diagnostic
     dps:
       - id: 117
         name: sensor
         type: integer
         unit: "V"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
     name: Evie battery voltage
     class: voltage
-    category: diagnostic
     dps:
       - id: 119
         name: sensor
         type: integer
         unit: "V"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
     name: Battery voltage
     class: voltage
-    category: diagnostic
     dps:
       - id: 118
         type: integer
         name: sensor
         unit: "V"
+        class: measurement
         mapping:
           - scale: 10
   - entity: binary_sensor

custom_components/tuya_local/devices/honeyguardian_s56_petfeeder.yaml

@@ -86,7 +86,6 @@ entities:
             value: 24 hour
             icon: "mdi:hours-24"
   - entity: sensor
-    category: diagnostic
     class: battery
     dps:
       - id: 103

custom_components/tuya_local/devices/htw_htwd020a4_dehumidifier.yaml

@@ -97,6 +97,7 @@ entities:
       - id: 110
         type: integer
         name: sensor
+        class: measurement
         unit: "C"
 
   - entity: lock

custom_components/tuya_local/devices/hysen_hy08acf_thermostat.yaml

@@ -133,12 +133,12 @@ entities:
   - entity: sensor
     name: External temperature
     class: temperature
-    category: diagnostic
     dps:
       - id: 101
         type: integer
         name: sensor
         unit: C
+        class: measurement
         mapping:
           - scale: 10
   - entity: number

custom_components/tuya_local/devices/imeter_3pn_energymonitor.yaml

@@ -109,6 +109,7 @@ entities:
         type: base64
         name: sensor
         optional: true
+        class: measurement
         force: true
         mask: "FFFF000000000000"
         unit: V
@@ -128,6 +129,7 @@ entities:
         force: true
         mask: "0000FFFFFF000000"
         unit: A
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -143,6 +145,7 @@ entities:
         optional: true
         force: true
         mask: "0000000000FFFFFF"
+        class: measurement
         unit: W
 
   - entity: sensor
@@ -158,6 +161,7 @@ entities:
         force: true
         mask: "FFFF000000000000"
         unit: V
+        class: measurement
         mapping:
           - scale: 10
 
@@ -174,6 +178,7 @@ entities:
         force: true
         mask: "0000FFFFFF000000"
         unit: A
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -188,6 +193,7 @@ entities:
         name: sensor
         optional: true
         force: true
+        class: measurement
         mask: "0000000000FFFFFF"
         unit: W
 
@@ -204,6 +210,7 @@ entities:
         force: true
         mask: "FFFF000000000000"
         unit: V
+        class: measurement
         mapping:
           - scale: 10
 
@@ -220,6 +227,7 @@ entities:
         force: true
         mask: "0000FFFFFF000000"
         unit: A
+        class: measurement
         mapping:
           - scale: 1000
 
@@ -235,4 +243,5 @@ entities:
         optional: true
         force: true
         mask: "0000000000FFFFFF"
+        class: measurement
         unit: W

custom_components/tuya_local/devices/inkbird_bbq4t_thermometer.yaml

@@ -93,7 +93,6 @@ entities:
             value: celsius
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 101
         type: integer

custom_components/tuya_local/devices/inkbird_bbq4t_thermometerv2.yaml

@@ -99,7 +99,6 @@ entities:
             value: celsius
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 101
         type: integer

custom_components/tuya_local/devices/inkbird_ibbq4bw_thermometer.yaml

@@ -81,7 +81,6 @@ entities:
             value: celsius
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 101
         type: integer

custom_components/tuya_local/devices/inkbird_ibs_m1s.yaml

@@ -67,7 +67,6 @@ entities:
   - entity: sensor
     name: Battery 1
     class: battery
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 114
@@ -145,7 +144,6 @@ entities:
   - entity: sensor
     name: Battery 2
     class: battery
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 114
@@ -223,7 +221,6 @@ entities:
   - entity: sensor
     name: Battery 3
     class: battery
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 114
@@ -303,7 +300,6 @@ entities:
   - entity: sensor
     name: Battery 4
     class: battery
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 114

custom_components/tuya_local/devices/inkbird_ibt_26s_thermometer.yaml

@@ -99,7 +99,6 @@ entities:
             value: celsius
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 101
         type: integer

custom_components/tuya_local/devices/intelbras_IFR7000_lock.yaml

@@ -72,7 +72,6 @@ entities:
         name: unlock_voice
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 10
         type: integer

custom_components/tuya_local/devices/inventor_atmospherexl_dehumidifier.yaml

@@ -130,6 +130,7 @@ entities:
       - id: 15
         type: integer
         name: sensor
+        class: measurement
         unit: ugm3
   - entity: lock
     translation_key: child_lock

custom_components/tuya_local/devices/ips_pro_heatpump.yaml

@@ -70,13 +70,13 @@ entities:
         class: measurement
   - entity: sensor
     class: power
-    category: diagnostic
     dps:
       - id: 142
         name: sensor
         type: integer
         unit: W
         optional: true
+        class: measurement
   - entity: binary_sensor
     name: Water flow
     class: problem

custom_components/tuya_local/devices/joyonway_pb562_spacontroller.yaml

@@ -210,6 +210,7 @@ entities:
         type: integer
         name: sensor
         unit: W
+        class: measurement
 
   - entity: sensor
     class: voltage
@@ -218,6 +219,7 @@ entities:
         type: integer
         name: sensor
         unit: V
+        class: measurement
 
   - entity: binary_sensor
     class: problem

custom_components/tuya_local/devices/junsun_ev_charger.yaml

@@ -220,6 +220,7 @@ entities:
         optional: true
         unit: V
         mask: "FFFF000000000000"
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor
@@ -231,6 +232,7 @@ entities:
         optional: true
         unit: A
         mask: "000000FFFF000000"
+        class: measurement
         mapping:
           - scale: 1000
   - entity: sensor
@@ -242,5 +244,6 @@ entities:
         optional: true
         unit: kW
         mask: "000000000000FFFF"
+        class: measurement
         mapping:
           - scale: 1000

custom_components/tuya_local/devices/kaisai_proheat_airconditioner.yaml

@@ -149,6 +149,7 @@ entities:
         type: integer
         unit: C
         optional: true
+        class: measurement
         mapping:
           - scale: 100
 

custom_components/tuya_local/devices/kanchou_petfountain.yaml

@@ -109,12 +109,12 @@ entities:
   - entity: sensor
     class: volume
     name: Water consumption
-    category: diagnostic
     dps:
       - id: 22
         type: integer
         name: sensor
         unit: mL
+        class: measurement
   - entity: binary_sensor
     class: problem
     category: diagnostic

custom_components/tuya_local/devices/kishin_bsdw002_motionsensor.yaml

@@ -17,7 +17,6 @@ entities:
           - value: false
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 3
         type: string

custom_components/tuya_local/devices/kkmoon_airquality_monitor.yaml

@@ -60,3 +60,4 @@ entities:
         type: integer
         name: sensor
         unit: ppm
+        class: measurement

custom_components/tuya_local/devices/klarta_humea_grande_humidifier.yaml

@@ -41,6 +41,7 @@ entities:
       - id: 10
         type: integer
         name: sensor
+        class: measurement
         unit: C
   - entity: select
     name: Backlight

custom_components/tuya_local/devices/kogan_garage_opener.yaml

@@ -25,7 +25,6 @@ entities:
             value: closed
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 104
         name: sensor

custom_components/tuya_local/devices/krisbow_sync_dehumidifier.yaml

@@ -31,6 +31,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: switch
     translation_key: sleep

custom_components/tuya_local/devices/laresar_l6nex_vacuum.yaml

@@ -290,7 +290,6 @@ entities:
 
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 8
         type: integer

custom_components/tuya_local/devices/lefant_t700_vacuum.yaml

@@ -78,7 +78,6 @@ entities:
         name: map_config
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 6
         type: integer

custom_components/tuya_local/devices/linkoze_dual_button.yaml

@@ -34,7 +34,6 @@ entities:
             value: double_click
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 10
         type: integer

custom_components/tuya_local/devices/littepets.yaml

@@ -100,7 +100,6 @@ entities:
             value: occupied
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 101
         type: integer

custom_components/tuya_local/devices/loratap_zigbee_six_switch.yaml

@@ -103,7 +103,6 @@ entities:
             value: double_click
   - entity: sensor
     class: battery
-    category: diagnostic
     dps:
       - id: 10
         type: integer

custom_components/tuya_local/devices/madimack_eco_heatpump_9kW.yaml

@@ -105,6 +105,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: sensor
     name: Minimum temperature
@@ -115,6 +116,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: sensor
     name: Coil temperature
@@ -125,6 +127,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: sensor
     name: Vent temperature
@@ -135,6 +138,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: sensor
     name: Outlet temperature
@@ -145,6 +149,7 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement
 
   - entity: sensor
     translation_key: ambient_temperature
@@ -154,3 +159,4 @@ entities:
         type: integer
         name: sensor
         unit: "°C"
+        class: measurement

custom_components/tuya_local/devices/madimack_elite_v3_heatpump.yaml

@@ -114,6 +114,7 @@ entities:
       - id: 23
         type: integer
         name: sensor
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -130,6 +131,7 @@ entities:
       - id: 24
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -146,6 +148,7 @@ entities:
       - id: 25
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -161,6 +164,7 @@ entities:
       - id: 26
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -177,6 +181,7 @@ entities:
       - id: 103
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -193,6 +198,7 @@ entities:
       - id: 104
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string
@@ -209,6 +215,7 @@ entities:
       - id: 105
         name: sensor
         type: integer
+        class: measurement
       - id: 6
         name: unit
         type: string

custom_components/tuya_local/devices/madimack_elite_v3_heatpump_updated.yaml

@@ -82,6 +82,7 @@ entities:
       - id: 112
         type: integer
         name: sensor
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -98,6 +99,7 @@ entities:
       - id: 113
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -114,6 +116,7 @@ entities:
       - id: 114
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -129,6 +132,7 @@ entities:
       - id: 115
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -145,6 +149,7 @@ entities:
       - id: 118
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -161,6 +166,7 @@ entities:
       - id: 119
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -177,6 +183,7 @@ entities:
       - id: 120
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string

custom_components/tuya_local/devices/madimack_elitev4_heatpump.yaml

@@ -108,6 +108,7 @@ entities:
       - id: 112
         type: integer
         name: sensor
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -124,6 +125,7 @@ entities:
       - id: 113
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -140,6 +142,7 @@ entities:
       - id: 114
         name: sensor
         type: integer
+        class: measurement
         mapping:
           - scale: 10
       - id: 106
@@ -157,6 +160,7 @@ entities:
       - id: 115
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -173,6 +177,7 @@ entities:
       - id: 118
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -189,6 +194,7 @@ entities:
       - id: 119
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string
@@ -205,6 +211,7 @@ entities:
       - id: 120
         name: sensor
         type: integer
+        class: measurement
       - id: 106
         name: unit
         type: string

custom_components/tuya_local/devices/madimack_heatpump.yaml

@@ -111,6 +111,7 @@ entities:
       - id: 120
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean
@@ -182,6 +183,7 @@ entities:
       - id: 124
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean
@@ -206,6 +208,7 @@ entities:
       - id: 127
         type: integer
         name: sensor
+        class: measurement
       - id: 103
         name: unit
         type: boolean

custom_components/tuya_local/devices/madimack_inverflow_pro.yaml

@@ -165,21 +165,21 @@ entities:
         unit: s
   - entity: sensor
     class: power
-    category: diagnostic
     dps:
       - id: 5
         type: integer
         name: sensor
         unit: W
+        class: measurement
   - entity: sensor
     class: volume_flow_rate
-    category: diagnostic
     hidden: unavailable
     dps:
       - id: 112
         type: integer
         optional: true
         name: sensor
+        class: measurement
       - id: 110
         type: string
         optional: true

custom_components/tuya_local/devices/makeskyblue_mppt_charger.yaml

@@ -142,7 +142,6 @@ entities:
           min: 0
           max: 1000
   - entity: sensor
-    category: diagnostic
     class: battery
     dps:
       - id: 111
@@ -166,7 +165,6 @@ entities:
           - dps_val: lithium
             value: Lithium
   - entity: sensor
-    category: diagnostic
     class: temperature
     dps:
       - id: 113
@@ -176,6 +174,7 @@ entities:
         range:
           min: -400
           max: 1200
+        class: measurement
         mapping:
           - scale: 10
   - entity: sensor

custom_components/tuya_local/devices/me80_thermostat.yaml

@@ -257,12 +257,12 @@ entities:
         name: fault_code
   - entity: sensor
     name: Floor temperature
-    category: diagnostic
     class: temperature
     dps:
       - id: 101
         type: integer
         name: sensor
+        class: measurement
         mapping:
           - constraint: unit
             conditions:

custom_components/tuya_local/devices/meegeem_selfcleaningcatlitterbox.yaml

@@ -68,6 +68,7 @@ entities:
         name: sensor
         type: bitfield
         unit: kg
+        class: measurement
         mapping:
           - dps_val: 0
             value: null