From a2fb382e11857cef04b1893ce40e6ba0b032e5f2 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 2 Feb 2023 13:21:54 -0500 Subject: [PATCH] Regenerate generated code. --- .../all-clusters-app.matter | 12 +- .../all-clusters-minimal-app.matter | 12 +- .../bridge-common/bridge-app.matter | 12 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 12 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 12 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 12 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 12 +- .../rootnode_doorlock_aNKYAreMXE.matter | 12 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 12 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 12 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 12 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 12 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 12 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 12 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 12 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 12 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 12 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 12 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 12 +- .../rootnode_speaker_RpzeXdimqA.matter | 12 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 12 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 12 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 12 +- .../contact-sensor-app.matter | 12 +- .../bridge-common/bridge-app.matter | 12 +- .../light-switch-app.matter | 12 +- .../lighting-common/lighting-app.matter | 12 +- examples/lock-app/lock-common/lock-app.matter | 12 +- .../log-source-common/log-source-app.matter | 22 +-- .../esp32/main/temperature-measurement.matter | 12 +- .../thermostat-common/thermostat.matter | 12 +- examples/tv-app/tv-common/tv-app.matter | 12 +- .../tv-casting-common/tv-casting-app.matter | 12 +- .../data_model/controller-clusters.matter | 16 +- .../chip/devicecontroller/ChipClusters.java | 6 +- .../devicecontroller/ClusterInfoMapping.java | 4 +- .../python/chip/clusters/CHIPClusters.py | 2 +- .../python/chip/clusters/Objects.py | 22 +-- .../CHIP/zap-generated/MTRBaseClusters.h | 67 +++++-- .../CHIP/zap-generated/MTRBaseClusters.mm | 5 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 176 +++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 36 ++-- .../CHIP/zap-generated/MTRClusters.mm | 5 +- .../zap-generated/MTRCommandPayloadsObjc.h | 4 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 5 +- .../zap-generated/cluster-enums-check.h | 12 +- .../app-common/zap-generated/cluster-enums.h | 12 +- .../zap-generated/cluster-objects.h | 16 +- .../zap-generated/cluster/Commands.h | 9 +- 49 files changed, 427 insertions(+), 376 deletions(-) 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 3872956148de0d..3890f261737ea9 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 @@ -1124,13 +1124,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -1138,7 +1138,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1147,9 +1147,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 35157a1c70dd3b..42fb17d3059eba 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 @@ -1015,13 +1015,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -1029,7 +1029,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1038,9 +1038,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 18cdac8cf27d1c..fd40490d33c284 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -755,13 +755,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -769,7 +769,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -778,9 +778,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 55066d37b26292..0fa0dbd5ff9162 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -610,13 +610,13 @@ server cluster GeneralCommissioning = 48 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -624,7 +624,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -633,9 +633,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 37ddc92e299bcd..e412ca94a5e5df 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -722,13 +722,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -736,7 +736,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -745,9 +745,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index c78e19271ca6bd..7d55c5381c9d53 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -599,13 +599,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -613,7 +613,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -622,9 +622,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 45473a2e4140b3..0a773cb5dd4f86 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -744,13 +744,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -758,7 +758,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -767,9 +767,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 20cc3bb20da76b..f3880e1cf3b028 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -599,13 +599,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -613,7 +613,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -622,9 +622,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index a2520e905c4478..52d0d4c763b5e9 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -744,13 +744,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -758,7 +758,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -767,9 +767,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index e49282666e54ac..aff9ecda7c46c7 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -601,13 +601,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -615,7 +615,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -624,9 +624,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 15c106ea23462e..28215ac71e4e40 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -612,13 +612,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -626,7 +626,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -635,9 +635,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index f2d7633500a71d..9b7e51e2285c2c 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -737,13 +737,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -751,7 +751,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -760,9 +760,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 1fea3cd56bb2f9..9af504d65fdba4 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -612,13 +612,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -626,7 +626,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -635,9 +635,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 4bc590e377fdcf..6a7e2acae77492 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -612,13 +612,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -626,7 +626,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -635,9 +635,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 16d07dec7c877d..4e106f78b14566 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -612,13 +612,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -626,7 +626,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -635,9 +635,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 4a2bf2810685a4..e5770c5bfec304 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -744,13 +744,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -758,7 +758,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -767,9 +767,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 861c60deef8bef..2643822044ab4a 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -683,13 +683,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -697,7 +697,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -706,9 +706,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 237b62a61af864..951aed0735c06b 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -645,13 +645,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -659,7 +659,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -668,9 +668,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 8619eb1664e965..76757c25cbb341 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -617,13 +617,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -631,7 +631,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -640,9 +640,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 71a51a8ad27c61..795b5c6942c3e1 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -735,13 +735,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -749,7 +749,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -758,9 +758,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 64926a1ef16c9c..8da2550cc94401 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -612,13 +612,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -626,7 +626,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -635,9 +635,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 5c255f0f39dfff..9812c7bf8950b2 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -599,13 +599,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -613,7 +613,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -622,9 +622,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 185d06293ab795..521750750ae1d3 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -599,13 +599,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -613,7 +613,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -622,9 +622,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 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 99a39ebfebd41b..95f3973c94a301 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 @@ -602,13 +602,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -616,7 +616,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -625,9 +625,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 18cdac8cf27d1c..fd40490d33c284 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -755,13 +755,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -769,7 +769,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -778,9 +778,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index ba452d17d77e20..3b5a17431f2f06 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 @@ -804,13 +804,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -818,7 +818,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -827,9 +827,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 2568988fa5ae56..7a8cc7f9f64744 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -756,13 +756,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -770,7 +770,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -779,9 +779,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 3c5c2dc494f7c0..d5918446728c14 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -672,13 +672,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -686,7 +686,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -695,9 +695,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index ae2ba9a7b6b1a6..6f41d04af580b3 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -246,13 +246,13 @@ server cluster NetworkCommissioning = 49 { } client cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -260,7 +260,7 @@ client cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -270,13 +270,13 @@ client cluster DiagnosticLogs = 50 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -284,7 +284,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -293,14 +293,14 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } response struct RetrieveLogsResponse = 1 { - LogsStatus status = 0; - OCTET_STRING logContent = 1; + StatusEnum status = 0; + LONG_OCTET_STRING logContent = 1; epoch_s UTCTimeStamp = 2; INT32U timeSinceBoot = 3; } diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index abacf2ab2043f7..cfecefe498c9ce 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -370,13 +370,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -384,7 +384,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -393,9 +393,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index b0827ce5344894..c2a11c73c50b72 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -774,13 +774,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -788,7 +788,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -797,9 +797,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 9c28de68619181..30634f820d9127 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -810,13 +810,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -824,7 +824,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -833,9 +833,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 1edfe24e2b1b3e..9f7f4e24823b6a 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -977,13 +977,13 @@ server cluster NetworkCommissioning = 49 { } server cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -991,7 +991,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1000,9 +1000,9 @@ server cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 9bbe56bf61ceff..5f7077d65de2d3 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1252,13 +1252,13 @@ client cluster NetworkCommissioning = 49 { } client cluster DiagnosticLogs = 50 { - enum LogsIntent : ENUM8 { + enum IntentEnum : ENUM8 { kEndUserSupport = 0; kNetworkDiag = 1; kCrashLogs = 2; } - enum LogsStatus : ENUM8 { + enum StatusEnum : ENUM8 { kSuccess = 0; kExhausted = 1; kNoLogs = 2; @@ -1266,7 +1266,7 @@ client cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1278,14 +1278,14 @@ client cluster DiagnosticLogs = 50 { readonly attribute int16u clusterRevision = 65533; request struct RetrieveLogsRequestRequest { - LogsIntent intent = 0; - LogsTransferProtocol requestedProtocol = 1; - OCTET_STRING<32> transferFileDesignator = 2; + IntentEnum intent = 0; + TransferProtocolEnum requestedProtocol = 1; + optional CHAR_STRING<32> transferFileDesignator = 2; } response struct RetrieveLogsResponse = 1 { - LogsStatus status = 0; - OCTET_STRING logContent = 1; + StatusEnum status = 0; + LONG_OCTET_STRING logContent = 1; epoch_s UTCTimeStamp = 2; INT32U timeSinceBoot = 3; } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 6a6058623a10f3..36fb7f5f565398 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -6479,7 +6479,7 @@ public void retrieveLogsRequest( RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, - byte[] transferFileDesignator) { + Optional transferFileDesignator) { retrieveLogsRequest( chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null); } @@ -6488,7 +6488,7 @@ public void retrieveLogsRequest( RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, - byte[] transferFileDesignator, + Optional transferFileDesignator, int timedInvokeTimeoutMs) { retrieveLogsRequest( chipClusterPtr, @@ -6504,7 +6504,7 @@ private native void retrieveLogsRequest( RetrieveLogsResponseCallback Callback, Integer intent, Integer requestedProtocol, - byte[] transferFileDesignator, + Optional transferFileDesignator, @Nullable Integer timedInvokeTimeoutMs); public interface RetrieveLogsResponseCallback { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 6d1316f170da2f..e13c778e1613e8 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -9181,7 +9181,7 @@ public Map> getCommandMap() { CommandParameterInfo diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo = - new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class); + new CommandParameterInfo("transferFileDesignator", Optional.class, String.class); diagnosticLogsretrieveLogsRequestCommandParams.put( "transferFileDesignator", diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo); @@ -9194,7 +9194,7 @@ public Map> getCommandMap() { (ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback, (Integer) commandArguments.get("intent"), (Integer) commandArguments.get("requestedProtocol"), - (byte[]) commandArguments.get("transferFileDesignator")); + (Optional) commandArguments.get("transferFileDesignator")); }, () -> new DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback(), diagnosticLogsretrieveLogsRequestCommandParams); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index cc69cb02ec9887..24c33deabf93fb 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -1979,7 +1979,7 @@ class ChipClusters: "args": { "intent": "int", "requestedProtocol": "int", - "transferFileDesignator": "bytes", + "transferFileDesignator": "str", }, }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 31907a43193109..8883a9d51e0750 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7379,7 +7379,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class LogsIntent(MatterIntEnum): + class IntentEnum(MatterIntEnum): kEndUserSupport = 0x00 kNetworkDiag = 0x01 kCrashLogs = 0x02 @@ -7389,7 +7389,7 @@ class LogsIntent(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 3, - class LogsStatus(MatterIntEnum): + class StatusEnum(MatterIntEnum): kSuccess = 0x00 kExhausted = 0x01 kNoLogs = 0x02 @@ -7401,7 +7401,7 @@ class LogsStatus(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 5, - class LogsTransferProtocol(MatterIntEnum): + class TransferProtocolEnum(MatterIntEnum): kResponsePayload = 0x00 kBdx = 0x01 # All received enum values that are not listed above will be mapped @@ -7425,14 +7425,14 @@ class RetrieveLogsRequest(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="intent", Tag=0, Type=DiagnosticLogs.Enums.LogsIntent), - ClusterObjectFieldDescriptor(Label="requestedProtocol", Tag=1, Type=DiagnosticLogs.Enums.LogsTransferProtocol), - ClusterObjectFieldDescriptor(Label="transferFileDesignator", Tag=2, Type=bytes), + ClusterObjectFieldDescriptor(Label="intent", Tag=0, Type=DiagnosticLogs.Enums.IntentEnum), + ClusterObjectFieldDescriptor(Label="requestedProtocol", Tag=1, Type=DiagnosticLogs.Enums.TransferProtocolEnum), + ClusterObjectFieldDescriptor(Label="transferFileDesignator", Tag=2, Type=typing.Optional[str]), ]) - intent: 'DiagnosticLogs.Enums.LogsIntent' = 0 - requestedProtocol: 'DiagnosticLogs.Enums.LogsTransferProtocol' = 0 - transferFileDesignator: 'bytes' = b"" + intent: 'DiagnosticLogs.Enums.IntentEnum' = 0 + requestedProtocol: 'DiagnosticLogs.Enums.TransferProtocolEnum' = 0 + transferFileDesignator: 'typing.Optional[str]' = None @dataclass class RetrieveLogsResponse(ClusterCommand): @@ -7445,13 +7445,13 @@ class RetrieveLogsResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=DiagnosticLogs.Enums.LogsStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=DiagnosticLogs.Enums.StatusEnum), ClusterObjectFieldDescriptor(Label="logContent", Tag=1, Type=bytes), ClusterObjectFieldDescriptor(Label="UTCTimeStamp", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="timeSinceBoot", Tag=3, Type=uint), ]) - status: 'DiagnosticLogs.Enums.LogsStatus' = 0 + status: 'DiagnosticLogs.Enums.StatusEnum' = 0 logContent: 'bytes' = b"" UTCTimeStamp: 'uint' = 0 timeSinceBoot: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 940a0e38fdbc62..7083c76b9c3588 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -19350,24 +19350,65 @@ typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurity) { = 0x10, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDiagnosticLogsIntent) { + MTRDiagnosticLogsIntentEndUserSupport API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, + MTRDiagnosticLogsIntentNetworkDiag API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, + MTRDiagnosticLogsIntentCrashLogs API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, +} API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + typedef NS_ENUM(uint8_t, MTRDiagnosticLogsLogsIntent) { - MTRDiagnosticLogsLogsIntentEndUserSupport API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDiagnosticLogsLogsIntentNetworkDiag API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDiagnosticLogsLogsIntentCrashLogs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDiagnosticLogsLogsIntentEndUserSupport API_DEPRECATED( + "Please use MTRDiagnosticLogsIntentEndUserSupport", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x00, + MTRDiagnosticLogsLogsIntentNetworkDiag API_DEPRECATED( + "Please use MTRDiagnosticLogsIntentNetworkDiag", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x01, + MTRDiagnosticLogsLogsIntentCrashLogs API_DEPRECATED( + "Please use MTRDiagnosticLogsIntentCrashLogs", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x02, +} API_DEPRECATED("Please use MTRDiagnosticLogsIntent", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTRDiagnosticLogsStatus) { + MTRDiagnosticLogsStatusSuccess API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, + MTRDiagnosticLogsStatusExhausted API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, + MTRDiagnosticLogsStatusNoLogs API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02, + MTRDiagnosticLogsStatusBusy API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x03, + MTRDiagnosticLogsStatusDenied API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x04, +} API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); typedef NS_ENUM(uint8_t, MTRDiagnosticLogsLogsStatus) { - MTRDiagnosticLogsLogsStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDiagnosticLogsLogsStatusExhausted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDiagnosticLogsLogsStatusNoLogs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDiagnosticLogsLogsStatusBusy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDiagnosticLogsLogsStatusDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDiagnosticLogsLogsStatusSuccess API_DEPRECATED( + "Please use MTRDiagnosticLogsStatusSuccess", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x00, + MTRDiagnosticLogsLogsStatusExhausted API_DEPRECATED( + "Please use MTRDiagnosticLogsStatusExhausted", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x01, + MTRDiagnosticLogsLogsStatusNoLogs API_DEPRECATED( + "Please use MTRDiagnosticLogsStatusNoLogs", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x02, + MTRDiagnosticLogsLogsStatusBusy API_DEPRECATED( + "Please use MTRDiagnosticLogsStatusBusy", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x03, + MTRDiagnosticLogsLogsStatusDenied API_DEPRECATED( + "Please use MTRDiagnosticLogsStatusDenied", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x04, +} API_DEPRECATED("Please use MTRDiagnosticLogsStatus", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + +typedef NS_ENUM(uint8_t, MTRDiagnosticLogsTransferProtocol) { + MTRDiagnosticLogsTransferProtocolResponsePayload API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, + MTRDiagnosticLogsTransferProtocolBDX API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01, +} API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); typedef NS_ENUM(uint8_t, MTRDiagnosticLogsLogsTransferProtocol) { - MTRDiagnosticLogsLogsTransferProtocolResponsePayload API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDiagnosticLogsLogsTransferProtocolBDX API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDiagnosticLogsLogsTransferProtocolResponsePayload API_DEPRECATED( + "Please use MTRDiagnosticLogsTransferProtocolResponsePayload", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), + tvos(16.1, 16.4)) + = 0x00, + MTRDiagnosticLogsLogsTransferProtocolBDX API_DEPRECATED( + "Please use MTRDiagnosticLogsTransferProtocolBDX", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x01, +} API_DEPRECATED("Please use MTRDiagnosticLogsTransferProtocol", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), + tvos(16.1, 16.4)); typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsBootReason) { MTRGeneralDiagnosticsBootReasonUnspecified API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index b9ff0ac45ee50c..008df104b7f965 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -25682,7 +25682,10 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque request.intent = static_cast>(params.intent.unsignedCharValue); request.requestedProtocol = static_cast>( params.requestedProtocol.unsignedCharValue); - request.transferFileDesignator = [self asByteSpan:params.transferFileDesignator]; + if (params.transferFileDesignator != nil) { + auto & definedValue_0 = request.transferFileDesignator.Emplace(); + definedValue_0 = [self asCharSpan:params.transferFileDesignator]; + } return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index a42ab726be8bcd..8567dfa7dd9075 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -265,16 +265,16 @@ typedef void (*NullableNetworkCommissioningClusterNetworkCommissioningStatusAttr typedef void (*NetworkCommissioningClusterWiFiBandAttributeCallback)(void *, chip::app::Clusters::NetworkCommissioning::WiFiBand); typedef void (*NullableNetworkCommissioningClusterWiFiBandAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*DiagnosticLogsClusterLogsIntentAttributeCallback)(void *, chip::app::Clusters::DiagnosticLogs::LogsIntent); -typedef void (*NullableDiagnosticLogsClusterLogsIntentAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DiagnosticLogsClusterLogsStatusAttributeCallback)(void *, chip::app::Clusters::DiagnosticLogs::LogsStatus); -typedef void (*NullableDiagnosticLogsClusterLogsStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DiagnosticLogsClusterLogsTransferProtocolAttributeCallback)( - void *, chip::app::Clusters::DiagnosticLogs::LogsTransferProtocol); -typedef void (*NullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*DiagnosticLogsClusterIntentEnumAttributeCallback)(void *, chip::app::Clusters::DiagnosticLogs::IntentEnum); +typedef void (*NullableDiagnosticLogsClusterIntentEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DiagnosticLogsClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::DiagnosticLogs::StatusEnum); +typedef void (*NullableDiagnosticLogsClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DiagnosticLogsClusterTransferProtocolEnumAttributeCallback)( + void *, chip::app::Clusters::DiagnosticLogs::TransferProtocolEnum); +typedef void (*NullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*GeneralDiagnosticsClusterBootReasonEnumAttributeCallback)(void *, chip::app::Clusters::GeneralDiagnostics::BootReasonEnum); typedef void (*NullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallback)( @@ -14185,204 +14185,204 @@ class MTRNullableNetworkCommissioningClusterWiFiBandAttributeCallbackSubscriptio MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::LogsIntent value); + static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::IntentEnum value); }; -class MTRDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge - : public MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge +class MTRDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge + : public MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge { public: - MTRDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(queue, handler, action), + MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::OnDone; + using MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge - : public MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge +class MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge( + MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge(queue, handler, action), + MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::OnDone; + using MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::LogsStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::StatusEnum value); }; -class MTRDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge - : public MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge +class MTRDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge + : public MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge { public: - MTRDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(queue, handler, action), + MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::OnDone; + using MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge - : public MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge +class MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge( + MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::OnDone; + using MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::LogsTransferProtocol value); + static void OnSuccessFn(void * context, chip::app::Clusters::DiagnosticLogs::TransferProtocolEnum value); }; -class MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge - : public MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge +class MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge + : public MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge { public: - MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge( + MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(queue, handler, action), + MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::OnDone; + using MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge - : public MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge +class MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge { public: - MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge( + MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge(queue, handler, action), + MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::OnDone; + using MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index bc1d0e3e7544e2..66c8c613a720fe 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -14917,15 +14917,15 @@ } } -void MTRDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DiagnosticLogs::LogsIntent value) +void MTRDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DiagnosticLogs::IntentEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -14940,8 +14940,8 @@ } } -void MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -14952,7 +14952,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -14967,15 +14967,15 @@ } } -void MTRDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DiagnosticLogs::LogsStatus value) +void MTRDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DiagnosticLogs::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -14990,8 +14990,8 @@ } } -void MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15002,7 +15002,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15017,15 +15017,15 @@ } } -void MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DiagnosticLogs::LogsTransferProtocol value) +void MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DiagnosticLogs::TransferProtocolEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15040,8 +15040,8 @@ } } -void MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15052,7 +15052,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDiagnosticLogsClusterLogsTransferProtocolAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDiagnosticLogsClusterTransferProtocolEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 0247bc118dc256..307672e90f3268 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -8475,7 +8475,10 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque request.intent = static_cast>(params.intent.unsignedCharValue); request.requestedProtocol = static_cast>( params.requestedProtocol.unsignedCharValue); - request.transferFileDesignator = [self asByteSpan:params.transferFileDesignator]; + if (params.transferFileDesignator != nil) { + auto & definedValue_0 = request.transferFileDesignator.Emplace(); + definedValue_0 = [self asCharSpan:params.transferFileDesignator]; + } return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index cde5e7183900ac..c6cdd911748d85 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -2802,8 +2802,8 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull requestedProtocol API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSData * _Nonnull transferFileDesignator API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - ; +@property (nonatomic, copy) + NSString * _Nullable transferFileDesignator API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); /** * Controls whether the command is a timed command (using Timed Invoke). * diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index afc4fd9d807ac7..6a31d0a7757535 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -3446,7 +3446,7 @@ - (instancetype)init _requestedProtocol = @(0); - _transferFileDesignator = [NSData data]; + _transferFileDesignator = nil; _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -3469,8 +3469,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = [NSString stringWithFormat:@"<%@: intent:%@; requestedProtocol:%@; transferFileDesignator:%@; >", - NSStringFromClass([self class]), _intent, _requestedProtocol, - [_transferFileDesignator base64EncodedStringWithOptions:0]]; + NSStringFromClass([self class]), _intent, _requestedProtocol, _transferFileDesignator]; return descriptionString; } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index a823faf417234f..7f66cda4b204d1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -627,9 +627,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::W } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsIntent val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::IntentEnum val) { - using EnumType = DiagnosticLogs::LogsIntent; + using EnumType = DiagnosticLogs::IntentEnum; switch (val) { case EnumType::kEndUserSupport: @@ -640,9 +640,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsInt return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::StatusEnum val) { - using EnumType = DiagnosticLogs::LogsStatus; + using EnumType = DiagnosticLogs::StatusEnum; switch (val) { case EnumType::kSuccess: @@ -655,9 +655,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsSta return static_cast(5); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::LogsTransferProtocol val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DiagnosticLogs::TransferProtocolEnum val) { - using EnumType = DiagnosticLogs::LogsTransferProtocol; + using EnumType = DiagnosticLogs::TransferProtocolEnum; switch (val) { case EnumType::kResponsePayload: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 47a5293538d1e6..4e8bd18a946f7d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -771,8 +771,8 @@ enum class WiFiSecurity : uint8_t namespace DiagnosticLogs { -// Enum for LogsIntent -enum class LogsIntent : uint8_t +// Enum for IntentEnum +enum class IntentEnum : uint8_t { kEndUserSupport = 0x00, kNetworkDiag = 0x01, @@ -784,8 +784,8 @@ enum class LogsIntent : uint8_t kUnknownEnumValue = 3, }; -// Enum for LogsStatus -enum class LogsStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kExhausted = 0x01, @@ -799,8 +799,8 @@ enum class LogsStatus : uint8_t kUnknownEnumValue = 5, }; -// Enum for LogsTransferProtocol -enum class LogsTransferProtocol : uint8_t +// Enum for TransferProtocolEnum +enum class TransferProtocolEnum : uint8_t { kResponsePayload = 0x00, kBdx = 0x01, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index f4144c83c67342..ef11cc8b031ab6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -7567,9 +7567,9 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RetrieveLogsRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; } - LogsIntent intent = static_cast(0); - LogsTransferProtocol requestedProtocol = static_cast(0); - chip::ByteSpan transferFileDesignator; + IntentEnum intent = static_cast(0); + TransferProtocolEnum requestedProtocol = static_cast(0); + Optional transferFileDesignator; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -7584,9 +7584,9 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RetrieveLogsRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; } - LogsIntent intent = static_cast(0); - LogsTransferProtocol requestedProtocol = static_cast(0); - chip::ByteSpan transferFileDesignator; + IntentEnum intent = static_cast(0); + TransferProtocolEnum requestedProtocol = static_cast(0); + Optional transferFileDesignator; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace RetrieveLogsRequest @@ -7606,7 +7606,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RetrieveLogsResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; } - LogsStatus status = static_cast(0); + StatusEnum status = static_cast(0); chip::ByteSpan logContent; uint32_t UTCTimeStamp = static_cast(0); uint32_t timeSinceBoot = static_cast(0); @@ -7624,7 +7624,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RetrieveLogsResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DiagnosticLogs::Id; } - LogsStatus status = static_cast(0); + StatusEnum status = static_cast(0); chip::ByteSpan logContent; uint32_t UTCTimeStamp = static_cast(0); uint32_t timeSinceBoot = static_cast(0); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 5fef89b991fdc5..cd6a79b582f89d 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -21140,8 +21140,13 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand { = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.intent = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.intent)]; params.requestedProtocol = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.requestedProtocol)]; - params.transferFileDesignator = [NSData dataWithBytes:mRequest.transferFileDesignator.data() - length:mRequest.transferFileDesignator.size()]; + if (mRequest.transferFileDesignator.HasValue()) { + params.transferFileDesignator = [[NSString alloc] initWithBytes:mRequest.transferFileDesignator.Value().data() + length:mRequest.transferFileDesignator.Value().size() + encoding:NSUTF8StringEncoding]; + } else { + params.transferFileDesignator = nil; + } uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) {