From 4237cfcd8d516aa4567caa4ce9910020c8b6d9f1 Mon Sep 17 00:00:00 2001 From: Konrad Klimczuk Date: Tue, 24 Mar 2026 16:46:59 +0100 Subject: [PATCH 1/2] CHAD-17872 - changes device category in zigbee-power-meter device profiles --- .../zigbee-power-meter/profiles/power-meter-1p.yml | 6 +++--- .../zigbee-power-meter/profiles/power-meter-2p.yml | 8 ++++---- .../zigbee-power-meter/profiles/power-meter-3p.yml | 10 +++++----- .../profiles/power-meter-consumption-report-sihas.yml | 2 +- .../profiles/power-meter-consumption-report.yml | 2 +- .../zigbee-power-meter/profiles/power-meter.yml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-1p.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-1p.yml index 7290794ffe..0490a234b2 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-1p.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-1p.yml @@ -10,14 +10,14 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: TotalReverseEnergy label: Total Reverse Energy capabilities: - id: energyMeter version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseA label: Phase A capabilities: @@ -28,4 +28,4 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter \ No newline at end of file + - name: PowerMeasurementSensor \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-2p.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-2p.yml index 11f2dd412b..794c1cad89 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-2p.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-2p.yml @@ -10,14 +10,14 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: TotalReverseEnergy label: Total Reverse Energy capabilities: - id: energyMeter version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseA label: Phase A capabilities: @@ -28,7 +28,7 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseB label: Phase B capabilities: @@ -39,4 +39,4 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter \ No newline at end of file + - name: PowerMeasurementSensor \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-3p.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-3p.yml index 20c824d092..99151e2cc7 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-3p.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-3p.yml @@ -10,14 +10,14 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: TotalReverseEnergy label: Total Reverse Energy capabilities: - id: energyMeter version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseA label: Phase A capabilities: @@ -28,7 +28,7 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseB label: Phase B capabilities: @@ -39,7 +39,7 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor - id: PhaseC label: Phase C capabilities: @@ -50,4 +50,4 @@ components: - id: voltageMeasurement version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml index fbac1180c7..342567add0 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml @@ -13,4 +13,4 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml index eeec9ea2e6..c616aa7f96 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml @@ -13,7 +13,7 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor metadata: mnmn: SmartThingsEdge vid: STES-1-EZEX-Zigbee_Power_Meter \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter.yml index 4159245581..d453f2e8e9 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter.yml @@ -11,4 +11,4 @@ components: - id: refresh version: 1 categories: - - name: CurbPowerMeter + - name: PowerMeasurementSensor From 62e1677a3b40f41f65b16de5e060dc6c658c701e Mon Sep 17 00:00:00 2001 From: Konrad Klimczuk Date: Tue, 24 Mar 2026 17:04:50 +0100 Subject: [PATCH 2/2] cleanup in device profiles --- .../zigbee-power-meter/fingerprints.yml | 12 ++++++------ .../frient-power-meter-consumption-report.yml | 16 ---------------- ...l => power-meter-consumption-report-ezex.yml} | 9 ++++++--- .../profiles/power-meter-consumption-report.yml | 7 ++----- ...gbee_power_meter_consumption_report_sihas.lua | 2 +- .../src/test/test_zigbee_power_meter_ezex.lua | 2 +- .../src/test/test_zigbee_power_meter_frient.lua | 2 +- 7 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 drivers/SmartThings/zigbee-power-meter/profiles/frient-power-meter-consumption-report.yml rename drivers/SmartThings/zigbee-power-meter/profiles/{power-meter-consumption-report-sihas.yml => power-meter-consumption-report-ezex.yml} (65%) diff --git a/drivers/SmartThings/zigbee-power-meter/fingerprints.yml b/drivers/SmartThings/zigbee-power-meter/fingerprints.yml index 15d3f199ec..5930f8b8fe 100644 --- a/drivers/SmartThings/zigbee-power-meter/fingerprints.yml +++ b/drivers/SmartThings/zigbee-power-meter/fingerprints.yml @@ -2,7 +2,7 @@ zigbeeManufacturer: - id: "E240-KR080Z0-HA" deviceLabel: Energy Monitor model: "E240-KR080Z0-HA" - deviceProfileName: power-meter-consumption-report + deviceProfileName: power-meter-consumption-report-ezex - id: "Develco/ZHEMI101" deviceLabel: frient Energy Monitor manufacturer: Develco @@ -12,12 +12,12 @@ zigbeeManufacturer: deviceLabel: frient Energy Monitor manufacturer: Develco Products A/S model: "EMIZB-132" - deviceProfileName: frient-power-meter-consumption-report + deviceProfileName: power-meter-consumption-report - id: "frient A/S/EMIZB-132" deviceLabel: frient Energy Monitor manufacturer: frient A/S model: "EMIZB-132" - deviceProfileName: frient-power-meter-consumption-report + deviceProfileName: power-meter-consumption-report - id: "frient A/S/EMIZB-141" deviceLabel: "frient EMI 2 LED" manufacturer: frient A/S @@ -32,17 +32,17 @@ zigbeeManufacturer: deviceLabel: SiHAS Energy Monitor manufacturer: ShinaSystem model: "PMM-300Z1" - deviceProfileName: power-meter-consumption-report-sihas + deviceProfileName: power-meter-consumption-report - id: "ShinaSystem/PMM-300Z2" deviceLabel: SiHAS Energy Monitor manufacturer: ShinaSystem model: "PMM-300Z2" - deviceProfileName: power-meter-consumption-report-sihas + deviceProfileName: power-meter-consumption-report - id: "ShinaSystem/PMM-300Z3" deviceLabel: SiHAS Energy Monitor manufacturer: ShinaSystem model: "PMM-300Z3" - deviceProfileName: power-meter-consumption-report-sihas + deviceProfileName: power-meter-consumption-report - id: "BITUO TECHNIK/SPM01-E0" deviceLabel: Energy Monitor 1PN manufacturer: BITUO TECHNIK diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/frient-power-meter-consumption-report.yml b/drivers/SmartThings/zigbee-power-meter/profiles/frient-power-meter-consumption-report.yml deleted file mode 100644 index f65fce5d42..0000000000 --- a/drivers/SmartThings/zigbee-power-meter/profiles/frient-power-meter-consumption-report.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: frient-power-meter-consumption-report -components: -- id: main - capabilities: - - id: powerMeter - version: 1 - - id: energyMeter - version: 1 - - id: powerConsumptionReport - version: 1 - - id: firmwareUpdate - version: 1 - - id: refresh - version: 1 - categories: - - name: PowerMeasurementSensor \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-ezex.yml similarity index 65% rename from drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml rename to drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-ezex.yml index 342567add0..c14c4789c8 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-sihas.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report-ezex.yml @@ -1,4 +1,4 @@ -name: power-meter-consumption-report-sihas +name: power-meter-consumption-report-ezex components: - id: main capabilities: @@ -7,10 +7,13 @@ components: - id: energyMeter version: 1 - id: powerConsumptionReport - version: 1 + version: 1 - id: firmwareUpdate version: 1 - id: refresh - version: 1 + version: 1 categories: - name: PowerMeasurementSensor +metadata: + mnmn: SmartThingsEdge + vid: STES-1-EZEX-Zigbee_Power_Meter \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml index c616aa7f96..ae09ae9cb9 100644 --- a/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml +++ b/drivers/SmartThings/zigbee-power-meter/profiles/power-meter-consumption-report.yml @@ -7,13 +7,10 @@ components: - id: energyMeter version: 1 - id: powerConsumptionReport - version: 1 + version: 1 - id: firmwareUpdate version: 1 - id: refresh - version: 1 + version: 1 categories: - name: PowerMeasurementSensor -metadata: - mnmn: SmartThingsEdge - vid: STES-1-EZEX-Zigbee_Power_Meter \ No newline at end of file diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua index 56dd597d92..f3b8a4f1cb 100644 --- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua +++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua @@ -31,7 +31,7 @@ local constants = require "st.zigbee.constants" local mock_device = test.mock_device.build_test_zigbee_device( { - profile = t_utils.get_profile_definition("power-meter-consumption-report-sihas.yml"), + profile = t_utils.get_profile_definition("power-meter-consumption-report.yml"), zigbee_endpoints = { [1] = { id = 1, diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua index 8673e2d468..900c1dcdc1 100644 --- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua +++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua @@ -29,7 +29,7 @@ local Status = require "st.zigbee.generated.types.ZclStatus" local mock_device = test.mock_device.build_test_zigbee_device( { - profile = t_utils.get_profile_definition("power-meter-consumption-report.yml"), + profile = t_utils.get_profile_definition("power-meter-consumption-report-ezex.yml"), zigbee_endpoints = { [1] = { id = 1, diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua index 1409c8e749..07604a63a0 100644 --- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua +++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua @@ -13,7 +13,7 @@ local constants = require "st.zigbee.constants" local LAST_REPORT_TIME = "LAST_REPORT_TIME" local mock_device = test.mock_device.build_test_zigbee_device({ - profile = t_utils.get_profile_definition("frient-power-meter-consumption-report.yml"), + profile = t_utils.get_profile_definition("power-meter-consumption-report.yml"), zigbee_endpoints = { [1] = { id = 1,