diff --git a/docs/examples/index.md b/docs/examples/index.md
index 83a1a6f936c90c..e5144f81885039 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -87,6 +87,15 @@ darwin-framework-tool/README
java-matter-controller/README
```
+## Kotlin matter controller example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+kotlin-matter-controller/README
+```
+
## Virtual Device App example
```{toctree}
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 79f59b1b0e07a2..404448b9e4c0b9 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 d48d5dc06ad787..44f320f78c7558 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;
}
@@ -7681,7 +7681,7 @@ endpoint 2 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
- ram attribute featureMap default = 0x0000;
+ ram attribute featureMap default = 0x0001;
ram attribute clusterRevision default = 5;
}
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..983304e753c7a7 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,
@@ -22442,7 +22442,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0x0000",
+ "defaultValue": "0x0001",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index 39e3516ada4c96..8c69395887af7b 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -235,13 +235,13 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)
GeneralFaults current;
// On Linux Simulation, set following radio faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnOnFailure(previous.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kWiFiFault)));
+ ReturnOnFailure(previous.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kThreadFault)));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kWiFiFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kCellularFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kThreadFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kNFCFault)));
Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(previous, current);
}
else if (eventId == Clusters::GeneralDiagnostics::Events::NetworkFaultChange::Id)
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 9c54b1b5e44391..2ca8608a500556 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 9bdfd398998334..9e3b8b5121d322 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 e8a648cce1e7a5..e0f86a6de3b3f4 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 2755039e2a9a17..32ea8f4dfdcb6e 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 b2cca3370bee16..ce7fa2cafb81cc 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 03e88b89f44b89..b7d23535ba705d 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 ef6de649e0e6cf..61a1e8d68f14e4 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 79da2c2ee58908..e604d6b18b0eb6 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 1dab80f8206f9e..f8463a39954b2d 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 e6f102982276d3..2955c47233427c 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 cdde10a948bcdf..d34447b605e51c 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 288b3b472c1fb7..e390e64a298c08 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 85b504c30be04c..fe2e2a445c3d6e 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 55e1ee2432fec7..62c5e67f01069b 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 2970734d45647c..6ff17f63746f42 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 2f918a693ce9e0..c9a8d24fe920fa 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 9dad4068c77a02..d0c13b9af0f655 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 b0ed49d1a530a8..a00296c870bf8e 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 e190c2c3f45159..881a8f98bebe72 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 43e01f401d2c25..d414e6d6090b3d 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 e45cbab08f1b84..ba6144e0f90ef5 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 25df83b2b40c4a..f250774a1fee66 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 a73b3cdddc35de..90030716aa3610 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 b01ae32784b585..0813b6e11cc9b0 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 0aeb7175dbed32..427f5fb12746a5 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/kotlin-matter-controller/.gitignore b/examples/kotlin-matter-controller/.gitignore
new file mode 100644
index 00000000000000..d59e52c6fd3f22
--- /dev/null
+++ b/examples/kotlin-matter-controller/.gitignore
@@ -0,0 +1,20 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+
+# Shared libs & JAR libs (those libs are copied into source tree for easy Android build).
+*.so
+*.jar
+*.map
diff --git a/examples/kotlin-matter-controller/.gn b/examples/kotlin-matter-controller/.gn
new file mode 100644
index 00000000000000..5cd171abcda9ff
--- /dev/null
+++ b/examples/kotlin-matter-controller/.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020-2022 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.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+ import("//args.gni")
+}
diff --git a/examples/kotlin-matter-controller/BUILD.gn b/examples/kotlin-matter-controller/BUILD.gn
new file mode 100644
index 00000000000000..b13208e65ef749
--- /dev/null
+++ b/examples/kotlin-matter-controller/BUILD.gn
@@ -0,0 +1,56 @@
+# Copyright (c) 2022-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.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/build/chip/java/rules.gni")
+import("${chip_root}/build/chip/tools.gni")
+
+kotlin_binary("kotlin-matter-controller") {
+ output_name = "kotlin-matter-controller"
+ deps = [
+ "${chip_root}/src/controller/java:kotlin_matter_controller",
+ "${chip_root}/src/controller/java:onboarding_payload",
+ "${chip_root}/third_party/java_deps:annotation",
+ ]
+
+ sources = [
+ "java/src/com/matter/controller/Main.kt",
+ "java/src/com/matter/controller/commands/common/Argument.kt",
+ "java/src/com/matter/controller/commands/common/ArgumentType.kt",
+ "java/src/com/matter/controller/commands/common/Command.kt",
+ "java/src/com/matter/controller/commands/common/CommandManager.kt",
+ "java/src/com/matter/controller/commands/common/CredentialsIssuer.kt",
+ "java/src/com/matter/controller/commands/common/FutureResult.kt",
+ "java/src/com/matter/controller/commands/common/IPAddress.kt",
+ "java/src/com/matter/controller/commands/common/MatterCommand.kt",
+ "java/src/com/matter/controller/commands/common/RealResult.kt",
+ "java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt",
+ "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairingCommand.kt",
+ "java/src/com/matter/controller/commands/pairing/PairingModeType.kt",
+ "java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt",
+ ]
+
+ kotlinc_flags = [ "-Xlint:deprecation" ]
+}
+
+group("default") {
+ deps = [ ":kotlin-matter-controller" ]
+}
diff --git a/examples/kotlin-matter-controller/Manifest.txt b/examples/kotlin-matter-controller/Manifest.txt
new file mode 100644
index 00000000000000..2ef5017b51334a
--- /dev/null
+++ b/examples/kotlin-matter-controller/Manifest.txt
@@ -0,0 +1,2 @@
+Main-Class: com.matter.controller.MainKt
+Class-Path: ../lib/third_party/connectedhomeip/src/controller/java/*.jar ../lib/third_party/connectedhomeip/third_party/java_deps/stub_src/Android.jar ../lib/third_party/connectedhomeip/third_party/java_deps/json-20220924.jar ../lib/third_party/connectedhomeip/third_party/java_deps/jsr305-3.0.2.jar ../lib/third_party/connectedhomeip/third_party/java_deps/kotlin-stdlib-1.8.20.jar ../lib/third_party/connectedhomeip/third_party/java_deps/kotlinx-coroutines-core-jvm-1.7.3.jar
diff --git a/examples/kotlin-matter-controller/README.md b/examples/kotlin-matter-controller/README.md
new file mode 100644
index 00000000000000..c4e84cbd5982a4
--- /dev/null
+++ b/examples/kotlin-matter-controller/README.md
@@ -0,0 +1,118 @@
+# Matter Controller Kotlin App Example
+
+This is a Matter Controller Kotlin app that can be used to commission and
+control Matter accessory devices.
+
+
+
+- [Matter Controller Kotlin App Example](#matter-controller-kotlin-app-example)
+ - [Requirements for building](#requirements-for-building)
+ - [Preparing for build](#preparing-for-build)
+ - [Building & Running the app](#building--running-the-app)
+
+
+
+## Requirements for building
+
+You need to have the following two software installed on your Ubuntu system:
+
+1. Java Runtime Environment (JRE)
+2. Java Development Kit (JDK)
+
+openjdk version "11.0.20.1" or above is needed
+
+First, check if we have the Java Runtime Environment and Java Development Kit
+installed on our system or not.
+
+```shell
+java -version
+```
+
+If not, you can install the Java Runtime Environment and Java Development Kit on
+your system through the following command as root:
+
+```
+sudo apt install default-jre
+sudo apt install default-jdk
+```
+
+You also need to install kotlin compiler on your Ubuntu system:
+
+kotlin compiler version 1.8.10 or above is needed to compile
+kotlin-matter-controller, if you already have lower version kotlin compiler
+installed on your Ubuntu from apt,
+you need to remove the Kotlin compiler package, run the following command:
+
+```shell
+sudo apt-get remove kotlin
+```
+
+Wait for the removal process to complete. Once it's done, the Kotlin compiler
+will be removed from your system.
+
+(Optional) If you want to remove any configuration files associated with Kotlin,
+run the following command:
+
+```shell
+sudo apt-get purge kotlin
+```
+
+Install kotlin compiler 1.8.10 or above, such as
+[kotlin-compiler-1.8.10-url](https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip)
+
+```shell
+cd /usr/lib \
+&& sudo wget -q [kotlin-compiler-1.8.10-url] \
+&& sudo unzip kotlin-compiler-*.zip \
+&& sudo rm kotlin-compiler-*.zip \
+&& sudo rm -f kotlinc/bin/*.bat
+```
+
+Add a directory to PATH permanently by editing the `.bashrc` file located in the
+Home directory. Follow these steps:
+
+1. Open the `.bashrc` file using a text editor.
+2. Go to the end of the file.
+3. Paste the export syntax at the end of the file.
+
+```shell
+export PATH="/usr/lib/kotlinc/bin:$PATH"
+```
+
+### Linux
+
+```shell
+export JAVA_PATH=[JDK path]
+```
+
+
+
+## Preparing for build
+
+Complete the following steps to prepare the Matter build:
+
+1. Check out the Matter repository.
+
+2. Run bootstrap (**only required first time**)
+
+ ```shell
+ source scripts/bootstrap.sh
+ ```
+
+## Building & Running the app
+
+This is the simplest option. In the command line, run the following command from
+the top Matter directory:
+
+```shell
+./scripts/build/build_examples.py --target linux-x64-kotlin-matter-controller build
+```
+
+The Java executable file `kotlin-matter-controller` will be generated at
+`out/android-x86-kotlin-matter-controller/bin/`
+
+Run the kotlin-matter-controller
+
+```shell
+java -Djava.library.path=../lib/jni -jar kotlin-matter-controller
+```
diff --git a/examples/kotlin-matter-controller/args.gni b/examples/kotlin-matter-controller/args.gni
new file mode 100644
index 00000000000000..9b0c312fbdc837
--- /dev/null
+++ b/examples/kotlin-matter-controller/args.gni
@@ -0,0 +1,26 @@
+# Copyright (c) 2020-2022 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.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/config/standalone/args.gni")
+
+chip_device_project_config_include = ""
+chip_project_config_include = ""
+chip_system_project_config_include = ""
+
+chip_project_config_include_dirs =
+ [ "${chip_root}/examples/kotlin-matter-controller/include" ]
+chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
+chip_stack_lock_tracking = "fatal"
diff --git a/examples/kotlin-matter-controller/build_overrides b/examples/kotlin-matter-controller/build_overrides
new file mode 120000
index 00000000000000..b430cf6a2e6391
--- /dev/null
+++ b/examples/kotlin-matter-controller/build_overrides
@@ -0,0 +1 @@
+../build_overrides
\ No newline at end of file
diff --git a/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h b/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h
new file mode 100644
index 00000000000000..09183cc4485256
--- /dev/null
+++ b/examples/kotlin-matter-controller/include/CHIPProjectAppConfig.h
@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright (c) 2020-2022 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.
+ */
+
+#ifndef CHIPPROJECTCONFIG_H
+#define CHIPPROJECTCONFIG_H
+
+#define CHIP_CONFIG_MAX_FABRICS 17
+
+#define CHIP_CONFIG_EVENT_LOGGING_NUM_EXTERNAL_CALLBACKS 2
+
+// Enable support functions for parsing command-line arguments
+#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+
+// Enable reading DRBG seed data from /dev/(u)random.
+// This is needed for test applications and the CHIP device manager to function
+// properly when CHIP_CONFIG_RNG_IMPLEMENTATION_CHIPDRBG is enabled.
+#define CHIP_CONFIG_DEV_RANDOM_DRBG_SEED 1
+
+// For convenience, Chip Security Test Mode can be enabled and the
+// requirement for authentication in various protocols can be disabled.
+//
+// WARNING: These options make it possible to circumvent basic Chip security functionality,
+// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
+//
+#define CHIP_CONFIG_SECURITY_TEST_MODE 0
+
+#define CHIP_CONFIG_ENABLE_UPDATE 1
+
+#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
+
+#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 1
+
+// Enable some test-only interaction model APIs.
+#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
+
+#endif /* CHIPPROJECTCONFIG_H */
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/Main.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/Main.kt
new file mode 100644
index 00000000000000..997c1b92b0ebb4
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/Main.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller
+
+import com.matter.controller.commands.common.Command
+import com.matter.controller.commands.common.CommandManager
+import com.matter.controller.commands.common.CredentialsIssuer
+import com.matter.controller.commands.pairing.PairOnNetworkLongCommand
+import com.matter.controller.commands.pairing.PairOnNetworkLongImInvokeCommand
+import com.matter.controller.commands.pairing.PairOnNetworkLongImReadCommand
+import com.matter.controller.commands.pairing.PairOnNetworkLongImSubscribeCommand
+import com.matter.controller.commands.pairing.PairOnNetworkLongImWriteCommand
+import matter.controller.ControllerParams
+import matter.controller.MatterController
+import matter.controller.MatterControllerImpl
+
+private fun getPairingCommands(
+ controller: MatterController,
+ credentialsIssuer: CredentialsIssuer
+): List {
+ return listOf(
+ PairOnNetworkLongCommand(controller, credentialsIssuer),
+ )
+}
+
+private fun getImCommands(
+ controller: MatterController,
+ credentialsIssuer: CredentialsIssuer
+): List {
+ return listOf(
+ PairOnNetworkLongImReadCommand(controller, credentialsIssuer),
+ PairOnNetworkLongImSubscribeCommand(controller, credentialsIssuer),
+ PairOnNetworkLongImWriteCommand(controller, credentialsIssuer),
+ PairOnNetworkLongImInvokeCommand(controller, credentialsIssuer),
+ )
+}
+
+fun main(args: Array) {
+ val controller: MatterController = MatterControllerImpl(ControllerParams(countryCode = "US"))
+ val credentialsIssuer = CredentialsIssuer()
+ val commandManager = CommandManager()
+
+ commandManager.register("pairing", getPairingCommands(controller, credentialsIssuer))
+ commandManager.register("im", getImCommands(controller, credentialsIssuer))
+
+ try {
+ commandManager.run(args)
+ } catch (e: Exception) {
+ println("Run command failed with exception: " + e.message)
+ controller.close()
+ System.exit(1)
+ }
+
+ controller.close()
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt
new file mode 100644
index 00000000000000..7f9f11d183ec80
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.net.InetAddress
+import java.net.UnknownHostException
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+// TODO Issue #29632:Refactor class Argument to have specializations for various types.
+class Argument {
+ val name: String
+ val type: ArgumentType
+ private val minValue: Long
+ private val maxValue: Long
+ val value: Any
+ val desc: String?
+ val isOptional: Boolean
+
+ constructor(name: String, value: IPAddress, optional: Boolean) {
+ this.name = name
+ type = ArgumentType.ADDRESS
+ minValue = 0
+ maxValue = 0
+ this.value = value
+ desc = null
+ isOptional = optional
+ }
+
+ constructor(name: String, value: StringBuffer, desc: String?, optional: Boolean) {
+ this.name = name
+ type = ArgumentType.STRING
+ minValue = 0
+ maxValue = 0
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ constructor(name: String, value: AtomicBoolean, desc: String?, optional: Boolean) {
+ this.name = name
+ type = ArgumentType.BOOL
+ minValue = 0
+ maxValue = 0
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ constructor(
+ name: String,
+ min: Short,
+ max: Short,
+ value: AtomicInteger,
+ desc: String?,
+ optional: Boolean
+ ) {
+ this.name = name
+ type = ArgumentType.NUMBER_INT16
+ minValue = min.toLong()
+ maxValue = max.toLong()
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ constructor(
+ name: String,
+ min: Int,
+ max: Int,
+ value: AtomicInteger,
+ desc: String?,
+ optional: Boolean
+ ) {
+ this.name = name
+ type = ArgumentType.NUMBER_INT32
+ minValue = min.toLong()
+ maxValue = max.toLong()
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ constructor(
+ name: String,
+ min: Short,
+ max: Short,
+ value: AtomicLong,
+ desc: String?,
+ optional: Boolean
+ ) {
+ this.name = name
+ type = ArgumentType.NUMBER_INT32
+ minValue = min.toLong()
+ maxValue = max.toLong()
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ constructor(
+ name: String,
+ min: Long,
+ max: Long,
+ value: AtomicLong,
+ desc: String?,
+ optional: Boolean
+ ) {
+ this.name = name
+ type = ArgumentType.NUMBER_INT64
+ minValue = min
+ maxValue = max
+ this.value = value
+ this.desc = desc
+ isOptional = optional
+ }
+
+ fun setValue(value: String) {
+ var isValidArgument = false
+ when (type) {
+ ArgumentType.ATTRIBUTE -> {
+ val str = this.value as String
+ isValidArgument = value == str
+ }
+ ArgumentType.NUMBER_INT16 -> {
+ val numShort = this.value as AtomicInteger
+ numShort.set(value.toInt())
+ isValidArgument = numShort.toInt() >= minValue && numShort.toInt() <= maxValue
+ }
+ ArgumentType.NUMBER_INT32 -> {
+ val num = this.value as AtomicInteger
+ num.set(value.toInt())
+ isValidArgument = num.toInt() >= minValue && num.toInt() <= maxValue
+ }
+ ArgumentType.NUMBER_INT64 -> {
+ val numLong = this.value as AtomicLong
+ numLong.set(value.toLong())
+ isValidArgument = numLong.toInt() >= minValue && numLong.toInt() <= maxValue
+ }
+ ArgumentType.STRING -> {
+ val stringBuffer = this.value as StringBuffer
+ stringBuffer.append(value)
+ val str = stringBuffer.toString()
+ isValidArgument = value == str
+ }
+ ArgumentType.BOOL -> {
+ val atomicBoolean = this.value as AtomicBoolean
+ try {
+ atomicBoolean.set(value.toBoolean())
+ isValidArgument = true
+ } catch (e: Exception) {
+ isValidArgument = false
+ }
+ }
+ ArgumentType.ADDRESS ->
+ isValidArgument =
+ try {
+ val ipAddress = this.value as IPAddress
+ ipAddress.address = InetAddress.getByName(value)
+ true
+ } catch (e: UnknownHostException) {
+ false
+ }
+ else -> {}
+ }
+ require(isValidArgument) { "Invalid argument " + name + ": " + value }
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt
new file mode 100644
index 00000000000000..acd31fbb0ac25a
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+enum class ArgumentType {
+ NUMBER_INT8,
+ NUMBER_INT16,
+ NUMBER_INT32,
+ NUMBER_INT64,
+ FLOAT,
+ DOUBLE,
+ BOOL,
+ STRING,
+ CHARSTRING,
+ OCTETSTRING,
+ ATTRIBUTE,
+ ADDRESS,
+ COMPLEX,
+ CUSTOM,
+ VECTOR_BOOL,
+ VECTOR16,
+ VECTOR32,
+ VECTOR_CUSTOM
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Command.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Command.kt
new file mode 100644
index 00000000000000..1b05e0205f9a0b
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/Command.kt
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.util.ArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+/**
+ * @brief Matter Controller command
+ * @details The base class of all the commands the Matter Controller supports, which are actions
+ * that may be performed. Commands are verb-like, such as pair a Matter device or discover Matter
+ * devices from the environment.
+ */
+abstract class Command(val name: String, val helpText: String? = null) {
+ private val arguments = ArrayList()
+
+ fun getArgumentName(index: Int): String {
+ return arguments[index].name
+ }
+
+ fun getArgumentsCount(): Int {
+ return arguments.size
+ }
+
+ fun getArgumentIsOptional(index: Int): Boolean {
+ return arguments[index].isOptional
+ }
+
+ /**
+ * @return A pointer to an Optional where the Attribute argument will be stored
+ * @brief Get attribute argument if it exists, there is at most one Attribute argument per command
+ */
+ fun getAttribute(): String? {
+ return arguments.find { arg -> arg.type === ArgumentType.ATTRIBUTE }?.value as? String
+ }
+
+ /**
+ * @return A pointer to an Optional where the argument description will be stored
+ * @brief Get argument description if it exists
+ */
+ fun getArgumentDescription(index: Int): String? {
+ return arguments[index].desc
+ }
+
+ fun addArgumentToList(arg: Argument) {
+ if (arg.isOptional || arguments.isEmpty()) {
+ // Safe to just append to the end of a list.
+ arguments.add(arg)
+ return
+ }
+
+ // mandatory arg needs to be inserted before the optional arguments.
+ var index = 0
+ while (index < arguments.size && !arguments[index].isOptional) {
+ index++
+ }
+
+ // Insert before the first optional arg.
+ arguments.add(index, arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param out A pointer to a AtomicBoolean where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add a bool command argument
+ */
+ fun addArgument(name: String, out: AtomicBoolean, desc: String?, optional: Boolean) {
+ val arg = Argument(name, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param min The minimum value of the argv value
+ * @param max The minimum value of the argv value
+ * @param out A pointer to a AtomicInteger where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add a short command argument
+ */
+ fun addArgument(
+ name: String,
+ min: Short,
+ max: Short,
+ out: AtomicInteger,
+ desc: String?,
+ optional: Boolean
+ ) {
+ val arg = Argument(name, min, max, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param min The minimum value of the argv value
+ * @param max The minimum value of the argv value
+ * @param out A pointer to a AtomicInteger where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add an int command argument
+ */
+ fun addArgument(
+ name: String,
+ min: Int,
+ max: Int,
+ out: AtomicInteger,
+ desc: String?,
+ optional: Boolean
+ ) {
+ val arg = Argument(name, min, max, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param min The minimum value of the argv value
+ * @param max The minimum value of the argv value
+ * @param out A pointer to a MutableInteger where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add a long Integer command argument
+ */
+ fun addArgument(
+ name: String,
+ min: Short,
+ max: Short,
+ out: AtomicLong,
+ desc: String?,
+ optional: Boolean
+ ) {
+ val arg = Argument(name, min, max, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param min The minimum value of the argv value
+ * @param max The minimum value of the argv value
+ * @param out A pointer to a AtomicLong where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add a long Integer command argument
+ */
+ fun addArgument(
+ name: String,
+ min: Long,
+ max: Long,
+ out: AtomicLong,
+ desc: String?,
+ optional: Boolean
+ ) {
+ val arg = Argument(name, min, max, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param out A pointer to a IPAddress where the argv value will be stored
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add an IP address command argument
+ */
+ fun addArgument(name: String, out: IPAddress, optional: Boolean) {
+ val arg = Argument(name, out, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param name The name that will be displayed in the command help
+ * @param out A pointer to a StringBuffer where the argv value will be stored
+ * @param desc The description of the argument that will be displayed in the command help
+ * @param optional Indicate if an optional argument
+ * @return The number of arguments currently added to the command
+ * @brief Add a String command argument
+ */
+ fun addArgument(name: String, out: StringBuffer, desc: String?, optional: Boolean) {
+ val arg = Argument(name, out, desc, optional)
+ addArgumentToList(arg)
+ }
+
+ /**
+ * @param args Supplied command-line arguments as an array of String objects.
+ * @brief Initialize command arguments
+ */
+ fun setArgumentValues(args: Array) {
+ val argc = args.size
+ var mandatoryArgsCount = 0
+ var currentIndex = 0
+ for (arg in arguments) {
+ if (!arg.isOptional) {
+ mandatoryArgsCount++
+ }
+ }
+ require(argc >= mandatoryArgsCount) {
+ "setArgumentValues: Wrong arguments number: $argc instead of $mandatoryArgsCount"
+ }
+
+ // Initialize mandatory arguments
+ for (i in 0 until mandatoryArgsCount) {
+ setArgumentValue(currentIndex++, args[i])
+ }
+
+ // Initialize optional arguments
+ // Optional arguments expect a name and a value, so it is increased by 2 on every step.
+ var i = mandatoryArgsCount
+ while (i < argc) {
+
+ // optional arguments starts with OPTIONAL_ARGUMENT_PREFIX
+ require(
+ !(args[i].length <= OPTIONAL_ARGUMENT_PREFIX_LENGTH &&
+ !args[i].startsWith(OPTIONAL_ARGUMENT_PREFIX))
+ ) {
+ "setArgumentValues: Invalid optional argument: " + args[i]
+ }
+ if (args[i].substring(OPTIONAL_ARGUMENT_PREFIX_LENGTH) == arguments[currentIndex].name) {
+ require(i + 1 < argc) {
+ "setArgumentValues: Optional argument " + args[i] + " missing value"
+ }
+ setArgumentValue(currentIndex++, args[i + 1])
+ }
+ i += 2
+ }
+ }
+
+ private fun setArgumentValue(argIndex: Int, argValue: String) {
+ arguments[argIndex].setValue(argValue)
+ }
+
+ @Throws(Exception::class) abstract fun run()
+
+ companion object {
+ private const val OPTIONAL_ARGUMENT_PREFIX = "--"
+ private const val OPTIONAL_ARGUMENT_PREFIX_LENGTH = 2
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt
new file mode 100644
index 00000000000000..36389a743cf8c5
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.util.Arrays
+import java.util.HashMap
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlin.collections.MutableMap
+
+class CommandManager {
+ private val clusters: MutableMap> = HashMap()
+
+ fun register(clusterName: String, commandsList: List) {
+ clusters[clusterName] = commandsList
+ }
+
+ @Throws(Exception::class)
+ fun run(args: Array) {
+ val command: Command?
+ if (args.size < 1) {
+ logger.log(Level.INFO, "Missing cluster name")
+ showHelpInfo()
+ return
+ }
+ val commands = clusters[args[0]]
+ if (commands == null) {
+ logger.log(Level.INFO, "Unknown cluster: " + args[0])
+ showHelpInfo()
+ return
+ }
+ if (args.size < 2) {
+ logger.log(Level.INFO, "Missing command name")
+ showCluster(args[0], commands)
+ return
+ }
+ if (!isGlobalCommand(args[0])) {
+ command = getCommand(commands, args[1])
+ if (command == null) {
+ System.out.printf("Unknown command: %s", args[1])
+ showCluster(args[0], commands)
+ throw IllegalArgumentException()
+ }
+ } else if (isEventCommand(args[1])) {
+ if (args.size < 3) {
+ logger.log(Level.INFO, "Missing event name")
+ showClusterEvents(args[0], args[1], commands)
+ throw IllegalArgumentException()
+ }
+ command = getGlobalCommand(commands, args[1], args[2])
+ if (command == null) {
+ logger.log(Level.INFO, "Unknown event: " + args[2])
+ showClusterEvents(args[0], args[1], commands)
+ throw IllegalArgumentException()
+ }
+ } else {
+ if (args.size < 3) {
+ logger.log(Level.INFO, "Missing attribute name")
+ showClusterAttributes(args[0], args[1], commands)
+ throw IllegalArgumentException()
+ }
+ command = getGlobalCommand(commands, args[1], args[2])
+ if (command == null) {
+ logger.log(Level.INFO, "Unknown attribute: " + args[2])
+ showClusterAttributes(args[0], args[1], commands)
+ throw IllegalArgumentException()
+ }
+ }
+
+ // need skip over binary and command name and only get arguments
+ val temp = Arrays.copyOfRange(args, 2, args.size)
+ try {
+ command.setArgumentValues(temp)
+ } catch (e: IllegalArgumentException) {
+ logger.log(Level.INFO, "Arguments init failed with exception: " + e.message)
+ showCommand(args[0], command)
+ System.exit(1)
+ }
+ command.run()
+ }
+
+ private fun isAttributeCommand(commandName: String): Boolean {
+ return commandName == "read" || commandName == "write" || commandName == "subscribe"
+ }
+
+ private fun isEventCommand(commandName: String): Boolean {
+ return commandName == "read-event" || commandName == "subscribe-event"
+ }
+
+ private fun isGlobalCommand(commandName: String): Boolean {
+ return isAttributeCommand(commandName) || isEventCommand(commandName)
+ }
+
+ private fun getCommand(commands: List, commandName: String): Command? {
+ for (command in commands) {
+ if (commandName == command.name) {
+ return command
+ }
+ }
+ return null
+ }
+
+ private fun getGlobalCommand(
+ commands: List,
+ commandName: String,
+ attributeName: String
+ ): Command? {
+ for (command in commands) {
+ if (commandName == command.name && attributeName == command.getAttribute()) {
+ return command
+ }
+ }
+ return null
+ }
+
+ private fun showHelpInfo() {
+ logger.log(Level.INFO, "Usage:")
+ logger.log(Level.INFO, " cluster_name command_name [param1 param2 ...]")
+ logger.log(Level.INFO, "\n")
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ logger.log(
+ Level.INFO,
+ " | Clusters: |"
+ )
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ for (key in clusters.keys) {
+ System.out.printf(" | * %-82s|\n", key)
+ }
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ }
+
+ private fun showCluster(clusterName: String, commands: List) {
+ logger.log(Level.INFO, "Usage:")
+ logger.log(
+ Level.INFO,
+ " kotlin-matter-controller $clusterName command_name [param1 param2 ...]"
+ )
+ logger.log(Level.INFO, "\n")
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ logger.log(
+ Level.INFO,
+ " | Commands: |"
+ )
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ var readCommand = false
+ var writeCommand = false
+ var subscribeCommand = false
+ var readEventCommand = false
+ var subscribeEventCommand = false
+ for (command in commands) {
+ var shouldPrint = true
+ val cmdName = command.name
+ if (isGlobalCommand(cmdName)) {
+ if (cmdName == "read" && !readCommand) {
+ readCommand = true
+ } else if (cmdName == "write" && !writeCommand) {
+ writeCommand = true
+ } else if (cmdName == "subscribe" && !subscribeCommand) {
+ subscribeCommand = true
+ } else if (cmdName == "read-event" && !readEventCommand) {
+ readEventCommand = true
+ } else if (cmdName == "subscribe-event" && !subscribeEventCommand) {
+ subscribeEventCommand = true
+ } else {
+ shouldPrint = false
+ }
+ }
+ if (shouldPrint) {
+ System.out.printf(" | * %-82s|\n", cmdName)
+ }
+ }
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+\n"
+ )
+ }
+
+ private fun showClusterAttributes(
+ clusterName: String,
+ commandName: String,
+ commands: List
+ ) {
+ logger.log(Level.INFO, "Usage:")
+ System.out.printf(
+ " kotlin-matter-controller %s %s attribute-name [param1 param2 ...]\n",
+ clusterName,
+ commandName
+ )
+ logger.log(Level.INFO, "\n")
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ logger.log(
+ Level.INFO,
+ " | Attributes: |"
+ )
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ for (command in commands) {
+ if (commandName == command.name) {
+ System.out.printf(" | * %-82s|\n", command.getAttribute())
+ }
+ }
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ }
+
+ private fun showClusterEvents(clusterName: String, commandName: String, commands: List) {
+ logger.log(Level.INFO, "Usage:")
+ System.out.printf(
+ " kotlin-matter-controller %s %s event-name [param1 param2 ...]\n",
+ clusterName,
+ commandName
+ )
+ logger.log(Level.INFO, "\n")
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ logger.log(
+ Level.INFO,
+ " | Events: |"
+ )
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ for (command in commands) {
+ if (commandName == command.name) {
+ System.out.printf(" | * %-82s|\n", command.getAttribute())
+ }
+ }
+ logger.log(
+ Level.INFO,
+ " +-------------------------------------------------------------------------------------+"
+ )
+ }
+
+ private fun showCommand(clusterName: String, command: Command) {
+ logger.log(Level.INFO, "Usage:")
+ var arguments: String? = command.name
+ var description = ""
+ val argumentsCount = command.getArgumentsCount()
+ for (i in 0 until argumentsCount) {
+ var arg = ""
+ val isOptional = command.getArgumentIsOptional(i)
+ if (isOptional) {
+ arg += "[--"
+ }
+ arg += command.getArgumentName(i)
+ if (isOptional) {
+ arg += "]"
+ }
+ arguments += " "
+ arguments += arg
+ val argDescription = command.getArgumentDescription(i)
+ if (argDescription != null) {
+ description += "\n"
+ description += arg
+ description += ":\n "
+ description += argDescription
+ description += "\n"
+ }
+ }
+ System.out.format(" %s %s\n", clusterName, arguments)
+ val helpText = command.helpText
+ if (helpText != null) {
+ System.out.format("\n%s\n", helpText)
+ }
+ if (!description.isEmpty()) {
+ logger.log(Level.INFO, description)
+ }
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(CommandManager::class.java.name)
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt
new file mode 100644
index 00000000000000..a0a384860af93c
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+/**
+ * Credentials Issuer which contains all credential information of the issuer of the command, such
+ * as operational credentials for a given fabric, the DAC verifier of the commissioner, etc ..
+ */
+class CredentialsIssuer
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/FutureResult.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/FutureResult.kt
new file mode 100644
index 00000000000000..5fe4b5240dce3d
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/FutureResult.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+package com.matter.controller.commands.common
+
+import java.util.concurrent.TimeoutException
+import java.util.logging.Level
+import java.util.logging.Logger
+
+/**
+ * Implements the future result that encapculates the optional realResult, application would wait
+ * for realResult set by other thread wben receiving data from the other end. If the expected
+ * duration elapsed without receiving the expected realResult, the runtime exception would be
+ * raised.
+ */
+class FutureResult {
+ private var realResult: RealResult? = null
+ private val lock = Object()
+ var timeoutMs: Long = 0
+
+ fun setRealResult(realResult: RealResult) {
+ synchronized(lock) {
+ if (this.realResult != null) {
+ throw TimeoutException("Error, real result has been set!")
+ }
+ this.realResult = realResult
+ lock.notifyAll()
+ }
+ }
+
+ fun waitResult() {
+ val start = System.currentTimeMillis()
+ synchronized(lock) {
+ while (realResult == null) {
+ val remainingTime = timeoutMs - (System.currentTimeMillis() - start)
+ if (remainingTime <= 0) {
+ throw TimeoutException("Timeout!")
+ }
+
+ try {
+ lock.wait(remainingTime)
+ } catch (e: InterruptedException) {
+ logger.log(Level.INFO, "Wait Result failed with exception: " + e.message)
+ }
+ }
+
+ val errorResult = realResult as? RealResult.Error
+ if (errorResult != null) {
+ logger.log(Level.INFO, "Error: ${errorResult.error}")
+ throw TimeoutException("Received failure test result")
+ }
+ }
+ }
+
+ fun clear() {
+ synchronized(lock) { realResult = null }
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(FutureResult::class.java.name)
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt
new file mode 100644
index 00000000000000..c28ce9c5d5a055
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.net.InetAddress
+
+class IPAddress(var address: InetAddress) {
+ override fun toString(): String {
+ return address.toString()
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt
new file mode 100644
index 00000000000000..6ca0e223ee921c
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicLong
+import matter.controller.MatterController
+
+abstract class MatterCommand(
+ private val matterController: MatterController,
+ private val credIssuerCmds: CredentialsIssuer?,
+ commandName: String,
+ helpText: String? = null
+) : Command(commandName, helpText) {
+ private val commissionerName = StringBuffer()
+ private val paaTrustStorePath = StringBuffer()
+ private val cdTrustStorePath = StringBuffer()
+ private val commissionerNodeId: AtomicLong = AtomicLong()
+ private val useMaxSizedCerts: AtomicBoolean = AtomicBoolean()
+ private val onlyAllowTrustedCdKeys: AtomicBoolean = AtomicBoolean()
+ private val futureResult = FutureResult()
+
+ init {
+ addArgument(
+ "paa-trust-store-path",
+ paaTrustStorePath,
+ "Path to directory holding PAA certificate information. Can be absolute or relative to the current working " +
+ "directory.",
+ true
+ )
+ addArgument(
+ "cd-trust-store-path",
+ cdTrustStorePath,
+ "Path to directory holding CD certificate information. Can be absolute or relative to the current working " +
+ "directory.",
+ true
+ )
+ addArgument(
+ "commissioner-name",
+ commissionerName,
+ "Name of fabric to use. Valid values are \"alpha\", \"beta\", \"gamma\", and integers greater than or equal to " +
+ "4. The default if not specified is \"alpha\".",
+ true
+ )
+ addArgument(
+ "commissioner-nodeid",
+ 0,
+ Long.MAX_VALUE,
+ commissionerNodeId,
+ "The node id to use for kotlin-matter-controller. If not provided, kTestControllerNodeId (112233, 0x1B669) will be used.",
+ true
+ )
+ addArgument(
+ "use-max-sized-certs",
+ useMaxSizedCerts,
+ "Maximize the size of operational certificates. If not provided or 0 (\"false\"), normally sized operational " +
+ "certificates are generated.",
+ true
+ )
+ addArgument(
+ "only-allow-trusted-cd-keys",
+ onlyAllowTrustedCdKeys,
+ "Only allow trusted CD verifying keys (disallow test keys). If not provided or 0 (\"false\"), untrusted CD " +
+ "verifying keys are allowed. If 1 (\"true\"), test keys are disallowed.",
+ true
+ )
+ }
+
+ // This method returns the commissioner instance to be used for running the command.
+ fun currentCommissioner(): MatterController {
+ return matterController
+ }
+
+ /////////// Command Interface /////////
+ @Throws(Exception::class)
+ override fun run() {
+ runCommand()
+ }
+
+ protected abstract fun runCommand()
+
+ fun setSuccess() {
+ futureResult.setRealResult(RealResult.success())
+ }
+
+ fun setFailure(error: String?) {
+ futureResult.setRealResult(RealResult.error(error))
+ }
+
+ fun waitCompleteMs(timeoutMs: Long) {
+ futureResult.timeoutMs = timeoutMs
+ futureResult.waitResult()
+ }
+
+ fun clear() {
+ futureResult.clear()
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/RealResult.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/RealResult.kt
new file mode 100644
index 00000000000000..50debc33f0d014
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/common/RealResult.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+package com.matter.controller.commands.common
+
+/**
+ * Represents a result that can either indicate success or failure with an associated error message.
+ *
+ * In the context of RealResult, success is represented by [Success] and failure by [Error]. When
+ * there is an error, an error message explains the reason for the failure.
+ */
+sealed class RealResult {
+ data class Error(val error: String) : RealResult()
+
+ object Success : RealResult()
+
+ companion object {
+ fun success(): RealResult {
+ return Success
+ }
+
+ fun error(error: String?): RealResult {
+ return error?.let { Error(it) } ?: Success
+ }
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt
new file mode 100644
index 00000000000000..eb254ae5ec638d
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class DiscoveryFilterType {
+ NONE,
+ SHORT_DISCRIMINATOR,
+ LONG_DISCRIMINATOR,
+ VENDOR_ID,
+ DEVICE_TYPE,
+ COMMISSIONING_MODE,
+ INSTANCE_NAME,
+ COMMISSIONER,
+ COMPRESSED_FABRIC_ID
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt
new file mode 100644
index 00000000000000..594d30d5fa3c8c
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import com.matter.controller.commands.common.CredentialsIssuer
+import matter.controller.MatterController
+
+private const val MATTER_PORT = 5540
+
+class PairOnNetworkLongCommand(controller: MatterController, credsIssue: CredentialsIssuer?) :
+ PairingCommand(
+ controller,
+ "onnetwork-long",
+ credsIssue,
+ PairingModeType.ON_NETWORK,
+ PairingNetworkType.NONE,
+ DiscoveryFilterType.LONG_DISCRIMINATOR
+ ) {
+ override fun runCommand() {
+ currentCommissioner()
+ .pairDevice(
+ getNodeId(),
+ getRemoteAddr().address.hostAddress,
+ MATTER_PORT,
+ getDiscriminator(),
+ getSetupPINCode(),
+ )
+ currentCommissioner().setCompletionListener(this)
+ waitCompleteMs(getTimeoutMillis())
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
new file mode 100644
index 00000000000000..313e67419927a0
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.tlv.AnonymousTag
+import chip.tlv.ContextSpecificTag
+import chip.tlv.TlvWriter
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.time.Duration
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlinx.coroutines.runBlocking
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.model.CommandPath
+
+class PairOnNetworkLongImInvokeCommand(
+ controller: MatterController,
+ credsIssue: CredentialsIssuer?
+) :
+ PairingCommand(
+ controller,
+ "onnetwork-long-im-invoke",
+ credsIssue,
+ PairingModeType.ON_NETWORK,
+ PairingNetworkType.NONE,
+ DiscoveryFilterType.LONG_DISCRIMINATOR
+ ) {
+ override fun runCommand() {
+ val IdentifyTime: UShort = 1u
+ val tlvWriter1 = TlvWriter()
+ tlvWriter1.startStructure(AnonymousTag)
+ tlvWriter1.put(ContextSpecificTag(0), IdentifyTime)
+ tlvWriter1.endStructure()
+
+ val element1: InvokeRequest =
+ InvokeRequest(
+ CommandPath(endpointId = 0u, clusterId = CLUSTER_ID_IDENTIFY, commandId = IDENTIFY_COMMAND),
+ tlvPayload = tlvWriter1.getEncoded(),
+ timedRequest = Duration.ZERO
+ )
+
+ currentCommissioner()
+ .pairDevice(
+ getNodeId(),
+ getRemoteAddr().address.hostAddress,
+ MATTER_PORT,
+ getDiscriminator(),
+ getSetupPINCode(),
+ )
+ currentCommissioner().setCompletionListener(this)
+ waitCompleteMs(getTimeoutMillis())
+
+ runBlocking {
+ try {
+ val response: InvokeResponse = currentCommissioner().invoke(element1)
+ logger.log(Level.INFO, "Invoke command succeeded")
+ if (response.payload.isNotEmpty()) {
+ // TODO:Handle TLV data response
+ }
+ } catch (ex: Exception) {
+ setFailure("invoke failure: ${ex.message}")
+ } finally {
+ clear()
+ }
+ }
+
+ setSuccess()
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(PairOnNetworkLongImInvokeCommand::class.java.name)
+
+ private const val MATTER_PORT = 5540
+ private const val CLUSTER_ID_IDENTIFY = 0x0003u
+ private const val IDENTIFY_COMMAND = 0u
+ private const val CLUSTER_ID_TEST = 0xFFF1FC05u
+ private const val TEST_ADD_ARGUMENT_COMMAND = 0X04u
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
new file mode 100644
index 00000000000000..15cf62ed504067
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
@@ -0,0 +1,109 @@
+package com.matter.controller.commands.pairing
+
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlinx.coroutines.runBlocking
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.ReadResponse
+import matter.controller.model.AttributePath
+import matter.controller.model.EventPath
+
+class PairOnNetworkLongImReadCommand(controller: MatterController, credsIssue: CredentialsIssuer?) :
+ PairingCommand(
+ controller,
+ "onnetwork-long-im-read",
+ credsIssue,
+ PairingModeType.ON_NETWORK,
+ PairingNetworkType.NONE,
+ DiscoveryFilterType.LONG_DISCRIMINATOR
+ ) {
+ override fun runCommand() {
+ val attributePaths =
+ listOf(
+ AttributePath(
+ endpointId = DEFAULT_ENDPOINT,
+ clusterId = CLUSTER_ID_BASIC,
+ attributeId = ATTR_ID_LOCAL_CONFIG_DISABLED,
+ ),
+ AttributePath(
+ endpointId = DEFAULT_ENDPOINT,
+ clusterId = CLUSTER_ID_BASIC,
+ attributeId = GLOBAL_ATTRIBUTE_LIST,
+ )
+ )
+
+ val eventPaths =
+ listOf(
+ EventPath(
+ endpointId = WILDCARD_ENDPOINT_ID,
+ clusterId = WILDCARD_CLUSTER_ID,
+ eventId = WILDCARD_EVENT_ID
+ )
+ )
+
+ val readRequest: ReadRequest = ReadRequest(eventPaths, attributePaths)
+
+ currentCommissioner()
+ .pairDevice(
+ getNodeId(),
+ getRemoteAddr().address.hostAddress,
+ MATTER_PORT,
+ getDiscriminator(),
+ getSetupPINCode(),
+ )
+ currentCommissioner().setCompletionListener(this)
+ waitCompleteMs(getTimeoutMillis())
+
+ runBlocking {
+ try {
+ val response: ReadResponse = currentCommissioner().read(readRequest)
+ logger.log(Level.INFO, "Read command succeeded")
+ validateResponse(response)
+ } catch (ex: Exception) {
+ logger.log(Level.WARNING, "General read failure occurred with error ${ex.message}")
+ setFailure("read failure")
+ } finally {
+ clear()
+ }
+ }
+
+ setSuccess()
+ }
+
+ private fun findAttributeById(successes: List, id: UInt): ReadData.Attribute? {
+ return successes.filterIsInstance().find { it.path.attributeId == id }
+ }
+
+ private fun findEventById(successes: List, id: UInt): ReadData.Event? {
+ return successes.filterIsInstance().find { it.path.eventId == id }
+ }
+
+ private fun validateResponse(response: ReadResponse) {
+ require(response.successes.isNotEmpty()) { "Unexpected: response.successes is empty" }
+ require(response.failures.isEmpty()) { "Unexpected: response.failures is not empty" }
+
+ val localConfigDisabledAttribute =
+ findAttributeById(response.successes, ATTR_ID_LOCAL_CONFIG_DISABLED)
+ requireNotNull(localConfigDisabledAttribute) { "No local config disabled attribute found." }
+
+ // TODO: Add more validation rules as needed
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(PairOnNetworkLongImReadCommand::class.java.name)
+
+ private const val MATTER_PORT = 5540
+ private const val DEFAULT_ENDPOINT: UShort = 0u
+ private const val WILDCARD_ENDPOINT_ID: UShort = 0xffffu
+ private const val WILDCARD_CLUSTER_ID: UInt = 0xffffffffu
+ private const val WILDCARD_ATTRIBUTE_ID: UInt = 0xffffffffu
+ private const val WILDCARD_EVENT_ID: UInt = 0xffffffffu
+ private const val CLUSTER_ID_BASIC: UInt = 0x0028u
+ private const val ATTR_ID_LOCAL_CONFIG_DISABLED: UInt = 16u
+ private const val EVENT_ID_START_UP: UInt = 0u
+ private const val GLOBAL_ATTRIBUTE_LIST: UInt = 65531u
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt
new file mode 100644
index 00000000000000..c2ea79683ec980
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt
@@ -0,0 +1,113 @@
+package com.matter.controller.commands.pairing
+
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.runBlocking
+import matter.controller.MatterController
+import matter.controller.SubscribeRequest
+import matter.controller.SubscriptionState
+import matter.controller.model.AttributePath
+import matter.controller.model.EventPath
+
+class PairOnNetworkLongImSubscribeCommand(
+ controller: MatterController,
+ credsIssue: CredentialsIssuer?
+) :
+ PairingCommand(
+ controller,
+ "onnetwork-long-im-subscribe",
+ credsIssue,
+ PairingModeType.ON_NETWORK,
+ PairingNetworkType.NONE,
+ DiscoveryFilterType.LONG_DISCRIMINATOR
+ ) {
+ override fun runCommand() {
+ val attributePaths =
+ listOf(
+ AttributePath(
+ endpointId = WILDCARD_ENDPOINT_ID,
+ clusterId = WILDCARD_CLUSTER_ID,
+ attributeId = WILDCARD_EVENT_ID,
+ )
+ )
+
+ val eventPaths =
+ listOf(
+ EventPath(
+ endpointId = WILDCARD_ENDPOINT_ID,
+ clusterId = WILDCARD_CLUSTER_ID,
+ eventId = WILDCARD_EVENT_ID
+ )
+ )
+
+ val subscribeRequest: SubscribeRequest = SubscribeRequest(eventPaths, attributePaths)
+
+ currentCommissioner()
+ .pairDevice(
+ getNodeId(),
+ getRemoteAddr().address.hostAddress,
+ MATTER_PORT,
+ getDiscriminator(),
+ getSetupPINCode(),
+ )
+ currentCommissioner().setCompletionListener(this)
+ waitCompleteMs(getTimeoutMillis())
+
+ runBlocking {
+ try {
+ startSubscription(subscribeRequest)
+ } catch (ex: Exception) {
+ logger.log(Level.WARNING, "General subscribe failure occurred with error ${ex.message}")
+ setFailure("subscribe failure")
+ } finally {
+ clear()
+ }
+ }
+
+ setSuccess()
+ }
+
+ private suspend fun startSubscription(request: SubscribeRequest) {
+ logger.log(Level.INFO, "Starting subscription")
+
+ currentCommissioner()
+ .subscribe(request)
+ .takeWhile { subscriptionState ->
+ // Keep collecting as long as it's not SubscriptionEstablished
+ subscriptionState !is SubscriptionState.SubscriptionEstablished
+ }
+ .collect { subscriptionState ->
+ when (subscriptionState) {
+ is SubscriptionState.NodeStateUpdate -> {
+ logger.log(Level.INFO, "Received NodeStateUpdate: ${subscriptionState.updateState}")
+
+ // TODO: Add more validation rules as needed
+ }
+ is SubscriptionState.SubscriptionErrorNotification -> {
+ logger.log(
+ Level.WARNING,
+ "Received SubscriptionErrorNotification with terminationCause: ${subscriptionState.terminationCause}"
+ )
+ }
+ is SubscriptionState.SubscriptionEstablished -> {
+ logger.log(Level.INFO, "Subscription is established")
+ }
+ else -> {
+ logger.log(Level.SEVERE, "Unexpected subscription state: $subscriptionState")
+ }
+ }
+ }
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(PairOnNetworkLongImSubscribeCommand::class.java.name)
+
+ private const val MATTER_PORT = 5540
+ private const val WILDCARD_ENDPOINT_ID: UShort = 0xffffu
+ private const val WILDCARD_CLUSTER_ID: UInt = 0xffffffffu
+ private const val WILDCARD_ATTRIBUTE_ID: UInt = 0xffffffffu
+ private const val WILDCARD_EVENT_ID: UInt = 0xffffffffu
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
new file mode 100644
index 00000000000000..376e132194c889
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.tlv.AnonymousTag
+import chip.tlv.TlvWriter
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.time.Duration
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlinx.coroutines.runBlocking
+import matter.controller.MatterController
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.model.AttributePath
+
+class PairOnNetworkLongImWriteCommand(
+ controller: MatterController,
+ credsIssue: CredentialsIssuer?
+) :
+ PairingCommand(
+ controller,
+ "onnetwork-long-im-write",
+ credsIssue,
+ PairingModeType.ON_NETWORK,
+ PairingNetworkType.NONE,
+ DiscoveryFilterType.LONG_DISCRIMINATOR
+ ) {
+ override fun runCommand() {
+ val tlvWriter1 = TlvWriter()
+ tlvWriter1.put(AnonymousTag, true)
+ val writeRequests: WriteRequests =
+ WriteRequests(
+ requests =
+ listOf(
+ WriteRequest(
+ attributePath =
+ AttributePath(
+ endpointId = 0u,
+ clusterId = CLUSTER_ID_BASIC,
+ attributeId = ATTR_ID_LOCAL_CONFIG_DISABLED
+ ),
+ tlvPayload = tlvWriter1.getEncoded()
+ )
+ ),
+ timedRequest = Duration.ZERO
+ )
+
+ currentCommissioner()
+ .pairDevice(
+ getNodeId(),
+ getRemoteAddr().address.hostAddress,
+ MATTER_PORT,
+ getDiscriminator(),
+ getSetupPINCode(),
+ )
+ currentCommissioner().setCompletionListener(this)
+ waitCompleteMs(getTimeoutMillis())
+
+ runBlocking {
+ try {
+ val response: WriteResponse = currentCommissioner().write(writeRequests)
+
+ if (response is WriteResponse.Success) {
+ logger.log(Level.INFO, "Write command succeeded")
+ } else if (response is WriteResponse.PartialWriteFailure) {
+ logger.log(
+ Level.WARNING,
+ "Partial write failure occurred with ${response.failures.size} errors"
+ )
+
+ for ((index, error) in response.failures.withIndex()) {
+ logger.log(Level.WARNING, "Error ${index + 1}:")
+ logger.log(Level.WARNING, "Attribute Path: ${error.attributePath}")
+ logger.log(Level.WARNING, "Exception Message: ${error.ex.message}")
+ }
+
+ setFailure("invoke failure")
+ }
+ } catch (ex: Exception) {
+ setFailure("invoke failure: ${ex.message}")
+ } catch (ex: Exception) {
+ logger.log(Level.WARNING, "General write failure occurred with error ${ex.message}")
+ setFailure("invoke failure")
+ } finally {
+ clear()
+ }
+ }
+
+ setSuccess()
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(PairOnNetworkLongImWriteCommand::class.java.name)
+
+ private const val MATTER_PORT = 5540
+ private const val CLUSTER_ID_BASIC = 0x0028u
+ private const val ATTR_ID_LOCAL_CONFIG_DISABLED = 16u
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt
new file mode 100644
index 00000000000000..96b856568ccbc5
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import com.matter.controller.commands.common.CredentialsIssuer
+import com.matter.controller.commands.common.IPAddress
+import com.matter.controller.commands.common.MatterCommand
+import java.net.InetAddress
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+import java.util.logging.Level
+import java.util.logging.Logger
+import matter.controller.MatterController
+
+abstract class PairingCommand(
+ controller: MatterController,
+ commandName: String,
+ credsIssuer: CredentialsIssuer?,
+ private val pairingMode: PairingModeType = PairingModeType.NONE,
+ private val networkType: PairingNetworkType = PairingNetworkType.NONE,
+ private val filterType: DiscoveryFilterType = DiscoveryFilterType.NONE
+) : MatterCommand(controller, credsIssuer, commandName), MatterController.CompletionListener {
+ private val remoteAddr: IPAddress = IPAddress(InetAddress.getByName("::1"))
+ private val nodeId = AtomicLong()
+ private val discoveryFilterCode = AtomicLong()
+ private val timeoutMillis = AtomicLong()
+ private val discoverOnce = AtomicBoolean()
+ private val useOnlyOnNetworkDiscovery = AtomicBoolean()
+ private val remotePort = AtomicInteger()
+ private val discriminator = AtomicInteger()
+ private val setupPINCode = AtomicLong()
+ private val operationalDataset = StringBuffer()
+ private val ssid = StringBuffer()
+ private val password = StringBuffer()
+ private val onboardingPayload = StringBuffer()
+ private val discoveryFilterInstanceName = StringBuffer()
+
+ init {
+ addArgument("node-id", 0, Long.MAX_VALUE, nodeId, null, false)
+
+ when (networkType) {
+ PairingNetworkType.NONE -> {}
+ PairingNetworkType.WIFI -> {
+ addArgument("ssid", ssid, null, false)
+ addArgument("password", password, null, false)
+ }
+ PairingNetworkType.THREAD ->
+ addArgument("operationalDataset", operationalDataset, null, false)
+ }
+
+ when (pairingMode) {
+ PairingModeType.NONE -> {}
+ PairingModeType.CODE,
+ PairingModeType.CODE_PASE_ONLY -> {
+ addArgument("payload", onboardingPayload, null, false)
+ addArgument("discover-once", discoverOnce, null, true)
+ addArgument("use-only-onnetwork-discovery", useOnlyOnNetworkDiscovery, null, true)
+ }
+ PairingModeType.ADDRESS_PASE_ONLY -> {
+ addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+ addArgument("device-remote-ip", remoteAddr, false)
+ addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+ }
+ PairingModeType.BLE -> {
+ addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+ addArgument("discriminator", 0.toShort(), 4096.toShort(), discriminator, null, false)
+ }
+ PairingModeType.ON_NETWORK ->
+ addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+ PairingModeType.SOFT_AP -> {
+ addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+ addArgument("discriminator", 0.toShort(), 4096.toShort(), discriminator, null, false)
+ addArgument("device-remote-ip", remoteAddr, false)
+ addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+ }
+ PairingModeType.ALREADY_DISCOVERED -> {
+ addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+ addArgument("device-remote-ip", remoteAddr, false)
+ addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+ }
+ }
+
+ when (filterType) {
+ DiscoveryFilterType.NONE -> {}
+ DiscoveryFilterType.SHORT_DISCRIMINATOR,
+ DiscoveryFilterType.LONG_DISCRIMINATOR ->
+ addArgument("discriminator", 0.toShort(), 4096.toShort(), discriminator, null, false)
+ DiscoveryFilterType.VENDOR_ID ->
+ addArgument("vendor-id", 1.toShort(), Short.MAX_VALUE, discoveryFilterCode, null, false)
+ DiscoveryFilterType.COMPRESSED_FABRIC_ID ->
+ addArgument("fabric-id", 0L, Long.MAX_VALUE, discoveryFilterCode, null, false)
+ DiscoveryFilterType.COMMISSIONING_MODE,
+ DiscoveryFilterType.COMMISSIONER -> {}
+ DiscoveryFilterType.DEVICE_TYPE ->
+ addArgument("device-type", 0.toShort(), Short.MAX_VALUE, discoveryFilterCode, null, false)
+ DiscoveryFilterType.INSTANCE_NAME ->
+ addArgument("name", discoveryFilterInstanceName, null, false)
+ }
+
+ addArgument("timeout", 0L, Long.MAX_VALUE, timeoutMillis, null, false)
+ }
+
+ override fun onConnectDeviceComplete() {
+ logger.log(Level.INFO, "onConnectDeviceComplete")
+ }
+
+ override fun onStatusUpdate(status: Int) {
+ logger.log(Level.INFO, "onStatusUpdate with status: $status")
+ }
+
+ override fun onPairingComplete(errorCode: Int) {
+ logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
+ if (errorCode != 0) {
+ setFailure("onPairingComplete failure")
+ }
+ }
+
+ override fun onPairingDeleted(errorCode: Int) {
+ logger.log(Level.INFO, "onPairingDeleted with error code: $errorCode")
+ }
+
+ override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
+ logger.log(Level.INFO, "onCommissioningComplete with error code: $errorCode")
+ if (errorCode == 0) {
+ setSuccess()
+ } else {
+ setFailure("onCommissioningComplete failure")
+ }
+ }
+
+ override fun onReadCommissioningInfo(
+ vendorId: Int,
+ productId: Int,
+ wifiEndpointId: Int,
+ threadEndpointId: Int
+ ) {
+ logger.log(Level.INFO, "onReadCommissioningInfo")
+ }
+
+ override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
+ logger.log(Level.INFO, "onCommissioningStatusUpdate")
+ }
+
+ override fun onNotifyChipConnectionClosed() {
+ logger.log(Level.INFO, "onNotifyChipConnectionClosed")
+ }
+
+ override fun onError(error: Throwable) {
+ setFailure(error.toString())
+ logger.log(Level.INFO, "onError with error: $error")
+ }
+
+ override fun onOpCSRGenerationComplete(csr: ByteArray) {
+ logger.log(Level.INFO, "onOpCSRGenerationComplete")
+ for (i in csr.indices) {
+ print(csr[i].toString() + " ")
+ }
+ }
+
+ fun getNodeId(): Long {
+ return nodeId.get()
+ }
+
+ fun getRemoteAddr(): IPAddress {
+ return remoteAddr
+ }
+
+ fun getRemotePort(): Int {
+ return remotePort.get()
+ }
+
+ fun getSetupPINCode(): Long {
+ return setupPINCode.get()
+ }
+
+ fun getDiscriminator(): Int {
+ return discriminator.get()
+ }
+
+ fun getTimeoutMillis(): Long {
+ return timeoutMillis.get()
+ }
+
+ fun getOnboardingPayload(): String {
+ return onboardingPayload.toString()
+ }
+
+ private fun String.hexToByteArray(): ByteArray {
+ return chunked(2).map { byteStr -> byteStr.toUByte(16).toByte() }.toByteArray()
+ }
+
+ fun getDiscoverOnce(): Boolean {
+ return discoverOnce.get()
+ }
+
+ fun getUseOnlyOnNetworkDiscovery(): Boolean {
+ return useOnlyOnNetworkDiscovery.get()
+ }
+
+ companion object {
+ private val logger = Logger.getLogger(PairingCommand::class.java.name)
+ }
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt
new file mode 100644
index 00000000000000..590688da9feda5
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class PairingModeType {
+ NONE,
+ CODE,
+ CODE_PASE_ONLY,
+ ADDRESS_PASE_ONLY,
+ BLE,
+ SOFT_AP,
+ ALREADY_DISCOVERED,
+ ON_NETWORK
+}
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt
new file mode 100644
index 00000000000000..4cde1fc97642d6
--- /dev/null
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class PairingNetworkType {
+ NONE,
+ WIFI,
+ THREAD
+}
diff --git a/examples/kotlin-matter-controller/third_party/connectedhomeip b/examples/kotlin-matter-controller/third_party/connectedhomeip
new file mode 120000
index 00000000000000..1b20c9fb816b63
--- /dev/null
+++ b/examples/kotlin-matter-controller/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../
\ No newline at end of file
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 6aca902510b8d1..890d85c444109a 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 e40627ca282f25..5922aa4673140e 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 eee0184396c2e7..2b055a6f59cc08 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 856e82ba0322c8..af45d5d4803c70 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 d96e174322eae8..855ca99ff22934 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/linux/LightingAppCommandDelegate.cpp b/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
index d0b772f6f04845..cafc1df1161359 100644
--- a/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
+++ b/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
@@ -199,13 +199,13 @@ void LightingAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)
GeneralFaults current;
// On Linux Simulation, set following radio faults statically.
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+ ReturnOnFailure(previous.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kWiFiFault)));
+ ReturnOnFailure(previous.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kThreadFault)));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
- ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kWiFiFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kCellularFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kThreadFault)));
+ ReturnOnFailure(current.add(to_underlying(GeneralDiagnostics::RadioFaultEnum::kNFCFault)));
Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(previous, current);
}
else if (eventId == Clusters::GeneralDiagnostics::Events::NetworkFaultChange::Id)
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 582f7597447530..a45cf8e7822b88 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 1317ca4067c2d0..df42d2a1d936fb 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 9d88da32ddf49a..fc69ee9767d91d 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 2eacd4b2df4cf2..e267b14dd745c7 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 37e3fcd5ccf8e7..e6d86462b53cdb 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 5c45f3417fd011..cbbb2470b230dc 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 df7bb68f7f1bc5..c660a9059be565 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 2f310c7d9fb494..05bc66cc3633dd 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 1bb874a6a017b8..a6b8e3cf644d9e 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 087a2ce56d3e06..2f84c2dd7a41f8 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 087a2ce56d3e06..2f84c2dd7a41f8 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 222ebbe9172cdb..8facb46e61f023 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 761173084c23d8..de4473cdffd5e8 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 f278a04905b2b6..49e50f203afa4e 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 ad15d482984401..c6e97acdc2043a 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 c852a0807f58e4..c198ff1b793772 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 2522f2372f1ccf..1fc0eb2057763c 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 a6a847e84236b1..51e7215cef0133 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/build/build/targets.py b/scripts/build/build/targets.py
index c1b0fad61be8ff..17807371745ea6 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -111,6 +111,8 @@ def BuildHostTarget():
TargetPart('thermostat', app=HostApp.THERMOSTAT),
TargetPart('java-matter-controller',
app=HostApp.JAVA_MATTER_CONTROLLER),
+ TargetPart('kotlin-matter-controller',
+ app=HostApp.KOTLIN_MATTER_CONTROLLER),
TargetPart('minmdns', app=HostApp.MIN_MDNS),
TargetPart('light', app=HostApp.LIGHT),
TargetPart('lock', app=HostApp.LOCK),
@@ -332,6 +334,8 @@ def BuildAndroidTarget():
TargetPart('tv-casting-app', app=AndroidApp.TV_CASTING_APP),
TargetPart('java-matter-controller',
app=AndroidApp.JAVA_MATTER_CONTROLLER),
+ TargetPart('kotlin-matter-controller',
+ app=AndroidApp.KOTLIN_MATTER_CONTROLLER),
TargetPart('virtual-device-app',
app=AndroidApp.VIRTUAL_DEVICE_APP),
])
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
index a5b86e7ccd1388..14802fe5e83e80 100644
--- a/scripts/build/builders/android.py
+++ b/scripts/build/builders/android.py
@@ -71,6 +71,7 @@ class AndroidApp(Enum):
TV_SERVER = auto()
TV_CASTING_APP = auto()
JAVA_MATTER_CONTROLLER = auto()
+ KOTLIN_MATTER_CONTROLLER = auto()
VIRTUAL_DEVICE_APP = auto()
def AppName(self):
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
index 01a9e771136032..fcc159894bda29 100644
--- a/scripts/build/builders/host.py
+++ b/scripts/build/builders/host.py
@@ -67,6 +67,7 @@ class HostApp(Enum):
TV_CASTING = auto()
BRIDGE = auto()
JAVA_MATTER_CONTROLLER = auto()
+ KOTLIN_MATTER_CONTROLLER = auto()
CONTACT_SENSOR = auto()
DISHWASHER = auto()
REFRIGERATOR = auto()
@@ -113,6 +114,8 @@ def ExamplePath(self):
return 'bridge-app/linux'
elif self == HostApp.JAVA_MATTER_CONTROLLER:
return 'java-matter-controller'
+ elif self == HostApp.KOTLIN_MATTER_CONTROLLER:
+ return 'kotlin-matter-controller'
elif self == HostApp.CONTACT_SENSOR:
return 'contact-sensor-app/linux'
elif self == HostApp.DISHWASHER:
@@ -197,6 +200,9 @@ def OutputNames(self):
elif self == HostApp.JAVA_MATTER_CONTROLLER:
yield 'java-matter-controller'
yield 'java-matter-controller.map'
+ elif self == HostApp.KOTLIN_MATTER_CONTROLLER:
+ yield 'kotlin-matter-controller'
+ yield 'kotlin-matter-controller.map'
elif self == HostApp.CONTACT_SENSOR:
yield 'contact-sensor-app'
yield 'contact-sensor-app.map'
@@ -451,6 +457,15 @@ def generate(self):
],
title="Copying Manifest.txt to " + self.output_dir,
)
+ if exampleName == "kotlin-matter-controller":
+ self._Execute(
+ [
+ "cp",
+ os.path.join(self.root, "Manifest.txt"),
+ self.output_dir,
+ ],
+ title="Copying Manifest.txt to " + self.output_dir,
+ )
if self.app == HostApp.TESTS and self.use_coverage:
self.coverage_dir = os.path.join(self.output_dir, 'coverage')
@@ -484,6 +499,9 @@ def PostBuildCommand(self):
if self.app == HostApp.JAVA_MATTER_CONTROLLER:
self.createJavaExecutable("java-matter-controller")
+ if self.app == HostApp.KOTLIN_MATTER_CONTROLLER:
+ self.createJavaExecutable("kotlin-matter-controller")
+
def build_outputs(self):
outputs = {}
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index dd29ccecea337c..4c65d6c04db464 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -1,6 +1,6 @@
ameba-amebad-{all-clusters,all-clusters-minimal,light,light-switch,pigweed}
asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-switch,lock,bridge,temperature-measurement,thermostat,ota-requestor,dishwasher,refrigerator}[-ota][-shell][-no_logging][-factory][-rotating_id][-rio]
-android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,virtual-device-app}[-no-debug]
+android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,kotlin-matter-controller,virtual-device-app}[-no-debug]
bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor]
cc32xx-lock
ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
@@ -10,7 +10,7 @@ efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,b
esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]
genio-lighting-app
linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang]
-linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
+linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
linux-x64-efr32-test-runner[-clang]
imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage]
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/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
index 41062c7cb4fe21..6c50b581e397d7 100644
--- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
+++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
@@ -53,13 +53,14 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve
GeneralFaults radioFaultsPrevious;
GeneralFaults radioFaultsCurrent;
- ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
-
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
- ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
+ using app::Clusters::GeneralDiagnostics::RadioFaultEnum;
+ ReturnErrorOnFailure(radioFaultsPrevious.add(to_underlying(RadioFaultEnum::kWiFiFault)));
+ ReturnErrorOnFailure(radioFaultsPrevious.add(to_underlying(RadioFaultEnum::kThreadFault)));
+
+ ReturnErrorOnFailure(radioFaultsCurrent.add(to_underlying(RadioFaultEnum::kWiFiFault)));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(to_underlying(RadioFaultEnum::kCellularFault)));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(to_underlying(RadioFaultEnum::kThreadFault)));
+ ReturnErrorOnFailure(radioFaultsCurrent.add(to_underlying(RadioFaultEnum::kNFCFault)));
app::Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(radioFaultsPrevious, radioFaultsCurrent);
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 40251139dae555..e62e21a9fce29b 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -6,10 +6,8 @@ WeakEnums:
- ColorControlOptions
- ColorMode
- EnhancedColorMode
- - InterfaceTypeEnum
- MoveMode
- PHYRateEnum
- - RadioFaultEnum
- StepMode
CommandHandlerInterfaceOnlyClusters:
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 6f740e66f759b0..8ea8bc06d52aad 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.
-->
-
+