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 4eda97c156b110..1aea4a55b48e4e 100644 --- a/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb +++ b/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb @@ -1416,7 +1416,7 @@ "│ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor'>: {\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.UpdateState'>: <UpdateStateEnum.kUnknown: 0>,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'>: 0,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", @@ -2432,7 +2432,7 @@ "\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.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.UpdateState'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m<\u001b[0m\u001b[1;95mUpdateStateEnum.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", "\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.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", diff --git a/docs/guides/repl/Matter_Basic_Interactions.ipynb b/docs/guides/repl/Matter_Basic_Interactions.ipynb index c87663f6e26959..41c1c788655612 100644 --- a/docs/guides/repl/Matter_Basic_Interactions.ipynb +++ b/docs/guides/repl/Matter_Basic_Interactions.ipynb @@ -1409,7 +1409,7 @@ "│ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor'>: {\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.UpdateState'>: <UpdateStateEnum.kUnknown: 0>,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress'>: 0,\n", "│ │ │ <class 'chip.clusters.Objects.OtaSoftwareUpdateRequestor.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", @@ -2425,7 +2425,7 @@ "\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.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.UpdateState'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m<\u001b[0m\u001b[1;95mUpdateStateEnum.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", "\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.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 76bb3a31f2a511..f65560f58b1ca7 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -235,20 +235,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -266,7 +266,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -274,7 +274,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -290,7 +290,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -309,13 +309,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -323,7 +323,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -342,9 +342,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -362,7 +362,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -374,7 +374,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap index 1abd6a15e3ef42..a41df830c0ac3e 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 feab7c107608df..6d90c6a0d7678d 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 @@ -849,20 +849,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -880,7 +880,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -888,7 +888,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -904,7 +904,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -923,13 +923,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -937,7 +937,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -956,9 +956,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -976,7 +976,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -988,7 +988,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 0835158762e7e7..38a6468122ec4f 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 @@ -1310,7 +1310,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 92ce7b72cae1a0..ce7b538806f9d9 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 @@ -691,20 +691,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -722,7 +722,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -730,7 +730,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -746,7 +746,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -765,13 +765,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -779,7 +779,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -798,9 +798,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -818,7 +818,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -830,7 +830,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 7b921c5a6ef3da..2908aed7212954 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 @@ -1137,7 +1137,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 30d40ecbda6c6d..7e6fb8da7770a9 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -473,20 +473,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -504,7 +504,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -528,7 +528,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -580,9 +580,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -600,7 +600,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -612,7 +612,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 8fad96abc3cd9c..43247bb0a0f29e 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index a458a1fa8708e1..80859244ad0c07 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -235,20 +235,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -266,7 +266,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -274,7 +274,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -290,7 +290,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -309,13 +309,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -323,7 +323,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -342,9 +342,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -362,7 +362,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -374,7 +374,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap index f3a38e8f503d3a..afe82d113b42e4 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 1f64ceeb410a13..30a51d4827c7e2 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -240,20 +240,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -271,7 +271,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -279,7 +279,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -295,7 +295,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -314,13 +314,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -328,7 +328,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -347,9 +347,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -367,7 +367,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -379,7 +379,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index 238bb6aef53fef..bb258ae23318d8 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index fe49f02cdcc3d3..a517fe3e90e3e3 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -472,20 +472,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -503,7 +503,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -511,7 +511,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -527,7 +527,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -546,13 +546,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -560,7 +560,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -579,9 +579,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -599,7 +599,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -611,7 +611,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 459140ce41d8eb..0f7cbcdcc70c02 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 614cebd589162f..4e4fa60ed9e996 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -323,20 +323,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -354,7 +354,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -362,7 +362,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -378,7 +378,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -430,9 +430,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -450,7 +450,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 2ef1cc50b57591..3fa93d5624abe2 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 46ddcd5baa7ceb..cdf998672b6818 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -473,20 +473,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -504,7 +504,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -528,7 +528,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -580,9 +580,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -600,7 +600,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -612,7 +612,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 81703a894c186d..a3f2467e49a364 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -844,7 +844,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index ad5768b626d4bf..fa7250eab3b535 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -323,20 +323,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -354,7 +354,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -362,7 +362,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -378,7 +378,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -430,9 +430,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -450,7 +450,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 347ad19d435824..4f026970a0bc2c 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 92201a63b5c397..74c04ef3170c3b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -473,20 +473,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -504,7 +504,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -528,7 +528,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -580,9 +580,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -600,7 +600,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -612,7 +612,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 24ba1363454886..3fb0f445ac33a3 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index bc6baad3d218ea..abf615d59ac1a0 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 4022dc8619176a..97aed3cec5abdc 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 7afed448d7dc16..a75f11c38afb61 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 3ea7ce55f17d53..0ab8d25d0de7a7 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 93dc97d9c585b1..d516b07bc20c59 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -467,20 +467,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -498,7 +498,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -506,7 +506,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -522,7 +522,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -541,13 +541,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -555,7 +555,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -574,9 +574,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -594,7 +594,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -606,7 +606,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 334ba9a55b4eb7..4f3e6a41b7d8ec 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 3233d48e4510bd..22317fb2ee12d7 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 064aabe956540b..29e915a14b0926 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 0240425386a089..e95a62f97ef8c2 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index f48bdd770329f5..8e3f21c29b9d11 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index d5cf64ac63e730..741413ae0f4fef 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index b8844c2c55f430..d3e6024747d7b5 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index d005d1153bf0b1..54e9c7637554e7 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -473,20 +473,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -504,7 +504,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -528,7 +528,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -580,9 +580,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -600,7 +600,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -612,7 +612,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index ce2dd0e5f618a0..ebdb57375b960d 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index 6387be09640c4d..3f32825039cbce 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -473,20 +473,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -504,7 +504,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -528,7 +528,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -580,9 +580,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -600,7 +600,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -612,7 +612,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 8ee048ee56b90c..e199b57ad41ec5 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index ea1ae5f516f76f..51739105fbee8f 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -437,20 +437,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -468,7 +468,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -476,7 +476,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -492,7 +492,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -511,13 +511,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -525,7 +525,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -544,9 +544,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -564,7 +564,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -576,7 +576,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 2ff637ad1cc94c..c13a0a0d3f4dd2 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 6e2f63292d50ad..0693742e55da02 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -372,20 +372,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -403,7 +403,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -411,7 +411,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -427,7 +427,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -446,13 +446,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -460,7 +460,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -479,9 +479,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -499,7 +499,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -511,7 +511,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 3ddcfdb4e4dd99..4591960b342b8e 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index b36c3a8e920e71..cc1d32f20da1e5 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 726ee3a1f97d6e..98cbf629e7930b 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 2dac786569c46f..eb28feaa756775 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -398,20 +398,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -429,7 +429,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -437,7 +437,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -453,7 +453,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -472,13 +472,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -486,7 +486,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -505,9 +505,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -525,7 +525,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -537,7 +537,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index a09206e377f2a1..7db8717ef88672 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 26df25d8ca8eb9..22ac71f359d21f 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -329,20 +329,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -368,7 +368,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -384,7 +384,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -436,9 +436,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -456,7 +456,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index c30b342889ccc2..2ba92b7adab512 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index c384ea16c974fc..db165aa268a7be 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -323,20 +323,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -354,7 +354,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -362,7 +362,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -378,7 +378,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -430,9 +430,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -450,7 +450,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 31151830ac8d59..2d8224a81b9fa6 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 222d7c556778df..606d6285b8cad4 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -323,20 +323,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -354,7 +354,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -362,7 +362,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -378,7 +378,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -430,9 +430,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -450,7 +450,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index a738b13c93a2b6..30496146b9aafb 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 2488ad155e52d3..62ad8dac11354c 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 @@ -1789,7 +1789,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 bb832ec6cd2543..4b6be40ba6fe0e 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 @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 6aa7b0e89bf85c..87154efcdd42a3 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 @@ -952,7 +952,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 34350fc3a8ccee..88763096fa2b5b 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 @@ -624,20 +624,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -655,7 +655,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -663,7 +663,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -679,7 +679,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -698,13 +698,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -712,7 +712,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -731,9 +731,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -751,7 +751,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -763,7 +763,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 a6563f00b92b1f..47ffda8e5e6fc3 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 @@ -870,7 +870,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index c2cab0ceecc69b..53c33bf15fadfc 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -481,20 +481,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -520,7 +520,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -536,7 +536,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -588,9 +588,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -608,7 +608,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -620,7 +620,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index 8ba7d833f83db0..9e4bad3b2f6d96 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -706,7 +706,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 43d9ebf87776c0..a396be847fc705 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -481,20 +481,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -520,7 +520,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -536,7 +536,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -588,9 +588,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -608,7 +608,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -620,7 +620,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index cf5391e8cb48e9..5e22e60ad1d179 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index 67cf70599807d2..bb3590ac3f8fe1 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -481,20 +481,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -512,7 +512,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -520,7 +520,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -536,7 +536,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -588,9 +588,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -608,7 +608,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -620,7 +620,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index d3dac550577b97..33294a788aa3dc 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 51119b9b1355b0..46d3c1e265463d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -628,20 +628,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -659,7 +659,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -667,7 +667,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -683,7 +683,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -702,13 +702,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -716,7 +716,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -735,9 +735,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -755,7 +755,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -767,7 +767,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index e057a52fd8d24f..5704e26200591d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 5e2bbb6a6af676..7fe54b339ebab5 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -466,20 +466,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -497,7 +497,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -505,7 +505,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -521,7 +521,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -540,13 +540,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -554,7 +554,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -573,9 +573,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -593,7 +593,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -605,7 +605,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index dcc9f8d05d6fb0..230d9775ad6481 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -684,7 +684,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index ec87126475bed2..f68a4753d9817f 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -477,20 +477,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -508,7 +508,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -516,7 +516,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -532,7 +532,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -551,13 +551,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -565,7 +565,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -584,9 +584,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -604,7 +604,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -616,7 +616,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index fea82174d0eb99..95e2b746c0b9a0 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -956,7 +956,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 08321b79c0f3a7..f0812c6cdd8b2f 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -649,20 +649,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -680,7 +680,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -688,7 +688,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -704,7 +704,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -723,13 +723,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -737,7 +737,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -756,9 +756,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -776,7 +776,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -788,7 +788,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index d955b73265d3c9..7b3e1af338bdec 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -789,7 +789,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 4831ffa4724785..c616ca21c750e5 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -628,20 +628,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -659,7 +659,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -667,7 +667,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -683,7 +683,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -702,13 +702,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -716,7 +716,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -735,9 +735,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -755,7 +755,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -767,7 +767,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index e4ed21e54b2a58..89a46128f2a4ae 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -789,7 +789,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 6509ec88c0f48c..cd4ddcfc99b4e6 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -290,20 +290,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -321,7 +321,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -329,7 +329,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -345,7 +345,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -364,13 +364,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -378,7 +378,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -397,9 +397,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -429,7 +429,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 43e5f51159cfed..ff24659d9037f1 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -996,7 +996,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index f6998bc270712b..de0cfc9688a166 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index f7df67aaf66303..c727195f8e2138 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -956,7 +956,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 34ca16af94fecb..9882d0fd6d1cb7 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 @@ -268,20 +268,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ server cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -299,7 +299,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -317,7 +317,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -328,7 +328,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } 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 736da0dbc31adf..ed012fc199a474 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 @@ -373,20 +373,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -404,7 +404,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -412,7 +412,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -428,7 +428,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -447,13 +447,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -461,7 +461,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -480,9 +480,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -500,7 +500,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -512,7 +512,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 e06c41f8af16c5..95f619affa042e 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 @@ -812,7 +812,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index d314409dec183a..c2390a51fdb713 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -396,20 +396,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -427,7 +427,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -435,7 +435,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -451,7 +451,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -503,9 +503,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -523,7 +523,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -535,7 +535,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 6ed558c3fbbc9f..18b64cdd993c24 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -924,7 +924,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 32b9ce185d7bcf..c09c349172291a 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -396,20 +396,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -427,7 +427,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -435,7 +435,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -451,7 +451,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -503,9 +503,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -523,7 +523,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -535,7 +535,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index 621b0c9cbc4f41..fdec9df363874b 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -924,7 +924,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 32b9ce185d7bcf..c09c349172291a 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -396,20 +396,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -427,7 +427,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -435,7 +435,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -451,7 +451,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -503,9 +503,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -523,7 +523,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -535,7 +535,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index 621b0c9cbc4f41..fdec9df363874b 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -924,7 +924,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, 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 cc5ac542565968..132811e6bac1dd 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 @@ -321,20 +321,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -352,7 +352,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -360,7 +360,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -376,7 +376,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -395,13 +395,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -409,7 +409,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -428,9 +428,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -448,7 +448,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -460,7 +460,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } 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 5df46bf0d08760..3aaeede729bef0 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 @@ -924,7 +924,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index f16204c49a52fe..a8338554de032e 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index 017947d47e8377..c70149af7ff147 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -952,7 +952,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 38db87bea567d6..0c20525aa3ec7b 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap index b1e40069e57b92..89e7581fd05629 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap @@ -773,7 +773,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 133c578b796fa2..9ee6e0b09991fb 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -377,20 +377,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -408,7 +408,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -416,7 +416,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -432,7 +432,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -451,13 +451,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -465,7 +465,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -484,9 +484,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -504,7 +504,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -516,7 +516,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 8eea1aca5f7c01..315bc6e478cf53 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -938,7 +938,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 0cb3ddc08b5ce2..83aa998c1ef8c1 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -386,20 +386,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ server cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -435,7 +435,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -446,7 +446,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 44ba66acb121bd..1f1808e68578f4 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -515,20 +515,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ server cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -546,7 +546,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -564,7 +564,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -575,7 +575,7 @@ server cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index ddbf18db2dea7c..c1f01981729ca4 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -310,20 +310,20 @@ server cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -341,7 +341,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -349,7 +349,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -365,7 +365,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -417,9 +417,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -437,7 +437,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -449,7 +449,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index e62be371441075..0a1ee627d95db5 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -996,7 +996,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter index 6687139a8cf557..11593ca49c55d9 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter @@ -603,13 +603,13 @@ server cluster BasicInformation = 40 { } client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHttps = 2; @@ -629,7 +629,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorId = 0; INT16U productId = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -647,7 +647,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -657,13 +657,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { } server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -671,7 +671,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -690,9 +690,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -710,7 +710,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOtaProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -718,7 +718,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOtaProviderRequest { node_id providerNodeId = 0; vendor_id vendorId = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter index 4fae3caa9e0aa3..fb698630da7511 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter @@ -387,13 +387,13 @@ server cluster BasicInformation = 40 { } client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHttps = 2; @@ -413,7 +413,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorId = 0; INT16U productId = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -442,7 +442,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -452,13 +452,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { } server cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -466,7 +466,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -485,9 +485,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -505,7 +505,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOtaProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -513,7 +513,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOtaProviderRequest { node_id providerNodeId = 0; vendor_id vendorId = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/proto/ota_software_update_provider_cluster.proto b/scripts/py_matter_idl/matter_idl/tests/outputs/proto/ota_software_update_provider_cluster.proto index 15bfdb9abe5c4c..179ade44b9fa00 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/proto/ota_software_update_provider_cluster.proto +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/proto/ota_software_update_provider_cluster.proto @@ -16,17 +16,17 @@ message OtaSoftwareUpdateProviderCluster { } // Enums - enum OTAApplyUpdateAction { - OTAAUA_PROCEED = 0; - OTAAUA_AWAIT_NEXT_ACTION = 1; - OTAAUA_DISCONTINUE = 2; + enum ApplyUpdateActionEnum { + AUAE_PROCEED = 0; + AUAE_AWAIT_NEXT_ACTION = 1; + AUAE_DISCONTINUE = 2; } - enum OTADownloadProtocol { - OTADP_BDXSYNCHRONOUS = 0; - OTADP_BDXASYNCHRONOUS = 1; - OTADP_HTTPS = 2; - OTADP_VENDOR_SPECIFIC = 3; + enum DownloadProtocolEnum { + DPE_BDXSYNCHRONOUS = 0; + DPE_BDXASYNCHRONOUS = 1; + DPE_HTTPS = 2; + DPE_VENDOR_SPECIFIC = 3; } enum OTAQueryStatus { @@ -60,8 +60,8 @@ message OtaSoftwareUpdateProviderCluster { INT16U product_id = 3145729; /** INT32U Type: 6 IsList: 0 FieldId: 2 */ INT32U software_version = 3145730; - /** OTADownloadProtocol Type: 6 IsList: 1 FieldId: 3 */ - repeated OTADownloadProtocol protocols_supported = 3145731; + /** DownloadProtocolEnum Type: 6 IsList: 1 FieldId: 3 */ + repeated DownloadProtocolEnum protocols_supported = 3145731; /** INT16U Type: 6 IsList: 0 FieldId: 4 */ optional INT16U hardware_version = 3145732; /** CHAR_STRING Type: 4 IsList: 0 FieldId: 5 */ @@ -89,8 +89,8 @@ message OtaSoftwareUpdateProviderCluster { message ApplyUpdateRequestCommandResponse { // option (message_type) = MATTER_COMMAND_RESPONSE; - /** OTAApplyUpdateAction Type: 6 IsList: 0 FieldId: 0 */ - OTAApplyUpdateAction action = 3145728; + /** ApplyUpdateActionEnum Type: 6 IsList: 0 FieldId: 0 */ + ApplyUpdateActionEnum action = 3145728; /** INT32U Type: 6 IsList: 0 FieldId: 1 */ INT32U delayed_action_time = 3145729; } diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index e5f288d0437f7b..3c68c6a1f5bd31 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -1294,7 +1294,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index aa8b2c6787d726..e4553bb4a29bfc 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -968,7 +968,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "OTAUpdateStateEnum", + "type": "UpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/app/CompatEnumNames.h b/src/app/CompatEnumNames.h new file mode 100644 index 00000000000000..eb5a4aabfdc3cd --- /dev/null +++ b/src/app/CompatEnumNames.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * This file contains backwards-compatibility enum name definitions. This file + * is meant to be included at the end of cluster-enums.h, after all the normal + * enum definitions are available. + */ + +#pragma once + +namespace chip { +namespace app { +namespace Clusters { + +namespace OtaSoftwareUpdateProvider { +// https://github.com/project-chip/connectedhomeip/pull/29459 renamed these +// enums to follow the spec names. +using OTAApplyUpdateAction = ApplyUpdateActionEnum; +using OTADownloadProtocol = DownloadProtocolEnum; +using OTAQueryStatus = StatusEnum; +} // namespace OtaSoftwareUpdateProvider + +namespace OtaSoftwareUpdateRequestor { +// https://github.com/project-chip/connectedhomeip/pull/29459 renamed these +// enums to follow the spec names. +using OTAAnnouncementReason = AnnouncementReasonEnum; +using OTAChangeReasonEnum = ChangeReasonEnum; +using OTAUpdateStateEnum = UpdateStateEnum; +} // namespace OtaSoftwareUpdateRequestor + +} // namespace Clusters +} // namespace app +} // namespace chip diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt index 4394ed79a7c25a..d6c9e46befde3c 100644 --- a/src/app/zap-templates/templates/app/cluster-enums.zapt +++ b/src/app/zap-templates/templates/app/cluster-enums.zapt @@ -52,3 +52,6 @@ k{{asUpperCamelCase label}} = {{asHex mask}}, } // namespace Clusters } // namespace app } // namespace chip + +// Included at the end, so all our definitions above are available. +#include 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 f14d6df8f6940f..ad9cfb35c84f66 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 @@ -16,20 +16,20 @@ limitations under the License. --> - + - + - + @@ -49,7 +49,7 @@ limitations under the License. - + @@ -57,7 +57,7 @@ limitations under the License. Response to QueryImage command - + @@ -73,7 +73,7 @@ limitations under the License. Reponse to ApplyUpdateRequest command - + @@ -82,13 +82,13 @@ limitations under the License. - + - + @@ -100,7 +100,7 @@ limitations under the License. - + @@ -123,21 +123,21 @@ limitations under the License. true DefaultOTAProviders UpdatePossible - UpdateState + 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 8a794ee5701783..036dcb9abee6e1 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -928,20 +928,20 @@ client cluster BasicInformation = 40 { /** Provides an interface for providing OTA software updates */ client cluster OtaSoftwareUpdateProvider = 41 { - enum OTAApplyUpdateAction : ENUM8 { + enum ApplyUpdateActionEnum : ENUM8 { kProceed = 0; kAwaitNextAction = 1; kDiscontinue = 2; } - enum OTADownloadProtocol : ENUM8 { + enum DownloadProtocolEnum : ENUM8 { kBDXSynchronous = 0; kBDXAsynchronous = 1; kHTTPS = 2; kVendorSpecific = 3; } - enum OTAQueryStatus : ENUM8 { + enum StatusEnum : ENUM8 { kUpdateAvailable = 0; kBusy = 1; kNotAvailable = 2; @@ -959,7 +959,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { vendor_id vendorID = 0; INT16U productID = 1; INT32U softwareVersion = 2; - OTADownloadProtocol protocolsSupported[] = 3; + DownloadProtocolEnum protocolsSupported[] = 3; optional INT16U hardwareVersion = 4; optional CHAR_STRING<2> location = 5; optional BOOLEAN requestorCanConsent = 6; @@ -967,7 +967,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct QueryImageResponse = 1 { - OTAQueryStatus status = 0; + StatusEnum status = 0; optional INT32U delayedActionTime = 1; optional CHAR_STRING<256> imageURI = 2; optional INT32U softwareVersion = 3; @@ -983,7 +983,7 @@ client cluster OtaSoftwareUpdateProvider = 41 { } response struct ApplyUpdateResponse = 3 { - OTAApplyUpdateAction action = 0; + ApplyUpdateActionEnum action = 0; INT32U delayedActionTime = 1; } @@ -1002,13 +1002,13 @@ client cluster OtaSoftwareUpdateProvider = 41 { /** Provides an interface for downloading and applying OTA software updates */ client cluster OtaSoftwareUpdateRequestor = 42 { - enum OTAAnnouncementReason : ENUM8 { + enum AnnouncementReasonEnum : ENUM8 { kSimpleAnnouncement = 0; kUpdateAvailable = 1; kUrgentUpdateAvailable = 2; } - enum OTAChangeReasonEnum : ENUM8 { + enum ChangeReasonEnum : ENUM8 { kUnknown = 0; kSuccess = 1; kFailure = 2; @@ -1016,7 +1016,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 { kDelayByProvider = 4; } - enum OTAUpdateStateEnum : ENUM8 { + enum UpdateStateEnum : ENUM8 { kUnknown = 0; kIdle = 1; kQuerying = 2; @@ -1035,9 +1035,9 @@ client cluster OtaSoftwareUpdateRequestor = 42 { } info event StateTransition = 0 { - OTAUpdateStateEnum previousState = 0; - OTAUpdateStateEnum newState = 1; - OTAChangeReasonEnum reason = 2; + UpdateStateEnum previousState = 0; + UpdateStateEnum newState = 1; + ChangeReasonEnum reason = 2; nullable INT32U targetSoftwareVersion = 3; } @@ -1055,7 +1055,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 { attribute ProviderLocation defaultOTAProviders[] = 0; readonly attribute boolean updatePossible = 1; - readonly attribute OTAUpdateStateEnum updateState = 2; + readonly attribute UpdateStateEnum updateState = 2; readonly attribute nullable int8u updateStateProgress = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1067,7 +1067,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 { request struct AnnounceOTAProviderRequest { node_id providerNodeID = 0; vendor_id vendorID = 1; - OTAAnnouncementReason announcementReason = 2; + AnnouncementReasonEnum announcementReason = 2; optional OCTET_STRING<512> metadataForNode = 3; endpoint_no endpoint = 4; } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 300e8b56cb66c7..9fd5e22b832ab9 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -4755,7 +4755,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class OTAApplyUpdateAction(MatterIntEnum): + class ApplyUpdateActionEnum(MatterIntEnum): kProceed = 0x00 kAwaitNextAction = 0x01 kDiscontinue = 0x02 @@ -4765,7 +4765,7 @@ class OTAApplyUpdateAction(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 3, - class OTADownloadProtocol(MatterIntEnum): + class DownloadProtocolEnum(MatterIntEnum): kBDXSynchronous = 0x00 kBDXAsynchronous = 0x01 kHttps = 0x02 @@ -4776,7 +4776,7 @@ class OTADownloadProtocol(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 4, - class OTAQueryStatus(MatterIntEnum): + class StatusEnum(MatterIntEnum): kUpdateAvailable = 0x00 kBusy = 0x01 kNotAvailable = 0x02 @@ -4802,7 +4802,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: 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="protocolsSupported", Tag=3, Type=typing.List[OtaSoftwareUpdateProvider.Enums.DownloadProtocolEnum]), ClusterObjectFieldDescriptor(Label="hardwareVersion", Tag=4, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="location", Tag=5, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="requestorCanConsent", Tag=6, Type=typing.Optional[bool]), @@ -4812,7 +4812,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: vendorID: 'uint' = 0 productID: 'uint' = 0 softwareVersion: 'uint' = 0 - protocolsSupported: 'typing.List[OtaSoftwareUpdateProvider.Enums.OTADownloadProtocol]' = field(default_factory=lambda: []) + protocolsSupported: 'typing.List[OtaSoftwareUpdateProvider.Enums.DownloadProtocolEnum]' = field(default_factory=lambda: []) hardwareVersion: 'typing.Optional[uint]' = None location: 'typing.Optional[str]' = None requestorCanConsent: 'typing.Optional[bool]' = None @@ -4829,7 +4829,7 @@ class QueryImageResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=OtaSoftwareUpdateProvider.Enums.OTAQueryStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=OtaSoftwareUpdateProvider.Enums.StatusEnum), ClusterObjectFieldDescriptor(Label="delayedActionTime", Tag=1, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="imageURI", Tag=2, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="softwareVersion", Tag=3, Type=typing.Optional[uint]), @@ -4839,7 +4839,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="metadataForRequestor", Tag=7, Type=typing.Optional[bytes]), ]) - status: 'OtaSoftwareUpdateProvider.Enums.OTAQueryStatus' = 0 + status: 'OtaSoftwareUpdateProvider.Enums.StatusEnum' = 0 delayedActionTime: 'typing.Optional[uint]' = None imageURI: 'typing.Optional[str]' = None softwareVersion: 'typing.Optional[uint]' = None @@ -4877,11 +4877,11 @@ class ApplyUpdateResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="action", Tag=0, Type=OtaSoftwareUpdateProvider.Enums.OTAApplyUpdateAction), + ClusterObjectFieldDescriptor(Label="action", Tag=0, Type=OtaSoftwareUpdateProvider.Enums.ApplyUpdateActionEnum), ClusterObjectFieldDescriptor(Label="delayedActionTime", Tag=1, Type=uint), ]) - action: 'OtaSoftwareUpdateProvider.Enums.OTAApplyUpdateAction' = 0 + action: 'OtaSoftwareUpdateProvider.Enums.ApplyUpdateActionEnum' = 0 delayedActionTime: 'uint' = 0 @dataclass @@ -5010,7 +5010,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ 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="updateState", Tag=0x00000002, Type=OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum), ClusterObjectFieldDescriptor(Label="updateStateProgress", Tag=0x00000003, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -5022,7 +5022,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: defaultOTAProviders: 'typing.List[OtaSoftwareUpdateRequestor.Structs.ProviderLocation]' = None updatePossible: 'bool' = None - updateState: 'OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum' = None + updateState: 'OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum' = None updateStateProgress: 'typing.Union[Nullable, uint]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -5032,7 +5032,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class OTAAnnouncementReason(MatterIntEnum): + class AnnouncementReasonEnum(MatterIntEnum): kSimpleAnnouncement = 0x00 kUpdateAvailable = 0x01 kUrgentUpdateAvailable = 0x02 @@ -5042,7 +5042,7 @@ class OTAAnnouncementReason(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 3, - class OTAChangeReasonEnum(MatterIntEnum): + class ChangeReasonEnum(MatterIntEnum): kUnknown = 0x00 kSuccess = 0x01 kFailure = 0x02 @@ -5054,7 +5054,7 @@ class OTAChangeReasonEnum(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 5, - class OTAUpdateStateEnum(MatterIntEnum): + class UpdateStateEnum(MatterIntEnum): kUnknown = 0x00 kIdle = 0x01 kQuerying = 0x02 @@ -5100,14 +5100,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ 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="announcementReason", Tag=2, Type=OtaSoftwareUpdateRequestor.Enums.AnnouncementReasonEnum), ClusterObjectFieldDescriptor(Label="metadataForNode", Tag=3, Type=typing.Optional[bytes]), ClusterObjectFieldDescriptor(Label="endpoint", Tag=4, Type=uint), ]) providerNodeID: 'uint' = 0 vendorID: 'uint' = 0 - announcementReason: 'OtaSoftwareUpdateRequestor.Enums.OTAAnnouncementReason' = 0 + announcementReason: 'OtaSoftwareUpdateRequestor.Enums.AnnouncementReasonEnum' = 0 metadataForNode: 'typing.Optional[bytes]' = None endpoint: 'uint' = 0 @@ -5156,9 +5156,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum) + return ClusterObjectFieldDescriptor(Type=OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum) - value: 'OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum' = 0 + value: 'OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum' = 0 @dataclass class UpdateStateProgress(ClusterAttributeDescriptor): @@ -5287,15 +5287,15 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="previousState", Tag=0, Type=OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum), - ClusterObjectFieldDescriptor(Label="newState", Tag=1, Type=OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum), - ClusterObjectFieldDescriptor(Label="reason", Tag=2, Type=OtaSoftwareUpdateRequestor.Enums.OTAChangeReasonEnum), + ClusterObjectFieldDescriptor(Label="previousState", Tag=0, Type=OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum), + ClusterObjectFieldDescriptor(Label="newState", Tag=1, Type=OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum), + ClusterObjectFieldDescriptor(Label="reason", Tag=2, Type=OtaSoftwareUpdateRequestor.Enums.ChangeReasonEnum), ClusterObjectFieldDescriptor(Label="targetSoftwareVersion", Tag=3, Type=typing.Union[Nullable, uint]), ]) - previousState: 'OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum' = 0 - newState: 'OtaSoftwareUpdateRequestor.Enums.OTAUpdateStateEnum' = 0 - reason: 'OtaSoftwareUpdateRequestor.Enums.OTAChangeReasonEnum' = 0 + previousState: 'OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum' = 0 + newState: 'OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum' = 0 + reason: 'OtaSoftwareUpdateRequestor.Enums.ChangeReasonEnum' = 0 targetSoftwareVersion: 'typing.Union[Nullable, uint]' = NullValue @dataclass diff --git a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h index 4fb7016c488937..d166c378e1a9b3 100644 --- a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h +++ b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h @@ -51,4 +51,119 @@ typedef NS_OPTIONS(uint8_t, MTRFanControlWindSettingMask) { = 0x2, } MTR_DEPRECATED("Please use MTRFanControlWindBitmap", ios(16.1, 17.0), macos(13.0, 14.0), watchos(9.1, 10.0), tvos(16.1, 17.0)); +/** + * For the OTA clusters, first we changed the names of the clusters, and then we + * changed the names of the enums. That means we now have three names for the + * enums (newest name, name before enum name change, name before cluster name + * change). We can only track one old name for things, so just manually add the + * intermediate names. + */ +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAApplyUpdateAction) { + MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionProceed") + = 0x00, + MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction") + = 0x01, + MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue") + = 0x02, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateAction"); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTADownloadProtocol) { + MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous") + = 0x00, + MTROTASoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous") + = 0x01, + MTROTASoftwareUpdateProviderOTADownloadProtocolHTTPS MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolHTTPS") + = 0x02, + MTROTASoftwareUpdateProviderOTADownloadProtocolVendorSpecific MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific") + = 0x03, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocol"); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAQueryStatus) { + MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusUpdateAvailable") + = 0x00, + MTROTASoftwareUpdateProviderOTAQueryStatusBusy MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusBusy") + = 0x01, + MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusNotAvailable") + = 0x02, + MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), + tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported") + = 0x03, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatus"); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAAnnouncementReason) { + MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), + tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement") + = 0x00, + MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), + tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable") + = 0x01, + MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), + tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable") + = 0x02, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReason"); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAChangeReason) { + MTROTASoftwareUpdateRequestorOTAChangeReasonUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonUnknown") + = 0x00, + MTROTASoftwareUpdateRequestorOTAChangeReasonSuccess MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonSuccess") + = 0x01, + MTROTASoftwareUpdateRequestorOTAChangeReasonFailure MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonFailure") + = 0x02, + MTROTASoftwareUpdateRequestorOTAChangeReasonTimeOut MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonTimeOut") + = 0x03, + MTROTASoftwareUpdateRequestorOTAChangeReasonDelayByProvider MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider") + = 0x04, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReason"); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAUpdateState) { + MTROTASoftwareUpdateRequestorOTAUpdateStateUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateUnknown") + = 0x00, + MTROTASoftwareUpdateRequestorOTAUpdateStateIdle MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateIdle") + = 0x01, + MTROTASoftwareUpdateRequestorOTAUpdateStateQuerying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateQuerying") + = 0x02, + MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery") + = 0x03, + MTROTASoftwareUpdateRequestorOTAUpdateStateDownloading MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDownloading") + = 0x04, + MTROTASoftwareUpdateRequestorOTAUpdateStateApplying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateApplying") + = 0x05, + MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnApply MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply") + = 0x06, + MTROTASoftwareUpdateRequestorOTAUpdateStateRollingBack MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateRollingBack") + = 0x07, + MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent") + = 0x08, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateState"); + NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm b/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm index 3204ab60369b80..6fe3c48a17548a 100644 --- a/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm +++ b/src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm @@ -641,9 +641,9 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath ChipLogDetail(Controller, "QueryImage: application responded with: %s", [[data description] UTF8String]); - auto hasUpdate = [data.status isEqual:@(MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable)]; - auto isBDXProtocolSupported = [commandParams.protocolsSupported - containsObject:@(MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXSynchronous)]; + auto hasUpdate = [data.status isEqual:@(MTROTASoftwareUpdateProviderStatusUpdateAvailable)]; + auto isBDXProtocolSupported = + [commandParams.protocolsSupported containsObject:@(MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous)]; // The logic we are following here is if none of the protocols supported by the requestor are supported by us, we // can't transfer the image even if we had an image available and we would return a Protocol Not Supported status. @@ -656,8 +656,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath // If the protocol requested is not supported, return status - Protocol Not Supported if (!isBDXProtocolSupported) { Commands::QueryImageResponse::Type response; - response.status - = static_cast(MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported); + response.status = static_cast(MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported); handler->AddResponse(cachedCommandPath, response); handle.Release(); return; @@ -682,7 +681,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath ChipLogError( Controller, "Responding with Busy due to being in the middle of handling another BDX transfer"); Commands::QueryImageResponse::Type response; - response.status = static_cast(MTROTASoftwareUpdateProviderOTAQueryStatusBusy); + response.status = static_cast(MTROTASoftwareUpdateProviderStatusBusy); response.delayedActionTime.SetValue(delegateResponse.delayedActionTime.ValueOr(kDelayedActionTimeSeconds)); handler->AddResponse(cachedCommandPath, response); handle.Release(); @@ -864,7 +863,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath auto iterator = commandData.protocolsSupported.begin(); NSMutableArray * protocolsSupported = [[NSMutableArray alloc] init]; while (iterator.Next()) { - OTADownloadProtocol protocol = iterator.GetValue(); + DownloadProtocolEnum protocol = iterator.GetValue(); [protocolsSupported addObject:[NSNumber numberWithInt:to_underlying(protocol)]]; } ReturnErrorOnFailure(iterator.GetStatus()); @@ -892,7 +891,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath const MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * responseParams, Commands::QueryImageResponse::Type & response) { - response.status = static_cast([responseParams.status intValue]); + response.status = static_cast([responseParams.status intValue]); if (responseParams.delayedActionTime) { response.delayedActionTime.SetValue([responseParams.delayedActionTime unsignedIntValue]); @@ -935,7 +934,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath const MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * responseParams, Commands::ApplyUpdateResponse::Type & response) { - response.action = static_cast([responseParams.action intValue]); + response.action = static_cast([responseParams.action intValue]); response.delayedActionTime = [responseParams.delayedActionTime unsignedIntValue]; } diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 7bfe5c0ebae565..c02f9ffcf536bd 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -7593,7 +7593,52 @@ - utcTime - granularity - timeSource + enums: + OTASoftwareUpdateProvider: + - StatusEnum + - ApplyUpdateActionEnum + - DownloadProtocolEnum + OTASoftwareUpdateRequestor: + - AnnouncementReasonEnum + - UpdateStateEnum + - ChangeReasonEnum enum values: + OTASoftwareUpdateProvider: + StatusEnum: + - UpdateAvailable + - Busy + - NotAvailable + - DownloadProtocolNotSupported + ApplyUpdateActionEnum: + - Proceed + - AwaitNextAction + - Discontinue + DownloadProtocolEnum: + - BDXSynchronous + - BDXAsynchronous + - HTTPS + - VendorSpecific + OTASoftwareUpdateRequestor: + AnnouncementReasonEnum: + - SimpleAnnouncement + - UpdateAvailable + - UrgentUpdateAvailable + UpdateStateEnum: + - Unknown + - Idle + - Querying + - DelayedOnQuery + - Downloading + - Applying + - DelayedOnApply + - RollingBack + - DelayedOnUserConsent + ChangeReasonEnum: + - Unknown + - Success + - Failure + - TimeOut + - DelayByProvider OnOff: DelayedAllOffEffectVariantEnum: - DelayedOffFastFade @@ -7612,6 +7657,15 @@ OnOffControlBitmap: - AcceptOnlyWhenOn deprecated: + enums: + OTASoftwareUpdateProvider: + - OTAQueryStatus + - OTAApplyUpdateAction + - OTADownloadProtocol + OTASoftwareUpdateRequestor: + - OTAAnnouncementReason + - OTAUpdateStateEnum + - OTAChangeReasonEnum enum values: OnOff: DelayedAllOffEffectVariantEnum: @@ -7642,6 +7696,15 @@ # Not in the spec yet. - AverageWearCount renames: + enums: + OTASoftwareUpdateProvider: + StatusEnum: OTAQueryStatus + ApplyUpdateActionEnum: OTAApplyUpdateAction + DownloadProtocolEnum: OTADownloadProtocol + OTASoftwareUpdateRequestor: + AnnouncementReasonEnum: OTAAnnouncementReason + UpdateStateEnum: OTAUpdateStateEnum + ChangeReasonEnum: OTAChangeReasonEnum enum values: OnOff: DelayedAllOffEffectVariantEnum: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 22657490eb413b..c7b3d8ef2955e5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -13464,97 +13464,97 @@ typedef NS_ENUM(uint8_t, MTRBasicInformationProductFinish) { MTRBasicInformationProductFinishFabric MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x05, } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)); -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAApplyUpdateAction) { - MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderApplyUpdateAction) { + MTROTASoftwareUpdateProviderApplyUpdateActionProceed MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue MTR_NEWLY_AVAILABLE = 0x02, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAApplyUpdateAction) { - MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateProviderOTAApplyUpdateActionDiscontinue MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAApplyUpdateAction", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); - -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTADownloadProtocol) { - MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateProviderOTADownloadProtocolHTTPS MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, - MTROTASoftwareUpdateProviderOTADownloadProtocolVendorSpecific MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x03, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionProceed", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateProviderOTAApplyUpdateActionDiscontinue MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateAction", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderDownloadProtocol) { + MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateProviderDownloadProtocolHTTPS MTR_NEWLY_AVAILABLE = 0x02, + MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific MTR_NEWLY_AVAILABLE = 0x03, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTADownloadProtocol) { - MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateProviderOTADownloadProtocolHTTPS MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTADownloadProtocolHTTPS", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, - MTROtaSoftwareUpdateProviderOTADownloadProtocolVendorSpecific MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTADownloadProtocolVendorSpecific", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTADownloadProtocol", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); - -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAQueryStatus) { - MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateProviderOTAQueryStatusBusy MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, - MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x03, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateProviderOTADownloadProtocolHTTPS MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolHTTPS", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, + MTROtaSoftwareUpdateProviderOTADownloadProtocolVendorSpecific MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocol", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderStatus) { + MTROTASoftwareUpdateProviderStatusUpdateAvailable MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateProviderStatusBusy MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateProviderStatusNotAvailable MTR_NEWLY_AVAILABLE = 0x02, + MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported MTR_NEWLY_AVAILABLE = 0x03, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAQueryStatus) { - MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateProviderOTAQueryStatusBusy MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAQueryStatusBusy", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, - MTROtaSoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderOTAQueryStatus", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); - -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAAnnouncementReason) { - MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateProviderOTAQueryStatusBusy MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusBusy", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusNotAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, + MTROtaSoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatus", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorAnnouncementReason) { + MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable MTR_NEWLY_AVAILABLE = 0x02, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAAnnouncementReason) { - MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAAnnouncementReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); - -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAChangeReason) { - MTROTASoftwareUpdateRequestorOTAChangeReasonUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateRequestorOTAChangeReasonSuccess MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateRequestorOTAChangeReasonFailure MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, - MTROTASoftwareUpdateRequestorOTAChangeReasonTimeOut MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x03, - MTROTASoftwareUpdateRequestorOTAChangeReasonDelayByProvider MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x04, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorChangeReason) { + MTROTASoftwareUpdateRequestorChangeReasonUnknown MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateRequestorChangeReasonSuccess MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateRequestorChangeReasonFailure MTR_NEWLY_AVAILABLE = 0x02, + MTROTASoftwareUpdateRequestorChangeReasonTimeOut MTR_NEWLY_AVAILABLE = 0x03, + MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider MTR_NEWLY_AVAILABLE = 0x04, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAChangeReason) { - MTROtaSoftwareUpdateRequestorOTAChangeReasonUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReasonUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateRequestorOTAChangeReasonSuccess MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReasonSuccess", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateRequestorOTAChangeReasonFailure MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReasonFailure", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, - MTROtaSoftwareUpdateRequestorOTAChangeReasonTimeOut MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReasonTimeOut", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, - MTROtaSoftwareUpdateRequestorOTAChangeReasonDelayByProvider MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReasonDelayByProvider", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x04, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAChangeReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); - -typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAUpdateState) { - MTROTASoftwareUpdateRequestorOTAUpdateStateUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, - MTROTASoftwareUpdateRequestorOTAUpdateStateIdle MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, - MTROTASoftwareUpdateRequestorOTAUpdateStateQuerying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, - MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x03, - MTROTASoftwareUpdateRequestorOTAUpdateStateDownloading MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x04, - MTROTASoftwareUpdateRequestorOTAUpdateStateApplying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x05, - MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnApply MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x06, - MTROTASoftwareUpdateRequestorOTAUpdateStateRollingBack MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x07, - MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x08, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTROtaSoftwareUpdateRequestorOTAChangeReasonUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateRequestorOTAChangeReasonSuccess MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonSuccess", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateRequestorOTAChangeReasonFailure MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonFailure", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, + MTROtaSoftwareUpdateRequestorOTAChangeReasonTimeOut MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonTimeOut", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, + MTROtaSoftwareUpdateRequestorOTAChangeReasonDelayByProvider MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x04, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorUpdateState) { + MTROTASoftwareUpdateRequestorUpdateStateUnknown MTR_NEWLY_AVAILABLE = 0x00, + MTROTASoftwareUpdateRequestorUpdateStateIdle MTR_NEWLY_AVAILABLE = 0x01, + MTROTASoftwareUpdateRequestorUpdateStateQuerying MTR_NEWLY_AVAILABLE = 0x02, + MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery MTR_NEWLY_AVAILABLE = 0x03, + MTROTASoftwareUpdateRequestorUpdateStateDownloading MTR_NEWLY_AVAILABLE = 0x04, + MTROTASoftwareUpdateRequestorUpdateStateApplying MTR_NEWLY_AVAILABLE = 0x05, + MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply MTR_NEWLY_AVAILABLE = 0x06, + MTROTASoftwareUpdateRequestorUpdateStateRollingBack MTR_NEWLY_AVAILABLE = 0x07, + MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent MTR_NEWLY_AVAILABLE = 0x08, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAUpdateState) { - MTROtaSoftwareUpdateRequestorOTAUpdateStateUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, - MTROtaSoftwareUpdateRequestorOTAUpdateStateIdle MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateIdle", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, - MTROtaSoftwareUpdateRequestorOTAUpdateStateQuerying MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateQuerying", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, - MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, - MTROtaSoftwareUpdateRequestorOTAUpdateStateDownloading MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateDownloading", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x04, - MTROtaSoftwareUpdateRequestorOTAUpdateStateApplying MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateApplying", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x05, - MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnApply MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnApply", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x06, - MTROtaSoftwareUpdateRequestorOTAUpdateStateRollingBack MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateRollingBack", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x07, - MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x08, -} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorOTAUpdateState", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + MTROtaSoftwareUpdateRequestorOTAUpdateStateUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00, + MTROtaSoftwareUpdateRequestorOTAUpdateStateIdle MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateIdle", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x01, + MTROtaSoftwareUpdateRequestorOTAUpdateStateQuerying MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateQuerying", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x02, + MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x03, + MTROtaSoftwareUpdateRequestorOTAUpdateStateDownloading MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDownloading", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x04, + MTROtaSoftwareUpdateRequestorOTAUpdateStateApplying MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateApplying", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x05, + MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnApply MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x06, + MTROtaSoftwareUpdateRequestorOTAUpdateStateRollingBack MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateRollingBack", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x07, + MTROtaSoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x08, +} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateState", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); typedef NS_ENUM(uint8_t, MTRTimeFormatLocalizationCalendarType) { MTRTimeFormatLocalizationCalendarTypeBuddhist MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 26e3d6accbdc38..1790c746aa2b00 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -14191,7 +14191,7 @@ - (void)readAttributeUpdateStateWithCompletion:(void (^)(NSNumber * _Nullable va { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo; - return MTRReadAttribute(params, completion, self.callbackQueue, self.device, self.endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -14201,13 +14201,13 @@ - (void)subscribeAttributeUpdateStateWithParams:(MTRSubscribeParams * _Nonnull)p reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self.endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self.endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeUpdateStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, ^(OTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, ^(OTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::UpdateState::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 5fb75a86607979..dcbcd7a593d0cc 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -87,30 +87,30 @@ typedef void (*BasicInformationClusterProductFinishEnumAttributeCallback)(void * chip::app::Clusters::BasicInformation::ProductFinishEnum); typedef void (*NullableBasicInformationClusterProductFinishEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction); -typedef void (*NullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateProvider::OTADownloadProtocol); -typedef void (*NullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAQueryStatus); -typedef void (*NullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAAnnouncementReason); -typedef void (*NullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAChangeReasonEnum); -typedef void (*NullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback)( - void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum); -typedef void (*NullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateProvider::ApplyUpdateActionEnum); +typedef void (*NullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateProvider::DownloadProtocolEnum); +typedef void (*NullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateProviderClusterStatusEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateProvider::StatusEnum); +typedef void (*NullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::AnnouncementReasonEnum); +typedef void (*NullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::ChangeReasonEnum); +typedef void (*NullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallback)( + void *, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum); +typedef void (*NullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*TimeFormatLocalizationClusterCalendarTypeEnumAttributeCallback)( void *, chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum); typedef void (*NullableTimeFormatLocalizationClusterCalendarTypeEnumAttributeCallback)( @@ -20071,441 +20071,437 @@ class MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackSubscr MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::ApplyUpdateActionEnum value); }; -class MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge +class MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn( + void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTADownloadProtocol value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::DownloadProtocolEnum value); }; -class MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge +class MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAQueryStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::StatusEnum value); }; -class MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge +class MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAAnnouncementReason value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::AnnouncementReasonEnum value); }; -class MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge +class MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn( void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAChangeReasonEnum value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::ChangeReasonEnum value); }; -class MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge +class MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge - : public MTRCallbackBridge +class MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value); + static void OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value); }; -class MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge - : public MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge +class MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge + : public MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge { public: - MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge( + MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(queue, handler, action), + MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::OnDone; + using MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge - : public MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge +class MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge { public: - MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge( + MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge(queue, handler, action), + MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::OnDone; + using MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::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 d34f244c92f528..3d4676f906e2ea 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -20113,14 +20113,14 @@ } } -void MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction value) +void MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::ApplyUpdateActionEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20135,7 +20135,7 @@ } } -void MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20146,7 +20146,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateProviderClusterApplyUpdateActionEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20161,14 +20161,14 @@ } } -void MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTADownloadProtocol value) +void MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::DownloadProtocolEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20183,7 +20183,7 @@ } } -void MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20194,7 +20194,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateProviderClusterOTADownloadProtocolAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateProviderClusterDownloadProtocolEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20209,14 +20209,14 @@ } } -void MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAQueryStatus value) +void MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20231,7 +20231,7 @@ } } -void MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20242,7 +20242,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateProviderClusterOTAQueryStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateProviderClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20257,14 +20257,14 @@ } } -void MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAAnnouncementReason value) +void MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::AnnouncementReasonEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20279,7 +20279,7 @@ } } -void MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20290,7 +20290,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateRequestorClusterOTAAnnouncementReasonAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateRequestorClusterAnnouncementReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20305,14 +20305,14 @@ } } -void MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAChangeReasonEnum value) +void MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::ChangeReasonEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20327,7 +20327,7 @@ } } -void MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20338,7 +20338,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateRequestorClusterOTAChangeReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateRequestorClusterChangeReasonEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20353,14 +20353,14 @@ } } -void MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value) +void MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20375,7 +20375,7 @@ } } -void MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20386,7 +20386,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOTASoftwareUpdateRequestorClusterOTAUpdateStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOTASoftwareUpdateRequestorClusterUpdateStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m b/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m index 478a42fdf42ab4..2383341afa4d55 100644 --- a/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m +++ b/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m @@ -331,14 +331,14 @@ - (void)handleBDXTransferSessionEndForNodeID:(NSNumber *)nodeID - (void)respondNotAvailableWithCompletion:(QueryImageCompletion)completion { __auto_type * responseParams = [[MTROTASoftwareUpdateProviderClusterQueryImageResponseParams alloc] init]; - responseParams.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable); + responseParams.status = @(MTROTASoftwareUpdateProviderStatusNotAvailable); completion(responseParams, nil); } - (void)respondBusyWithDelay:(NSNumber *)delay completion:(QueryImageCompletion)completion { __auto_type * responseParams = [[MTROTASoftwareUpdateProviderClusterQueryImageResponseParams alloc] init]; - responseParams.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusBusy); + responseParams.status = @(MTROTASoftwareUpdateProviderStatusBusy); responseParams.delayedActionTime = delay; completion(responseParams, nil); } @@ -351,7 +351,7 @@ - (void)respondAvailableWithDelay:(NSNumber *)delay completion:(QueryImageCompletion)completion { __auto_type * responseParams = [[MTROTASoftwareUpdateProviderClusterQueryImageResponseParams alloc] init]; - responseParams.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable); + responseParams.status = @(MTROTASoftwareUpdateProviderStatusUpdateAvailable); responseParams.delayedActionTime = delay; responseParams.imageURI = uri; // TODO: Figure out whether we need better @@ -369,7 +369,7 @@ - (void)respondWithErrorToApplyUpdateRequestWithCompletion:(ApplyUpdateRequestCo }]; } -- (void)respondToApplyUpdateRequestWithAction:(MTROTASoftwareUpdateProviderOTAApplyUpdateAction)action +- (void)respondToApplyUpdateRequestWithAction:(MTROTASoftwareUpdateProviderApplyUpdateAction)action completion:(ApplyUpdateRequestCompletion)completion { __auto_type * params = [[MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams alloc] init]; @@ -426,7 +426,7 @@ - (instancetype)initWithRawImagePath:(NSString *)rawImagePath nodeID:(NSNumber *)nodeID softwareVersion:(NSNumber *)softwareVersion softwareVersionString:(NSString *)softwareVersionString - applyUpdateAction:(MTROTASoftwareUpdateProviderOTAApplyUpdateAction)applyUpdateAction + applyUpdateAction:(MTROTASoftwareUpdateProviderApplyUpdateAction)applyUpdateAction testcase:(XCTestCase *)testcase; @property (nonatomic, readonly) XCTestExpectation * queryExpectation; @@ -444,7 +444,7 @@ - (instancetype)initWithRawImagePath:(NSString *)rawImagePath nodeID:(NSNumber *)nodeID softwareVersion:(NSNumber *)softwareVersion softwareVersionString:(NSString *)softwareVersionString - applyUpdateAction:(MTROTASoftwareUpdateProviderOTAApplyUpdateAction)applyUpdateAction + applyUpdateAction:(MTROTASoftwareUpdateProviderApplyUpdateAction)applyUpdateAction testcase:(MTROTAProviderTests *)testcase { if (!(self = [super init])) { @@ -555,7 +555,7 @@ - (instancetype)initWithRawImagePath:(NSString *)rawImagePath [self.applyUpdateRequestExpectation fulfill]; }; - if (applyUpdateAction == MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed) { + if (applyUpdateAction == MTROTASoftwareUpdateProviderApplyUpdateActionProceed) { sOTAProviderDelegate.notifyUpdateAppliedHandler = ^(NSNumber * nodeID, MTRDeviceController * controller, MTROTASoftwareUpdateProviderClusterNotifyUpdateAppliedParams * params, MTRStatusCompletion completion) { XCTAssertEqualObjects(nodeID, nodeID); @@ -822,7 +822,7 @@ - (XCTestExpectation *)announceProviderToDevice:(MTRDevice *)device __auto_type * params = [[MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams alloc] init]; params.providerNodeID = [sController controllerNodeID]; params.vendorID = @(kTestVendorId); - params.announcementReason = @(MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement); + params.announcementReason = @(MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement); params.endpoint = @(kOTAProviderEndpointId); __auto_type * cluster = [[MTRClusterOTASoftwareUpdateRequestor alloc] initWithDevice:device endpointID:@(0) queue:queue]; @@ -1026,7 +1026,7 @@ - (void)test004_DoBDXTransferDenyUpdateRequest nodeID:@(kDeviceId1) softwareVersion:kUpdatedSoftwareVersion_5 softwareVersionString:kUpdatedSoftwareVersionString_5 - applyUpdateAction:MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue + applyUpdateAction:MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue testcase:self]; // We do not expect the update to actually be applied here. checker.notifyUpdateAppliedExpectation.inverted = YES; @@ -1084,7 +1084,7 @@ - (void)test005_DoBDXTransferAllowUpdateRequest nodeID:@(kDeviceId1) softwareVersion:kUpdatedSoftwareVersion_5 softwareVersionString:kUpdatedSoftwareVersionString_5 - applyUpdateAction:MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed + applyUpdateAction:MTROTASoftwareUpdateProviderApplyUpdateActionProceed testcase:self]; // Advertise ourselves as an OTA provider. @@ -1395,7 +1395,7 @@ - (void)test006_DoBDXTransferWithTwoOTARequesters XCTAssertTrue([[NSFileManager defaultManager] contentsEqualAtPath:otaImageFilePath andPath:otaDownloadedFilePath]); - [sOTAProviderDelegate respondToApplyUpdateRequestWithAction:MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed + [sOTAProviderDelegate respondToApplyUpdateRequestWithAction:MTROTASoftwareUpdateProviderApplyUpdateActionProceed completion:completion]; if (isDeviceID1) { @@ -1508,7 +1508,7 @@ - (void)test007_DoBDXTransferIncrementalOtaUpdate nodeID:@(kDeviceId3) softwareVersion:kUpdatedSoftwareVersion_5 softwareVersionString:kUpdatedSoftwareVersionString_5 - applyUpdateAction:MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed + applyUpdateAction:MTROTASoftwareUpdateProviderApplyUpdateActionProceed testcase:self]; // Advertise ourselves as an OTA provider. @@ -1539,7 +1539,7 @@ - (void)test007_DoBDXTransferIncrementalOtaUpdate nodeID:@(kDeviceId3) softwareVersion:kUpdatedSoftwareVersion_10 softwareVersionString:kUpdatedSoftwareVersionString_10 - applyUpdateAction:MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed + applyUpdateAction:MTROTASoftwareUpdateProviderApplyUpdateActionProceed testcase:self]; // Advertise ourselves as an OTA provider. diff --git a/src/test_driver/openiotsdk/integration-tests/ota-requestor-app/test_app.py b/src/test_driver/openiotsdk/integration-tests/ota-requestor-app/test_app.py index 9470d5a16e46ef..c0ec04a02274bc 100644 --- a/src/test_driver/openiotsdk/integration-tests/ota-requestor-app/test_app.py +++ b/src/test_driver/openiotsdk/integration-tests/ota-requestor-app/test_app.py @@ -161,7 +161,7 @@ def test_update_ctrl(device, controller, ota_provider, softwareVersion): # Announce the OTA provider and start the firmware update process err, res = send_zcl_command(devCtrl, "OtaSoftwareUpdateRequestor", "AnnounceOTAProvider", requestorNodeId, OTA_REQUESTOR_CTRL_TEST_ENDPOINT_ID, dict(providerNodeID=providerNodeId, vendorID=int(setupPayloadProvider.attributes['VendorID']), - announcementReason=OtaSoftwareUpdateRequestor.Enums.OTAAnnouncementReason.kUrgentUpdateAvailable, + announcementReason=OtaSoftwareUpdateRequestor.Enums.AnnouncementReasonEnum.kUrgentUpdateAvailable, metadataForNode=None, endpoint=0)) ret = device.wait_for_output("New version of the software is available") diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index eea6f71fe6596b..2f849e55632d4b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -2534,9 +2534,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) namespace UpdateState { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, readable, sizeof(temp)); @@ -2548,9 +2548,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpd *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 6aa879d45c01b1..ac2eb5ef856272 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -502,8 +502,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value); namespace UpdateState { EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum * value); // OTAUpdateStateEnum -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value); + chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum * value); // UpdateStateEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value); } // namespace UpdateState namespace UpdateStateProgress { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 3f374ba71068bf..851294af325272 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -304,9 +304,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(BasicInformation::Produ } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::OTAApplyUpdateAction val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::ApplyUpdateActionEnum val) { - using EnumType = OtaSoftwareUpdateProvider::OTAApplyUpdateAction; + using EnumType = OtaSoftwareUpdateProvider::ApplyUpdateActionEnum; switch (val) { case EnumType::kProceed: @@ -317,9 +317,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvid return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::OTADownloadProtocol val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::DownloadProtocolEnum val) { - using EnumType = OtaSoftwareUpdateProvider::OTADownloadProtocol; + using EnumType = OtaSoftwareUpdateProvider::DownloadProtocolEnum; switch (val) { case EnumType::kBDXSynchronous: @@ -331,9 +331,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvid return static_cast(4); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::OTAQueryStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::StatusEnum val) { - using EnumType = OtaSoftwareUpdateProvider::OTAQueryStatus; + using EnumType = OtaSoftwareUpdateProvider::StatusEnum; switch (val) { case EnumType::kUpdateAvailable: @@ -346,9 +346,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvid } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::OTAAnnouncementReason val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::AnnouncementReasonEnum val) { - using EnumType = OtaSoftwareUpdateRequestor::OTAAnnouncementReason; + using EnumType = OtaSoftwareUpdateRequestor::AnnouncementReasonEnum; switch (val) { case EnumType::kSimpleAnnouncement: @@ -359,9 +359,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateReques return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::OTAChangeReasonEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::ChangeReasonEnum val) { - using EnumType = OtaSoftwareUpdateRequestor::OTAChangeReasonEnum; + using EnumType = OtaSoftwareUpdateRequestor::ChangeReasonEnum; switch (val) { case EnumType::kUnknown: @@ -374,9 +374,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateReques return static_cast(5); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::OTAUpdateStateEnum val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateRequestor::UpdateStateEnum val) { - using EnumType = OtaSoftwareUpdateRequestor::OTAUpdateStateEnum; + using EnumType = OtaSoftwareUpdateRequestor::UpdateStateEnum; switch (val) { case EnumType::kUnknown: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index d69da66fa05f6c..d4925b21a741f5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -416,8 +416,8 @@ enum class ProductFinishEnum : uint8_t namespace OtaSoftwareUpdateProvider { -// Enum for OTAApplyUpdateAction -enum class OTAApplyUpdateAction : uint8_t +// Enum for ApplyUpdateActionEnum +enum class ApplyUpdateActionEnum : uint8_t { kProceed = 0x00, kAwaitNextAction = 0x01, @@ -429,8 +429,8 @@ enum class OTAApplyUpdateAction : uint8_t kUnknownEnumValue = 3, }; -// Enum for OTADownloadProtocol -enum class OTADownloadProtocol : uint8_t +// Enum for DownloadProtocolEnum +enum class DownloadProtocolEnum : uint8_t { kBDXSynchronous = 0x00, kBDXAsynchronous = 0x01, @@ -443,8 +443,8 @@ enum class OTADownloadProtocol : uint8_t kUnknownEnumValue = 4, }; -// Enum for OTAQueryStatus -enum class OTAQueryStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kUpdateAvailable = 0x00, kBusy = 0x01, @@ -460,8 +460,8 @@ enum class OTAQueryStatus : uint8_t namespace OtaSoftwareUpdateRequestor { -// Enum for OTAAnnouncementReason -enum class OTAAnnouncementReason : uint8_t +// Enum for AnnouncementReasonEnum +enum class AnnouncementReasonEnum : uint8_t { kSimpleAnnouncement = 0x00, kUpdateAvailable = 0x01, @@ -473,8 +473,8 @@ enum class OTAAnnouncementReason : uint8_t kUnknownEnumValue = 3, }; -// Enum for OTAChangeReasonEnum -enum class OTAChangeReasonEnum : uint8_t +// Enum for ChangeReasonEnum +enum class ChangeReasonEnum : uint8_t { kUnknown = 0x00, kSuccess = 0x01, @@ -488,8 +488,8 @@ enum class OTAChangeReasonEnum : uint8_t kUnknownEnumValue = 5, }; -// Enum for OTAUpdateStateEnum -enum class OTAUpdateStateEnum : uint8_t +// Enum for UpdateStateEnum +enum class UpdateStateEnum : uint8_t { kUnknown = 0x00, kIdle = 0x01, @@ -4140,3 +4140,6 @@ namespace SampleMei {} // namespace SampleMei } // namespace Clusters } // namespace app } // namespace chip + +// Included at the end, so all our definitions above are available. +#include 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 cbc4e2c721b9a0..6161d06777ce7c 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 @@ -5286,7 +5286,7 @@ struct Type chip::VendorId vendorID = static_cast(0); uint16_t productID = static_cast(0); uint32_t softwareVersion = static_cast(0); - DataModel::List protocolsSupported; + DataModel::List protocolsSupported; Optional hardwareVersion; Optional location; Optional requestorCanConsent; @@ -5308,7 +5308,7 @@ struct DecodableType chip::VendorId vendorID = static_cast(0); uint16_t productID = static_cast(0); uint32_t softwareVersion = static_cast(0); - DataModel::DecodableList protocolsSupported; + DataModel::DecodableList protocolsSupported; Optional hardwareVersion; Optional location; Optional requestorCanConsent; @@ -5336,7 +5336,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::QueryImageResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - OTAQueryStatus status = static_cast(0); + StatusEnum status = static_cast(0); Optional delayedActionTime; Optional imageURI; Optional softwareVersion; @@ -5358,7 +5358,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::QueryImageResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - OTAQueryStatus status = static_cast(0); + StatusEnum status = static_cast(0); Optional delayedActionTime; Optional imageURI; Optional softwareVersion; @@ -5418,8 +5418,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ApplyUpdateResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - OTAApplyUpdateAction action = static_cast(0); - uint32_t delayedActionTime = static_cast(0); + ApplyUpdateActionEnum action = static_cast(0); + uint32_t delayedActionTime = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -5434,8 +5434,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ApplyUpdateResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateProvider::Id; } - OTAApplyUpdateAction action = static_cast(0); - uint32_t delayedActionTime = static_cast(0); + ApplyUpdateActionEnum action = static_cast(0); + uint32_t delayedActionTime = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ApplyUpdateResponse @@ -5598,9 +5598,9 @@ struct Type 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); - OTAAnnouncementReason announcementReason = static_cast(0); + chip::NodeId providerNodeID = static_cast(0); + chip::VendorId vendorID = static_cast(0); + AnnouncementReasonEnum announcementReason = static_cast(0); Optional metadataForNode; chip::EndpointId endpoint = static_cast(0); @@ -5617,9 +5617,9 @@ struct DecodableType 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); - OTAAnnouncementReason announcementReason = static_cast(0); + chip::NodeId providerNodeID = static_cast(0); + chip::VendorId vendorID = static_cast(0); + AnnouncementReasonEnum announcementReason = static_cast(0); Optional metadataForNode; chip::EndpointId endpoint = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -5658,9 +5658,9 @@ struct TypeInfo namespace UpdateState { struct TypeInfo { - using Type = chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum; - using DecodableType = chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum; - using DecodableArgType = chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum; + using Type = chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum; + using DecodableType = chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum; + using DecodableArgType = chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum; static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::UpdateState::Id; } @@ -5727,7 +5727,7 @@ struct TypeInfo Attributes::DefaultOTAProviders::TypeInfo::DecodableType defaultOTAProviders; Attributes::UpdatePossible::TypeInfo::DecodableType updatePossible = static_cast(0); Attributes::UpdateState::TypeInfo::DecodableType updateState = - static_cast(0); + static_cast(0); Attributes::UpdateStateProgress::TypeInfo::DecodableType updateStateProgress; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; @@ -5758,9 +5758,9 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } static constexpr bool kIsFabricScoped = false; - OTAUpdateStateEnum previousState = static_cast(0); - OTAUpdateStateEnum newState = static_cast(0); - OTAChangeReasonEnum reason = static_cast(0); + UpdateStateEnum previousState = static_cast(0); + UpdateStateEnum newState = static_cast(0); + ChangeReasonEnum reason = static_cast(0); DataModel::Nullable targetSoftwareVersion; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -5773,9 +5773,9 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::StateTransition::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; } - OTAUpdateStateEnum previousState = static_cast(0); - OTAUpdateStateEnum newState = static_cast(0); - OTAChangeReasonEnum reason = static_cast(0); + UpdateStateEnum previousState = static_cast(0); + UpdateStateEnum newState = static_cast(0); + ChangeReasonEnum reason = static_cast(0); DataModel::Nullable targetSoftwareVersion; CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 0797ea0223d3b8..e5073c18e6523d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -2312,7 +2312,7 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand private: chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Type mRequest; - TypedComplexArgument> + TypedComplexArgument> mComplex_ProtocolsSupported; }; @@ -12619,7 +12619,7 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "update-possible", 0, 1, Attributes::UpdatePossible::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "update-state", 0, UINT8_MAX, Attributes::UpdateState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>(Id, "update-state-progress", 0, UINT8_MAX, Attributes::UpdateStateProgress::Id, 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 4d231f57803a02..a0c839de546c59 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5990,7 +5990,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("UpdatePossible", 1, value); } case OtaSoftwareUpdateRequestor::Attributes::UpdateState::Id: { - chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum value; + chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("UpdateState", 1, value); } 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 93f28961645c39..591ad2209e8231 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -16843,7 +16843,7 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand { private: chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Type mRequest; - TypedComplexArgument> mComplex_ProtocolsSupported; + TypedComplexArgument> mComplex_ProtocolsSupported; }; /*