Merge branch 'zha_3phase_remaining_meetering' into zha_3ph_energy

Merge branch 'dev' into zha_3phase_remaining_meetering
2026-01-10 00:58:16 +00:00 · 2025-01-26 00:26:38 +00:00 · 2025-01-26 00:22:47 +00:00 · 2025-01-21 19:15:55 +00:00 · 2024-12-24 18:09:06 +00:00 · 2024-12-24 17:11:31 +00:00
2 changed files with 45 additions and 0 deletions
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -46,9 +46,15 @@ _EXTRA_STATE_ATTRIBUTES: set[str] = {
    "rms_current_max_ph_b",
    "rms_current_max_ph_c",
    "rms_voltage_max",
+    "rms_voltage_max_ph_b",
+    "rms_voltage_max_ph_c",
    "ac_frequency_max",
    "power_factor_max",
+    "power_factor_max_ph_b",
+    "power_factor_max_ph_c",
    "active_power_max",
+    "active_power_max_ph_b",
+    "active_power_max_ph_c",
    # Smart Energy metering
    "device_type",
    "status",
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -1031,6 +1031,12 @@
      }
    },
    "sensor": {
+      "active_power_ph_b": {
+        "name": "Power phase B"
+      },
+      "active_power_ph_c": {
+        "name": "Power phase C"
+      },
      "analog_input": {
        "name": "Analog input"
      },
@@ -1046,12 +1052,24 @@
      "instantaneous_demand": {
        "name": "Instantaneous demand"
      },
+      "power_factor_ph_b": {
+        "name": "Power factor phase B"
+      },
+      "power_factor_ph_c": {
+        "name": "Power factor phase C"
+      },
      "rms_current_ph_b": {
        "name": "Current phase B"
      },
      "rms_current_ph_c": {
        "name": "Current phase C"
      },
+      "rms_voltage_ph_b": {
+        "name": "Voltage phase B"
+      },
+      "rms_voltage_ph_c": {
+        "name": "Voltage phase C"
+      },
      "summation_delivered": {
        "name": "Summation delivered"
      },
@@ -1073,6 +1091,27 @@
      "tier6_summation_delivered": {
        "name": "Tier 6 summation delivered"
      },
+      "energy_ph_a": {
+        "name": "Energy phase A"
+      },
+      "energy_ph_b": {
+        "name": "Energy phase B"
+      },
+      "energy_ph_c": {
+        "name": "Energy phase C"
+      },
+      "energy_produced_ph_a": {
+        "name": "Energy produced phase A"
+      },
+      "energy_produced_ph_b": {
+        "name": "Energy produced phase B"
+      },
+      "energy_produced_ph_c": {
+        "name": "Energy produced phase C"
+      },
+      "energy_produced": {
+        "name": "Energy produced"
+      },
      "summation_received": {
        "name": "Summation received"
      },
Author	SHA1	Message	Date
Abílio Costa	66c3981ff5	Merge branch 'zha_3phase_remaining_meetering' into zha_3ph_energy	2025-01-26 00:26:38 +00:00
Abílio Costa	8ca9608a7e	Merge branch 'dev' into zha_3phase_remaining_meetering	2025-01-26 00:22:47 +00:00
Abílio Costa	cbf040a79d	Merge branch 'dev' into zha_3phase_remaining_meetering	2025-01-21 19:15:55 +00:00
abmantis	4315651187	Add strings for 3 phase energy in ZHA	2024-12-24 18:09:06 +00:00
abmantis	dda1404716	Add remaining strings and state attrs for ZHA 3 phase	2024-12-24 17:11:31 +00:00
abmantis	109a6a428d	Merge branch 'dev' of github.com:home-assistant/core into zha_3phase_current_entities	2024-12-24 15:36:29 +00:00
Abílio Costa	9883c54725	Merge branch 'dev' into zha_3phase_current_entities	2024-12-23 11:57:39 +00:00
abmantis	ed4c49cb21	Add strings and state attrs for ZHA 3 Phase current	2024-12-10 20:00:42 +00:00