From ad5fdfa11210a974c0eeab040740a72eb9df548e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 15 Feb 2023 09:38:28 -0500 Subject: [PATCH] Align diagnostic logs cluster XML to spec changes. (#24833) * Align diagnostic logs cluster XML to spec changes. Fixes https://github.com/project-chip/connectedhomeip/issues/24826 * 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 +- .../data_model/lighting-thread-app.matter | 12 +- .../efr32/data_model/lighting-wifi-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 +- .../diagnostic-logs-server.cpp | 20 +- .../chip/diagnostic-logs-cluster.xml | 16 +- .../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/templates/availability.yaml | 41 +++- .../CHIP/zap-generated/MTRBaseClusters.h | 66 +++++-- .../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 | 3 +- .../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 +- 54 files changed, 492 insertions(+), 410 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 34e2bb1992c851..cec70e41cd3781 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 @@ -1210,13 +1210,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; @@ -1224,7 +1224,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1237,9 +1237,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 6be1db0d1caf3e..63247da4bd18fb 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 @@ -1089,13 +1089,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; @@ -1103,7 +1103,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1116,9 +1116,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 7681897592318a..50442d83dc7c86 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -775,13 +775,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; @@ -789,7 +789,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -802,9 +802,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 06b3ea2b266569..39dac326062d8e 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -645,13 +645,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; @@ -659,7 +659,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -672,9 +672,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 8f2d13e01a63ff..6035360b3cfe0c 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -751,13 +751,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; @@ -765,7 +765,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/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index d93073af168e07..914794336412aa 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -636,13 +636,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; @@ -650,7 +650,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -663,9 +663,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 2811bc41d4db90..76d0a56024b2be 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -783,13 +783,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; @@ -797,7 +797,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -810,9 +810,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 6523f786491744..bdd1ccc6a9797a 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -636,13 +636,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; @@ -650,7 +650,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -663,9 +663,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 67787f7ea6b415..f744f98f2e6e38 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -783,13 +783,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; @@ -797,7 +797,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -810,9 +810,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 9a529c3095ec2a..f25e30b8a93398 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -635,13 +635,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; @@ -649,7 +649,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -662,9 +662,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 601fc2a3169912..75f98960af3ff6 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -650,13 +650,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; @@ -664,7 +664,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -677,9 +677,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 ed2df5473f7042..30bd99d8ae6615 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -776,13 +776,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; @@ -790,7 +790,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -803,9 +803,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 092566305f5d4e..f21bd9dce8d570 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -650,13 +650,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; @@ -664,7 +664,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -677,9 +677,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 e487f386ae37e2..abe0ec16c0f868 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -650,13 +650,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; @@ -664,7 +664,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -677,9 +677,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 39329dfff3db16..2d82830115e825 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -650,13 +650,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; @@ -664,7 +664,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -677,9 +677,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 961d2ae4d88ddc..ef092933beeddc 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -783,13 +783,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; @@ -797,7 +797,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -810,9 +810,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 fd393ddcb62f20..0a64802c98f1d1 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.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; } @@ -749,9 +749,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 16cb2a97622f77..37f9e14df4a52e 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.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; } @@ -710,9 +710,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 bc135dd14d739d..59c93833361bae 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -655,13 +655,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; @@ -669,7 +669,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -682,9 +682,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 2f7a127b3477d5..ecf26ab96ab327 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -777,13 +777,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; @@ -791,7 +791,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -804,9 +804,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 4cf5b515c473eb..dfda123cdfa2d7 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -650,13 +650,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; @@ -664,7 +664,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -677,9 +677,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 cc464929a380ff..5b8e3602c11149 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -636,13 +636,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; @@ -650,7 +650,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -663,9 +663,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 65c32f5f6e873e..d9696c30336450 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -636,13 +636,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; @@ -650,7 +650,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -663,9 +663,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 5910d9c094d8fb..9543cfeee4783d 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 @@ -640,13 +640,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; @@ -654,7 +654,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -667,9 +667,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 9c9130951002ea..4a98fa793255b6 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -775,13 +775,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; @@ -789,7 +789,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -802,9 +802,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 38558e99f07cc7..e0c4c633f41dbe 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 @@ -854,13 +854,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; @@ -868,7 +868,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -881,9 +881,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 fdb7fc4944321c..56185c1e94d00c 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -808,13 +808,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; @@ -822,7 +822,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -835,9 +835,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/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter index 11f7fc0c062cc9..112b81cf97b819 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter @@ -808,13 +808,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; @@ -822,7 +822,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -835,9 +835,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/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter index e3615b360e0912..2babfa44176079 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter @@ -808,13 +808,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; @@ -822,7 +822,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -835,9 +835,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 bf69baf34291a6..8f8041a65a40bc 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -724,13 +724,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; @@ -738,7 +738,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -751,9 +751,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 78a88db578c5e1..43fbdd8fa43487 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 @@ -257,13 +257,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; @@ -271,7 +271,7 @@ client cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -285,13 +285,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; @@ -299,7 +299,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -312,14 +312,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; optional epoch_us UTCTimeStamp = 2; optional systime_us 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 7584599bcd53a4..22f114fdae0d8f 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -401,13 +401,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; @@ -415,7 +415,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -428,9 +428,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 4d85db4ec125db..4d50ec19b3ec0a 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -833,13 +833,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; @@ -847,7 +847,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -860,9 +860,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 a2d7dd9ec9efd6..fd026d2601e524 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -869,13 +869,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; @@ -883,7 +883,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -896,9 +896,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 c286cf5da2af52..c54e066dcfc0ae 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 @@ -1052,13 +1052,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; @@ -1066,7 +1066,7 @@ server cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1079,9 +1079,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/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp index 9464d9c355235a..8a7b1736ac96af 100644 --- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp +++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp @@ -42,7 +42,7 @@ void DiagnosticLogsCommandHandler::InvokeCommand(HandlerContext & handlerContext { HandleCommand( handlerContext, [&](auto & _u, auto & payload) { - if (payload.requestedProtocol == chip::app::Clusters::DiagnosticLogs::LogsTransferProtocol::kUnknownEnumValue) + if (payload.requestedProtocol == chip::app::Clusters::DiagnosticLogs::TransferProtocolEnum::kUnknownEnumValue) { handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, chip::Protocols::InteractionModel::Status::InvalidCommand); @@ -51,11 +51,11 @@ void DiagnosticLogsCommandHandler::InvokeCommand(HandlerContext & handlerContext switch (payload.intent) { - case chip::app::Clusters::DiagnosticLogs::LogsIntent::kEndUserSupport: { + case chip::app::Clusters::DiagnosticLogs::IntentEnum::kEndUserSupport: { chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Type response; if (mBuffer.IsEmpty()) { - response.status = chip::app::Clusters::DiagnosticLogs::LogsStatus::kNoLogs; + response.status = chip::app::Clusters::DiagnosticLogs::StatusEnum::kNoLogs; handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response); break; } @@ -67,7 +67,7 @@ void DiagnosticLogsCommandHandler::InvokeCommand(HandlerContext & handlerContext chip::Platform::ScopedMemoryBuffer buf; if (!buf.Calloc(logSize)) { - response.status = chip::app::Clusters::DiagnosticLogs::LogsStatus::kBusy; + response.status = chip::app::Clusters::DiagnosticLogs::StatusEnum::kBusy; handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response); break; } @@ -80,25 +80,25 @@ void DiagnosticLogsCommandHandler::InvokeCommand(HandlerContext & handlerContext auto timestamp = chip::System::Clock::Milliseconds32(timeFromBuffer); - response.status = chip::app::Clusters::DiagnosticLogs::LogsStatus::kSuccess; + response.status = chip::app::Clusters::DiagnosticLogs::StatusEnum::kSuccess; response.logContent = chip::ByteSpan(buf.Get() + sizeof(timeFromBuffer), logSize - sizeof(timeFromBuffer)); response.timeSinceBoot.SetValue(chip::System::Clock::Microseconds64(timestamp).count()); handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response); } break; - case chip::app::Clusters::DiagnosticLogs::LogsIntent::kNetworkDiag: { + case chip::app::Clusters::DiagnosticLogs::IntentEnum::kNetworkDiag: { chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Type response; - response.status = chip::app::Clusters::DiagnosticLogs::LogsStatus::kNoLogs; + response.status = chip::app::Clusters::DiagnosticLogs::StatusEnum::kNoLogs; handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response); } break; - case chip::app::Clusters::DiagnosticLogs::LogsIntent::kCrashLogs: { + case chip::app::Clusters::DiagnosticLogs::IntentEnum::kCrashLogs: { chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Type response; - response.status = chip::app::Clusters::DiagnosticLogs::LogsStatus::kNoLogs; + response.status = chip::app::Clusters::DiagnosticLogs::StatusEnum::kNoLogs; handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response); } break; - case chip::app::Clusters::DiagnosticLogs::LogsIntent::kUnknownEnumValue: { + case chip::app::Clusters::DiagnosticLogs::IntentEnum::kUnknownEnumValue: { handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, chip::Protocols::InteractionModel::Status::InvalidCommand); break; diff --git a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml index 269db2f66573a8..f81ddc729fecde 100644 --- a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml @@ -16,13 +16,13 @@ limitations under the License. --> - + - + @@ -30,7 +30,7 @@ limitations under the License. - + @@ -45,14 +45,14 @@ limitations under the License. true Retrieving diagnostic logs from a Node - - - + + + Response to the RetrieveLogsRequest - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index ac7c8dd5b6b5ad..e64cc83db21d9b 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1282,13 +1282,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; @@ -1296,7 +1296,7 @@ client cluster DiagnosticLogs = 50 { kDenied = 4; } - enum LogsTransferProtocol : ENUM8 { + enum TransferProtocolEnum : ENUM8 { kResponsePayload = 0; kBdx = 1; } @@ -1309,14 +1309,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; optional epoch_us UTCTimeStamp = 2; optional systime_us 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 31a068473a3b97..db3370ee3ba039 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -7196,7 +7196,7 @@ public void retrieveLogsRequest( RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, - byte[] transferFileDesignator) { + Optional transferFileDesignator) { retrieveLogsRequest( chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator, null); } @@ -7205,7 +7205,7 @@ public void retrieveLogsRequest( RetrieveLogsResponseCallback callback, Integer intent, Integer requestedProtocol, - byte[] transferFileDesignator, + Optional transferFileDesignator, int timedInvokeTimeoutMs) { retrieveLogsRequest( chipClusterPtr, @@ -7221,7 +7221,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 6888762a60590b..e6ad7c6ffdc796 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -11147,7 +11147,7 @@ public Map> getCommandMap() { CommandParameterInfo diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo = - new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class); + new CommandParameterInfo("transferFileDesignator", Optional.class, String.class); diagnosticLogsretrieveLogsRequestCommandParams.put( "transferFileDesignator", diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo); @@ -11160,7 +11160,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 bfbf50bc2d647c..28ad2610dacf81 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -2159,7 +2159,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 047f3e07203ce7..4ab320dcf7ec65 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7777,7 +7777,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class LogsIntent(MatterIntEnum): + class IntentEnum(MatterIntEnum): kEndUserSupport = 0x00 kNetworkDiag = 0x01 kCrashLogs = 0x02 @@ -7787,7 +7787,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 @@ -7799,7 +7799,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 @@ -7823,14 +7823,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): @@ -7843,13 +7843,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=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="timeSinceBoot", Tag=3, Type=typing.Optional[uint]), ]) - status: 'DiagnosticLogs.Enums.LogsStatus' = 0 + status: 'DiagnosticLogs.Enums.StatusEnum' = 0 logContent: 'bytes' = b"" UTCTimeStamp: 'typing.Optional[uint]' = None timeSinceBoot: 'typing.Optional[uint]' = None diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index d197da56df6a20..c2a6fcc3b56df3 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -1855,7 +1855,6 @@ RetrieveLogsRequest: - intent - requestedProtocol - - transferFileDesignator RetrieveLogsResponse: - status - content @@ -6652,6 +6651,11 @@ - EventList FaultInjection: - EventList + command fields: + DiagnosticLogs: + RetrieveLogsRequest: + # Not really usable in earlier releases: wrong type. + - transferFileDesignator structs: TimeSynchronization: - DSTOffsetStruct @@ -6666,10 +6670,29 @@ - offset - validAt - name + enums: + DiagnosticLogs: + - IntentEnum + - StatusEnum + - TransferProtocolEnum enum values: DoorLock: LockDataTypeEnum: - FingerVein + DiagnosticLogs: + IntentEnum: + - EndUserSupport + - NetworkDiag + - CrashLogs + StatusEnum: + - Success + - Exhausted + - NoLogs + - Busy + - Denied + TransferProtocolEnum: + - ResponsePayload + - BDX deprecated: attributes: TimeSynchronization: @@ -6678,6 +6701,11 @@ TimeSynchronization: - DstOffsetType - TimeZoneType + enums: + DiagnosticLogs: + - LogsIntent + - LogsStatus + - LogsTransferProtocol removed: enum values: DoorLock: @@ -6686,10 +6714,15 @@ # exposing it. It's exposed for LockDataTypeEnum - FingerVein renames: + attributes: + TimeSynchronization: + DSTOffset: DstOffset structs: TimeSynchronization: DSTOffsetStruct: DstOffsetType TimeZoneStruct: TimeZoneType - attributes: - TimeSynchronization: - DSTOffset: DstOffset + enums: + DiagnosticLogs: + IntentEnum: LogsIntent + StatusEnum: LogsStatus + TransferProtocolEnum: LogsTransferProtocol diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 29a46c7aa0c3f7..c63b75b89ce470 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -20130,24 +20130,64 @@ 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 MTR_NEWLY_AVAILABLE = 0x00, + MTRDiagnosticLogsIntentNetworkDiag MTR_NEWLY_AVAILABLE = 0x01, + MTRDiagnosticLogsIntentCrashLogs MTR_NEWLY_AVAILABLE = 0x02, +} MTR_NEWLY_AVAILABLE; + 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_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsIntentEndUserSupport") + = 0x00, + MTRDiagnosticLogsLogsIntentNetworkDiag API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsIntentNetworkDiag") + = 0x01, + MTRDiagnosticLogsLogsIntentCrashLogs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsIntentCrashLogs") + = 0x02, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsIntent"); + +typedef NS_ENUM(uint8_t, MTRDiagnosticLogsStatus) { + MTRDiagnosticLogsStatusSuccess MTR_NEWLY_AVAILABLE = 0x00, + MTRDiagnosticLogsStatusExhausted MTR_NEWLY_AVAILABLE = 0x01, + MTRDiagnosticLogsStatusNoLogs MTR_NEWLY_AVAILABLE = 0x02, + MTRDiagnosticLogsStatusBusy MTR_NEWLY_AVAILABLE = 0x03, + MTRDiagnosticLogsStatusDenied MTR_NEWLY_AVAILABLE = 0x04, +} MTR_NEWLY_AVAILABLE; 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_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatusSuccess") + = 0x00, + MTRDiagnosticLogsLogsStatusExhausted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatusExhausted") + = 0x01, + MTRDiagnosticLogsLogsStatusNoLogs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatusNoLogs") + = 0x02, + MTRDiagnosticLogsLogsStatusBusy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatusBusy") + = 0x03, + MTRDiagnosticLogsLogsStatusDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatusDenied") + = 0x04, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsStatus"); + +typedef NS_ENUM(uint8_t, MTRDiagnosticLogsTransferProtocol) { + MTRDiagnosticLogsTransferProtocolResponsePayload MTR_NEWLY_AVAILABLE = 0x00, + MTRDiagnosticLogsTransferProtocolBDX MTR_NEWLY_AVAILABLE = 0x01, +} MTR_NEWLY_AVAILABLE; 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_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsTransferProtocolResponsePayload") + = 0x00, + MTRDiagnosticLogsLogsTransferProtocolBDX API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsTransferProtocolBDX") + = 0x01, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDiagnosticLogsTransferProtocol"); 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 0939316bacad4b..0bee3c5b6fd0a7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -26585,7 +26585,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 6a9b6f003e26a4..f690adeb7b8b24 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)( @@ -16367,204 +16367,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 a066f49234286b..e9111179e36b93 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -17395,15 +17395,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; @@ -17418,8 +17418,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()) { @@ -17430,7 +17430,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDiagnosticLogsClusterLogsIntentAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDiagnosticLogsClusterIntentEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -17445,15 +17445,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; @@ -17468,8 +17468,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()) { @@ -17480,7 +17480,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDiagnosticLogsClusterLogsStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDiagnosticLogsClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -17495,15 +17495,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; @@ -17518,8 +17518,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()) { @@ -17530,7 +17530,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 2f19213daa6d37..8d0b8c6113eac6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -8643,7 +8643,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 a79680b794a088..e4a766093c3e99 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -2802,8 +2802,7 @@ 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 MTR_NEWLY_AVAILABLE; /** * 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 8012d6a3ea9dee..b0a66d4e6484ee 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 e8435a7aee186b..fab0511dba1cb6 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 0d1ef41a5e1547..860303349d758a 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 f227922c8ac748..f6a10eb4083e4c 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 @@ -7733,9 +7733,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; @@ -7750,9 +7750,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 @@ -7772,7 +7772,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; Optional UTCTimeStamp; Optional timeSinceBoot; @@ -7790,7 +7790,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; Optional UTCTimeStamp; Optional timeSinceBoot; 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 d2fab834a88f7b..184c68449197c5 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -22608,8 +22608,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--) {