From 4e0bca40bee3aadfbbb5b6db65325aeba0203d4b Mon Sep 17 00:00:00 2001 From: Ricardo Torres Guzman Date: Thu, 27 Feb 2025 21:33:03 +0000 Subject: [PATCH 1/4] Added OTA Requestor Device --- .../energy-management-app.matter | 4 + .../energy-management-app.zap | 73 ++++++++++++++----- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter index a5e5d8e1364d39..2cc182eeee6d27 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.matter +++ b/examples/energy-management-app/energy-management-common/energy-management-app.matter @@ -2577,6 +2577,7 @@ provisional cluster DeviceEnergyManagementMode = 159 { endpoint 0 { device type ma_rootdevice = 22, version 1; + device type ma_otarequestor = 18, version 1; binding cluster OtaSoftwareUpdateProvider; @@ -2762,6 +2763,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVidVerificationStatement; + handle command SignVidVerificationRequest; + handle command SignVidVerificationResponse; } server cluster GroupKeyManagement { diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.zap b/examples/energy-management-app/energy-management-common/energy-management-app.zap index d7c6303e0ac7ec..60b8537bc84d66 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.zap +++ b/examples/energy-management-app/energy-management-common/energy-management-app.zap @@ -51,13 +51,22 @@ "label": "MA-rootdevice", "name": "MA-rootdevice", "deviceTypeOrder": 0 + }, + { + "code": 18, + "profileId": 259, + "label": "MA-otarequestor", + "name": "MA-otarequestor", + "deviceTypeOrder": 1 } ], "deviceVersions": [ + 1, 1 ], "deviceIdentifiers": [ - 22 + 22, + 18 ], "deviceTypeName": "MA-rootdevice", "deviceTypeCode": 22, @@ -98,7 +107,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -114,7 +123,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -130,7 +139,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -236,7 +245,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -390,7 +399,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -406,7 +415,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -422,7 +431,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -438,7 +447,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -454,7 +463,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -470,7 +479,7 @@ "singleton": 1, "bounded": 0, "defaultValue": "", - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -486,7 +495,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -502,7 +511,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -518,7 +527,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -534,7 +543,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -550,7 +559,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -973,7 +982,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "", - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -989,7 +998,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1095,7 +1104,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "", - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1771,7 +1780,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 1, + "reportable": 0, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -2133,6 +2142,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVidVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVidVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVidVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ From 1d66f20772be10c3d266fabb9c148221ffab4ba2 Mon Sep 17 00:00:00 2001 From: Ricardo Torres Guzman Date: Thu, 27 Feb 2025 21:34:08 +0000 Subject: [PATCH 2/4] Removing Un-conformant attribute --- .../energy-management-app.matter | 1 - .../energy-management-app.zap | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter index 2cc182eeee6d27..d64c09e9aacb9c 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.matter +++ b/examples/energy-management-app/energy-management-common/energy-management-app.matter @@ -2700,7 +2700,6 @@ endpoint 0 { ram attribute lastNetworkingStatus; ram attribute lastNetworkID; ram attribute lastConnectErrorValue; - callback attribute supportedWiFiBands; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.zap b/examples/energy-management-app/energy-management-common/energy-management-app.zap index 60b8537bc84d66..69e61046a3dcaf 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.zap +++ b/examples/energy-management-app/energy-management-common/energy-management-app.zap @@ -1605,22 +1605,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "SupportedWiFiBands", - "code": 8, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, From c17bb2c89bc467ac7e892fb150c8f9b68df688ee Mon Sep 17 00:00:00 2001 From: Ricardo Torres Guzman Date: Thu, 27 Feb 2025 21:43:02 +0000 Subject: [PATCH 3/4] Update Device versions --- .../energy-management-app.matter | 6 +-- .../energy-management-app.zap | 44 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter index d64c09e9aacb9c..dcda6e0e8536f5 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.matter +++ b/examples/energy-management-app/energy-management-common/energy-management-app.matter @@ -2576,7 +2576,7 @@ provisional cluster DeviceEnergyManagementMode = 159 { } endpoint 0 { - device type ma_rootdevice = 22, version 1; + device type ma_rootdevice = 22, version 2; device type ma_otarequestor = 18, version 1; binding cluster OtaSoftwareUpdateProvider; @@ -2789,8 +2789,8 @@ endpoint 0 { endpoint 1 { device type ma_powersource = 17, version 1; device type ma_electricalsensor = 1296, version 1; - device type energy_evse = 1292, version 1; - device type device_energy_management = 1293, version 1; + device type energy_evse = 1292, version 2; + device type device_energy_management = 1293, version 2; server cluster Identify { diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.zap b/examples/energy-management-app/energy-management-common/energy-management-app.zap index 69e61046a3dcaf..2f4c8a37f22fec 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.zap +++ b/examples/energy-management-app/energy-management-common/energy-management-app.zap @@ -61,7 +61,7 @@ } ], "deviceVersions": [ - 1, + 2, 1 ], "deviceIdentifiers": [ @@ -107,7 +107,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -123,7 +123,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -139,7 +139,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -245,7 +245,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -399,7 +399,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -415,7 +415,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -431,7 +431,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -447,7 +447,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -463,7 +463,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -479,7 +479,7 @@ "singleton": 1, "bounded": 0, "defaultValue": "", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -495,7 +495,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -511,7 +511,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -527,7 +527,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -543,7 +543,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -559,7 +559,7 @@ "singleton": 1, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -982,7 +982,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -998,7 +998,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1104,7 +1104,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -1764,7 +1764,7 @@ "singleton": 0, "bounded": 0, "defaultValue": null, - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -2578,9 +2578,9 @@ } ], "deviceVersions": [ + 2, 1, - 1, - 1, + 2, 1 ], "deviceIdentifiers": [ From 6219fd885edb267d28cec56095d9974e69e82b51 Mon Sep 17 00:00:00 2001 From: Ricardo Torres Guzman Date: Thu, 27 Feb 2025 22:03:39 +0000 Subject: [PATCH 4/4] Other fixes --- .../energy-management-app.matter | 6 +-- .../energy-management-app.zap | 42 ++++++++----------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter index dcda6e0e8536f5..b9dc2353d74c43 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.matter +++ b/examples/energy-management-app/energy-management-common/energy-management-app.matter @@ -2576,7 +2576,7 @@ provisional cluster DeviceEnergyManagementMode = 159 { } endpoint 0 { - device type ma_rootdevice = 22, version 2; + device type ma_rootdevice = 22, version 3; device type ma_otarequestor = 18, version 1; binding cluster OtaSoftwareUpdateProvider; @@ -2700,6 +2700,7 @@ endpoint 0 { ram attribute lastNetworkingStatus; ram attribute lastNetworkID; ram attribute lastConnectErrorValue; + callback attribute supportedWiFiBands; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; @@ -2762,9 +2763,6 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; - handle command SetVidVerificationStatement; - handle command SignVidVerificationRequest; - handle command SignVidVerificationResponse; } server cluster GroupKeyManagement { diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.zap b/examples/energy-management-app/energy-management-common/energy-management-app.zap index 2f4c8a37f22fec..fbd062668c7894 100644 --- a/examples/energy-management-app/energy-management-common/energy-management-app.zap +++ b/examples/energy-management-app/energy-management-common/energy-management-app.zap @@ -61,7 +61,7 @@ } ], "deviceVersions": [ - 2, + 3, 1 ], "deviceIdentifiers": [ @@ -1605,6 +1605,22 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "SupportedWiFiBands", + "code": 8, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "GeneratedCommandList", "code": 65528, @@ -2126,30 +2142,6 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 - }, - { - "name": "SetVidVerificationStatement", - "code": 12, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "SignVidVerificationRequest", - "code": 13, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "SignVidVerificationResponse", - "code": 14, - "mfgCode": null, - "source": "server", - "isIncoming": 0, - "isEnabled": 1 } ], "attributes": [