From aecfee238e85a685165e5a10004ee32b19912333 Mon Sep 17 00:00:00 2001 From: shgutte <102281713+shgutte@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:58:44 +0530 Subject: [PATCH] [SL-UP] Removed the OTA update provider from the zap file of refrigerator application (#107) --- examples/refrigerator-app/silabs/BUILD.gn | 4 +- .../data_model/refrigerator-thread-app.matter | 16 +-- .../data_model/refrigerator-thread-app.zap | 134 +++--------------- .../data_model/refrigerator-wifi-app.matter | 16 +-- .../data_model/refrigerator-wifi-app.zap | 134 +++--------------- 5 files changed, 48 insertions(+), 256 deletions(-) diff --git a/examples/refrigerator-app/silabs/BUILD.gn b/examples/refrigerator-app/silabs/BUILD.gn index 27c59f70a8..d902bb9e86 100644 --- a/examples/refrigerator-app/silabs/BUILD.gn +++ b/examples/refrigerator-app/silabs/BUILD.gn @@ -18,7 +18,7 @@ import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") import("${build_root}/config/defaults.gni") -import("${efr32_sdk_build_root}/silabs_executable.gni") +import("${silabs_sdk_build_root}/silabs_executable.gni") import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/platform/device.gni") @@ -38,7 +38,7 @@ if (wifi_soc) { import("${chip_root}/third_party/silabs/SiWx917_sdk.gni") examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917" } else { - import("${efr32_sdk_build_root}/efr32_sdk.gni") + import("${silabs_sdk_build_root}/efr32_sdk.gni") examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" } diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter index 5aa4cf0929..e65d84ae7d 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter @@ -1642,6 +1642,7 @@ cluster RefrigeratorAlarm = 87 { endpoint 0 { device type ma_rootdevice = 22, version 1; + binding cluster OtaSoftwareUpdateProvider; server cluster Identify { ram attribute identifyTime default = 0x0; @@ -1717,21 +1718,6 @@ endpoint 0 { ram attribute clusterRevision default = 3; } - server cluster OtaSoftwareUpdateProvider { - callback attribute generatedCommandList; - callback attribute acceptedCommandList; - callback attribute eventList; - callback attribute attributeList; - ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; - - handle command QueryImage; - handle command QueryImageResponse; - handle command ApplyUpdateRequest; - handle command ApplyUpdateResponse; - handle command NotifyUpdateApplied; - } - server cluster OtaSoftwareUpdateRequestor { callback attribute defaultOTAProviders; ram attribute updatePossible default = true; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap index 65dae2e422..6e77e3701a 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap @@ -41,14 +41,16 @@ "code": 22, "profileId": 259, "label": "MA-rootdevice", - "name": "MA-rootdevice" + "name": "MA-rootdevice", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 22, "profileId": 259, "label": "MA-rootdevice", - "name": "MA-rootdevice" + "name": "MA-rootdevice", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -1027,7 +1029,7 @@ "code": 41, "mfgCode": null, "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", - "side": "server", + "side": "client", "enabled": 1, "commands": [ { @@ -1035,7 +1037,7 @@ "code": 0, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 }, { @@ -1043,7 +1045,7 @@ "code": 1, "mfgCode": null, "source": "server", - "isIncoming": 0, + "isIncoming": 1, "isEnabled": 1 }, { @@ -1051,7 +1053,7 @@ "code": 2, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 }, { @@ -1059,7 +1061,7 @@ "code": 3, "mfgCode": null, "source": "server", - "isIncoming": 0, + "isIncoming": 1, "isEnabled": 1 }, { @@ -1067,107 +1069,9 @@ "code": 4, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 } - ], - "attributes": [ - { - "name": "GeneratedCommandList", - "code": 65528, - "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": "AcceptedCommandList", - "code": 65529, - "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": "EventList", - "code": 65530, - "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": "AttributeList", - "code": 65531, - "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": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } ] }, { @@ -3149,14 +3053,16 @@ "code": 112, "profileId": 259, "label": "MA-refrigerator", - "name": "MA-refrigerator" + "name": "MA-refrigerator", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 112, "profileId": 259, "label": "MA-refrigerator", - "name": "MA-refrigerator" + "name": "MA-refrigerator", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -3642,14 +3548,16 @@ "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -3989,14 +3897,16 @@ "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 } ], "deviceVersions": [ diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter index d51a109ad4..19f30a3108 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter @@ -1553,6 +1553,7 @@ cluster RefrigeratorAlarm = 87 { endpoint 0 { device type ma_rootdevice = 22, version 1; + binding cluster OtaSoftwareUpdateProvider; server cluster Identify { ram attribute identifyTime default = 0x0; @@ -1628,21 +1629,6 @@ endpoint 0 { ram attribute clusterRevision default = 3; } - server cluster OtaSoftwareUpdateProvider { - callback attribute generatedCommandList; - callback attribute acceptedCommandList; - callback attribute eventList; - callback attribute attributeList; - ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; - - handle command QueryImage; - handle command QueryImageResponse; - handle command ApplyUpdateRequest; - handle command ApplyUpdateResponse; - handle command NotifyUpdateApplied; - } - server cluster OtaSoftwareUpdateRequestor { callback attribute defaultOTAProviders; ram attribute updatePossible default = true; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap index a1a4a96399..8e9c2ace35 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.zap @@ -41,14 +41,16 @@ "code": 22, "profileId": 259, "label": "MA-rootdevice", - "name": "MA-rootdevice" + "name": "MA-rootdevice", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 22, "profileId": 259, "label": "MA-rootdevice", - "name": "MA-rootdevice" + "name": "MA-rootdevice", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -1027,7 +1029,7 @@ "code": 41, "mfgCode": null, "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", - "side": "server", + "side": "client", "enabled": 1, "commands": [ { @@ -1035,7 +1037,7 @@ "code": 0, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 }, { @@ -1043,7 +1045,7 @@ "code": 1, "mfgCode": null, "source": "server", - "isIncoming": 0, + "isIncoming": 1, "isEnabled": 1 }, { @@ -1051,7 +1053,7 @@ "code": 2, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 }, { @@ -1059,7 +1061,7 @@ "code": 3, "mfgCode": null, "source": "server", - "isIncoming": 0, + "isIncoming": 1, "isEnabled": 1 }, { @@ -1067,107 +1069,9 @@ "code": 4, "mfgCode": null, "source": "client", - "isIncoming": 1, + "isIncoming": 0, "isEnabled": 1 } - ], - "attributes": [ - { - "name": "GeneratedCommandList", - "code": 65528, - "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": "AcceptedCommandList", - "code": 65529, - "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": "EventList", - "code": 65530, - "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": "AttributeList", - "code": 65531, - "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": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } ] }, { @@ -3038,14 +2942,16 @@ "code": 112, "profileId": 259, "label": "MA-refrigerator", - "name": "MA-refrigerator" + "name": "MA-refrigerator", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 112, "profileId": 259, "label": "MA-refrigerator", - "name": "MA-refrigerator" + "name": "MA-refrigerator", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -3531,14 +3437,16 @@ "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 } ], "deviceVersions": [ @@ -3878,14 +3786,16 @@ "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 }, "deviceTypes": [ { "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", - "name": "MA-temperature-controlled-cabinet" + "name": "MA-temperature-controlled-cabinet", + "deviceTypeOrder": 0 } ], "deviceVersions": [