From 3246430b58e77c009e9bc4e2ca15b04f62de9cf7 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 3 Jan 2023 13:11:18 -0500 Subject: [PATCH] Align naming in OTA clusters better with spec. (#24235) * Align naming in OTA clusters better with spec. * Update ZAP files to the new naming. * Regenerate generated files. --- .github/.wordlist.txt | 2 +- ...tter - Basic Interactions-checkpoint.ipynb | 4 +- .../repl/Matter_Basic_Interactions.ipynb | 4 +- .../all-clusters-app.matter | 16 +- .../all-clusters-common/all-clusters-app.zap | 4 +- .../all-clusters-minimal-app.matter | 16 +- .../all-clusters-minimal-app.zap | 4 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 4 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 16 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 4 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 16 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 4 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 4 +- .../rootnode_doorlock_aNKYAreMXE.matter | 16 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 4 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 16 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 4 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 16 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 4 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 16 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 4 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 16 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 4 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 16 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 4 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 16 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 4 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 16 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 4 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 16 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 4 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 16 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 4 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 16 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 4 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 16 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 4 +- .../rootnode_speaker_RpzeXdimqA.matter | 16 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 4 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 16 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 4 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 16 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 4 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 16 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 4 +- .../test_files/sample_zap_file.zap | 262 +++++++----------- .../contact-sensor-app.matter | 16 +- .../contact-sensor-app.zap | 4 +- .../commands/provider/OTAProviderDelegate.mm | 6 +- .../provider/OTASoftwareUpdateInteractive.mm | 8 +- .../light-switch-app.matter | 16 +- .../light-switch-common/light-switch-app.zap | 4 +- .../lighting-common/lighting-app.matter | 16 +- .../lighting-common/lighting-app.zap | 4 +- .../nxp/zap/lighting-on-off.matter | 16 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 4 +- examples/lock-app/lock-common/lock-app.matter | 16 +- examples/lock-app/lock-common/lock-app.zap | 4 +- .../OTAProviderExample.cpp | 6 +- .../ota-provider-app.matter | 4 +- examples/ota-requestor-app/mbed/README.md | 4 +- .../ota-requestor-app.matter | 16 +- .../ota-requestor-app.zap | 4 +- examples/pump-app/pump-common/pump-app.matter | 16 +- examples/pump-app/pump-common/pump-app.zap | 4 +- .../pump-controller-app.matter | 16 +- .../pump-controller-app.zap | 4 +- .../thermostat-common/thermostat.matter | 16 +- .../thermostat-common/thermostat.zap | 4 +- examples/tv-app/tv-common/tv-app.matter | 4 +- .../tv-casting-common/tv-casting-app.matter | 4 +- examples/window-app/common/window-app.matter | 16 +- examples/window-app/common/window-app.zap | 4 +- scripts/idl/README.md | 4 +- .../inputs/large_all_clusters_app.matter | 4 +- .../tests/inputs/large_lighting_app.matter | 4 +- .../clusters/ota-provider/ota-provider.cpp | 4 +- .../ota-requestor/DefaultOTARequestor.cpp | 10 +- .../ota-requestor/DefaultOTARequestor.h | 2 +- .../ota-requestor/OTARequestorInterface.h | 2 +- .../ota-requestor/ota-requestor-server.cpp | 8 +- .../tests/suites/OTA_SuccessfulTransfer.yaml | 2 +- .../suites/certification/Test_TC_SU_4_1.yaml | 14 +- .../zcl/data-model/chip/chip-ota.xml | 58 ++-- .../data_model/controller-clusters.matter | 14 +- .../data_model/controller-clusters.zap | 4 +- .../CHIPAttributeTLVValueDecoder.cpp | 4 +- .../java/zap-generated/CHIPCallbackTypes.h | 4 +- .../zap-generated/CHIPClustersWrite-JNI.cpp | 4 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 136 ++++----- .../java/zap-generated/CHIPReadCallbacks.cpp | 16 +- .../java/zap-generated/CHIPReadCallbacks.h | 14 +- .../chip/devicecontroller/ChipClusters.java | 80 +++--- .../chip/devicecontroller/ChipIdLookup.java | 2 +- .../devicecontroller/ClusterInfoMapping.java | 144 +++++----- .../devicecontroller/ClusterReadMapping.java | 16 +- .../python/chip/clusters/CHIPClusters.py | 12 +- .../python/chip/clusters/Objects.py | 24 +- .../CHIP/MTROTAProviderDelegateBridge.mm | 4 +- .../CHIP/templates/availability.yaml | 28 +- .../MTRAttributeTLVValueDecoder.mm | 4 +- .../CHIP/zap-generated/MTRBaseClusters.h | 26 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 52 ++-- .../CHIP/zap-generated/MTRCallbackBridge.h | 26 +- .../CHIP/zap-generated/MTRCallbackBridge.mm | 4 +- .../CHIP/zap-generated/MTRClusterConstants.h | 8 +- .../CHIP/zap-generated/MTRClusters.h | 22 +- .../CHIP/zap-generated/MTRClusters.mm | 49 ++-- .../zap-generated/MTRCommandPayloadsObjc.h | 26 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 68 ++++- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../app-common/zap-generated/callback.h | 16 +- .../zap-generated/cluster-objects.cpp | 32 +-- .../zap-generated/cluster-objects.h | 44 +-- .../app-common/zap-generated/ids/Attributes.h | 4 +- .../app-common/zap-generated/ids/Commands.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/cluster/Commands.h | 30 +- .../cluster/logging/DataModelLogger.cpp | 4 +- .../chip-tool/zap-generated/test/Commands.h | 8 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/CHIPClientCallbacks.h | 2 +- .../zap-generated/cluster/Commands.h | 84 +++--- .../zap-generated/test/Commands.h | 8 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../nxp/zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../lock-app/zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../pump-app/zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 6 +- .../zap-generated/endpoint_config.h | 4 +- 187 files changed, 1223 insertions(+), 1184 deletions(-) diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt index 2061c3a630bccb..e7f2686627524c 100644 --- a/.github/.wordlist.txt +++ b/.github/.wordlist.txt @@ -54,7 +54,7 @@ AmebaZ amebaz2 announcementReason AnnounceOTAProvider -AnnounceOtaProviderRequest +AnnounceOTAProviderRequest APIs apk AppConfig diff --git a/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb b/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb index cf2046aaebc0bd..48cac23fe3434b 100644 --- a/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb +++ b/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb @@ -1414,7 +1414,7 @@ "│ │ │ <class 'chip.clusters.Objects.Basic.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", "│ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor'>: {\n", - "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOtaProviders'>: [],\n", + "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOTAProviders'>: [],\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdatePossible'>: True,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateState'>: <OTAUpdateStateEnum.kUnknown: 0>,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'>: 0,\n", @@ -2430,7 +2430,7 @@ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Basic.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", - "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOtaProviders'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n", + "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOTAProviders'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdatePossible'\u001b[0m\u001b[1m>\u001b[0m: \u001b[3;92mTrue\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateState'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m<\u001b[0m\u001b[1;95mOTAUpdateStateEnum.kUnknown:\u001b[0m\u001b[39m \u001b[0m\u001b[1;36m0\u001b[0m\u001b[1m>\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m0\u001b[0m,\n", diff --git a/docs/guides/repl/Matter_Basic_Interactions.ipynb b/docs/guides/repl/Matter_Basic_Interactions.ipynb index 0693f197cdc8b9..12d9224ef48613 100644 --- a/docs/guides/repl/Matter_Basic_Interactions.ipynb +++ b/docs/guides/repl/Matter_Basic_Interactions.ipynb @@ -1407,7 +1407,7 @@ "│ │ │ <class 'chip.clusters.Objects.Basic.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", "│ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor'>: {\n", - "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOtaProviders'>: [],\n", + "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOTAProviders'>: [],\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdatePossible'>: True,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateState'>: <OTAUpdateStateEnum.kUnknown: 0>,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'>: 0,\n", @@ -2423,7 +2423,7 @@ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Basic.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", - "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOtaProviders'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n", + "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.DefaultOTAProviders'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdatePossible'\u001b[0m\u001b[1m>\u001b[0m: \u001b[3;92mTrue\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateState'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m<\u001b[0m\u001b[1;95mOTAUpdateStateEnum.kUnknown:\u001b[0m\u001b[39m \u001b[0m\u001b[1;36m0\u001b[0m\u001b[1m>\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m0\u001b[0m,\n", diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 975a9590fe3ff3..9b446d57e763f5 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -636,8 +636,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -718,22 +718,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -3947,7 +3947,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index d0874dec15e8e4..550c16da95fef7 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -1663,7 +1663,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1699,7 +1699,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 9d6d7c6c5f91b1..cc3887148412de 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -571,8 +571,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -653,22 +653,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -3328,7 +3328,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index a9d16f86c65d19..87189ce6654867 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1663,7 +1663,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1699,7 +1699,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index edee44e914db51..d9ef62f931e9a4 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -410,8 +410,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -503,22 +503,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1349,7 +1349,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index ab66735db5b2df..d08112b8a74d62 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index f1a81e074ef215..419c1c0ec3e50f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -421,8 +421,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -514,22 +514,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster GeneralCommissioning = 48 { @@ -1426,7 +1426,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 8634ffb89470c2..b8f4d837892f1a 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -1657,7 +1657,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1693,7 +1693,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 41e311ca6b7d98..59d852d71c8e71 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -261,8 +261,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -354,22 +354,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1087,7 +1087,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index c0b3b624458b12..8e49bac0c5fbb9 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 251154160dbcbb..29126fd5bea537 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -410,8 +410,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -503,22 +503,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1233,7 +1233,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index dfedd4ba175e21..622d97c5033235 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index c05ca3e517b27e..fa752cf474b0d2 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -261,8 +261,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -354,22 +354,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1472,7 +1472,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 0e56a1a59a4289..cfcba042044c38 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 3af0753ff72c53..ac4448c7974be4 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -410,8 +410,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -503,22 +503,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1488,7 +1488,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index dba651796102e3..4a6c20dc3678d3 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index f6e0a95174df5a..552e9cf866ad77 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -260,8 +260,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -353,22 +353,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1143,7 +1143,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 1b917cc96427bc..15bea4e9f4e799 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -1657,7 +1657,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1693,7 +1693,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index e107ec6b95b652..ad925d918a52ee 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -274,8 +274,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -367,22 +367,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1099,7 +1099,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index c04b23579cd78f..05284278d50fde 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 1d8f5c6cf3efc5..b7bdb129487b5c 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -403,8 +403,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -496,22 +496,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1341,7 +1341,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 7d2c77f7a7261e..44ce0f1b32df80 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 3e5528eccd7ecd..925927642a3256 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -274,8 +274,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -367,22 +367,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1099,7 +1099,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index a9a852b9e2cf6c..5114019f8d73f5 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index cece2d69cdba34..16f4eece366d29 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -274,8 +274,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -367,22 +367,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1103,7 +1103,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 2424113df9d07e..223b4e055cda69 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 1c2b9cdef7733c..dac4ed7db083ca 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -274,8 +274,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -367,22 +367,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1098,7 +1098,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 60d6a2983d9782..36b8f09ea009af 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 055ed781ab85e6..0e4bf29e998561 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -410,8 +410,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -503,22 +503,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1223,7 +1223,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index c0e106f8eb8281..f366046581c6ea 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 3f1a304b60bc8f..1e12e4dd9afdea 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -353,8 +353,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -446,22 +446,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1166,7 +1166,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index e1db44e7efa78e..9a251571ccd7e0 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 5dabec9429a4ba..6b42c68a693e11 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -311,8 +311,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -404,22 +404,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1124,7 +1124,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 88077564992f0a..905f811e581e9d 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 6de593cd926aff..7ea0440d3de075 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -279,8 +279,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -372,22 +372,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1108,7 +1108,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 8cdcfd01a4b75e..87acceec68559e 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index d995492c64ac75..fd85f652eef039 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -401,8 +401,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -494,22 +494,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1214,7 +1214,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 0d001f8f524993..ee674ca36239af 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index f938b655f36a59..cfe8c141485bad 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -274,8 +274,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -367,22 +367,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1098,7 +1098,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 3c52979b32b5b2..deb4316ea5b8da 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 6eb009fc5e2ef1..93b98a167a910d 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -261,8 +261,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -354,22 +354,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1236,7 +1236,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 99ebe10bf6fad3..a275cc7a7c50d4 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 1d6273f22e8784..8056b6f42a374f 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -261,8 +261,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -354,22 +354,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1216,7 +1216,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 9c2c66761f534e..613186058c068a 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1593,7 +1593,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1629,7 +1629,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap index 4ae4707493e858..983188af02fd42 100644 --- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap +++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap @@ -79,7 +79,6 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { "name": "identify time", @@ -582,7 +581,6 @@ "define": "ON_OFF_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { "name": "OnOff", @@ -625,7 +623,6 @@ "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -652,7 +649,6 @@ "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { "name": "switch type", @@ -803,10 +799,9 @@ "define": "LEVEL_CONTROL_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { - "name": "current level", + "name": "CurrentLevel", "code": 0, "mfgCode": null, "side": "server", @@ -846,7 +841,6 @@ "define": "DESCRIPTOR_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -873,10 +867,9 @@ "define": "DESCRIPTOR_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { - "name": "device list", + "name": "DeviceTypeList", "code": 0, "mfgCode": null, "side": "server", @@ -892,7 +885,7 @@ "reportableChange": 0 }, { - "name": "server list", + "name": "ServerList", "code": 1, "mfgCode": null, "side": "server", @@ -908,7 +901,7 @@ "reportableChange": 0 }, { - "name": "client list", + "name": "ClientList", "code": 2, "mfgCode": null, "side": "server", @@ -924,7 +917,7 @@ "reportableChange": 0 }, { - "name": "parts list", + "name": "PartsList", "code": 3, "mfgCode": null, "side": "server", @@ -980,7 +973,6 @@ "define": "ACCESS_CONTROL_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -1007,7 +999,6 @@ "define": "ACCESS_CONTROL_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "ACL", @@ -1143,10 +1134,9 @@ "name": "Basic Information", "code": 40, "mfgCode": null, - "define": "BASIC_CLUSTER", + "define": "BASIC_INFORMATION_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -1170,10 +1160,9 @@ "name": "Basic Information", "code": 40, "mfgCode": null, - "define": "BASIC_CLUSTER", + "define": "BASIC_INFORMATION_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "DataModelRevision", @@ -1666,7 +1655,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1700,10 +1689,9 @@ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", @@ -1822,9 +1810,7 @@ "mfgCode": null, "define": "LOCALIZATION_CONFIGURATION_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "Localization Configuration", @@ -1833,7 +1819,6 @@ "define": "LOCALIZATION_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "ActiveLocale", @@ -1907,9 +1892,7 @@ "mfgCode": null, "define": "TIME_FORMAT_LOCALIZATION_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "Time Format Localization", @@ -1918,7 +1901,6 @@ "define": "TIME_FORMAT_LOCALIZATION_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "HourFormat", @@ -2008,9 +1990,7 @@ "mfgCode": null, "define": "UNIT_LOCALIZATION_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "Unit Localization", @@ -2019,7 +1999,6 @@ "define": "UNIT_LOCALIZATION_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { "name": "TemperatureUnit", @@ -2586,7 +2565,6 @@ "define": "GENERAL_DIAGNOSTICS_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -2613,7 +2591,6 @@ "define": "GENERAL_DIAGNOSTICS_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "NetworkInterfaces", @@ -2820,7 +2797,6 @@ "define": "SOFTWARE_DIAGNOSTICS_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "ThreadMetrics", @@ -2963,7 +2939,6 @@ "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "channel", @@ -2972,7 +2947,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2986,9 +2961,9 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "RoutingRole", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3004,7 +2979,7 @@ "side": "server", "type": "char_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -3020,7 +2995,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3036,7 +3011,7 @@ "side": "server", "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3052,7 +3027,7 @@ "side": "server", "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3068,7 +3043,7 @@ "side": "server", "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3116,7 +3091,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3132,7 +3107,7 @@ "side": "server", "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3148,7 +3123,7 @@ "side": "server", "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3164,7 +3139,7 @@ "side": "server", "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3180,7 +3155,7 @@ "side": "server", "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3196,7 +3171,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3212,7 +3187,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3228,7 +3203,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3244,7 +3219,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3260,7 +3235,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3276,7 +3251,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3292,7 +3267,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3308,7 +3283,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3324,7 +3299,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3340,7 +3315,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3356,7 +3331,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3372,7 +3347,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3388,7 +3363,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3404,7 +3379,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3420,7 +3395,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3436,7 +3411,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3452,7 +3427,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3468,7 +3443,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3484,7 +3459,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3500,7 +3475,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3516,7 +3491,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3532,7 +3507,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3548,7 +3523,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3564,7 +3539,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3580,7 +3555,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3596,7 +3571,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3612,7 +3587,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3628,7 +3603,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3644,7 +3619,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3660,7 +3635,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3676,7 +3651,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3692,7 +3667,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3708,7 +3683,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3724,7 +3699,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3740,7 +3715,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3756,7 +3731,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3772,7 +3747,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3788,7 +3763,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3804,7 +3779,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3820,7 +3795,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3836,7 +3811,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3852,7 +3827,7 @@ "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3868,7 +3843,7 @@ "side": "server", "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3884,7 +3859,7 @@ "side": "server", "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3894,13 +3869,13 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3914,7 +3889,7 @@ "code": 59, "mfgCode": null, "side": "server", - "type": "array", + "type": "SecurityPolicy", "included": 1, "storageOption": "External", "singleton": 0, @@ -3926,13 +3901,13 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3946,7 +3921,7 @@ "code": 61, "mfgCode": null, "side": "server", - "type": "array", + "type": "OperationalDatasetComponents", "included": 1, "storageOption": "External", "singleton": 0, @@ -4050,7 +4025,6 @@ "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "bssid", @@ -4337,7 +4311,6 @@ "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "PHYRate", @@ -4523,9 +4496,7 @@ "mfgCode": null, "define": "SWITCH_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "Switch", @@ -4534,7 +4505,6 @@ "define": "SWITCH_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "FeatureMap", @@ -4629,14 +4599,13 @@ "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "WindowStatus", "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -4784,14 +4753,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "RemoveTrustedRootCertificate", - "code": 12, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -4940,7 +4901,7 @@ "code": 5, "mfgCode": null, "side": "server", - "type": "fabric_idx", + "type": "int8u", "included": 1, "storageOption": "External", "singleton": 0, @@ -5025,8 +4986,7 @@ "incoming": 1, "outgoing": 0 } - ], - "attributes": [] + ] }, { "name": "Group Key Management", @@ -5158,9 +5118,7 @@ "mfgCode": null, "define": "FIXED_LABEL_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "Fixed Label", @@ -5169,7 +5127,6 @@ "define": "FIXED_LABEL_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "label list", @@ -5227,9 +5184,7 @@ "mfgCode": null, "define": "USER_LABEL_CLUSTER", "side": "client", - "enabled": 0, - "commands": [], - "attributes": [] + "enabled": 0 }, { "name": "User Label", @@ -5238,7 +5193,6 @@ "define": "USER_LABEL_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "label list", @@ -5349,7 +5303,6 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "identify time", @@ -5932,7 +5885,6 @@ "define": "ON_OFF_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "OnOff", @@ -6147,10 +6099,9 @@ "define": "LEVEL_CONTROL_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { - "name": "current level", + "name": "CurrentLevel", "code": 0, "mfgCode": null, "side": "server", @@ -6166,7 +6117,7 @@ "reportableChange": 0 }, { - "name": "remaining time", + "name": "RemainingTime", "code": 1, "mfgCode": null, "side": "server", @@ -6182,7 +6133,7 @@ "reportableChange": 0 }, { - "name": "min level", + "name": "MinLevel", "code": 2, "mfgCode": null, "side": "server", @@ -6198,7 +6149,7 @@ "reportableChange": 0 }, { - "name": "max level", + "name": "MaxLevel", "code": 3, "mfgCode": null, "side": "server", @@ -6214,7 +6165,7 @@ "reportableChange": 0 }, { - "name": "current frequency", + "name": "CurrentFrequency", "code": 4, "mfgCode": null, "side": "server", @@ -6230,7 +6181,7 @@ "reportableChange": 0 }, { - "name": "min frequency", + "name": "MinFrequency", "code": 5, "mfgCode": null, "side": "server", @@ -6246,7 +6197,7 @@ "reportableChange": 0 }, { - "name": "max frequency", + "name": "MaxFrequency", "code": 6, "mfgCode": null, "side": "server", @@ -6262,11 +6213,11 @@ "reportableChange": 0 }, { - "name": "options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6278,7 +6229,7 @@ "reportableChange": 0 }, { - "name": "on off transition time", + "name": "OnOffTransitionTime", "code": 16, "mfgCode": null, "side": "server", @@ -6294,7 +6245,7 @@ "reportableChange": 0 }, { - "name": "on level", + "name": "OnLevel", "code": 17, "mfgCode": null, "side": "server", @@ -6310,7 +6261,7 @@ "reportableChange": 0 }, { - "name": "on transition time", + "name": "OnTransitionTime", "code": 18, "mfgCode": null, "side": "server", @@ -6326,7 +6277,7 @@ "reportableChange": 0 }, { - "name": "off transition time", + "name": "OffTransitionTime", "code": 19, "mfgCode": null, "side": "server", @@ -6342,7 +6293,7 @@ "reportableChange": 0 }, { - "name": "default move rate", + "name": "DefaultMoveRate", "code": 20, "mfgCode": null, "side": "server", @@ -6358,7 +6309,7 @@ "reportableChange": 0 }, { - "name": "start up current level", + "name": "StartUpCurrentLevel", "code": 16384, "mfgCode": null, "side": "server", @@ -6462,7 +6413,6 @@ "define": "DESCRIPTOR_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -6489,10 +6439,9 @@ "define": "DESCRIPTOR_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { - "name": "device list", + "name": "DeviceTypeList", "code": 0, "mfgCode": null, "side": "server", @@ -6508,7 +6457,7 @@ "reportableChange": 0 }, { - "name": "server list", + "name": "ServerList", "code": 1, "mfgCode": null, "side": "server", @@ -6524,7 +6473,7 @@ "reportableChange": 0 }, { - "name": "client list", + "name": "ClientList", "code": 2, "mfgCode": null, "side": "server", @@ -6540,7 +6489,7 @@ "reportableChange": 0 }, { - "name": "parts list", + "name": "PartsList", "code": 3, "mfgCode": null, "side": "server", @@ -6593,10 +6542,9 @@ "name": "Basic Information", "code": 40, "mfgCode": null, - "define": "BASIC_CLUSTER", + "define": "BASIC_INFORMATION_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -6620,10 +6568,9 @@ "name": "Basic Information", "code": 40, "mfgCode": null, - "define": "BASIC_CLUSTER", + "define": "BASIC_INFORMATION_CLUSTER", "side": "server", "enabled": 0, - "commands": [], "attributes": [ { "name": "DataModelRevision", @@ -7150,7 +7097,6 @@ "define": "COLOR_CONTROL_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "CurrentHue", @@ -7265,7 +7211,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -7561,7 +7507,6 @@ "define": "OCCUPANCY_SENSING_CLUSTER", "side": "client", "enabled": 0, - "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -7588,7 +7533,6 @@ "define": "OCCUPANCY_SENSING_CLUSTER", "side": "server", "enabled": 1, - "commands": [], "attributes": [ { "name": "occupancy", diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index a180508ea4a95a..11af7b5d7413a9 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -262,8 +262,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -355,22 +355,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1310,7 +1310,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 6dd09d9367ba83..2004ac1190ae6b 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -1657,7 +1657,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1693,7 +1693,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm b/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm index 68eef16bfc31fe..f77b8d668656ae 100644 --- a/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm +++ b/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm @@ -59,7 +59,7 @@ - (void)handleQueryImageForNodeID:(NSNumber * _Nonnull)nodeID return; } - auto hasCandidate = [self SelectOTACandidate:params.vendorId rPID:params.productId rSV:params.softwareVersion]; + auto hasCandidate = [self SelectOTACandidate:params.vendorID rPID:params.productID rSV:params.softwareVersion]; if (!hasCandidate) { NSLog(@"Unable to select OTA Image."); _selectedCandidate.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable); @@ -222,8 +222,8 @@ - (bool)SelectOTACandidate:(NSNumber *)requestorVendorID auto candidateSoftwareVersion = [candidate.softwareVersion unsignedLongValue]; auto candidateMinApplicableSoftwareVersion = [candidate.deviceModelData.minApplicableSoftwareVersion unsignedLongValue]; auto candidateMaxApplicableSoftwareVersion = [candidate.deviceModelData.maxApplicableSoftwareVersion unsignedLongValue]; - auto candidateVendorId = [candidate.deviceModelData.vendorId unsignedIntValue]; - auto candidateProductId = [candidate.deviceModelData.productId unsignedIntValue]; + auto candidateVendorId = [candidate.deviceModelData.vendorID unsignedIntValue]; + auto candidateProductId = [candidate.deviceModelData.productID unsignedIntValue]; if (candidateSoftwareVersionValid && (softwareVersion < candidateSoftwareVersion) && (softwareVersion >= candidateMinApplicableSoftwareVersion) diff --git a/examples/darwin-framework-tool/commands/provider/OTASoftwareUpdateInteractive.mm b/examples/darwin-framework-tool/commands/provider/OTASoftwareUpdateInteractive.mm index 2e6734bea4c38f..77ca8d51a022a5 100644 --- a/examples/darwin-framework-tool/commands/provider/OTASoftwareUpdateInteractive.mm +++ b/examples/darwin-framework-tool/commands/provider/OTASoftwareUpdateInteractive.mm @@ -88,8 +88,8 @@ static bool ParseJsonFileAndPopulateCandidates( [NSNumber numberWithUnsignedLongLong:iter.get("maxApplicableSoftwareVersion", 1000).asUInt64()]; auto otaURL = [NSString stringWithUTF8String:iter.get("otaURL", "https://test.com").asCString()]; - candidate.deviceModelData.vendorId = vendorId; - candidate.deviceModelData.productId = productId; + candidate.deviceModelData.vendorID = vendorId; + candidate.deviceModelData.productID = productId; candidate.softwareVersion = softwareVersion; candidate.softwareVersionString = softwareVersionString; candidate.deviceModelData.cDVersionNumber = cDVersionNumber; @@ -246,8 +246,8 @@ static bool ParseJsonFileAndPopulateCandidates( ChipLogDetail(chipTool, "Validating image list candidate %s: ", [candidate.deviceModelData.otaURL UTF8String]); - auto vendorId = [candidate.deviceModelData.vendorId unsignedIntValue]; - auto productId = [candidate.deviceModelData.productId unsignedIntValue]; + auto vendorId = [candidate.deviceModelData.vendorID unsignedIntValue]; + auto productId = [candidate.deviceModelData.productID unsignedIntValue]; auto softwareVersion = [candidate.softwareVersion unsignedLongValue]; auto softwareVersionString = [candidate.softwareVersionString UTF8String]; auto softwareVersionStringLength = [candidate.softwareVersionString length]; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 4603a8c0d59fd1..79c5f8211cc643 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -464,8 +464,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -557,22 +557,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1774,7 +1774,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 09d6b7f97e2568..1c7a8c37ff26b6 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -1705,7 +1705,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1741,7 +1741,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index ebd11bb19fd4c3..094eb487f73404 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -420,8 +420,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -513,22 +513,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1761,7 +1761,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 04d047e1c038c3..ff918d36e23dd4 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -1657,7 +1657,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1693,7 +1693,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 9546b1e5d589a1..462581defec908 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -409,8 +409,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -502,22 +502,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster GeneralCommissioning = 48 { @@ -1229,7 +1229,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 482bbdc4c192c9..4046ea39646d67 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1696,7 +1696,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1732,7 +1732,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index f325a5b3a7c55f..51f148979f8491 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -237,8 +237,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -330,22 +330,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1917,7 +1917,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 0d4b608be89a9f..0c2ca2e2f67797 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1405,7 +1405,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1441,7 +1441,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp index 41b5008fa5412c..e7715a9fb9357a 100644 --- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp +++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp @@ -182,8 +182,8 @@ UserConsentSubject OTAProviderExample::GetUserConsentSubject(const app::CommandH subject.fabricIndex = commandObj->GetSubjectDescriptor().fabricIndex; subject.requestorNodeId = commandObj->GetSubjectDescriptor().subject; subject.providerEndpointId = commandPath.mEndpointId; - subject.requestorVendorId = commandData.vendorId; - subject.requestorProductId = commandData.productId; + subject.requestorVendorId = commandData.vendorID; + subject.requestorProductId = commandData.productID; subject.requestorCurrentVersion = commandData.softwareVersion; subject.requestorTargetVersion = targetVersion; if (commandData.metadataForProvider.HasValue()) @@ -341,7 +341,7 @@ void OTAProviderExample::HandleQueryImage(app::CommandHandler * commandObj, cons if (!mCandidates.empty()) // If list of OTA candidates is supplied { OTAProviderExample::DeviceSoftwareVersionModel candidate; - if (SelectOTACandidate(commandData.vendorId, commandData.productId, commandData.softwareVersion, candidate)) + if (SelectOTACandidate(commandData.vendorID, commandData.productID, commandData.softwareVersion, candidate)) { VerifyOrDie(sizeof(mSoftwareVersionString) > strlen(candidate.softwareVersionString)); diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 276b7a73991ce9..2b60e25294c1a2 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -225,8 +225,8 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; diff --git a/examples/ota-requestor-app/mbed/README.md b/examples/ota-requestor-app/mbed/README.md index 6e6fd542808811..38133986fda880 100644 --- a/examples/ota-requestor-app/mbed/README.md +++ b/examples/ota-requestor-app/mbed/README.md @@ -236,10 +236,10 @@ see how to use different CHIP tools to commission and control the application within a WiFi network. After commissioning is successful, announce OTA provider's presence using -`OtaSoftwareUpdateRequestor` cluster with `AnnounceOtaProvider` command. On +`OtaSoftwareUpdateRequestor` cluster with `AnnounceOTAProvider` command. On receiving this command OTA requestor will query for OTA image: - chip-device-ctrl > zcl OtaSoftwareUpdateRequestor AnnounceOtaProvider 1234 0 0 providerNodeId=1235 vendorId=9020 announcementReason=0 + chip-device-ctrl > zcl OtaSoftwareUpdateRequestor AnnounceOTAProvider 1234 0 0 providerNodeId=1235 vendorId=9020 announcementReason=0 The OTA requestor should communicate with provider, download update image and apply it. diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 2acb30b7d4e104..4227875db77573 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -320,8 +320,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -413,22 +413,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1030,7 +1030,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index ffed1259cb4982..45c956b1da3a61 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -1571,7 +1571,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1607,7 +1607,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index f48ce24db8d6b4..814c74a749102e 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -352,8 +352,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -445,7 +445,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; @@ -455,15 +455,15 @@ server cluster OtaSoftwareUpdateRequestor = 42 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster GeneralCommissioning = 48 { @@ -1301,7 +1301,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 934fe71be55faf..afde1ae3664bf4 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1707,7 +1707,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1725,7 +1725,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index b5e2093a66a48b..ec611de1097c57 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -251,8 +251,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -344,7 +344,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; @@ -354,15 +354,15 @@ server cluster OtaSoftwareUpdateRequestor = 42 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster GeneralCommissioning = 48 { @@ -1157,7 +1157,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = true; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index dc3a4bc206d159..ba5eddb46d3f84 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1655,7 +1655,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1673,7 +1673,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index f590beead8fe05..ea5fb8d06b6a74 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -408,8 +408,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -501,22 +501,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1550,7 +1550,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index d83a9d05c6b9bc..6047acaa680278 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1623,7 +1623,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1675,7 +1675,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 904b841097fd33..d9b338e17952d4 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -330,8 +330,8 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 7bdb0680f2ae39..42d660c73d3f60 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -695,8 +695,8 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 72947fd11fad94..194d1568c2736d 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -381,8 +381,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -474,22 +474,22 @@ server cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { @@ -1637,7 +1637,7 @@ endpoint 0 { } server cluster OtaSoftwareUpdateRequestor { - callback attribute defaultOtaProviders; + callback attribute defaultOTAProviders; ram attribute updatePossible default = 1; ram attribute updateState; ram attribute updateStateProgress; diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 705e782125e759..0e0e1180486cf1 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1737,7 +1737,7 @@ "enabled": 0, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -1773,7 +1773,7 @@ "enabled": 1, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/scripts/idl/README.md b/scripts/idl/README.md index 78ee9325ddf2e4..ac3ddf517f8277 100644 --- a/scripts/idl/README.md +++ b/scripts/idl/README.md @@ -60,7 +60,7 @@ server cluster AccessControl = 31 { // request structures are regular structures that are used // as command inputs. Special tagging to make the use clear. - request struct AnnounceOtaProviderRequest {} + request struct AnnounceOTAProviderRequest {} request struct ConnectNetworkRequest { OCTET_STRING networkID = 0; INT64U breadcrumb = 1; @@ -109,7 +109,7 @@ server cluster AccessControl = 31 { // IDLs specifically do not define a structure for DefaultSuccess. // // which is considered an internal type. - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 1; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 1; // Some commands may take no inputs at all command On(): DefaultSuccess = 2; diff --git a/scripts/idl/tests/inputs/large_all_clusters_app.matter b/scripts/idl/tests/inputs/large_all_clusters_app.matter index 47810281dfd37f..32eac2423ee3da 100644 --- a/scripts/idl/tests/inputs/large_all_clusters_app.matter +++ b/scripts/idl/tests/inputs/large_all_clusters_app.matter @@ -720,7 +720,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { + request struct AnnounceOTAProviderRequest { node_id providerNodeId = 0; vendor_id vendorId = 1; OTAAnnouncementReason announcementReason = 2; @@ -728,7 +728,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { diff --git a/scripts/idl/tests/inputs/large_lighting_app.matter b/scripts/idl/tests/inputs/large_lighting_app.matter index 67b2390fe614b7..5ebc3616898784 100644 --- a/scripts/idl/tests/inputs/large_lighting_app.matter +++ b/scripts/idl/tests/inputs/large_lighting_app.matter @@ -515,7 +515,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { + request struct AnnounceOTAProviderRequest { node_id providerNodeId = 0; vendor_id vendorId = 1; OTAAnnouncementReason announcementReason = 2; @@ -523,7 +523,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; } server cluster LocalizationConfiguration = 43 { diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index da21de71399c92..c55641b7b4cbd8 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -148,8 +148,8 @@ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(app::CommandHandl const app::ConcreteCommandPath & commandPath, const Commands::QueryImage::DecodableType & commandData) { - auto & vendorId = commandData.vendorId; - auto & productId = commandData.productId; + auto & vendorId = commandData.vendorID; + auto & productId = commandData.productID; auto & hardwareVersion = commandData.hardwareVersion; auto & softwareVersion = commandData.softwareVersion; auto & protocolsSupported = commandData.protocolsSupported; diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp index e339659b716019..a8e29660aedc80 100644 --- a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp +++ b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp @@ -327,7 +327,7 @@ void DefaultOTARequestor::Reset() } void DefaultOTARequestor::HandleAnnounceOTAProvider(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const AnnounceOtaProvider::DecodableType & commandData) + const AnnounceOTAProvider::DecodableType & commandData) { VerifyOrReturn(commandObj != nullptr, ChipLogError(SoftwareUpdate, "Invalid commandObj, cannot handle AnnounceOTAProvider")); @@ -335,13 +335,13 @@ void DefaultOTARequestor::HandleAnnounceOTAProvider(app::CommandHandler * comman ChipLogProgress(SoftwareUpdate, "OTA Requestor received AnnounceOTAProvider"); - ProviderLocationType providerLocation = { .providerNodeID = commandData.providerNodeId, + ProviderLocationType providerLocation = { .providerNodeID = commandData.providerNodeID, .endpoint = commandData.endpoint, .fabricIndex = commandObj->GetAccessingFabricIndex() }; ChipLogDetail(SoftwareUpdate, " FabricIndex: %u", providerLocation.fabricIndex); ChipLogDetail(SoftwareUpdate, " ProviderNodeID: 0x" ChipLogFormatX64, ChipLogValueX64(providerLocation.providerNodeID)); - ChipLogDetail(SoftwareUpdate, " VendorID: 0x%x", commandData.vendorId); + ChipLogDetail(SoftwareUpdate, " VendorID: 0x%x", commandData.vendorID); ChipLogDetail(SoftwareUpdate, " AnnouncementReason: %u", to_underlying(announcementReason)); if (commandData.metadataForNode.HasValue()) { @@ -737,9 +737,9 @@ CHIP_ERROR DefaultOTARequestor::SendQueryImageRequest(Messaging::ExchangeManager uint16_t vendorId; ReturnErrorOnFailure(DeviceLayer::GetDeviceInstanceInfoProvider()->GetVendorId(vendorId)); - args.vendorId = static_cast(vendorId); + args.vendorID = static_cast(vendorId); - ReturnErrorOnFailure(DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(args.productId)); + ReturnErrorOnFailure(DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(args.productID)); ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(args.softwareVersion)); diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.h b/src/app/clusters/ota-requestor/DefaultOTARequestor.h index 938f2be59f671a..32de9772743491 100644 --- a/src/app/clusters/ota-requestor/DefaultOTARequestor.h +++ b/src/app/clusters/ota-requestor/DefaultOTARequestor.h @@ -44,7 +44,7 @@ class DefaultOTARequestor : public OTARequestorInterface, public BDXDownloader:: void HandleAnnounceOTAProvider( app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::DecodableType & commandData) override; + const app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::DecodableType & commandData) override; // Application API to send the QueryImage command and start the image update process with the next available Provider CHIP_ERROR TriggerImmediateQuery(FabricIndex fabricIndex) override; diff --git a/src/app/clusters/ota-requestor/OTARequestorInterface.h b/src/app/clusters/ota-requestor/OTARequestorInterface.h index bd09f833971cc0..d81b67424f0b60 100644 --- a/src/app/clusters/ota-requestor/OTARequestorInterface.h +++ b/src/app/clusters/ota-requestor/OTARequestorInterface.h @@ -154,7 +154,7 @@ class OTARequestorInterface */ virtual void HandleAnnounceOTAProvider( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::DecodableType & commandData) = 0; + const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::DecodableType & commandData) = 0; // Destructor virtual ~OTARequestorInterface() = default; diff --git a/src/app/clusters/ota-requestor/ota-requestor-server.cpp b/src/app/clusters/ota-requestor/ota-requestor-server.cpp index 06adf80e4de07f..b5611b7d57c70f 100644 --- a/src/app/clusters/ota-requestor/ota-requestor-server.cpp +++ b/src/app/clusters/ota-requestor/ota-requestor-server.cpp @@ -62,7 +62,7 @@ CHIP_ERROR OtaSoftwareUpdateRequestorAttrAccess::Read(const ConcreteReadAttribut { switch (aPath.mAttributeId) { - case Attributes::DefaultOtaProviders::Id: + case Attributes::DefaultOTAProviders::Id: return ReadDefaultOtaProviders(aEncoder); default: break; @@ -75,7 +75,7 @@ CHIP_ERROR OtaSoftwareUpdateRequestorAttrAccess::Write(const ConcreteDataAttribu { switch (aPath.mAttributeId) { - case Attributes::DefaultOtaProviders::Id: { + case Attributes::DefaultOTAProviders::Id: { return WriteDefaultOtaProviders(aPath, aDecoder); } default: @@ -258,9 +258,9 @@ void OtaRequestorServerOnDownloadError(uint32_t softwareVersion, uint64_t bytesD // ----------------------------------------------------------------------------- // Callbacks implementation -bool emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback( +bool emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::DecodableType & commandData) + const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::DecodableType & commandData) { auto & metadataForNode = commandData.metadataForNode; diff --git a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml index 4e186d4fd5b815..ed31f4b232c93d 100644 --- a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml +++ b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml @@ -144,7 +144,7 @@ tests: - label: "Send an announce OTA provider command to the requestor" cluster: "OTA Software Update Requestor" - command: "AnnounceOtaProvider" + command: "AnnounceOTAProvider" arguments: values: - name: "providerNodeId" diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml index b3d5cf344862ad..d1fc484a21ec0b 100644 --- a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml @@ -44,7 +44,7 @@ tests: verify on chip-tool logs: - [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277342848] [26860:35431852] CHIP: [TOO] [1]: { [1651277342848] [26860:35431852] CHIP: [TOO] ProviderNodeID: 1 [1651277342848] [26860:35431852] CHIP: [TOO] Endpoint: 0 @@ -72,7 +72,7 @@ tests: verify on chip-tool logs: - [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277342848] [26860:35431852] CHIP: [TOO] [1]: { [1651277342848] [26860:35431852] CHIP: [TOO] ProviderNodeID: 1 [1651277342848] [26860:35431852] CHIP: [TOO] Endpoint: 0 @@ -83,7 +83,7 @@ tests: verify on chip-tool logs: - [1651277543492] [26864:35434761] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277543492] [26864:35434761] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277543492] [26864:35434761] CHIP: [TOO] [1]: { [1651277543492] [26864:35434761] CHIP: [TOO] ProviderNodeID: 5 [1651277543492] [26864:35434761] CHIP: [TOO] Endpoint: 0 @@ -108,7 +108,7 @@ tests: verify on chip-tool logs: - [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277342848] [26860:35431852] CHIP: [TOO] [1]: { [1651277342848] [26860:35431852] CHIP: [TOO] ProviderNodeID: 10 [1651277342848] [26860:35431852] CHIP: [TOO] Endpoint: 0 @@ -119,7 +119,7 @@ tests: verify on chip-tool logs: - [1651277543492] [26864:35434761] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277543492] [26864:35434761] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277543492] [26864:35434761] CHIP: [TOO] [1]: { [1651277543492] [26864:35434761] CHIP: [TOO] ProviderNodeID: 5 [1651277543492] [26864:35434761] CHIP: [TOO] Endpoint: 0 @@ -144,7 +144,7 @@ tests: verify on chip-tool logs: - [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOtaProviders: 1 entries + [1651277342848] [26860:35431852] CHIP: [TOO] DefaultOTAProviders: 1 entries [1651277342848] [26860:35431852] CHIP: [TOO] [1]: { [1651277342848] [26860:35431852] CHIP: [TOO] ProviderNodeID: 10 [1651277342848] [26860:35431852] CHIP: [TOO] Endpoint: 0 @@ -155,7 +155,7 @@ tests: verify on chip-tool logs: - [1651280268033] [27804:35481732] CHIP: [TOO] DefaultOtaProviders: 0 entries + [1651280268033] [27804:35481732] CHIP: [TOO] DefaultOTAProviders: 0 entries disabled: true - label: diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 9cdf878619eab0..f14d6df8f6940f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -46,40 +46,40 @@ limitations under the License. true Determine availability of a new Software Image - - - - - - - - + + + + + + + + Response to QueryImage command - - - - - - - - + + + + + + + + Determine next action to take for a downloaded Software Image - - + + Reponse to ApplyUpdateRequest command - - + + Notify OTA Provider that an update was applied - - + + @@ -121,17 +121,17 @@ limitations under the License. OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER true true - DefaultOtaProviders + DefaultOTAProviders UpdatePossible UpdateState UpdateStateProgress - + Announce the presence of an OTA Provider - - - - - + + + + + This event SHALL be generated when a change of the UpdateState attribute occurs due to an OTA Requestor moving through the states necessary to query for updates. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index dc56fe00eb51f5..57579f0d2bbf99 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -752,8 +752,8 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly attribute int16u clusterRevision = 65533; request struct QueryImageRequest { - vendor_id vendorId = 0; - INT16U productId = 1; + vendor_id vendorID = 0; + INT16U productID = 1; INT32U softwareVersion = 2; OTADownloadProtocol protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; @@ -845,7 +845,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 { nullable INT64S platformCode = 3; } - attribute ProviderLocation defaultOtaProviders[] = 0; + attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; readonly attribute OTAUpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; @@ -853,15 +853,15 @@ client cluster OtaSoftwareUpdateRequestor = 42 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct AnnounceOtaProviderRequest { - node_id providerNodeId = 0; - vendor_id vendorId = 1; + request struct AnnounceOTAProviderRequest { + node_id providerNodeID = 0; + vendor_id vendorID = 1; OTAAnnouncementReason announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } - command AnnounceOtaProvider(AnnounceOtaProviderRequest): DefaultSuccess = 0; + command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0; } client cluster LocalizationConfiguration = 43 { diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index ae5582ba161bfa..2f2bfda6bfb730 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -3191,7 +3191,7 @@ "enabled": 1, "commands": [ { - "name": "AnnounceOtaProvider", + "name": "AnnounceOTAProvider", "code": 0, "mfgCode": null, "source": "client", @@ -3243,7 +3243,7 @@ "enabled": 0, "attributes": [ { - "name": "DefaultOtaProviders", + "name": "DefaultOTAProviders", "code": 0, "mfgCode": null, "side": "server", diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index b497ca97384004..aae0878ab2d6a5 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -2907,8 +2907,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR using namespace app::Clusters::OtaSoftwareUpdateRequestor; switch (aPath.mAttributeId) { - case Attributes::DefaultOtaProviders::Id: { - using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo; + case Attributes::DefaultOTAProviders::Id: { + using TypeInfo = Attributes::DefaultOTAProviders::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 660ddda61e66a2..665312f6af6a13 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -316,8 +316,8 @@ typedef void (*CHIPOtaSoftwareUpdateProviderClusterFeatureMapAttributeCallbackTy typedef void (*CHIPOtaSoftwareUpdateProviderClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::OtaSoftwareUpdateProvider::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallbackType)( - void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo::DecodableType &); +typedef void (*CHIPOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallbackType)( + void *, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo::DecodableType &); typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdatePossibleAttributeCallbackType)( void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::TypeInfo::DecodableArgType); typedef void (*CHIPOtaSoftwareUpdateRequestorClusterUpdateStateAttributeCallbackType)( diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 265a5323c3877a..1b78fa5638cf10 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -1390,12 +1390,12 @@ JNI_METHOD(void, BasicInformationCluster, writeLocalConfigDisabledAttribute) onFailure.release(); } -JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttribute) +JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOTAProvidersAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo; + using TypeInfo = chip::app::Clusters::OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 86fbdfe3f8564b..9d3344adab4134 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -946,115 +946,115 @@ void CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject delayedActionTime; + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject DelayedActionTime; if (!dataResponse.delayedActionTime.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, delayedActionTime); + chip::JniReferences::GetInstance().CreateOptional(nullptr, DelayedActionTime); } else { - jobject delayedActionTimeInsideOptional; - std::string delayedActionTimeInsideOptionalClassName = "java/lang/Long"; - std::string delayedActionTimeInsideOptionalCtorSignature = "(J)V"; + jobject DelayedActionTimeInsideOptional; + std::string DelayedActionTimeInsideOptionalClassName = "java/lang/Long"; + std::string DelayedActionTimeInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - delayedActionTimeInsideOptionalClassName.c_str(), delayedActionTimeInsideOptionalCtorSignature.c_str(), - dataResponse.delayedActionTime.Value(), delayedActionTimeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(delayedActionTimeInsideOptional, delayedActionTime); + DelayedActionTimeInsideOptionalClassName.c_str(), DelayedActionTimeInsideOptionalCtorSignature.c_str(), + dataResponse.delayedActionTime.Value(), DelayedActionTimeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(DelayedActionTimeInsideOptional, DelayedActionTime); } - jobject imageURI; + jobject ImageURI; if (!dataResponse.imageURI.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, imageURI); + chip::JniReferences::GetInstance().CreateOptional(nullptr, ImageURI); } else { - jobject imageURIInsideOptional; - imageURIInsideOptional = + jobject ImageURIInsideOptional; + ImageURIInsideOptional = env->NewStringUTF(std::string(dataResponse.imageURI.Value().data(), dataResponse.imageURI.Value().size()).c_str()); - chip::JniReferences::GetInstance().CreateOptional(imageURIInsideOptional, imageURI); + chip::JniReferences::GetInstance().CreateOptional(ImageURIInsideOptional, ImageURI); } - jobject softwareVersion; + jobject SoftwareVersion; if (!dataResponse.softwareVersion.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersion); + chip::JniReferences::GetInstance().CreateOptional(nullptr, SoftwareVersion); } else { - jobject softwareVersionInsideOptional; - std::string softwareVersionInsideOptionalClassName = "java/lang/Long"; - std::string softwareVersionInsideOptionalCtorSignature = "(J)V"; + jobject SoftwareVersionInsideOptional; + std::string SoftwareVersionInsideOptionalClassName = "java/lang/Long"; + std::string SoftwareVersionInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - softwareVersionInsideOptionalClassName.c_str(), softwareVersionInsideOptionalCtorSignature.c_str(), - dataResponse.softwareVersion.Value(), softwareVersionInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(softwareVersionInsideOptional, softwareVersion); + SoftwareVersionInsideOptionalClassName.c_str(), SoftwareVersionInsideOptionalCtorSignature.c_str(), + dataResponse.softwareVersion.Value(), SoftwareVersionInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(SoftwareVersionInsideOptional, SoftwareVersion); } - jobject softwareVersionString; + jobject SoftwareVersionString; if (!dataResponse.softwareVersionString.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, softwareVersionString); + chip::JniReferences::GetInstance().CreateOptional(nullptr, SoftwareVersionString); } else { - jobject softwareVersionStringInsideOptional; - softwareVersionStringInsideOptional = env->NewStringUTF( + jobject SoftwareVersionStringInsideOptional; + SoftwareVersionStringInsideOptional = env->NewStringUTF( std::string(dataResponse.softwareVersionString.Value().data(), dataResponse.softwareVersionString.Value().size()) .c_str()); - chip::JniReferences::GetInstance().CreateOptional(softwareVersionStringInsideOptional, softwareVersionString); + chip::JniReferences::GetInstance().CreateOptional(SoftwareVersionStringInsideOptional, SoftwareVersionString); } - jobject updateToken; + jobject UpdateToken; if (!dataResponse.updateToken.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, updateToken); + chip::JniReferences::GetInstance().CreateOptional(nullptr, UpdateToken); } else { - jobject updateTokenInsideOptional; - jbyteArray updateTokenInsideOptionalByteArray = + jobject UpdateTokenInsideOptional; + jbyteArray UpdateTokenInsideOptionalByteArray = env->NewByteArray(static_cast(dataResponse.updateToken.Value().size())); - env->SetByteArrayRegion(updateTokenInsideOptionalByteArray, 0, static_cast(dataResponse.updateToken.Value().size()), + env->SetByteArrayRegion(UpdateTokenInsideOptionalByteArray, 0, static_cast(dataResponse.updateToken.Value().size()), reinterpret_cast(dataResponse.updateToken.Value().data())); - updateTokenInsideOptional = updateTokenInsideOptionalByteArray; - chip::JniReferences::GetInstance().CreateOptional(updateTokenInsideOptional, updateToken); + UpdateTokenInsideOptional = UpdateTokenInsideOptionalByteArray; + chip::JniReferences::GetInstance().CreateOptional(UpdateTokenInsideOptional, UpdateToken); } - jobject userConsentNeeded; + jobject UserConsentNeeded; if (!dataResponse.userConsentNeeded.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, userConsentNeeded); + chip::JniReferences::GetInstance().CreateOptional(nullptr, UserConsentNeeded); } else { - jobject userConsentNeededInsideOptional; - std::string userConsentNeededInsideOptionalClassName = "java/lang/Boolean"; - std::string userConsentNeededInsideOptionalCtorSignature = "(Z)V"; + jobject UserConsentNeededInsideOptional; + std::string UserConsentNeededInsideOptionalClassName = "java/lang/Boolean"; + std::string UserConsentNeededInsideOptionalCtorSignature = "(Z)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - userConsentNeededInsideOptionalClassName.c_str(), userConsentNeededInsideOptionalCtorSignature.c_str(), - dataResponse.userConsentNeeded.Value(), userConsentNeededInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(userConsentNeededInsideOptional, userConsentNeeded); + UserConsentNeededInsideOptionalClassName.c_str(), UserConsentNeededInsideOptionalCtorSignature.c_str(), + dataResponse.userConsentNeeded.Value(), UserConsentNeededInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(UserConsentNeededInsideOptional, UserConsentNeeded); } - jobject metadataForRequestor; + jobject MetadataForRequestor; if (!dataResponse.metadataForRequestor.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, metadataForRequestor); + chip::JniReferences::GetInstance().CreateOptional(nullptr, MetadataForRequestor); } else { - jobject metadataForRequestorInsideOptional; - jbyteArray metadataForRequestorInsideOptionalByteArray = + jobject MetadataForRequestorInsideOptional; + jbyteArray MetadataForRequestorInsideOptionalByteArray = env->NewByteArray(static_cast(dataResponse.metadataForRequestor.Value().size())); - env->SetByteArrayRegion(metadataForRequestorInsideOptionalByteArray, 0, + env->SetByteArrayRegion(MetadataForRequestorInsideOptionalByteArray, 0, static_cast(dataResponse.metadataForRequestor.Value().size()), reinterpret_cast(dataResponse.metadataForRequestor.Value().data())); - metadataForRequestorInsideOptional = metadataForRequestorInsideOptionalByteArray; - chip::JniReferences::GetInstance().CreateOptional(metadataForRequestorInsideOptional, metadataForRequestor); + MetadataForRequestorInsideOptional = MetadataForRequestorInsideOptionalByteArray; + chip::JniReferences::GetInstance().CreateOptional(MetadataForRequestorInsideOptional, MetadataForRequestor); } - env->CallVoidMethod(javaCallbackRef, javaMethod, status, delayedActionTime, imageURI, softwareVersion, softwareVersionString, - updateToken, userConsentNeeded, metadataForRequestor); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, DelayedActionTime, ImageURI, SoftwareVersion, SoftwareVersionString, + UpdateToken, UserConsentNeeded, MetadataForRequestor); } CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback( jobject javaCallback) : @@ -1111,19 +1111,19 @@ void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CallbackFn &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject action; - std::string actionClassName = "java/lang/Integer"; - std::string actionCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(actionClassName.c_str(), actionCtorSignature.c_str(), - static_cast(dataResponse.action), action); - jobject delayedActionTime; - std::string delayedActionTimeClassName = "java/lang/Long"; - std::string delayedActionTimeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(delayedActionTimeClassName.c_str(), - delayedActionTimeCtorSignature.c_str(), - dataResponse.delayedActionTime, delayedActionTime); - - env->CallVoidMethod(javaCallbackRef, javaMethod, action, delayedActionTime); + jobject Action; + std::string ActionClassName = "java/lang/Integer"; + std::string ActionCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(ActionClassName.c_str(), ActionCtorSignature.c_str(), + static_cast(dataResponse.action), Action); + jobject DelayedActionTime; + std::string DelayedActionTimeClassName = "java/lang/Long"; + std::string DelayedActionTimeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(DelayedActionTimeClassName.c_str(), + DelayedActionTimeCtorSignature.c_str(), + dataResponse.delayedActionTime, DelayedActionTime); + + env->CallVoidMethod(javaCallbackRef, javaMethod, Action, DelayedActionTime); } CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissioningClusterArmFailSafeResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 4e87497189d35b..70cff6f9eba4a4 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -4847,9 +4847,9 @@ void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback:: - CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback:: + CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -4866,8 +4866,8 @@ CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback:: } } -CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback:: - ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback() +CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback:: + ~CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -4878,7 +4878,7 @@ CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::CallbackFn( +void CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & list) @@ -4890,8 +4890,8 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index aa4dc9c77396ae..202396b6e5e053 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -2049,20 +2049,20 @@ class CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback bool keepAlive; }; -class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback - : public chip::Callback::Callback +class CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback + : public chip::Callback::Callback { public: - CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback(); + ~CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback(); - static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback * callback) + static void maybeDestroy(CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -2072,7 +2072,7 @@ class CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index c09468ef388e16..51d696f1b15781 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -4065,8 +4065,8 @@ public OtaSoftwareUpdateProviderCluster(long devicePtr, int endpointId) { public void queryImage( QueryImageResponseCallback callback, - Integer vendorId, - Integer productId, + Integer vendorID, + Integer productID, Long softwareVersion, ArrayList protocolsSupported, Optional hardwareVersion, @@ -4076,8 +4076,8 @@ public void queryImage( queryImage( chipClusterPtr, callback, - vendorId, - productId, + vendorID, + productID, softwareVersion, protocolsSupported, hardwareVersion, @@ -4089,8 +4089,8 @@ public void queryImage( public void queryImage( QueryImageResponseCallback callback, - Integer vendorId, - Integer productId, + Integer vendorID, + Integer productID, Long softwareVersion, ArrayList protocolsSupported, Optional hardwareVersion, @@ -4101,8 +4101,8 @@ public void queryImage( queryImage( chipClusterPtr, callback, - vendorId, - productId, + vendorID, + productID, softwareVersion, protocolsSupported, hardwareVersion, @@ -4142,8 +4142,8 @@ public void notifyUpdateApplied( private native void queryImage( long chipClusterPtr, QueryImageResponseCallback Callback, - Integer vendorId, - Integer productId, + Integer vendorID, + Integer productID, Long softwareVersion, ArrayList protocolsSupported, Optional hardwareVersion, @@ -4253,54 +4253,54 @@ public OtaSoftwareUpdateRequestorCluster(long devicePtr, int endpointId) { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void announceOtaProvider( + public void announceOTAProvider( DefaultClusterCallback callback, - Long providerNodeId, - Integer vendorId, + Long providerNodeID, + Integer vendorID, Integer announcementReason, Optional metadataForNode, Integer endpoint) { - announceOtaProvider( + announceOTAProvider( chipClusterPtr, callback, - providerNodeId, - vendorId, + providerNodeID, + vendorID, announcementReason, metadataForNode, endpoint, null); } - public void announceOtaProvider( + public void announceOTAProvider( DefaultClusterCallback callback, - Long providerNodeId, - Integer vendorId, + Long providerNodeID, + Integer vendorID, Integer announcementReason, Optional metadataForNode, Integer endpoint, int timedInvokeTimeoutMs) { - announceOtaProvider( + announceOTAProvider( chipClusterPtr, callback, - providerNodeId, - vendorId, + providerNodeID, + vendorID, announcementReason, metadataForNode, endpoint, timedInvokeTimeoutMs); } - private native void announceOtaProvider( + private native void announceOTAProvider( long chipClusterPtr, DefaultClusterCallback Callback, - Long providerNodeId, - Integer vendorId, + Long providerNodeID, + Integer vendorID, Integer announcementReason, Optional metadataForNode, Integer endpoint, @Nullable Integer timedInvokeTimeoutMs); - public interface DefaultOtaProvidersAttributeCallback { + public interface DefaultOTAProvidersAttributeCallback { void onSuccess(List valueList); void onError(Exception ex); @@ -4324,26 +4324,26 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished() {} } - public void readDefaultOtaProvidersAttribute(DefaultOtaProvidersAttributeCallback callback) { - readDefaultOtaProvidersAttribute(chipClusterPtr, callback); + public void readDefaultOTAProvidersAttribute(DefaultOTAProvidersAttributeCallback callback) { + readDefaultOTAProvidersAttribute(chipClusterPtr, callback); } - public void writeDefaultOtaProvidersAttribute( + public void writeDefaultOTAProvidersAttribute( DefaultClusterCallback callback, ArrayList value) { - writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, null); + writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, null); } - public void writeDefaultOtaProvidersAttribute( + public void writeDefaultOTAProvidersAttribute( DefaultClusterCallback callback, ArrayList value, int timedWriteTimeoutMs) { - writeDefaultOtaProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); + writeDefaultOTAProvidersAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); } - public void subscribeDefaultOtaProvidersAttribute( - DefaultOtaProvidersAttributeCallback callback, int minInterval, int maxInterval) { - subscribeDefaultOtaProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval); + public void subscribeDefaultOTAProvidersAttribute( + DefaultOTAProvidersAttributeCallback callback, int minInterval, int maxInterval) { + subscribeDefaultOTAProvidersAttribute(chipClusterPtr, callback, minInterval, maxInterval); } public void readUpdatePossibleAttribute(BooleanAttributeCallback callback) { @@ -4400,18 +4400,18 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDefaultOtaProvidersAttribute( - long chipClusterPtr, DefaultOtaProvidersAttributeCallback callback); + private native void readDefaultOTAProvidersAttribute( + long chipClusterPtr, DefaultOTAProvidersAttributeCallback callback); - private native void writeDefaultOtaProvidersAttribute( + private native void writeDefaultOTAProvidersAttribute( long chipClusterPtr, DefaultClusterCallback callback, ArrayList value, @Nullable Integer timedWriteTimeoutMs); - private native void subscribeDefaultOtaProvidersAttribute( + private native void subscribeDefaultOTAProvidersAttribute( long chipClusterPtr, - DefaultOtaProvidersAttributeCallback callback, + DefaultOTAProvidersAttributeCallback callback, int minInterval, int maxInterval); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 8538488775242f..0bcad38c702c69 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -653,7 +653,7 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 42L) { if (attributeId == 0L) { - return "DefaultOtaProviders"; + return "DefaultOTAProviders"; } if (attributeId == 1L) { return "UpdatePossible"; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index d1328469f17931..b44dafacce0f17 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -1607,38 +1607,38 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer status, - Optional delayedActionTime, - Optional imageURI, - Optional softwareVersion, - Optional softwareVersionString, - Optional updateToken, - Optional userConsentNeeded, - Optional metadataForRequestor) { + Integer Status, + Optional DelayedActionTime, + Optional ImageURI, + Optional SoftwareVersion, + Optional SoftwareVersionString, + Optional UpdateToken, + Optional UserConsentNeeded, + Optional MetadataForRequestor) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo delayedActionTimeResponseValue = - new CommandResponseInfo("delayedActionTime", "Optional"); - responseValues.put(delayedActionTimeResponseValue, delayedActionTime); - CommandResponseInfo imageURIResponseValue = - new CommandResponseInfo("imageURI", "Optional"); - responseValues.put(imageURIResponseValue, imageURI); - CommandResponseInfo softwareVersionResponseValue = - new CommandResponseInfo("softwareVersion", "Optional"); - responseValues.put(softwareVersionResponseValue, softwareVersion); - CommandResponseInfo softwareVersionStringResponseValue = - new CommandResponseInfo("softwareVersionString", "Optional"); - responseValues.put(softwareVersionStringResponseValue, softwareVersionString); - CommandResponseInfo updateTokenResponseValue = - new CommandResponseInfo("updateToken", "Optional"); - responseValues.put(updateTokenResponseValue, updateToken); - CommandResponseInfo userConsentNeededResponseValue = - new CommandResponseInfo("userConsentNeeded", "Optional"); - responseValues.put(userConsentNeededResponseValue, userConsentNeeded); - CommandResponseInfo metadataForRequestorResponseValue = - new CommandResponseInfo("metadataForRequestor", "Optional"); - responseValues.put(metadataForRequestorResponseValue, metadataForRequestor); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo DelayedActionTimeResponseValue = + new CommandResponseInfo("DelayedActionTime", "Optional"); + responseValues.put(DelayedActionTimeResponseValue, DelayedActionTime); + CommandResponseInfo ImageURIResponseValue = + new CommandResponseInfo("ImageURI", "Optional"); + responseValues.put(ImageURIResponseValue, ImageURI); + CommandResponseInfo SoftwareVersionResponseValue = + new CommandResponseInfo("SoftwareVersion", "Optional"); + responseValues.put(SoftwareVersionResponseValue, SoftwareVersion); + CommandResponseInfo SoftwareVersionStringResponseValue = + new CommandResponseInfo("SoftwareVersionString", "Optional"); + responseValues.put(SoftwareVersionStringResponseValue, SoftwareVersionString); + CommandResponseInfo UpdateTokenResponseValue = + new CommandResponseInfo("UpdateToken", "Optional"); + responseValues.put(UpdateTokenResponseValue, UpdateToken); + CommandResponseInfo UserConsentNeededResponseValue = + new CommandResponseInfo("UserConsentNeeded", "Optional"); + responseValues.put(UserConsentNeededResponseValue, UserConsentNeeded); + CommandResponseInfo MetadataForRequestorResponseValue = + new CommandResponseInfo("MetadataForRequestor", "Optional"); + responseValues.put(MetadataForRequestorResponseValue, MetadataForRequestor); callback.onSuccess(responseValues); } @@ -1659,13 +1659,13 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer action, Long delayedActionTime) { + public void onSuccess(Integer Action, Long DelayedActionTime) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo actionResponseValue = new CommandResponseInfo("action", "Integer"); - responseValues.put(actionResponseValue, action); - CommandResponseInfo delayedActionTimeResponseValue = - new CommandResponseInfo("delayedActionTime", "Long"); - responseValues.put(delayedActionTimeResponseValue, delayedActionTime); + CommandResponseInfo ActionResponseValue = new CommandResponseInfo("Action", "Integer"); + responseValues.put(ActionResponseValue, Action); + CommandResponseInfo DelayedActionTimeResponseValue = + new CommandResponseInfo("DelayedActionTime", "Long"); + responseValues.put(DelayedActionTimeResponseValue, DelayedActionTime); callback.onSuccess(responseValues); } @@ -1699,9 +1699,9 @@ public void onError(Exception ex) { } } - public static class DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback + public static class DelegatedOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster - .DefaultOtaProvidersAttributeCallback, + .DefaultOTAProvidersAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8605,15 +8605,15 @@ public Map> getCommandMap() { new LinkedHashMap<>(); Map otaSoftwareUpdateProviderqueryImageCommandParams = new LinkedHashMap(); - CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo = - new CommandParameterInfo("vendorId", Integer.class, Integer.class); + CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo = + new CommandParameterInfo("vendorID", Integer.class, Integer.class); otaSoftwareUpdateProviderqueryImageCommandParams.put( - "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo); + "vendorID", otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo); - CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo = - new CommandParameterInfo("productId", Integer.class, Integer.class); + CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo = + new CommandParameterInfo("productID", Integer.class, Integer.class); otaSoftwareUpdateProviderqueryImageCommandParams.put( - "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo); + "productID", otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo); CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo = new CommandParameterInfo("softwareVersion", Long.class, Long.class); @@ -8657,8 +8657,8 @@ public Map> getCommandMap() { .queryImage( (ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback) callback, - (Integer) commandArguments.get("vendorId"), - (Integer) commandArguments.get("productId"), + (Integer) commandArguments.get("vendorID"), + (Integer) commandArguments.get("productID"), (Long) commandArguments.get("softwareVersion"), (ArrayList) commandArguments.get("protocolsSupported"), (Optional) commandArguments.get("hardwareVersion"), @@ -8728,55 +8728,55 @@ public Map> getCommandMap() { commandMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInteractionInfoMap); Map otaSoftwareUpdateRequestorClusterInteractionInfoMap = new LinkedHashMap<>(); - Map otaSoftwareUpdateRequestorannounceOtaProviderCommandParams = + Map otaSoftwareUpdateRequestorannounceOTAProviderCommandParams = new LinkedHashMap(); CommandParameterInfo - otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo = - new CommandParameterInfo("providerNodeId", Long.class, Long.class); - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put( - "providerNodeId", - otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo); + otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo = + new CommandParameterInfo("providerNodeID", Long.class, Long.class); + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put( + "providerNodeID", + otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo); - CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo = - new CommandParameterInfo("vendorId", Integer.class, Integer.class); - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put( - "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo); + CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo = + new CommandParameterInfo("vendorID", Integer.class, Integer.class); + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put( + "vendorID", otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo); CommandParameterInfo - otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo = + otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo = new CommandParameterInfo("announcementReason", Integer.class, Integer.class); - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put( + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put( "announcementReason", - otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo); + otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo); CommandParameterInfo - otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo = + otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo = new CommandParameterInfo("metadataForNode", Optional.class, byte[].class); - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put( + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put( "metadataForNode", - otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo); + otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo); - CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo = + CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo = new CommandParameterInfo("endpoint", Integer.class, Integer.class); - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put( - "endpoint", otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo); + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put( + "endpoint", otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo); - InteractionInfo otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo = + InteractionInfo otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster) - .announceOtaProvider( + .announceOTAProvider( (DefaultClusterCallback) callback, - (Long) commandArguments.get("providerNodeId"), - (Integer) commandArguments.get("vendorId"), + (Long) commandArguments.get("providerNodeID"), + (Integer) commandArguments.get("vendorID"), (Integer) commandArguments.get("announcementReason"), (Optional) commandArguments.get("metadataForNode"), (Integer) commandArguments.get("endpoint")); }, () -> new DelegatedDefaultClusterCallback(), - otaSoftwareUpdateRequestorannounceOtaProviderCommandParams); + otaSoftwareUpdateRequestorannounceOTAProviderCommandParams); otaSoftwareUpdateRequestorClusterInteractionInfoMap.put( - "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderInteractionInfo); + "announceOTAProvider", otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo); commandMap.put( "otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInteractionInfoMap); Map localizationConfigurationClusterInteractionInfoMap = diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 679955f977665c..0a8c4151b11748 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -1763,24 +1763,24 @@ public Map> getReadAttributeMap() { Map readOtaSoftwareUpdateRequestorInteractionInfo = new LinkedHashMap<>(); Map - readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams = + readOtaSoftwareUpdateRequestorDefaultOTAProvidersCommandParams = new LinkedHashMap(); - InteractionInfo readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo = + InteractionInfo readOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster) - .readDefaultOtaProvidersAttribute( + .readDefaultOTAProvidersAttribute( (ChipClusters.OtaSoftwareUpdateRequestorCluster - .DefaultOtaProvidersAttributeCallback) + .DefaultOTAProvidersAttributeCallback) callback); }, () -> new ClusterInfoMapping - .DelegatedOtaSoftwareUpdateRequestorClusterDefaultOtaProvidersAttributeCallback(), - readOtaSoftwareUpdateRequestorDefaultOtaProvidersCommandParams); + .DelegatedOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallback(), + readOtaSoftwareUpdateRequestorDefaultOTAProvidersCommandParams); readOtaSoftwareUpdateRequestorInteractionInfo.put( - "readDefaultOtaProvidersAttribute", - readOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeInteractionInfo); + "readDefaultOTAProvidersAttribute", + readOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams = new LinkedHashMap(); InteractionInfo readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index f1724a953112db..a205e0fba26899 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -1238,8 +1238,8 @@ class ChipClusters: "commandId": 0x00000000, "commandName": "QueryImage", "args": { - "vendorId": "int", - "productId": "int", + "vendorID": "int", + "productID": "int", "softwareVersion": "int", "protocolsSupported": "int", "hardwareVersion": "int", @@ -1292,10 +1292,10 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "AnnounceOtaProvider", + "commandName": "AnnounceOTAProvider", "args": { - "providerNodeId": "int", - "vendorId": "int", + "providerNodeID": "int", + "vendorID": "int", "announcementReason": "int", "metadataForNode": "bytes", "endpoint": "int", @@ -1304,7 +1304,7 @@ class ChipClusters: }, "attributes": { 0x00000000: { - "attributeName": "DefaultOtaProviders", + "attributeName": "DefaultOTAProviders", "attributeId": 0x00000000, "type": "", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index c96dadb2f69e33..e3b6ed5cd44e46 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -4332,8 +4332,8 @@ class QueryImage(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="vendorId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="productId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="vendorID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="productID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="softwareVersion", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="protocolsSupported", Tag=3, Type=typing.List[OtaSoftwareUpdateProvider.Enums.OTADownloadProtocol]), ClusterObjectFieldDescriptor(Label="hardwareVersion", Tag=4, Type=typing.Optional[uint]), @@ -4342,8 +4342,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="metadataForProvider", Tag=7, Type=typing.Optional[bytes]), ]) - vendorId: 'uint' = 0 - productId: 'uint' = 0 + vendorID: 'uint' = 0 + productID: 'uint' = 0 softwareVersion: 'uint' = 0 protocolsSupported: 'typing.List[OtaSoftwareUpdateProvider.Enums.OTADownloadProtocol]' = field(default_factory=lambda: []) hardwareVersion: 'typing.Optional[uint]' = None @@ -4527,7 +4527,7 @@ class OtaSoftwareUpdateRequestor(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="defaultOtaProviders", Tag=0x00000000, Type=typing.List[OtaSoftwareUpdateRequestor.Structs.ProviderLocation]), + ClusterObjectFieldDescriptor(Label="defaultOTAProviders", Tag=0x00000000, Type=typing.List[OtaSoftwareUpdateRequestor.Structs.ProviderLocation]), ClusterObjectFieldDescriptor(Label="updatePossible", Tag=0x00000001, Type=bool), ClusterObjectFieldDescriptor(Label="updateState", Tag=0x00000002, Type=OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum), ClusterObjectFieldDescriptor(Label="updateStateProgress", Tag=0x00000003, Type=typing.Union[Nullable, uint]), @@ -4538,7 +4538,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - defaultOtaProviders: 'typing.List[OtaSoftwareUpdateRequestor.Structs.ProviderLocation]' = None + defaultOTAProviders: 'typing.List[OtaSoftwareUpdateRequestor.Structs.ProviderLocation]' = None updatePossible: 'bool' = None updateState: 'OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum' = None updateStateProgress: 'typing.Union[Nullable, uint]' = None @@ -4593,7 +4593,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class AnnounceOtaProvider(ClusterCommand): + class AnnounceOTAProvider(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x002A command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -4603,15 +4603,15 @@ class AnnounceOtaProvider(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="providerNodeId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="vendorId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="providerNodeID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="vendorID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="announcementReason", Tag=2, Type=OtaSoftwareUpdateRequestor.Enums.OTAAnnouncementReason), ClusterObjectFieldDescriptor(Label="metadataForNode", Tag=3, Type=typing.Optional[bytes]), ClusterObjectFieldDescriptor(Label="endpoint", Tag=4, Type=uint), ]) - providerNodeId: 'uint' = 0 - vendorId: 'uint' = 0 + providerNodeID: 'uint' = 0 + vendorID: 'uint' = 0 announcementReason: 'OtaSoftwareUpdateRequestor.Enums.OTAAnnouncementReason' = 0 metadataForNode: 'typing.Optional[bytes]' = None endpoint: 'uint' = 0 @@ -4619,7 +4619,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Attributes: @dataclass - class DefaultOtaProviders(ClusterAttributeDescriptor): + class DefaultOTAProviders(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x002A diff --git a/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm b/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm index 349c255e885eaa..8592a645982d89 100644 --- a/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm +++ b/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm @@ -746,8 +746,8 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath CHIP_ERROR MTROTAProviderDelegateBridge::ConvertToQueryImageParams( const Commands::QueryImage::DecodableType & commandData, MTROTASoftwareUpdateProviderClusterQueryImageParams * commandParams) { - commandParams.vendorId = [NSNumber numberWithUnsignedShort:commandData.vendorId]; - commandParams.productId = [NSNumber numberWithUnsignedShort:commandData.productId]; + commandParams.vendorID = [NSNumber numberWithUnsignedShort:commandData.vendorID]; + commandParams.productID = [NSNumber numberWithUnsignedShort:commandData.productID]; commandParams.softwareVersion = [NSNumber numberWithUnsignedLong:commandData.softwareVersion]; auto iterator = commandData.protocolsSupported.begin(); NSMutableArray * protocolsSupported = [[NSMutableArray alloc] init]; diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 7cc6281ed67ae1..fd77a490b63610 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4673,7 +4673,7 @@ - FeatureMap - ClusterRevision OTASoftwareUpdateRequestor: - - DefaultOtaProviders + - DefaultOTAProviders - UpdatePossible - UpdateState - UpdateStateProgress @@ -4723,7 +4723,7 @@ - ApplyUpdateResponse - NotifyUpdateApplied OTASoftwareUpdateRequestor: - - AnnounceOtaProvider + - AnnounceOTAProvider UnitTesting: - Test - TestSpecificResponse @@ -4880,8 +4880,8 @@ - arg1 OTASoftwareUpdateProvider: QueryImage: - - vendorId - - productId + - vendorID + - productID - softwareVersion - protocolsSupported - hardwareVersion @@ -4907,9 +4907,9 @@ - updateToken - softwareVersion OTASoftwareUpdateRequestor: - AnnounceOtaProvider: - - providerNodeId - - vendorId + AnnounceOTAProvider: + - providerNodeID + - vendorID - announcementReason - metadataForNode - endpoint @@ -5214,6 +5214,20 @@ PIROccupiedToUnoccupiedDelay: PirOccupiedToUnoccupiedDelay PIRUnoccupiedToOccupiedDelay: PirUnoccupiedToOccupiedDelay PIRUnoccupiedToOccupiedThreshold: PirUnoccupiedToOccupiedThreshold + OTASoftwareUpdateRequestor: + DefaultOTAProviders: DefaultOtaProviders + commands: + OTASoftwareUpdateRequestor: + AnnounceOTAProvider: AnnounceOtaProvider + command fields: + OTASoftwareUpdateProvider: + QueryImage: + vendorID: vendorId + productID: productId + OTASoftwareUpdateRequestor: + AnnounceOTAProvider: + providerNodeID: providerNodeId + vendorID: vendorId event fields: Switch: MultiPressComplete: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 9ef4237dbf3194..574e6f2f55a505 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -2525,8 +2525,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & case Clusters::OtaSoftwareUpdateRequestor::Id: { using namespace Clusters::OtaSoftwareUpdateRequestor; switch (aPath.mAttributeId) { - case Attributes::DefaultOtaProviders::Id: { - using TypeInfo = Attributes::DefaultOtaProviders::TypeInfo; + case Attributes::DefaultOTAProviders::Id: { + using TypeInfo = Attributes::DefaultOTAProviders::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index eabcb977d98501..9250cc268cbc54 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -2400,26 +2400,26 @@ MTR_NEWLY_AVAILABLE queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; /** - * Command AnnounceOtaProvider + * Command AnnounceOTAProvider * * Announce the presence of an OTA Provider */ -- (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params +- (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params +- (void)readAttributeDefaultOTAProvidersWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)subscribeAttributeDefaultOtaProvidersWithParams:(MTRSubscribeParams *)params +- (void)subscribeAttributeDefaultOTAProvidersWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; -+ (void)readAttributeDefaultOtaProvidersWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer ++ (void)readAttributeDefaultOTAProvidersWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, @@ -21970,21 +21970,21 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { - (void)announceOtaProviderWithParams:(MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use announceOtaProviderWithParams:completion:"); + MTR_NEWLY_DEPRECATED("Please use announceOTAProviderWithParams:completion:"); - (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeDefaultOtaProvidersWithParams:completion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeDefaultOTAProvidersWithParams:completion:"); - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOtaProvidersWithValue:completion:"); + MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOTAProvidersWithValue:completion:"); - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOtaProvidersWithValue:params:completion:"); + MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOTAProvidersWithValue:params:completion:"); - (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(MTRSubscribeParams * _Nullable)params @@ -21993,14 +21993,14 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use subscribeAttributeDefaultOtaProvidersWithParams:subscriptionEstablished:"); + MTR_NEWLY_DEPRECATED("Please use subscribeAttributeDefaultOTAProvidersWithParams:subscriptionEstablished:"); + (void)readAttributeDefaultOtaProvidersWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use readAttributeDefaultOtaProvidersWithAttributeCache:endpoint:queue:completion:"); + MTR_NEWLY_DEPRECATED("Please use readAttributeDefaultOTAProvidersWithAttributeCache:endpoint:queue:completion:"); - (void)readAttributeUpdatePossibleWithCompletionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 02e7cde392adca..488006a1bde394 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -15152,8 +15152,8 @@ - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParam timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue); } } - request.vendorId = static_cast>(params.vendorId.unsignedShortValue); - request.productId = params.productId.unsignedShortValue; + request.vendorID = static_cast>(params.vendorID.unsignedShortValue); + request.productID = params.productID.unsignedShortValue; request.softwareVersion = params.softwareVersion.unsignedIntValue; { using ListType_0 = std::remove_reference_t; @@ -15758,7 +15758,7 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en return self; } -- (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params +- (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params completion:(MTRStatusCompletion)completion { // Make a copy of params before we go async. @@ -15773,14 +15773,14 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou auto * typedBridge = static_cast(bridge); chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; - OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type request; + OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue); } } - request.providerNodeId = params.providerNodeId.unsignedLongLongValue; - request.vendorId = static_cast>(params.vendorId.unsignedShortValue); + request.providerNodeID = params.providerNodeID.unsignedLongLongValue; + request.vendorID = static_cast>(params.vendorID.unsignedShortValue); request.announcementReason = static_cast>( params.announcementReason.unsignedCharValue); if (params.metadataForNode != nil) { @@ -15795,21 +15795,21 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou std::move(*bridge).DispatchAction(self.device); } -- (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params +- (void)readAttributeDefaultOTAProvidersWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion { - [self writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull) value params:nil completion:completion]; + [self writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull) value params:nil completion:completion]; } -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion { @@ -15832,7 +15832,7 @@ - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value } ListFreer listFreer; - using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo; + using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo; TypeInfo::Type cppValue; { using ListType_0 = std::remove_reference_t; @@ -15865,29 +15865,29 @@ - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value std::move(*bridge).DispatchAction(self.device); } -- (void)subscribeAttributeDefaultOtaProvidersWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeDefaultOTAProvidersWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } -+ (void)readAttributeDefaultOtaProvidersWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer ++ (void)readAttributeDefaultOTAProvidersWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(OTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(OTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::TypeInfo; + using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -16267,13 +16267,13 @@ @implementation MTRBaseClusterOtaSoftwareUpdateRequestor (Deprecated) - (void)announceOtaProviderWithParams:(MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params completionHandler:(MTRStatusCompletion)completionHandler { - [self announceOtaProviderWithParams:params completion:completionHandler]; + [self announceOTAProviderWithParams:params completion:completionHandler]; } - (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeDefaultOtaProvidersWithParams:params + [self readAttributeDefaultOTAProvidersWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(value), error); @@ -16282,13 +16282,13 @@ - (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)pa - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler { - [self writeAttributeDefaultOtaProvidersWithValue:value params:nil completion:completionHandler]; + [self writeAttributeDefaultOTAProvidersWithValue:value params:nil completion:completionHandler]; } - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler { - [self writeAttributeDefaultOtaProvidersWithValue:value params:params completion:completionHandler]; + [self writeAttributeDefaultOTAProvidersWithValue:value params:params completion:completionHandler]; } - (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval @@ -16305,7 +16305,7 @@ - (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnul subscribeParams.minInterval = minInterval; subscribeParams.maxInterval = maxInterval; } - [self subscribeAttributeDefaultOtaProvidersWithParams:subscribeParams + [self subscribeAttributeDefaultOTAProvidersWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. @@ -16318,7 +16318,7 @@ + (void)readAttributeDefaultOtaProvidersWithAttributeCache:(MTRAttributeCacheCon completionHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler { - [self readAttributeDefaultOtaProvidersWithClusterStateCache:attributeCacheContainer.realContainer + [self readAttributeDefaultOTAProvidersWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:^(NSArray * _Nullable value, NSError * _Nullable error) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 1bfbf12ff47c8d..70a59ca8f5dc91 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -640,7 +640,7 @@ typedef void (*OTASoftwareUpdateProviderAcceptedCommandListListAttributeCallback void * context, const chip::app::DataModel::DecodableList & data); typedef void (*OTASoftwareUpdateProviderAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*OTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)( +typedef void (*OTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data); @@ -3567,16 +3567,16 @@ class MTROTASoftwareUpdateProviderAttributeListListAttributeCallbackSubscription MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, @@ -3584,20 +3584,20 @@ class MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridg chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value); }; -class MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge +class MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge { public: - MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 47aafa936faecf..96afba006b24df 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -2688,7 +2688,7 @@ } } -void MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackBridge::OnSuccessFn(void * context, +void MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & value) { @@ -2715,7 +2715,7 @@ DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 495b63ae9a3c24..53942f6a40012c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -1024,7 +1024,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { // Cluster OtaSoftwareUpdateRequestor deprecated attribute names MTRClusterOtaSoftwareUpdateRequestorAttributeDefaultOtaProvidersID API_AVAILABLE( ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOtaProvidersID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOTAProvidersID") = 0x00000000, MTRClusterOtaSoftwareUpdateRequestorAttributeUpdatePossibleID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeUpdatePossibleID") @@ -1055,7 +1055,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { = MTRClusterGlobalAttributeClusterRevisionID, // Cluster OTASoftwareUpdateRequestor attributes - MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOtaProvidersID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOTAProvidersID MTR_NEWLY_AVAILABLE = 0x00000000, MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeUpdatePossibleID MTR_NEWLY_AVAILABLE = 0x00000001, MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeUpdateStateID MTR_NEWLY_AVAILABLE = 0x00000002, MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeUpdateStateProgressID MTR_NEWLY_AVAILABLE = 0x00000003, @@ -5886,11 +5886,11 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { // Cluster OtaSoftwareUpdateRequestor deprecated command id names MTRClusterOtaSoftwareUpdateRequestorCommandAnnounceOtaProviderID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOtaProviderID") + MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOTAProviderID") = 0x00000000, // Cluster OTASoftwareUpdateRequestor commands - MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOtaProviderID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOTAProviderID MTR_NEWLY_AVAILABLE = 0x00000000, // Cluster GeneralCommissioning deprecated command id names MTRClusterGeneralCommissioningCommandArmFailSafeID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 17144eb969ef5d..d2c390fd1d0968 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -1019,15 +1019,15 @@ MTR_NEWLY_AVAILABLE endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; -- (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params +- (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary +- (NSDictionary *)readAttributeDefaultOTAProvidersWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_NEWLY_AVAILABLE; -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_NEWLY_AVAILABLE; @@ -7114,7 +7114,19 @@ MTR_NEWLY_DEPRECATED("Please use MTRClusterUnitTesting") expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use announceOtaProviderWithParams:expectedValues:expectedValueIntervalMs:completion:"); + MTR_NEWLY_DEPRECATED("Please use announceOTAProviderWithParams:expectedValues:expectedValueIntervalMs:completion:"); +- (NSDictionary *)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use readAttributeDefaultOTAProvidersWithParams on MTRClusterOTASoftwareUpdateRequestor"); +- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOTAProvidersWithValue on MTRClusterOTASoftwareUpdateRequestor"); +- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + params:(MTRWriteParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use writeAttributeDefaultOTAProvidersWithValue on MTRClusterOTASoftwareUpdateRequestor"); @end @interface MTRClusterLocalizationConfiguration (Deprecated) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index ae80c576928c55..2cc3860db1f5d5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -5533,9 +5533,9 @@ - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParam if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } - request.vendorId - = static_cast>(params.vendorId.unsignedShortValue); - request.productId = params.productId.unsignedShortValue; + request.vendorID + = static_cast>(params.vendorID.unsignedShortValue); + request.productID = params.productID.unsignedShortValue; request.softwareVersion = params.softwareVersion.unsignedIntValue; { using ListType_0 = std::remove_reference_t; @@ -5826,14 +5826,14 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi return self; } -- (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params +- (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, (unsigned int) MTRClusterIDTypeOTASoftwareUpdateRequestorID, - (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOtaProviderID]; + (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOTAProviderID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -5858,13 +5858,13 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; - OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type request; + OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } - request.providerNodeId = params.providerNodeId.unsignedLongLongValue; - request.vendorId - = static_cast>(params.vendorId.unsignedShortValue); + request.providerNodeID = params.providerNodeID.unsignedLongLongValue; + request.vendorID + = static_cast>(params.vendorID.unsignedShortValue); request.announcementReason = static_cast>( params.announcementReason.unsignedCharValue); if (params.metadataForNode != nil) { @@ -5892,21 +5892,21 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou } } -- (NSDictionary *)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary *)readAttributeDefaultOTAProvidersWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) clusterID:@(MTRClusterIDTypeOTASoftwareUpdateRequestorID) - attributeID:@(MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOtaProvidersID) + attributeID:@(MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOTAProvidersID) params:params]; } -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs { - [self writeAttributeDefaultOtaProvidersWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil]; + [self writeAttributeDefaultOTAProvidersWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil]; } -- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary +- (void)writeAttributeDefaultOTAProvidersWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params { @@ -5914,7 +5914,7 @@ - (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary [self.device writeAttributeWithEndpointID:@(_endpoint) clusterID:@(MTRClusterIDTypeOTASoftwareUpdateRequestorID) - attributeID:@(MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOtaProvidersID) + attributeID:@(MTRAttributeIDTypeClusterOTASoftwareUpdateRequestorAttributeDefaultOTAProvidersID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -6004,11 +6004,28 @@ - (void)announceOtaProviderWithParams:(MTROtaSoftwareUpdateRequestorClusterAnnou expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler { - [self announceOtaProviderWithParams:params + [self announceOTAProviderWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:completionHandler]; } +- (NSDictionary *)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params +{ + return [self readAttributeDefaultOTAProvidersWithParams:params]; +} +- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs +{ + [self writeAttributeDefaultOTAProvidersWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs]; +} +- (void)writeAttributeDefaultOtaProvidersWithValue:(NSDictionary *)dataValueDictionary + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + params:(MTRWriteParams * _Nullable)params +{ + [self writeAttributeDefaultOTAProvidersWithValue:dataValueDictionary + expectedValueInterval:expectedValueIntervalMs + params:params]; +} @end @implementation MTRClusterLocalizationConfiguration diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 23b869e7f5644e..a225897c00b0ef 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -1490,9 +1490,9 @@ MTR_NEWLY_DEPRECATED("This command has been removed") MTR_NEWLY_AVAILABLE @interface MTROTASoftwareUpdateProviderClusterQueryImageParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull vendorId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull vendorID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull productId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull productID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull softwareVersion MTR_NEWLY_AVAILABLE; @@ -1525,6 +1525,12 @@ MTR_NEWLY_AVAILABLE API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterQueryImageParams") @interface MTROtaSoftwareUpdateProviderClusterQueryImageParams : MTROTASoftwareUpdateProviderClusterQueryImageParams + +@property (nonatomic, copy) NSNumber * _Nonnull vendorId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use vendorID"); + +@property (nonatomic, copy) NSNumber * _Nonnull productId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use productID"); @end MTR_NEWLY_AVAILABLE @@ -1656,11 +1662,11 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterNotifyUpdate @end MTR_NEWLY_AVAILABLE -@interface MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams : NSObject +@interface MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull providerNodeId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull providerNodeID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull vendorId MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull vendorID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull announcementReason MTR_NEWLY_AVAILABLE; @@ -1685,9 +1691,15 @@ MTR_NEWLY_AVAILABLE @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams") +MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams") @interface MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams - : MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams + : MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams + +@property (nonatomic, copy) NSNumber * _Nonnull providerNodeId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use providerNodeID"); + +@property (nonatomic, copy) NSNumber * _Nonnull vendorId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use vendorID"); @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 59e991ed72e2bd..2a6e17339783e0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -2081,9 +2081,9 @@ - (instancetype)init { if (self = [super init]) { - _vendorId = @(0); + _vendorID = @(0); - _productId = @(0); + _productID = @(0); _softwareVersion = @(0); @@ -2105,8 +2105,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTROTASoftwareUpdateProviderClusterQueryImageParams alloc] init]; - other.vendorId = self.vendorId; - other.productId = self.productId; + other.vendorID = self.vendorID; + other.productID = self.productID; other.softwareVersion = self.softwareVersion; other.protocolsSupported = self.protocolsSupported; other.hardwareVersion = self.hardwareVersion; @@ -2121,9 +2121,9 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: vendorId:%@; productId:%@; softwareVersion:%@; protocolsSupported:%@; " + [NSString stringWithFormat:@"<%@: vendorID:%@; productID:%@; softwareVersion:%@; protocolsSupported:%@; " @"hardwareVersion:%@; location:%@; requestorCanConsent:%@; metadataForProvider:%@; >", - NSStringFromClass([self class]), _vendorId, _productId, _softwareVersion, _protocolsSupported, _hardwareVersion, + NSStringFromClass([self class]), _vendorID, _productID, _softwareVersion, _protocolsSupported, _hardwareVersion, _location, _requestorCanConsent, [_metadataForProvider base64EncodedStringWithOptions:0]]; return descriptionString; } @@ -2131,6 +2131,26 @@ - (NSString *)description @end @implementation MTROtaSoftwareUpdateProviderClusterQueryImageParams + +- (void)setVendorId:(NSNumber * _Nonnull)vendorId +{ + self.vendorID = vendorId; +} + +- (NSNumber * _Nonnull)vendorId +{ + return self.vendorID; +} + +- (void)setProductId:(NSNumber * _Nonnull)productId +{ + self.productID = productId; +} + +- (NSNumber * _Nonnull)productId +{ + return self.productID; +} @end @implementation MTROTASoftwareUpdateProviderClusterQueryImageResponseParams - (instancetype)init @@ -2296,14 +2316,14 @@ - (NSString *)description @implementation MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams @end -@implementation MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams +@implementation MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams - (instancetype)init { if (self = [super init]) { - _providerNodeId = @(0); + _providerNodeID = @(0); - _vendorId = @(0); + _vendorID = @(0); _announcementReason = @(0); @@ -2317,10 +2337,10 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init]; + auto other = [[MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams alloc] init]; - other.providerNodeId = self.providerNodeId; - other.vendorId = self.vendorId; + other.providerNodeID = self.providerNodeID; + other.vendorID = self.vendorID; other.announcementReason = self.announcementReason; other.metadataForNode = self.metadataForNode; other.endpoint = self.endpoint; @@ -2332,8 +2352,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = [NSString - stringWithFormat:@"<%@: providerNodeId:%@; vendorId:%@; announcementReason:%@; metadataForNode:%@; endpoint:%@; >", - NSStringFromClass([self class]), _providerNodeId, _vendorId, _announcementReason, + stringWithFormat:@"<%@: providerNodeID:%@; vendorID:%@; announcementReason:%@; metadataForNode:%@; endpoint:%@; >", + NSStringFromClass([self class]), _providerNodeID, _vendorID, _announcementReason, [_metadataForNode base64EncodedStringWithOptions:0], _endpoint]; return descriptionString; } @@ -2341,6 +2361,26 @@ - (NSString *)description @end @implementation MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams + +- (void)setProviderNodeId:(NSNumber * _Nonnull)providerNodeId +{ + self.providerNodeID = providerNodeId; +} + +- (NSNumber * _Nonnull)providerNodeId +{ + return self.providerNodeID; +} + +- (void)setVendorId:(NSNumber * _Nonnull)vendorId +{ + self.vendorID = vendorId; +} + +- (NSNumber * _Nonnull)vendorId +{ + return self.vendorID; +} @end @implementation MTRGeneralCommissioningClusterArmFailSafeParams - (instancetype)init diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index 38876e20dac341..8f61a4bc3c38c3 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -1272,13 +1272,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index b63b342d4889d8..9dc691a1055ab2 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -459,7 +459,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -1584,7 +1584,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=15) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=17) */ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp index 9e2c11a63bd377..fa9cb74877e047 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp @@ -1092,13 +1092,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index ee653446210dae..154d25138dfe81 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -368,7 +368,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -1108,7 +1108,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=14) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=16) */ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 64a3621fd3ed9f..406cb39979d4f7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -7912,9 +7912,9 @@ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback( * @brief OTA Software Update Provider Cluster QueryImageResponse Command callback (from server) */ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback( - chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status, uint32_t delayedActionTime, - chip::CharSpan imageURI, uint32_t softwareVersion, chip::CharSpan softwareVersionString, chip::ByteSpan updateToken, - bool userConsentNeeded, chip::ByteSpan metadataForRequestor); + chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, uint32_t DelayedActionTime, + chip::CharSpan ImageURI, uint32_t SoftwareVersion, chip::CharSpan SoftwareVersionString, chip::ByteSpan UpdateToken, + bool UserConsentNeeded, chip::ByteSpan MetadataForRequestor); /** * @brief OTA Software Update Provider Cluster ApplyUpdateRequest Command callback (from client) */ @@ -7925,8 +7925,8 @@ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestCallback( * @brief OTA Software Update Provider Cluster ApplyUpdateResponse Command callback (from server) */ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(chip::EndpointId endpoint, - chip::app::CommandSender * commandObj, uint8_t action, - uint32_t delayedActionTime); + chip::app::CommandSender * commandObj, uint8_t Action, + uint32_t DelayedActionTime); /** * @brief OTA Software Update Provider Cluster NotifyUpdateApplied Command callback (from client) */ @@ -7934,11 +7934,11 @@ bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::DecodableType & commandData); /** - * @brief OTA Software Update Requestor Cluster AnnounceOtaProvider Command callback (from client) + * @brief OTA Software Update Requestor Cluster AnnounceOTAProvider Command callback (from client) */ -bool emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback( +bool emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::DecodableType & commandData); + const chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::DecodableType & commandData); /** * @brief General Commissioning Cluster ArmFailSafe Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 9114d0a1d4352a..d1be6b40eb150b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -4218,8 +4218,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProductId)), productId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorID)), vendorID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProductID)), productID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSoftwareVersion)), softwareVersion)); ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProtocolsSupported)), protocolsSupported)); @@ -4247,11 +4247,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kVendorId): - ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); + case to_underlying(Fields::kVendorID): + ReturnErrorOnFailure(DataModel::Decode(reader, vendorID)); break; - case to_underlying(Fields::kProductId): - ReturnErrorOnFailure(DataModel::Decode(reader, productId)); + case to_underlying(Fields::kProductID): + ReturnErrorOnFailure(DataModel::Decode(reader, productID)); break; case to_underlying(Fields::kSoftwareVersion): ReturnErrorOnFailure(DataModel::Decode(reader, softwareVersion)); @@ -4571,13 +4571,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace Structs namespace Commands { -namespace AnnounceOtaProvider { +namespace AnnounceOTAProvider { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProviderNodeId)), providerNodeId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProviderNodeID)), providerNodeID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorID)), vendorID)); ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAnnouncementReason)), announcementReason)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMetadataForNode)), metadataForNode)); @@ -4600,11 +4600,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kProviderNodeId): - ReturnErrorOnFailure(DataModel::Decode(reader, providerNodeId)); + case to_underlying(Fields::kProviderNodeID): + ReturnErrorOnFailure(DataModel::Decode(reader, providerNodeID)); break; - case to_underlying(Fields::kVendorId): - ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); + case to_underlying(Fields::kVendorID): + ReturnErrorOnFailure(DataModel::Decode(reader, vendorID)); break; case to_underlying(Fields::kAnnouncementReason): ReturnErrorOnFailure(DataModel::Decode(reader, announcementReason)); @@ -4624,7 +4624,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace AnnounceOtaProvider. +} // namespace AnnounceOTAProvider. } // namespace Commands namespace Attributes { @@ -4632,8 +4632,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::DefaultOtaProviders::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, defaultOtaProviders)); + case Attributes::DefaultOTAProviders::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, defaultOTAProviders)); break; case Attributes::UpdatePossible::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, updatePossible)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 3108ce60910211..f3b8b509ae77b9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -4937,8 +4937,8 @@ namespace Commands { namespace QueryImage { enum class Fields { - kVendorId = 0, - kProductId = 1, + kVendorID = 0, + kProductID = 1, kSoftwareVersion = 2, kProtocolsSupported = 3, kHardwareVersion = 4, @@ -4954,8 +4954,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::QueryImage::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - chip::VendorId vendorId = static_cast(0); - uint16_t productId = static_cast(0); + chip::VendorId vendorID = static_cast(0); + uint16_t productID = static_cast(0); uint32_t softwareVersion = static_cast(0); DataModel::List protocolsSupported; Optional hardwareVersion; @@ -4976,8 +4976,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::QueryImage::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - chip::VendorId vendorId = static_cast(0); - uint16_t productId = static_cast(0); + chip::VendorId vendorID = static_cast(0); + uint16_t productID = static_cast(0); uint32_t softwareVersion = static_cast(0); DataModel::DecodableList protocolsSupported; Optional hardwareVersion; @@ -5237,19 +5237,19 @@ using DecodableType = Type; namespace Commands { // Forward-declarations so we can reference these later. -namespace AnnounceOtaProvider { +namespace AnnounceOTAProvider { struct Type; struct DecodableType; -} // namespace AnnounceOtaProvider +} // namespace AnnounceOTAProvider } // namespace Commands namespace Commands { -namespace AnnounceOtaProvider { +namespace AnnounceOTAProvider { enum class Fields { - kProviderNodeId = 0, - kVendorId = 1, + kProviderNodeID = 0, + kVendorID = 1, kAnnouncementReason = 2, kMetadataForNode = 3, kEndpoint = 4, @@ -5259,11 +5259,11 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::AnnounceOtaProvider::Id; } + static constexpr CommandId GetCommandId() { return Commands::AnnounceOTAProvider::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } - chip::NodeId providerNodeId = static_cast(0); - chip::VendorId vendorId = static_cast(0); + chip::NodeId providerNodeID = static_cast(0); + chip::VendorId vendorID = static_cast(0); OTAAnnouncementReason announcementReason = static_cast(0); Optional metadataForNode; chip::EndpointId endpoint = static_cast(0); @@ -5278,22 +5278,22 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::AnnounceOtaProvider::Id; } + static constexpr CommandId GetCommandId() { return Commands::AnnounceOTAProvider::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } - chip::NodeId providerNodeId = static_cast(0); - chip::VendorId vendorId = static_cast(0); + chip::NodeId providerNodeID = static_cast(0); + chip::VendorId vendorID = static_cast(0); OTAAnnouncementReason announcementReason = static_cast(0); Optional metadataForNode; chip::EndpointId endpoint = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace AnnounceOtaProvider +}; // namespace AnnounceOTAProvider } // namespace Commands namespace Attributes { -namespace DefaultOtaProviders { +namespace DefaultOTAProviders { struct TypeInfo { using Type = chip::app::DataModel::List; @@ -5303,10 +5303,10 @@ struct TypeInfo chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::DefaultOtaProviders::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::DefaultOTAProviders::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace DefaultOtaProviders +} // namespace DefaultOTAProviders namespace UpdatePossible { struct TypeInfo { @@ -5382,7 +5382,7 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::DefaultOtaProviders::TypeInfo::DecodableType defaultOtaProviders; + Attributes::DefaultOTAProviders::TypeInfo::DecodableType defaultOTAProviders; Attributes::UpdatePossible::TypeInfo::DecodableType updatePossible = static_cast(0); Attributes::UpdateState::TypeInfo::DecodableType updateState = static_cast(0); diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 901dc911960a6f..c03ad1bec6d5db 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -706,9 +706,9 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; namespace OtaSoftwareUpdateRequestor { namespace Attributes { -namespace DefaultOtaProviders { +namespace DefaultOTAProviders { static constexpr AttributeId Id = 0x00000000; -} // namespace DefaultOtaProviders +} // namespace DefaultOTAProviders namespace UpdatePossible { static constexpr AttributeId Id = 0x00000001; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index fc78c7cc294ea7..22576400404724 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -334,9 +334,9 @@ static constexpr CommandId Id = 0x00000004; namespace OtaSoftwareUpdateRequestor { namespace Commands { -namespace AnnounceOtaProvider { +namespace AnnounceOTAProvider { static constexpr CommandId Id = 0x00000000; -} // namespace AnnounceOtaProvider +} // namespace AnnounceOTAProvider } // namespace Commands } // namespace OtaSoftwareUpdateRequestor diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp index d9f3b89b0681e2..0c20b9740d0f3b 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp @@ -558,13 +558,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index 97b72598414f14..23daa85192a4cc 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -154,7 +154,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -501,7 +501,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/IMClusterCommandHandler.cpp index 61d9c9b81b531f..868bc7cb21271c 100644 --- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/IMClusterCommandHandler.cpp @@ -814,13 +814,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h index 8a0446d0cf8c7e..6ac4b6c00baacb 100644 --- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/endpoint_config.h @@ -165,7 +165,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -381,7 +381,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h index 252d4b7be03d33..a3be9e1b292b00 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -335,7 +335,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp index eb70c21c2224cf..851668df3cf66f 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/IMClusterCommandHandler.cpp @@ -605,13 +605,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index f911ba6ae1e50d..ad2497d999d8b7 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -154,7 +154,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -364,7 +364,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/IMClusterCommandHandler.cpp index f6d348ae203a0f..c4d9f49ad1f9cb 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/IMClusterCommandHandler.cpp @@ -551,13 +551,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h index 6c0dd496a190f0..a3c18b0f8c1ba1 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h @@ -156,7 +156,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -360,7 +360,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/IMClusterCommandHandler.cpp index ce86c480a54072..42621aac15f8f7 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/IMClusterCommandHandler.cpp @@ -805,13 +805,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h index c5a1d8603c6b8e..98a23bb9adcecc 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h @@ -160,7 +160,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -399,7 +399,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/IMClusterCommandHandler.cpp index 2cfd18584560a2..761a2acdec4472 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/IMClusterCommandHandler.cpp @@ -514,13 +514,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h index 631f59bc67fff7..5782ccff897af0 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h @@ -165,7 +165,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -374,7 +374,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h index 1daa88c4ede41b..7207b068315268 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -333,7 +333,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/IMClusterCommandHandler.cpp index eb70c21c2224cf..851668df3cf66f 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/IMClusterCommandHandler.cpp @@ -605,13 +605,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h index 78b54e5d6fd663..a08057b8119ee6 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h @@ -157,7 +157,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -377,7 +377,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h index f5d06cd8e5af27..be36b3fbcc9986 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -334,7 +334,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h index 48a1ed8d839765..5da1040bd17fd3 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -332,7 +332,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h index 123465dcfa155a..4979f720e979c4 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -335,7 +335,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/IMClusterCommandHandler.cpp index eb70c21c2224cf..851668df3cf66f 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/IMClusterCommandHandler.cpp @@ -605,13 +605,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h index ce8b09a9f15200..c74181bbaa46dc 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h @@ -154,7 +154,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -364,7 +364,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/IMClusterCommandHandler.cpp index 2531ec31ef89f5..8837e86d1e212b 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h index 033f01df5cb44c..483b0218b7396e 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -338,7 +338,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/IMClusterCommandHandler.cpp index 2531ec31ef89f5..8837e86d1e212b 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h index eb1983060821e8..9bb0327807d64e 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -344,7 +344,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h index ce32ab8a9c11ff..a4f8b57db09486 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -338,7 +338,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/IMClusterCommandHandler.cpp index eb70c21c2224cf..851668df3cf66f 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/IMClusterCommandHandler.cpp @@ -605,13 +605,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h index 69ab7e3458da2c..36c0ef11138e79 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -347,7 +347,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/IMClusterCommandHandler.cpp index c2427940edeef4..bea4f740099def 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h index 69ef078fd7297f..44079cb92c90f0 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -332,7 +332,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/IMClusterCommandHandler.cpp index 6b8e2069af3907..6ed81bc986df6a 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h index a889c85efb490f..c4a339cf3e0269 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h @@ -171,7 +171,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -410,7 +410,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/IMClusterCommandHandler.cpp index ee2a247f44ddde..78f899aa574a0f 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h index ccc320afac2102..08d2013599159b 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -366,7 +366,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index eb8a22c0b3305b..d06f504753b5c6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -1911,8 +1911,8 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand OtaSoftwareUpdateProviderQueryImage(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("query-image", credsIssuerConfig), mComplex_ProtocolsSupported(&mRequest.protocolsSupported) { - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); - AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); + AddArgument("ProductID", 0, UINT16_MAX, &mRequest.productID); AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion); AddArgument("ProtocolsSupported", &mComplex_ProtocolsSupported); AddArgument("HardwareVersion", 0, UINT16_MAX, &mRequest.hardwareVersion); @@ -2010,10 +2010,10 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ClusterCommand | Cluster OtaSoftwareUpdateRequestor | 0x002A | |------------------------------------------------------------------------------| | Commands: | | -| * AnnounceOtaProvider | 0x00 | +| * AnnounceOTAProvider | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | -| * DefaultOtaProviders | 0x0000 | +| * DefaultOTAProviders | 0x0000 | | * UpdatePossible | 0x0001 | | * UpdateState | 0x0002 | | * UpdateStateProgress | 0x0003 | @@ -2030,16 +2030,16 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ClusterCommand \*----------------------------------------------------------------------------*/ /* - * Command AnnounceOtaProvider + * Command AnnounceOTAProvider */ -class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand +class OtaSoftwareUpdateRequestorAnnounceOTAProvider : public ClusterCommand { public: - OtaSoftwareUpdateRequestorAnnounceOtaProvider(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("announce-ota-provider", credsIssuerConfig) + OtaSoftwareUpdateRequestorAnnounceOTAProvider(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("announce-otaprovider", credsIssuerConfig) { - AddArgument("ProviderNodeId", 0, UINT64_MAX, &mRequest.providerNodeId); - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); + AddArgument("ProviderNodeID", 0, UINT64_MAX, &mRequest.providerNodeID); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); AddArgument("AnnouncementReason", 0, UINT8_MAX, &mRequest.announcementReason); AddArgument("MetadataForNode", &mRequest.metadataForNode); AddArgument("Endpoint", 0, UINT16_MAX, &mRequest.endpoint); @@ -2061,7 +2061,7 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand } private: - chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type mRequest; + chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -9092,12 +9092,12 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs // Commands // make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig), // + make_unique(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig), // make_unique(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig), // make_unique(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig), // make_unique(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig), // @@ -9109,9 +9109,9 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs make_unique>(Id, credsIssuerConfig), // make_unique>>( - Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig), // + Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "default-ota-providers", Attributes::DefaultOtaProviders::Id, credsIssuerConfig), // + make_unique(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig), // make_unique(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig), // make_unique(Id, "update-state", Attributes::UpdateState::Id, credsIssuerConfig), // make_unique(Id, "update-state-progress", Attributes::UpdateStateProgress::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index b5a1e1012c5ba3..bffe45116c9d90 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -4965,12 +4965,12 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case OtaSoftwareUpdateRequestor::Id: { switch (path.mAttributeId) { - case OtaSoftwareUpdateRequestor::Attributes::DefaultOtaProviders::Id: { + case OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::Id: { chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("DefaultOtaProviders", 1, value); + return DataModelLogger::LogValue("DefaultOTAProviders", 1, value); } case OtaSoftwareUpdateRequestor::Attributes::UpdatePossible::Id: { bool value; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 70e6c7c69ede40..5d141df9c648e4 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -29937,13 +29937,13 @@ class OTA_SuccessfulTransferSuite : public TestCommand case 8: { LogStep(8, "Send an announce OTA provider command to the requestor"); ListFreer listFreer; - chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type value; - value.providerNodeId = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL; - value.vendorId = static_cast(0); + chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Type value; + value.providerNodeID = mProviderNodeId.HasValue() ? mProviderNodeId.Value() : 12648430ULL; + value.vendorID = static_cast(0); value.announcementReason = static_cast(0); value.endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0U; return SendCommand(kIdentityAlpha, GetEndpoint(0), OtaSoftwareUpdateRequestor::Id, - OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Id, value, chip::NullOptional + OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Id, value, chip::NullOptional ); } diff --git a/zzz_generated/contact-sensor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/contact-sensor-app/zap-generated/IMClusterCommandHandler.cpp index c7d1360efc3716..b00caa4216d19f 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/contact-sensor-app/zap-generated/IMClusterCommandHandler.cpp @@ -551,13 +551,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h index 419bb7512cb90f..ca9bcd81f14275 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h @@ -168,7 +168,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -512,7 +512,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index 93ba75c639084c..b901165e18c388 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -129,7 +129,7 @@ typedef void (*BasicInformationAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*OtaSoftwareUpdateProviderAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*OtaSoftwareUpdateRequestorDefaultOtaProvidersListAttributeCallback)( +typedef void (*OtaSoftwareUpdateRequestorDefaultOTAProvidersListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> & data); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 6b05272d2ccd66..bc2d99c42d3d9b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -12866,8 +12866,8 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand { : ClusterCommand("query-image") , mComplex_ProtocolsSupported(&mRequest.protocolsSupported) { - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); - AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); + AddArgument("ProductID", 0, UINT16_MAX, &mRequest.productID); AddArgument("SoftwareVersion", 0, UINT32_MAX, &mRequest.softwareVersion); AddArgument("ProtocolsSupported", &mComplex_ProtocolsSupported); AddArgument("HardwareVersion", 0, UINT16_MAX, &mRequest.hardwareVersion); @@ -12888,8 +12888,8 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand { __auto_type * params = [[MTROTASoftwareUpdateProviderClusterQueryImageParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)]; - params.productId = [NSNumber numberWithUnsignedShort:mRequest.productId]; + params.vendorID = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorID)]; + params.productID = [NSNumber numberWithUnsignedShort:mRequest.productID]; params.softwareVersion = [NSNumber numberWithUnsignedInt:mRequest.softwareVersion]; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -13401,10 +13401,10 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public Subscr | Cluster OtaSoftwareUpdateRequestor | 0x002A | |------------------------------------------------------------------------------| | Commands: | | -| * AnnounceOtaProvider | 0x00 | +| * AnnounceOTAProvider | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | -| * DefaultOtaProviders | 0x0000 | +| * DefaultOTAProviders | 0x0000 | | * UpdatePossible | 0x0001 | | * UpdateState | 0x0002 | | * UpdateStateProgress | 0x0003 | @@ -13421,15 +13421,15 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public Subscr \*----------------------------------------------------------------------------*/ /* - * Command AnnounceOtaProvider + * Command AnnounceOTAProvider */ -class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand { +class OtaSoftwareUpdateRequestorAnnounceOTAProvider : public ClusterCommand { public: - OtaSoftwareUpdateRequestorAnnounceOtaProvider() - : ClusterCommand("announce-ota-provider") + OtaSoftwareUpdateRequestorAnnounceOTAProvider() + : ClusterCommand("announce-otaprovider") { - AddArgument("ProviderNodeId", 0, UINT64_MAX, &mRequest.providerNodeId); - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); + AddArgument("ProviderNodeID", 0, UINT64_MAX, &mRequest.providerNodeID); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); AddArgument("AnnouncementReason", 0, UINT8_MAX, &mRequest.announcementReason); AddArgument("MetadataForNode", &mRequest.metadataForNode); AddArgument("Endpoint", 0, UINT16_MAX, &mRequest.endpoint); @@ -13444,11 +13444,11 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand { __auto_type * cluster = [[MTRBaseClusterOTASoftwareUpdateRequestor alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init]; + __auto_type * params = [[MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.providerNodeId = [NSNumber numberWithUnsignedLongLong:mRequest.providerNodeId]; - params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)]; + params.providerNodeID = [NSNumber numberWithUnsignedLongLong:mRequest.providerNodeID]; + params.vendorID = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorID)]; params.announcementReason = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.announcementReason)]; if (mRequest.metadataForNode.HasValue()) { params.metadataForNode = [NSData dataWithBytes:mRequest.metadataForNode.Value().data() @@ -13460,7 +13460,7 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand { uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster announceOtaProviderWithParams:params + [cluster announceOTAProviderWithParams:params completion:^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -13476,20 +13476,20 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ClusterCommand { } private: - chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOtaProvider::Type mRequest; + chip::app::Clusters::OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Type mRequest; }; /* - * Attribute DefaultOtaProviders + * Attribute DefaultOTAProviders */ -class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ReadAttribute { +class ReadOtaSoftwareUpdateRequestorDefaultOTAProviders : public ReadAttribute { public: - ReadOtaSoftwareUpdateRequestorDefaultOtaProviders() - : ReadAttribute("default-ota-providers") + ReadOtaSoftwareUpdateRequestorDefaultOTAProviders() + : ReadAttribute("default-otaproviders") { } - ~ReadOtaSoftwareUpdateRequestorDefaultOtaProviders() {} + ~ReadOtaSoftwareUpdateRequestorDefaultOTAProviders() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -13504,12 +13504,12 @@ class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ReadAttribute { params.filterByFabric = mFabricFiltered.Value(); } [cluster - readAttributeDefaultOtaProvidersWithParams:params + readAttributeDefaultOTAProvidersWithParams:params completion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"OTASoftwareUpdateRequestor.DefaultOtaProviders response %@", + NSLog(@"OTASoftwareUpdateRequestor.DefaultOTAProviders response %@", [value description]); if (error != nil) { - LogNSError("OTASoftwareUpdateRequestor DefaultOtaProviders read Error", error); + LogNSError("OTASoftwareUpdateRequestor DefaultOTAProviders read Error", error); } SetCommandExitStatus(error); }]; @@ -13517,18 +13517,18 @@ class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ReadAttribute { } }; -class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public WriteAttribute { +class WriteOtaSoftwareUpdateRequestorDefaultOTAProviders : public WriteAttribute { public: - WriteOtaSoftwareUpdateRequestorDefaultOtaProviders() - : WriteAttribute("default-ota-providers") + WriteOtaSoftwareUpdateRequestorDefaultOTAProviders() + : WriteAttribute("default-otaproviders") , mComplex(&mValue) { - AddArgument("attr-name", "default-ota-providers"); + AddArgument("attr-name", "default-otaproviders"); AddArgument("attr-value", &mComplex); WriteAttribute::AddArguments(); } - ~WriteOtaSoftwareUpdateRequestorDefaultOtaProviders() {} + ~WriteOtaSoftwareUpdateRequestorDefaultOTAProviders() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -13556,11 +13556,11 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public WriteAttribute } [cluster - writeAttributeDefaultOtaProvidersWithValue:value + writeAttributeDefaultOTAProvidersWithValue:value params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("OTASoftwareUpdateRequestor DefaultOtaProviders write Error", error); + LogNSError("OTASoftwareUpdateRequestor DefaultOTAProviders write Error", error); } SetCommandExitStatus(error); }]; @@ -13574,14 +13574,14 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public WriteAttribute mComplex; }; -class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public SubscribeAttribute { +class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOTAProviders : public SubscribeAttribute { public: - SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders() - : SubscribeAttribute("default-ota-providers") + SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOTAProviders() + : SubscribeAttribute("default-otaproviders") { } - ~SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders() {} + ~SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOTAProviders() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -13600,12 +13600,12 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public S if (mAutoResubscribe.HasValue()) { params.resubscribeIfLost = mAutoResubscribe.Value(); } - [cluster subscribeAttributeDefaultOtaProvidersWithParams:params + [cluster subscribeAttributeDefaultOTAProvidersWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"OTASoftwareUpdateRequestor.DefaultOtaProviders response %@", [value description]); + NSLog(@"OTASoftwareUpdateRequestor.DefaultOTAProviders response %@", [value description]); SetCommandExitStatus(error); }]; @@ -97982,13 +97982,13 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands) commands_list clusterCommands = { make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 8c3e978b3ed07b..79a768cea51471 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -45256,14 +45256,14 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - __auto_type * params = [[MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init]; - params.providerNodeId = mProviderNodeId.HasValue() ? [NSNumber numberWithUnsignedLongLong:mProviderNodeId.Value()] + __auto_type * params = [[MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams alloc] init]; + params.providerNodeID = mProviderNodeId.HasValue() ? [NSNumber numberWithUnsignedLongLong:mProviderNodeId.Value()] : [NSNumber numberWithUnsignedLongLong:12648430ULL]; - params.vendorId = [NSNumber numberWithUnsignedShort:0U]; + params.vendorID = [NSNumber numberWithUnsignedShort:0U]; params.announcementReason = [NSNumber numberWithUnsignedChar:0U]; params.endpoint = mEndpoint.HasValue() ? [NSNumber numberWithUnsignedShort:mEndpoint.Value()] : [NSNumber numberWithUnsignedShort:0U]; - [cluster announceOtaProviderWithParams:params + [cluster announceOTAProviderWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Send an announce OTA provider command to the requestor Error: %@", err); diff --git a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp index c7d1360efc3716..b00caa4216d19f 100644 --- a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp @@ -551,13 +551,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index c3725bb64036f3..e5eeeb83a3fe2a 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -159,7 +159,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -503,7 +503,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/lighting-app/nxp/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/nxp/zap-generated/IMClusterCommandHandler.cpp index ca173e1ae470bc..3bd64a77c04847 100644 --- a/zzz_generated/lighting-app/nxp/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/nxp/zap-generated/IMClusterCommandHandler.cpp @@ -557,13 +557,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h index fb3a75039574a8..860c7b4013f42a 100644 --- a/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h @@ -135,7 +135,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -386,7 +386,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp index adf2da73d06244..f0e07a1d5589e5 100644 --- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp @@ -851,13 +851,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index a8d2d046f2d30d..b81eb543bcdff7 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -177,7 +177,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -600,7 +600,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=12) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=14) */ \ diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp index e885cb4b8bfd10..28e7059c99e302 100644 --- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -650,13 +650,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index b5b15063d4efeb..79e3d6509d3956 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -202,7 +202,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -593,7 +593,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp index c5fc939fadb2e4..b1a5bd9c9be868 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp @@ -477,13 +477,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index 6adce2687b9e8a..208817a0893f66 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -163,7 +163,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -361,7 +361,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp index 61326d20165fff..d850b5db3d583a 100644 --- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp @@ -476,13 +476,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index 4175c8b2a12042..94c9ef3c40ba79 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -151,7 +151,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* UpdateStateProgress */ \ @@ -383,7 +383,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp index b9b666fe3a3bf9..588bc94aae0bb5 100644 --- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp @@ -376,13 +376,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index 2614982aeceb09..d392f2efe47f54 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -142,7 +142,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(true) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* UpdateStateProgress */ \ @@ -287,7 +287,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \ diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp index 190ff91967d964..190a33dc43fd64 100644 --- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp @@ -505,13 +505,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 628b2fbb615d52..310aefd1aa0c9b 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -192,7 +192,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -579,7 +579,7 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=2) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=4) */ \ diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp index de38b57f697afc..2a72863844227f 100644 --- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp @@ -477,13 +477,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AnnounceOtaProvider::Id: { - Commands::AnnounceOtaProvider::DecodableType commandData; + case Commands::AnnounceOTAProvider::Id: { + Commands::AnnounceOTAProvider::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderCallback(apCommandObj, aCommandPath, commandData); + emberAfOtaSoftwareUpdateRequestorClusterAnnounceOTAProviderCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index f968c8d69b4a90..bf6f9654516527 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -166,7 +166,7 @@ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* DefaultOtaProviders */ \ + ZAP_EMPTY_DEFAULT() }, /* DefaultOTAProviders */ \ { 0x00000001, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* UpdatePossible */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* UpdateState */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0) }, /* UpdateStateProgress */ \ @@ -625,7 +625,7 @@ #define GENERATED_COMMANDS { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* AnnounceOtaProvider */, \ + 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ /* AcceptedCommandList (index=2) */ \