Xoca meter: final review changes and docs

- shorten top level name
- move meter id to attribute
- reduce overuse of force directive
- use diagnostic category for non-primary sensors

PR #2652

ACKNOWLEDGEMENTS.md

@@ -764,7 +764,7 @@ Further device support has been made with the assistance of users. Please consid
 - [bwarden](https://github.com/bwarden) for contributing support for OmniBreeze tower fan.
 - [ASk1](https://github.com/ASk1) for assisting with support for Zemismart SPM01 zigbee energy meter.
 - [Nas-au](https://github.com/Nas-au) for assisting with support for Universal remote controllers.
-- [AlexK98](https://github.com/AlexK98) for contributing support for TOMPD-63-WIFI and variant of TOMPD-63LW energy meters, and improvements to Moes temperature humidity sensors.
+- [AlexK98](https://github.com/AlexK98) for contributing support for TOMPD-63-WIFI, XOCA DAC2121C BI, and variant of TOMPD-63LW energy meters, and improvements to Moes temperature humidity sensors.
 - [md1986](https://github.com/md1986) for contributing support for Morento HY4866-WF air purifier.
 - [TimPasquini](https://github.com/TimPasquini) for contributing support for Brizlabs string lights.
 - [darth-hp](https://github.com/darth-hp) for contributing support for Cecotec BigDry 4000 dehumidifier.

DEVICES.md

@@ -463,7 +463,8 @@
 - WDYK 2P63A energy meter circuit breaker
 - WDYK 3 phase 4 pole 400V energy meter circuit breaker
 - WDYK 4P100A energy meter circuit breaker
-- Yagusmart 3PN 63A 3-phase eneregy meter
+- Xoca DAC2121C BI energy meter
+- Yagusmart 3PN 63A 3-phase multi-tariff energy meter
 - Zemismart SDM01-TW0-12-ZM 3-phase bidirectional energy meter
 - ZM-Wi-Fi smart meter
 

custom_components/tuya_local/devices/xoca_dac2121c_energy_meter.yaml

@@ -1,9 +1,10 @@
-name: BiDirectional Energy Meter with Multi Tariff functions
+name: Multi-tariff energy meter
 products:
   - id: opdhepy0p7eyeurz
     name: DAC-2121C BI
 primary_entity:
   entity: switch
+  icon: "mdi:fuse"
   dps:
     - id: 16
       name: switch
@@ -17,12 +18,14 @@ primary_entity:
       name: alarm_set_2
       type: string
       optional: true
-      force: true
+    - id: 18
+      type: string
+      name: sensor
+      optional: true
 secondary_entities:
   - entity: sensor
     translation_key: energy_consumed
     class: energy
-    # category: diagnostic
     dps:
       - id: 1
         type: integer
@@ -35,7 +38,6 @@ secondary_entities:
   - entity: sensor
     translation_key: energy_produced
     class: energy
-    # category: diagnostic
     dps:
       - id: 2
         type: integer
@@ -47,7 +49,7 @@ secondary_entities:
           - scale: 100
   - entity: sensor
     class: voltage
-    # category: diagnostic
+    category: diagnostic
     dps:
       - id: 6
         optional: true
@@ -61,7 +63,7 @@ secondary_entities:
           - scale: 10
   - entity: sensor
     class: current
-    # category: diagnostic
+    category: diagnostic
     dps:
       - id: 6
         optional: true
@@ -74,7 +76,7 @@ secondary_entities:
           - scale: 1000
   - entity: sensor
     class: power
-    # category: diagnostic
+    category: diagnostic
     dps:
       - id: 6
         optional: true
@@ -85,20 +87,10 @@ secondary_entities:
         mask: "0000000000FFFFFF"
         mapping:
           - scale: 1000
-  - entity: sensor
-    name: Meter ID
-    category: diagnostic
-    dps:
-      - id: 18
-        type: string
-        name: sensor
-        optional: true
-        force: true
   - entity: sensor
     # Night zone
     name: Tariff 1
     class: energy
-    # category: diagnostic
     dps:
       - id: 21
         type: integer
@@ -113,7 +105,6 @@ secondary_entities:
     # Day zone
     name: Tariff 2
     class: energy
-    # category: diagnostic
     dps:
       - id: 22
         type: integer
@@ -127,7 +118,6 @@ secondary_entities:
   - entity: sensor
     name: Tariff 3
     class: energy
-    # category: diagnostic
     dps:
       - id: 23
         type: integer
@@ -141,7 +131,6 @@ secondary_entities:
   - entity: sensor
     name: Tariff 4
     class: energy
-    # category: diagnostic
     dps:
       - id: 24
         type: integer