From c14faebbc566b6436f199f1fe8b261e60638c9fc Mon Sep 17 00:00:00 2001 From: Marc Lepage <67919234+mlepage-google@users.noreply.github.com> Date: Fri, 25 Mar 2022 13:51:27 -0400 Subject: [PATCH] Update zap repo to latest upstream (#16674) * Update zap repo to latest upstream * Zap regen all --- .../all-clusters-app.matter | 650 ++++++------- .../bridge-common/bridge-app.matter | 152 ++-- .../door-lock-common/door-lock-app.matter | 242 ++--- .../light-switch-app.matter | 382 ++++---- .../lighting-common/lighting-app.matter | 416 ++++----- examples/lock-app/lock-common/lock-app.matter | 138 +-- .../log-source-common/log-source-app.matter | 88 +- .../ota-provider-app.matter | 116 +-- .../ota-requestor-app.matter | 138 +-- .../placeholder/linux/apps/app1/config.matter | 314 +++---- .../placeholder/linux/apps/app2/config.matter | 314 +++---- examples/pump-app/pump-common/pump-app.matter | 280 +++--- .../pump-controller-app.matter | 184 ++-- .../esp32/main/temperature-measurement.matter | 104 +-- .../thermostat-common/thermostat.matter | 244 ++--- examples/tv-app/tv-common/tv-app.matter | 318 +++---- .../tv-casting-common/tv-casting-app.matter | 356 ++++---- examples/window-app/common/window-app.matter | 130 +-- .../data_model/controller-clusters.matter | 854 +++++++++--------- third_party/zap/repo | 2 +- .../zap-generated/IMClusterCommandHandler.cpp | 548 +++++------ .../all-clusters-app/zap-generated/access.h | 24 +- .../zap-generated/IMClusterCommandHandler.cpp | 158 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 200 ++-- .../door-lock-app/zap-generated/access.h | 48 +- .../zap-generated/IMClusterCommandHandler.cpp | 158 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 340 +++---- .../zap-generated/IMClusterCommandHandler.cpp | 116 +-- .../zap-generated/IMClusterCommandHandler.cpp | 80 +- .../zap-generated/IMClusterCommandHandler.cpp | 98 +- .../zap-generated/IMClusterCommandHandler.cpp | 116 +-- .../zap-generated/IMClusterCommandHandler.cpp | 274 +++--- .../zap-generated/IMClusterCommandHandler.cpp | 274 +++--- .../zap-generated/IMClusterCommandHandler.cpp | 260 +++--- .../zap-generated/IMClusterCommandHandler.cpp | 158 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 116 +-- .../zap-generated/IMClusterCommandHandler.cpp | 212 ++--- .../zap-generated/IMClusterCommandHandler.cpp | 284 +++--- .../zap-generated/IMClusterCommandHandler.cpp | 230 ++--- .../zap-generated/IMClusterCommandHandler.cpp | 152 ++-- 40 files changed, 4634 insertions(+), 4634 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 245ad5d324e88c..9f07b140e72d3b 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 @@ -89,10 +89,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -101,8 +97,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -473,42 +473,62 @@ server cluster ColorControl = 768 { attribute int16u startUpColorTemperatureMireds = 16400; readonly global attribute int16u clusterRevision = 65533; - request struct ColorLoopSetRequest { - ColorLoopUpdateFlags updateFlags = 0; - ColorLoopAction action = 1; - ColorLoopDirection direction = 2; - INT16U time = 3; - INT16U startHue = 4; - BITMAP8 optionsMask = 5; - BITMAP8 optionsOverride = 6; + request struct MoveToHueRequest { + INT8U hue = 0; + HueDirection direction = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveHueRequest { + request struct MoveHueRequest { HueMoveMode moveMode = 0; - INT16U rate = 1; + INT8U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct EnhancedMoveToHueRequest { - INT16U enhancedHue = 0; - HueDirection direction = 1; - INT16U transitionTime = 2; + request struct StepHueRequest { + HueStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveToHueAndSaturationRequest { - INT16U enhancedHue = 0; + request struct MoveToSaturationRequest { + INT8U saturation = 0; + INT16U transitionTime = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct MoveSaturationRequest { + SaturationMoveMode moveMode = 0; + INT8U rate = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct StepSaturationRequest { + SaturationStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; + } + + request struct MoveToHueAndSaturationRequest { + INT8U hue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedStepHueRequest { - HueStepMode stepMode = 0; - INT16U stepSize = 1; + request struct MoveToColorRequest { + INT16U colorX = 0; + INT16U colorY = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; @@ -521,73 +541,74 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 3; } - request struct MoveColorTemperatureRequest { - HueMoveMode moveMode = 0; - INT16U rate = 1; - INT16U colorTemperatureMinimum = 2; - INT16U colorTemperatureMaximum = 3; - BITMAP8 optionsMask = 4; - BITMAP8 optionsOverride = 5; - } - - request struct MoveHueRequest { - HueMoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct StepColorRequest { + INT16S stepX = 0; + INT16S stepY = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct MoveSaturationRequest { - SaturationMoveMode moveMode = 0; - INT8U rate = 1; + request struct MoveToColorTemperatureRequest { + INT16U colorTemperature = 0; + INT16U transitionTime = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToColorRequest { - INT16U colorX = 0; - INT16U colorY = 1; + request struct EnhancedMoveToHueRequest { + INT16U enhancedHue = 0; + HueDirection direction = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToColorTemperatureRequest { - INT16U colorTemperature = 0; - INT16U transitionTime = 1; + request struct EnhancedMoveHueRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToHueRequest { - INT8U hue = 0; - HueDirection direction = 1; + request struct EnhancedStepHueRequest { + HueStepMode stepMode = 0; + INT16U stepSize = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToHueAndSaturationRequest { - INT8U hue = 0; + request struct EnhancedMoveToHueAndSaturationRequest { + INT16U enhancedHue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToSaturationRequest { - INT8U saturation = 0; - INT16U transitionTime = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct ColorLoopSetRequest { + ColorLoopUpdateFlags updateFlags = 0; + ColorLoopAction action = 1; + ColorLoopDirection direction = 2; + INT16U time = 3; + INT16U startHue = 4; + BITMAP8 optionsMask = 5; + BITMAP8 optionsOverride = 6; } - request struct StepColorRequest { - INT16S stepX = 0; - INT16S stepY = 1; - INT16U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; + request struct StopMoveStepRequest { + BITMAP8 optionsMask = 0; + BITMAP8 optionsOverride = 1; + } + + request struct MoveColorTemperatureRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; + INT16U colorTemperatureMinimum = 2; + INT16U colorTemperatureMaximum = 3; + BITMAP8 optionsMask = 4; + BITMAP8 optionsOverride = 5; } request struct StepColorTemperatureRequest { @@ -600,46 +621,25 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 6; } - request struct StepHueRequest { - HueStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StepSaturationRequest { - SaturationStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StopMoveStepRequest { - BITMAP8 optionsMask = 0; - BITMAP8 optionsOverride = 1; - } - - command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; - command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; - command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; - command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; - command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; - command MoveColor(MoveColorRequest): DefaultSuccess = 8; - command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; command MoveHue(MoveHueRequest): DefaultSuccess = 1; + command StepHue(StepHueRequest): DefaultSuccess = 2; + command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4; - command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; - command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; - command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; + command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6; - command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; + command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; - command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; - command StepHue(StepHueRequest): DefaultSuccess = 2; - command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; + command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; + command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; + command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; + command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; + command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; + command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71; + command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; } server cluster ContentLauncher = 1290 { @@ -1176,24 +1176,30 @@ server cluster DoorLock = 257 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + request struct LockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct ClearUserRequest { - INT16U userIndex = 0; + request struct UnlockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct GetCredentialStatusRequest { - DlCredential credential = 0; + request struct SetUserRequest { + DlDataOperationType operationType = 0; + INT16U userIndex = 1; + nullable CHAR_STRING userName = 2; + nullable INT32U userUniqueId = 3; + nullable DlUserStatus userStatus = 4; + nullable DlUserType userType = 5; + nullable DlCredentialRule credentialRule = 6; } request struct GetUserRequest { INT16U userIndex = 0; } - request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct ClearUserRequest { + INT16U userIndex = 0; } request struct SetCredentialRequest { @@ -1205,24 +1211,12 @@ server cluster DoorLock = 257 { nullable DlUserType userType = 5; } - request struct SetUserRequest { - DlDataOperationType operationType = 0; - INT16U userIndex = 1; - nullable CHAR_STRING userName = 2; - nullable INT32U userUniqueId = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; - nullable DlCredentialRule credentialRule = 6; - } - - request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct GetCredentialStatusRequest { + DlCredential credential = 0; } - response struct GetCredentialStatusResponse { - boolean credentialExists = 0; - nullable INT16U userIndex = 1; - nullable INT16U nextCredentialIndex = 2; + request struct ClearCredentialRequest { + nullable DlCredential credential = 0; } response struct GetUserResponse { @@ -1244,14 +1238,20 @@ server cluster DoorLock = 257 { nullable INT16U nextCredentialIndex = 2; } - timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; - timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; - command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; - command GetUser(GetUserRequest): GetUserResponse = 27; + response struct GetCredentialStatusResponse { + boolean credentialExists = 0; + nullable INT16U userIndex = 1; + nullable INT16U nextCredentialIndex = 2; + } + timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; - timed command SetCredential(SetCredentialRequest): SetCredentialResponse = 34; - timed command SetUser(SetUserRequest): DefaultSuccess = 26; timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1; + timed command SetUser(SetUserRequest): DefaultSuccess = 26; + command GetUser(GetUserRequest): GetUserResponse = 27; + timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; + timed command SetCredential(SetCredentialRequest): SetCredentialResponse = 34; + command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; + timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; } server cluster ElectricalMeasurement = 2820 { @@ -1355,19 +1355,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -1497,23 +1497,19 @@ server cluster GroupKeyManagement = 63 { readonly attribute int16u maxGroupKeysPerFabric = 3; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -1521,10 +1517,14 @@ server cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } server cluster Groups = 4 { @@ -1536,9 +1536,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -1549,8 +1548,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -1558,6 +1558,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -1568,18 +1574,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster IasZone = 1280 { @@ -1634,11 +1634,6 @@ server cluster IasZone = 1280 { INT8U zoneId = 1; } - response struct ZoneEnrollRequest { - IasZoneType zoneType = 0; - INT16U manufacturerCode = 1; - } - response struct ZoneStatusChangeNotification { IasZoneStatus zoneStatus = 0; BITMAP8 extendedStatus = 1; @@ -1646,6 +1641,11 @@ server cluster IasZone = 1280 { INT16U delay = 3; } + response struct ZoneEnrollRequest { + IasZoneType zoneType = 0; + INT16U manufacturerCode = 1; + } + command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0; } @@ -1847,13 +1847,6 @@ server cluster LevelControl = 8 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -1861,14 +1854,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -1879,24 +1869,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -2067,8 +2067,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -2078,8 +2078,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -2088,21 +2088,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -2110,19 +2111,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -2148,16 +2148,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -2169,14 +2159,24 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; + } + response struct ApplyUpdateResponse { OTAApplyUpdateAction action = 0; INT32U delayedActionTime = 1; } + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -2305,11 +2305,11 @@ server cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } server cluster OnOffSwitchConfiguration = 7 { @@ -2355,6 +2355,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -2363,37 +2375,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -2401,30 +2401,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PowerSource = 47 { @@ -2664,33 +2664,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -2699,23 +2699,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -2724,22 +2725,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } server cluster SoftwareDiagnostics = 52 { @@ -3023,80 +3023,76 @@ server cluster TestCluster = 1295 { attribute nullable int16s nullableRangeRestrictedInt16s = 32809; readonly global attribute int16u clusterRevision = 65533; - request struct SimpleStructEchoRequestRequest { - SimpleStruct arg1 = 0; - } - request struct TestAddArgumentsRequest { INT8U arg1 = 0; INT8U arg2 = 1; } - request struct TestEmitTestEventRequestRequest { - INT8U arg1 = 0; - SimpleEnum arg2 = 1; - BOOLEAN arg3 = 2; + request struct TestStructArgumentRequestRequest { + SimpleStruct arg1 = 0; } - request struct TestEmitTestFabricScopedEventRequestRequest { - INT8U arg1 = 0; + request struct TestNestedStructArgumentRequestRequest { + NestedStruct arg1 = 0; } - request struct TestEnumsRequestRequest { - vendor_id arg1 = 0; - SimpleEnum arg2 = 1; + request struct TestListStructArgumentRequestRequest { + SimpleStruct arg1[] = 0; } request struct TestListInt8UArgumentRequestRequest { INT8U arg1[] = 0; } - request struct TestListInt8UReverseRequestRequest { - INT8U arg1[] = 0; + request struct TestNestedStructListArgumentRequestRequest { + NestedStructList arg1 = 0; } request struct TestListNestedStructListArgumentRequestRequest { NestedStructList arg1[] = 0; } - request struct TestListStructArgumentRequestRequest { - SimpleStruct arg1[] = 0; - } - - request struct TestNestedStructArgumentRequestRequest { - NestedStruct arg1 = 0; + request struct TestListInt8UReverseRequestRequest { + INT8U arg1[] = 0; } - request struct TestNestedStructListArgumentRequestRequest { - NestedStructList arg1 = 0; + request struct TestEnumsRequestRequest { + vendor_id arg1 = 0; + SimpleEnum arg2 = 1; } request struct TestNullableOptionalRequestRequest { optional nullable INT8U arg1 = 0; } + request struct SimpleStructEchoRequestRequest { + SimpleStruct arg1 = 0; + } + request struct TestSimpleOptionalArgumentRequestRequest { optional BOOLEAN arg1 = 0; } - request struct TestStructArgumentRequestRequest { - SimpleStruct arg1 = 0; + request struct TestEmitTestEventRequestRequest { + INT8U arg1 = 0; + SimpleEnum arg2 = 1; + BOOLEAN arg3 = 2; } - response struct SimpleStructResponse { - SimpleStruct arg1 = 0; + request struct TestEmitTestFabricScopedEventRequestRequest { + INT8U arg1 = 0; } - response struct TestAddArgumentsResponse { + response struct TestSpecificResponse { INT8U returnValue = 0; } - response struct TestEmitTestEventResponse { - INT64U value = 0; + response struct TestAddArgumentsResponse { + INT8U returnValue = 0; } - response struct TestEmitTestFabricScopedEventResponse { - INT64U value = 0; + response struct TestListInt8UReverseResponse { + INT8U arg1[] = 0; } response struct TestEnumsResponse { @@ -3104,10 +3100,6 @@ server cluster TestCluster = 1295 { SimpleEnum arg2 = 1; } - response struct TestListInt8UReverseResponse { - INT8U arg1[] = 0; - } - response struct TestNullableOptionalResponse { BOOLEAN wasPresent = 0; optional BOOLEAN wasNull = 1; @@ -3115,28 +3107,36 @@ server cluster TestCluster = 1295 { optional nullable INT8U originalValue = 3; } - response struct TestSpecificResponse { - INT8U returnValue = 0; + response struct SimpleStructResponse { + SimpleStruct arg1 = 0; + } + + response struct TestEmitTestEventResponse { + INT64U value = 0; + } + + response struct TestEmitTestFabricScopedEventResponse { + INT64U value = 0; } - command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17; command Test(): DefaultSuccess = 0; + command TestNotHandled(): DefaultSuccess = 1; + command TestSpecific(): TestSpecificResponse = 2; command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4; - command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20; - command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21; - command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14; - command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10; - command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13; - command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12; - command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9; + command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7; command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8; + command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9; + command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10; command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11; - command TestNotHandled(): DefaultSuccess = 1; + command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12; + command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13; + command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14; command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15; - command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19; - command TestSpecific(): TestSpecificResponse = 2; - command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7; + command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17; timed command TimedInvokeRequest(): DefaultSuccess = 18; + command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19; + command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20; + command TestEmitTestFabricScopedEventRequest(TestEmitTestFabricScopedEventRequestRequest): TestEmitTestFabricScopedEventResponse = 21; } server cluster Thermostat = 513 { @@ -3561,13 +3561,17 @@ server cluster WindowCovering = 258 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct GoToLiftValueRequest { + INT16U liftValue = 0; + } + request struct GoToLiftPercentageRequest { Percent liftPercentageValue = 0; Percent100ths liftPercent100thsValue = 1; } - request struct GoToLiftValueRequest { - INT16U liftValue = 0; + request struct GoToTiltValueRequest { + INT16U tiltValue = 0; } request struct GoToTiltPercentageRequest { @@ -3575,17 +3579,13 @@ server cluster WindowCovering = 258 { Percent100ths tiltPercent100thsValue = 1; } - request struct GoToTiltValueRequest { - INT16U tiltValue = 0; - } - + command UpOrOpen(): DefaultSuccess = 0; command DownOrClose(): DefaultSuccess = 1; - command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; + command StopMotion(): DefaultSuccess = 2; command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4; - command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; + command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7; - command StopMotion(): DefaultSuccess = 2; - command UpOrOpen(): DefaultSuccess = 0; + command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; } diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 8f534c5f6478df..680859503ceb7e 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -148,10 +148,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -160,8 +156,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -321,19 +321,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -461,13 +461,6 @@ server cluster LevelControl = 8 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -475,14 +468,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -493,24 +483,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -587,8 +587,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -598,8 +598,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -608,21 +608,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -630,19 +631,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OnOff = 6 { @@ -720,6 +720,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -728,37 +740,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -766,30 +766,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter index 689514dcd63d1c..bb962dfbbe3248 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.matter +++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -589,53 +589,49 @@ server cluster DoorLock = 257 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + request struct LockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct ClearUserRequest { - INT16U userIndex = 0; + request struct UnlockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct ClearWeekDayScheduleRequest { + request struct SetWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; + DlDaysMaskMap daysMask = 2; + INT8U startHour = 3; + INT8U startMinute = 4; + INT8U endHour = 5; + INT8U endMinute = 6; } - request struct ClearYearDayScheduleRequest { - INT8U yearDayIndex = 0; + request struct GetWeekDayScheduleRequest { + INT8U weekDayIndex = 0; INT16U userIndex = 1; } - request struct GetCredentialStatusRequest { - DlCredential credential = 0; - } - - request struct GetUserRequest { - INT16U userIndex = 0; - } - - request struct GetWeekDayScheduleRequest { + request struct ClearWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; } - request struct GetYearDayScheduleRequest { + request struct SetYearDayScheduleRequest { INT8U yearDayIndex = 0; INT16U userIndex = 1; + epoch_s localStartTime = 2; + epoch_s localEndTime = 3; } - request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct GetYearDayScheduleRequest { + INT8U yearDayIndex = 0; + INT16U userIndex = 1; } - request struct SetCredentialRequest { - DlDataOperationType operationType = 0; - DlCredential credential = 1; - LONG_OCTET_STRING credentialData = 2; - nullable INT16U userIndex = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; + request struct ClearYearDayScheduleRequest { + INT8U yearDayIndex = 0; + INT16U userIndex = 1; } request struct SetUserRequest { @@ -648,44 +644,29 @@ server cluster DoorLock = 257 { nullable DlCredentialRule credentialRule = 6; } - request struct SetWeekDayScheduleRequest { - INT8U weekDayIndex = 0; - INT16U userIndex = 1; - DlDaysMaskMap daysMask = 2; - INT8U startHour = 3; - INT8U startMinute = 4; - INT8U endHour = 5; - INT8U endMinute = 6; + request struct GetUserRequest { + INT16U userIndex = 0; } - request struct SetYearDayScheduleRequest { - INT8U yearDayIndex = 0; - INT16U userIndex = 1; - epoch_s localStartTime = 2; - epoch_s localEndTime = 3; + request struct ClearUserRequest { + INT16U userIndex = 0; } - request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct SetCredentialRequest { + DlDataOperationType operationType = 0; + DlCredential credential = 1; + LONG_OCTET_STRING credentialData = 2; + nullable INT16U userIndex = 3; + nullable DlUserStatus userStatus = 4; + nullable DlUserType userType = 5; } - response struct GetCredentialStatusResponse { - boolean credentialExists = 0; - nullable INT16U userIndex = 1; - nullable INT16U nextCredentialIndex = 2; + request struct GetCredentialStatusRequest { + DlCredential credential = 0; } - response struct GetUserResponse { - INT16U userIndex = 0; - nullable CHAR_STRING userName = 1; - nullable INT32U userUniqueId = 2; - nullable DlUserStatus userStatus = 3; - nullable DlUserType userType = 4; - nullable DlCredentialRule credentialRule = 5; - nullable DlCredential credentials[] = 6; - nullable fabric_idx creatorFabricIndex = 7; - nullable fabric_idx lastModifiedFabricIndex = 8; - nullable INT16U nextUserIndex = 9; + request struct ClearCredentialRequest { + nullable DlCredential credential = 0; } response struct GetWeekDayScheduleResponse { @@ -707,26 +688,45 @@ server cluster DoorLock = 257 { optional epoch_s localEndTime = 4; } + response struct GetUserResponse { + INT16U userIndex = 0; + nullable CHAR_STRING userName = 1; + nullable INT32U userUniqueId = 2; + nullable DlUserStatus userStatus = 3; + nullable DlUserType userType = 4; + nullable DlCredentialRule credentialRule = 5; + nullable DlCredential credentials[] = 6; + nullable fabric_idx creatorFabricIndex = 7; + nullable fabric_idx lastModifiedFabricIndex = 8; + nullable INT16U nextUserIndex = 9; + } + response struct SetCredentialResponse { DlStatus status = 0; nullable INT16U userIndex = 1; nullable INT16U nextCredentialIndex = 2; } - timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; - timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; + response struct GetCredentialStatusResponse { + boolean credentialExists = 0; + nullable INT16U userIndex = 1; + nullable INT16U nextCredentialIndex = 2; + } + + timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; + timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1; + command SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11; + command GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12; command ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13; + command SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14; + command GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15; command ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16; - command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; + timed command SetUser(SetUserRequest): DefaultSuccess = 26; command GetUser(GetUserRequest): GetUserResponse = 27; - command GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12; - command GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15; - timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; + timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; timed command SetCredential(SetCredentialRequest): SetCredentialResponse = 34; - timed command SetUser(SetUserRequest): DefaultSuccess = 26; - command SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11; - command SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14; - timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1; + command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; + timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; } server cluster EthernetNetworkDiagnostics = 55 { @@ -805,19 +805,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -984,8 +984,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -995,8 +995,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1005,21 +1005,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1027,19 +1028,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OperationalCredentials = 62 { @@ -1079,6 +1079,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1087,37 +1099,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1125,30 +1125,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PowerSource = 47 { 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 2b8a5b7a3ce829..b1696aaaf0eb10 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 @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -238,42 +238,62 @@ client cluster ColorControl = 768 { attribute int16u startUpColorTemperatureMireds = 16400; readonly global attribute int16u clusterRevision = 65533; - request struct ColorLoopSetRequest { - ColorLoopUpdateFlags updateFlags = 0; - ColorLoopAction action = 1; - ColorLoopDirection direction = 2; - INT16U time = 3; - INT16U startHue = 4; - BITMAP8 optionsMask = 5; - BITMAP8 optionsOverride = 6; + request struct MoveToHueRequest { + INT8U hue = 0; + HueDirection direction = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveHueRequest { + request struct MoveHueRequest { HueMoveMode moveMode = 0; - INT16U rate = 1; + INT8U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct EnhancedMoveToHueRequest { - INT16U enhancedHue = 0; - HueDirection direction = 1; - INT16U transitionTime = 2; + request struct StepHueRequest { + HueStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveToHueAndSaturationRequest { - INT16U enhancedHue = 0; + request struct MoveToSaturationRequest { + INT8U saturation = 0; + INT16U transitionTime = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct MoveSaturationRequest { + SaturationMoveMode moveMode = 0; + INT8U rate = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct StepSaturationRequest { + SaturationStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; + } + + request struct MoveToHueAndSaturationRequest { + INT8U hue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedStepHueRequest { - HueStepMode stepMode = 0; - INT16U stepSize = 1; + request struct MoveToColorRequest { + INT16U colorX = 0; + INT16U colorY = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; @@ -286,23 +306,9 @@ client cluster ColorControl = 768 { BITMAP8 optionsOverride = 3; } - request struct MoveHueRequest { - HueMoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; - } - - request struct MoveSaturationRequest { - SaturationMoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; - } - - request struct MoveToColorRequest { - INT16U colorX = 0; - INT16U colorY = 1; + request struct StepColorRequest { + INT16S stepX = 0; + INT16S stepY = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; @@ -315,69 +321,63 @@ client cluster ColorControl = 768 { BITMAP8 optionsOverride = 3; } - request struct MoveToHueRequest { - INT8U hue = 0; + request struct EnhancedMoveToHueRequest { + INT16U enhancedHue = 0; HueDirection direction = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToHueAndSaturationRequest { - INT8U hue = 0; - INT8U saturation = 1; - INT16U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct MoveToSaturationRequest { - INT8U saturation = 0; - INT16U transitionTime = 1; + request struct EnhancedMoveHueRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct StepColorRequest { - INT16S stepX = 0; - INT16S stepY = 1; + request struct EnhancedStepHueRequest { + HueStepMode stepMode = 0; + INT16U stepSize = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct StepHueRequest { - HueStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; + request struct EnhancedMoveToHueAndSaturationRequest { + INT16U enhancedHue = 0; + INT8U saturation = 1; + INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct StepSaturationRequest { - SaturationStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; + request struct ColorLoopSetRequest { + ColorLoopUpdateFlags updateFlags = 0; + ColorLoopAction action = 1; + ColorLoopDirection direction = 2; + INT16U time = 3; + INT16U startHue = 4; + BITMAP8 optionsMask = 5; + BITMAP8 optionsOverride = 6; } - command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; - command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; - command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; - command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; - command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; - command MoveColor(MoveColorRequest): DefaultSuccess = 8; + command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; command MoveHue(MoveHueRequest): DefaultSuccess = 1; + command StepHue(StepHueRequest): DefaultSuccess = 2; + command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4; - command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; - command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; - command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; + command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6; - command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; + command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; - command StepHue(StepHueRequest): DefaultSuccess = 2; - command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; + command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; + command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; + command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; + command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; + command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; + command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; } server cluster Descriptor = 29 { @@ -502,19 +502,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -644,23 +644,19 @@ server cluster GroupKeyManagement = 63 { readonly attribute int16u maxGroupKeysPerFabric = 3; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -668,10 +664,14 @@ server cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } server cluster Groups = 4 { @@ -683,9 +683,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -696,8 +695,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -705,6 +705,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -715,18 +721,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } client cluster Identify = 3 { @@ -876,8 +876,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -887,8 +887,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -897,21 +897,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -919,19 +920,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -957,16 +957,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -978,9 +968,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -994,9 +989,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -1149,6 +1149,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1157,37 +1169,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1195,30 +1195,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } client cluster Scenes = 5 { @@ -1248,33 +1248,33 @@ client cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -1283,23 +1283,24 @@ client cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -1308,22 +1309,21 @@ client cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 30e7bd4a280f51..948f84ab2f3854 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -225,42 +225,62 @@ server cluster ColorControl = 768 { attribute int16u startUpColorTemperatureMireds = 16400; readonly global attribute int16u clusterRevision = 65533; - request struct ColorLoopSetRequest { - ColorLoopUpdateFlags updateFlags = 0; - ColorLoopAction action = 1; - ColorLoopDirection direction = 2; - INT16U time = 3; - INT16U startHue = 4; - BITMAP8 optionsMask = 5; - BITMAP8 optionsOverride = 6; + request struct MoveToHueRequest { + INT8U hue = 0; + HueDirection direction = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveHueRequest { + request struct MoveHueRequest { HueMoveMode moveMode = 0; - INT16U rate = 1; + INT8U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct EnhancedMoveToHueRequest { - INT16U enhancedHue = 0; - HueDirection direction = 1; - INT16U transitionTime = 2; + request struct StepHueRequest { + HueStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveToHueAndSaturationRequest { - INT16U enhancedHue = 0; + request struct MoveToSaturationRequest { + INT8U saturation = 0; + INT16U transitionTime = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct MoveSaturationRequest { + SaturationMoveMode moveMode = 0; + INT8U rate = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct StepSaturationRequest { + SaturationStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; + } + + request struct MoveToHueAndSaturationRequest { + INT8U hue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedStepHueRequest { - HueStepMode stepMode = 0; - INT16U stepSize = 1; + request struct MoveToColorRequest { + INT16U colorX = 0; + INT16U colorY = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; @@ -273,73 +293,74 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 3; } - request struct MoveColorTemperatureRequest { - HueMoveMode moveMode = 0; - INT16U rate = 1; - INT16U colorTemperatureMinimum = 2; - INT16U colorTemperatureMaximum = 3; - BITMAP8 optionsMask = 4; - BITMAP8 optionsOverride = 5; - } - - request struct MoveHueRequest { - HueMoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct StepColorRequest { + INT16S stepX = 0; + INT16S stepY = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct MoveSaturationRequest { - SaturationMoveMode moveMode = 0; - INT8U rate = 1; + request struct MoveToColorTemperatureRequest { + INT16U colorTemperature = 0; + INT16U transitionTime = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToColorRequest { - INT16U colorX = 0; - INT16U colorY = 1; + request struct EnhancedMoveToHueRequest { + INT16U enhancedHue = 0; + HueDirection direction = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToColorTemperatureRequest { - INT16U colorTemperature = 0; - INT16U transitionTime = 1; + request struct EnhancedMoveHueRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToHueRequest { - INT8U hue = 0; - HueDirection direction = 1; + request struct EnhancedStepHueRequest { + HueStepMode stepMode = 0; + INT16U stepSize = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToHueAndSaturationRequest { - INT8U hue = 0; + request struct EnhancedMoveToHueAndSaturationRequest { + INT16U enhancedHue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToSaturationRequest { - INT8U saturation = 0; - INT16U transitionTime = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct ColorLoopSetRequest { + ColorLoopUpdateFlags updateFlags = 0; + ColorLoopAction action = 1; + ColorLoopDirection direction = 2; + INT16U time = 3; + INT16U startHue = 4; + BITMAP8 optionsMask = 5; + BITMAP8 optionsOverride = 6; } - request struct StepColorRequest { - INT16S stepX = 0; - INT16S stepY = 1; - INT16U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; + request struct StopMoveStepRequest { + BITMAP8 optionsMask = 0; + BITMAP8 optionsOverride = 1; + } + + request struct MoveColorTemperatureRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; + INT16U colorTemperatureMinimum = 2; + INT16U colorTemperatureMaximum = 3; + BITMAP8 optionsMask = 4; + BITMAP8 optionsOverride = 5; } request struct StepColorTemperatureRequest { @@ -352,46 +373,25 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 6; } - request struct StepHueRequest { - HueStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StepSaturationRequest { - SaturationStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StopMoveStepRequest { - BITMAP8 optionsMask = 0; - BITMAP8 optionsOverride = 1; - } - - command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; - command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; - command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; - command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; - command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; - command MoveColor(MoveColorRequest): DefaultSuccess = 8; - command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; command MoveHue(MoveHueRequest): DefaultSuccess = 1; + command StepHue(StepHueRequest): DefaultSuccess = 2; + command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4; - command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; - command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; - command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; + command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6; - command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; + command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; - command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; - command StepHue(StepHueRequest): DefaultSuccess = 2; - command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; + command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; + command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; + command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; + command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; + command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; + command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71; + command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; } server cluster Descriptor = 29 { @@ -515,19 +515,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -657,23 +657,19 @@ server cluster GroupKeyManagement = 63 { readonly attribute int16u maxGroupKeysPerFabric = 3; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -681,10 +677,14 @@ server cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } server cluster Groups = 4 { @@ -696,9 +696,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -709,8 +708,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -718,6 +718,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -728,18 +734,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster Identify = 3 { @@ -821,13 +821,6 @@ server cluster LevelControl = 8 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -835,14 +828,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -853,24 +843,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -947,8 +947,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -958,8 +958,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -968,21 +968,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -990,19 +991,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -1028,16 +1028,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -1049,9 +1039,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -1065,9 +1060,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -1196,11 +1196,11 @@ server cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } server cluster OperationalCredentials = 62 { @@ -1240,6 +1240,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1248,37 +1260,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1286,30 +1286,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 308d393702ed8c..04368bc3032d03 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -261,19 +261,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -440,8 +440,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -451,8 +451,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -461,21 +461,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -483,19 +484,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -521,16 +521,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -542,9 +532,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -558,9 +553,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -712,6 +712,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -720,37 +732,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -758,30 +758,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PowerSource = 47 { 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 47f00086b6a32e..17bf6728a5b6be 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 @@ -163,19 +163,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster NetworkCommissioning = 49 { @@ -231,8 +231,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -242,8 +242,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -252,21 +252,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -274,19 +275,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OperationalCredentials = 62 { @@ -318,36 +318,36 @@ server cluster OperationalCredentials = 62 { readonly attribute OCTET_STRING trustedRootCertificates[] = 4; readonly global attribute int16u clusterRevision = 65533; - request struct AddNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; - OCTET_STRING IPKValue = 2; - NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; - } - - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - request struct AttestationRequestRequest { OCTET_STRING attestationNonce = 0; } + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + request struct CSRRequestRequest { OCTET_STRING CSRNonce = 0; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct AddNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; + OCTET_STRING IPKValue = 2; + NODE_ID caseAdminNode = 3; + INT16U adminVendorId = 4; + } + + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } response struct AttestationResponse { @@ -355,28 +355,28 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; - command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; + command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; } diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index ee4f44c3c02043..804504050e73f6 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -216,19 +216,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster LocalizationConfiguration = 43 { @@ -304,8 +304,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -315,8 +315,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -325,21 +325,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -347,19 +348,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OtaSoftwareUpdateProvider = 41 { @@ -385,16 +385,6 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -406,9 +396,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -422,9 +417,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OperationalCredentials = 62 { @@ -464,36 +464,36 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; - request struct AddNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; - OCTET_STRING IPKValue = 2; - NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; - } - - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - request struct AttestationRequestRequest { OCTET_STRING attestationNonce = 0; } + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + request struct CSRRequestRequest { OCTET_STRING CSRNonce = 0; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct AddNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; + OCTET_STRING IPKValue = 2; + NODE_ID caseAdminNode = 3; + INT16U adminVendorId = 4; + } + + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } response struct AttestationResponse { @@ -501,28 +501,28 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; - command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; + command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; } server cluster TimeFormatLocalization = 44 { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 74d69916fafaca..03275f68698589 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -189,19 +189,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster LocalizationConfiguration = 43 { @@ -277,8 +277,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -288,8 +288,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -298,21 +298,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -320,19 +321,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -358,16 +358,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -379,9 +369,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -395,9 +390,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -506,6 +506,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -514,37 +526,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -552,30 +552,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster TimeFormatLocalization = 44 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 63037ef5627973..ac66e224a4e2dd 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -161,13 +161,6 @@ server cluster ColorControl = 768 { attribute int16u startUpColorTemperatureMireds = 16400; readonly global attribute int16u clusterRevision = 65533; - request struct MoveColorRequest { - INT16S rateX = 0; - INT16S rateY = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; - } - request struct MoveToColorRequest { INT16U colorX = 0; INT16U colorY = 1; @@ -176,6 +169,13 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 4; } + request struct MoveColorRequest { + INT16S rateX = 0; + INT16S rateY = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + request struct StepColorRequest { INT16S stepX = 0; INT16S stepY = 1; @@ -184,8 +184,8 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 4; } - command MoveColor(MoveColorRequest): DefaultSuccess = 8; command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; } @@ -449,8 +449,8 @@ client cluster GeneralCommissioning = 48 { } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralCommissioning = 48 { @@ -500,19 +500,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -615,9 +615,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -628,8 +627,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -637,6 +637,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -647,18 +653,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster Identify = 3 { @@ -956,13 +956,6 @@ server cluster LevelControl = 8 { readonly attribute int8u currentLevel = 0; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -970,14 +963,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -988,24 +978,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -1134,8 +1134,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -1145,8 +1145,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1155,21 +1155,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1177,19 +1178,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OnOff = 6 { @@ -1242,11 +1242,11 @@ client cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } server cluster OnOff = 6 { @@ -1299,11 +1299,11 @@ server cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } client cluster OperationalCredentials = 62 { @@ -1336,6 +1336,18 @@ client cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1344,48 +1356,36 @@ client cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster OperationalCredentials = 62 { @@ -1418,6 +1418,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1426,37 +1438,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1464,30 +1464,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PumpConfigurationAndControl = 512 { @@ -1646,33 +1646,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -1681,23 +1681,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -1706,22 +1707,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } client cluster Switch = 59 { @@ -2051,13 +2051,17 @@ server cluster WindowCovering = 258 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct GoToLiftValueRequest { + INT16U liftValue = 0; + } + request struct GoToLiftPercentageRequest { Percent liftPercentageValue = 0; Percent100ths liftPercent100thsValue = 1; } - request struct GoToLiftValueRequest { - INT16U liftValue = 0; + request struct GoToTiltValueRequest { + INT16U tiltValue = 0; } request struct GoToTiltPercentageRequest { @@ -2065,17 +2069,13 @@ server cluster WindowCovering = 258 { Percent100ths tiltPercent100thsValue = 1; } - request struct GoToTiltValueRequest { - INT16U tiltValue = 0; - } - + command UpOrOpen(): DefaultSuccess = 0; command DownOrClose(): DefaultSuccess = 1; - command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; + command StopMotion(): DefaultSuccess = 2; command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4; - command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; + command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7; - command StopMotion(): DefaultSuccess = 2; - command UpOrOpen(): DefaultSuccess = 0; + command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 63037ef5627973..ac66e224a4e2dd 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -161,13 +161,6 @@ server cluster ColorControl = 768 { attribute int16u startUpColorTemperatureMireds = 16400; readonly global attribute int16u clusterRevision = 65533; - request struct MoveColorRequest { - INT16S rateX = 0; - INT16S rateY = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; - } - request struct MoveToColorRequest { INT16U colorX = 0; INT16U colorY = 1; @@ -176,6 +169,13 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 4; } + request struct MoveColorRequest { + INT16S rateX = 0; + INT16S rateY = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + request struct StepColorRequest { INT16S stepX = 0; INT16S stepY = 1; @@ -184,8 +184,8 @@ server cluster ColorControl = 768 { BITMAP8 optionsOverride = 4; } - command MoveColor(MoveColorRequest): DefaultSuccess = 8; command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; } @@ -449,8 +449,8 @@ client cluster GeneralCommissioning = 48 { } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralCommissioning = 48 { @@ -500,19 +500,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -615,9 +615,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -628,8 +627,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -637,6 +637,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -647,18 +653,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster Identify = 3 { @@ -956,13 +956,6 @@ server cluster LevelControl = 8 { readonly attribute int8u currentLevel = 0; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -970,14 +963,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -988,24 +978,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -1134,8 +1134,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -1145,8 +1145,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1155,21 +1155,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1177,19 +1178,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OnOff = 6 { @@ -1242,11 +1242,11 @@ client cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } server cluster OnOff = 6 { @@ -1299,11 +1299,11 @@ server cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } client cluster OperationalCredentials = 62 { @@ -1336,6 +1336,18 @@ client cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1344,48 +1356,36 @@ client cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster OperationalCredentials = 62 { @@ -1418,6 +1418,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1426,37 +1438,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1464,30 +1464,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PumpConfigurationAndControl = 512 { @@ -1646,33 +1646,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -1681,23 +1681,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -1706,22 +1707,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } client cluster Switch = 59 { @@ -2051,13 +2051,17 @@ server cluster WindowCovering = 258 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct GoToLiftValueRequest { + INT16U liftValue = 0; + } + request struct GoToLiftPercentageRequest { Percent liftPercentageValue = 0; Percent100ths liftPercent100thsValue = 1; } - request struct GoToLiftValueRequest { - INT16U liftValue = 0; + request struct GoToTiltValueRequest { + INT16U tiltValue = 0; } request struct GoToTiltPercentageRequest { @@ -2065,17 +2069,13 @@ server cluster WindowCovering = 258 { Percent100ths tiltPercent100thsValue = 1; } - request struct GoToTiltValueRequest { - INT16U tiltValue = 0; - } - + command UpOrOpen(): DefaultSuccess = 0; command DownOrClose(): DefaultSuccess = 1; - command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; + command StopMotion(): DefaultSuccess = 2; command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4; - command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; + command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7; - command StopMotion(): DefaultSuccess = 2; - command UpOrOpen(): DefaultSuccess = 0; + command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; } diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index ad2a8b6132d36b..481b4f38b41c83 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -256,19 +256,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -398,23 +398,19 @@ server cluster GroupKeyManagement = 63 { readonly attribute int16u maxGroupKeysPerFabric = 3; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -422,10 +418,14 @@ server cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } server cluster Groups = 4 { @@ -437,9 +437,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -450,8 +449,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -459,6 +459,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -469,18 +475,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster Identify = 3 { @@ -561,13 +561,6 @@ server cluster LevelControl = 8 { attribute nullable int8u startUpCurrentLevel = 16384; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -575,14 +568,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -593,24 +583,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -687,8 +687,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -698,8 +698,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -708,21 +708,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -730,19 +731,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -767,16 +767,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { } - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -788,9 +778,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -804,9 +799,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -923,11 +923,11 @@ server cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } server cluster OperationalCredentials = 62 { @@ -967,6 +967,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -975,37 +987,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1013,30 +1013,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } client cluster PressureMeasurement = 1027 { @@ -1207,33 +1207,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -1242,23 +1242,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -1267,22 +1268,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 3142742f267baa..2970870ceef26e 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -250,19 +250,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -395,23 +395,19 @@ server cluster GroupKeyManagement = 63 { readonly attribute int16u maxGroupKeysPerFabric = 3; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -419,10 +415,14 @@ server cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } server cluster Groups = 4 { @@ -434,9 +434,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -447,8 +446,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -456,6 +456,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -466,18 +472,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster Identify = 3 { @@ -598,8 +598,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -609,8 +609,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -619,21 +619,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -641,19 +642,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -678,16 +678,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { } - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -699,9 +689,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -715,9 +710,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OtaSoftwareUpdateRequestor = 42 { @@ -857,6 +857,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -865,37 +877,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -903,30 +903,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } client cluster PressureMeasurement = 1027 { diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 6b01d8725d68dd..41787faba07523 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -259,19 +259,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -438,18 +438,23 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; + INT64U breadcrumb = 1; + } + request struct AddOrUpdateWiFiNetworkRequest { OCTET_STRING ssid = 0; OCTET_STRING credentials = 1; INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { + request struct RemoveNetworkRequest { OCTET_STRING networkID = 0; INT64U breadcrumb = 1; } - request struct RemoveNetworkRequest { + request struct ConnectNetworkRequest { OCTET_STRING networkID = 0; INT64U breadcrumb = 1; } @@ -460,15 +465,11 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -476,18 +477,17 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OperationalCredentials = 62 { @@ -527,6 +527,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -535,37 +547,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -573,30 +573,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 732fe2dd2c02de..64c92f2445f131 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -272,19 +272,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -411,9 +411,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -424,8 +423,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -433,6 +433,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -443,18 +449,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } client cluster Identify = 3 { @@ -608,8 +608,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -619,8 +619,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -629,21 +629,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -651,19 +652,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OtaSoftwareUpdateProvider = 41 { @@ -689,16 +689,6 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -710,9 +700,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -726,9 +721,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OperationalCredentials = 62 { @@ -768,6 +768,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -776,37 +788,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -814,30 +814,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster Scenes = 5 { @@ -866,33 +866,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -901,23 +901,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -926,22 +927,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } server cluster SoftwareDiagnostics = 52 { @@ -1042,9 +1042,9 @@ server cluster Thermostat = 513 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct GetWeeklyScheduleRequest { - DayOfWeek daysToReturn = 0; - ModeForSequence modeToReturn = 1; + request struct SetpointRaiseLowerRequest { + SetpointAdjustMode mode = 0; + INT8S amount = 1; } request struct SetWeeklyScheduleRequest { @@ -1054,9 +1054,16 @@ server cluster Thermostat = 513 { INT8U payload[] = 3; } - request struct SetpointRaiseLowerRequest { - SetpointAdjustMode mode = 0; - INT8S amount = 1; + request struct GetWeeklyScheduleRequest { + DayOfWeek daysToReturn = 0; + ModeForSequence modeToReturn = 1; + } + + response struct GetWeeklyScheduleResponse { + ENUM8 numberOfTransitionsForSequence = 0; + DayOfWeek dayOfWeekForSequence = 1; + ModeForSequence modeForSequence = 2; + INT8U payload[] = 3; } response struct GetRelayStatusLogResponse { @@ -1068,18 +1075,11 @@ server cluster Thermostat = 513 { INT16U unreadEntries = 5; } - response struct GetWeeklyScheduleResponse { - ENUM8 numberOfTransitionsForSequence = 0; - DayOfWeek dayOfWeekForSequence = 1; - ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; - } - + command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; + command SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; + command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; command ClearWeeklySchedule(): DefaultSuccess = 3; command GetRelayStatusLog(): GetRelayStatusLogResponse = 4; - command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; - command SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; - command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; } server cluster ThreadNetworkDiagnostics = 53 { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index b5d2fd098ef8b7..c297c0bc0cb9b1 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -107,10 +107,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -119,8 +115,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -173,10 +173,6 @@ server cluster ApplicationLauncher = 1292 { attribute nullable ApplicationEP currentApp = 1; readonly global attribute int16u clusterRevision = 65533; - request struct HideAppRequest { - Application application = 0; - } - request struct LaunchAppRequest { Application application = 0; optional OCTET_STRING data = 1; @@ -186,14 +182,18 @@ server cluster ApplicationLauncher = 1292 { Application application = 0; } + request struct HideAppRequest { + Application application = 0; + } + response struct LauncherResponse { StatusEnum status = 0; OCTET_STRING data = 1; } - command HideApp(HideAppRequest): LauncherResponse = 2; command LaunchApp(LaunchAppRequest): LauncherResponse = 0; command StopApp(StopAppRequest): LauncherResponse = 1; + command HideApp(HideAppRequest): LauncherResponse = 2; } server cluster AudioOutput = 1291 { @@ -220,17 +220,17 @@ server cluster AudioOutput = 1291 { readonly attribute int8u currentOutput = 1; readonly global attribute int16u clusterRevision = 65533; - request struct RenameOutputRequest { + request struct SelectOutputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectOutputRequest { + request struct RenameOutputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; command SelectOutput(SelectOutputRequest): DefaultSuccess = 0; + command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; } server cluster Basic = 40 { @@ -573,19 +573,19 @@ client cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralCommissioning = 48 { @@ -632,19 +632,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -907,13 +907,6 @@ server cluster LevelControl = 8 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -921,14 +914,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -939,24 +929,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -1003,19 +1003,19 @@ server cluster MediaInput = 1287 { readonly attribute int8u currentInput = 1; readonly global attribute int16u clusterRevision = 65533; - request struct RenameInputRequest { + request struct SelectInputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectInputRequest { + request struct RenameInputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; + command HideInputStatus(): DefaultSuccess = 2; + command RenameInput(RenameInputRequest): DefaultSuccess = 3; } server cluster MediaPlayback = 1286 { @@ -1049,16 +1049,16 @@ server cluster MediaPlayback = 1286 { readonly attribute nullable int64u seekRangeStart = 6; readonly global attribute int16u clusterRevision = 65533; - request struct SeekRequest { - INT64U position = 0; + request struct SkipForwardRequest { + INT64U deltaPositionMilliseconds = 0; } request struct SkipBackwardRequest { INT64U deltaPositionMilliseconds = 0; } - request struct SkipForwardRequest { - INT64U deltaPositionMilliseconds = 0; + request struct SeekRequest { + INT64U position = 0; } response struct PlaybackResponse { @@ -1066,17 +1066,17 @@ server cluster MediaPlayback = 1286 { optional CHAR_STRING data = 1; } - command FastForward(): PlaybackResponse = 7; - command Next(): PlaybackResponse = 5; - command Pause(): PlaybackResponse = 1; command Play(): PlaybackResponse = 0; + command Pause(): PlaybackResponse = 1; + command StopPlayback(): PlaybackResponse = 2; + command StartOver(): PlaybackResponse = 3; command Previous(): PlaybackResponse = 4; + command Next(): PlaybackResponse = 5; command Rewind(): PlaybackResponse = 6; - command Seek(SeekRequest): PlaybackResponse = 11; - command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command FastForward(): PlaybackResponse = 7; command SkipForward(SkipForwardRequest): PlaybackResponse = 8; - command StartOver(): PlaybackResponse = 3; - command StopPlayback(): PlaybackResponse = 2; + command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command Seek(SeekRequest): PlaybackResponse = 11; } client cluster NetworkCommissioning = 49 { @@ -1146,8 +1146,8 @@ client cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -1157,8 +1157,8 @@ client cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1167,21 +1167,22 @@ client cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1189,19 +1190,18 @@ client cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster NetworkCommissioning = 49 { @@ -1271,8 +1271,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -1282,8 +1282,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1292,21 +1292,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1314,19 +1315,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OtaSoftwareUpdateProvider = 41 { @@ -1352,16 +1352,6 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -1373,9 +1363,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -1389,9 +1384,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } server cluster OnOff = 6 { @@ -1469,36 +1469,36 @@ client cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; - request struct AddNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; - OCTET_STRING IPKValue = 2; - NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; - } - - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - request struct AttestationRequestRequest { OCTET_STRING attestationNonce = 0; } + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + request struct CSRRequestRequest { OCTET_STRING CSRNonce = 0; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct AddNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; + OCTET_STRING IPKValue = 2; + NODE_ID caseAdminNode = 3; + INT16U adminVendorId = 4; + } + + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } response struct AttestationResponse { @@ -1506,28 +1506,28 @@ client cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; - command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; + command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; } server cluster OperationalCredentials = 62 { @@ -1567,6 +1567,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1575,37 +1587,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1613,30 +1613,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster RelativeHumidityMeasurement = 1029 { 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 563aaf8f08732c..ae6b188c18f73a 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 @@ -103,10 +103,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -115,8 +111,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -156,10 +156,6 @@ client cluster ApplicationLauncher = 1292 { readonly attribute INT16U catalogList[] = 0; readonly global attribute int16u clusterRevision = 65533; - request struct HideAppRequest { - Application application = 0; - } - request struct LaunchAppRequest { Application application = 0; optional OCTET_STRING data = 1; @@ -169,9 +165,13 @@ client cluster ApplicationLauncher = 1292 { Application application = 0; } - command HideApp(HideAppRequest): LauncherResponse = 2; + request struct HideAppRequest { + Application application = 0; + } + command LaunchApp(LaunchAppRequest): LauncherResponse = 0; command StopApp(StopAppRequest): LauncherResponse = 1; + command HideApp(HideAppRequest): LauncherResponse = 2; } client cluster AudioOutput = 1291 { @@ -197,17 +197,17 @@ client cluster AudioOutput = 1291 { readonly attribute OutputInfo outputList[] = 0; readonly global attribute int16u clusterRevision = 65533; - request struct RenameOutputRequest { + request struct SelectOutputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectOutputRequest { + request struct RenameOutputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; command SelectOutput(SelectOutputRequest): DefaultSuccess = 0; + command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; } server cluster BarrierControl = 259 { @@ -562,19 +562,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -701,9 +701,8 @@ server cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -714,8 +713,9 @@ server cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -723,6 +723,12 @@ server cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -733,18 +739,12 @@ server cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } server cluster IasZone = 1280 { @@ -799,11 +799,6 @@ server cluster IasZone = 1280 { INT8U zoneId = 1; } - response struct ZoneEnrollRequest { - IasZoneType zoneType = 0; - INT16U manufacturerCode = 1; - } - response struct ZoneStatusChangeNotification { IasZoneStatus zoneStatus = 0; BITMAP8 extendedStatus = 1; @@ -811,6 +806,11 @@ server cluster IasZone = 1280 { INT16U delay = 3; } + response struct ZoneEnrollRequest { + IasZoneType zoneType = 0; + INT16U manufacturerCode = 1; + } + command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0; } @@ -996,13 +996,6 @@ client cluster LevelControl = 8 { attribute nullable int8u startUpCurrentLevel = 16384; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -1010,14 +1003,11 @@ client cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -1028,24 +1018,34 @@ client cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -1082,13 +1082,6 @@ server cluster LevelControl = 8 { attribute nullable int8u startUpCurrentLevel = 16384; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -1096,14 +1089,11 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -1114,24 +1104,34 @@ server cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -1171,19 +1171,19 @@ client cluster MediaInput = 1287 { readonly attribute InputInfo inputList[] = 0; readonly global attribute int16u clusterRevision = 65533; - request struct RenameInputRequest { + request struct SelectInputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectInputRequest { + request struct RenameInputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; + command HideInputStatus(): DefaultSuccess = 2; + command RenameInput(RenameInputRequest): DefaultSuccess = 3; } client cluster MediaPlayback = 1286 { @@ -1205,29 +1205,29 @@ client cluster MediaPlayback = 1286 { readonly global attribute int16u clusterRevision = 65533; - request struct SeekRequest { - INT64U position = 0; + request struct SkipForwardRequest { + INT64U deltaPositionMilliseconds = 0; } request struct SkipBackwardRequest { INT64U deltaPositionMilliseconds = 0; } - request struct SkipForwardRequest { - INT64U deltaPositionMilliseconds = 0; + request struct SeekRequest { + INT64U position = 0; } - command FastForward(): PlaybackResponse = 7; - command Next(): PlaybackResponse = 5; - command Pause(): PlaybackResponse = 1; command Play(): PlaybackResponse = 0; + command Pause(): PlaybackResponse = 1; + command StopPlayback(): PlaybackResponse = 2; + command StartOver(): PlaybackResponse = 3; command Previous(): PlaybackResponse = 4; + command Next(): PlaybackResponse = 5; command Rewind(): PlaybackResponse = 6; - command Seek(SeekRequest): PlaybackResponse = 11; - command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command FastForward(): PlaybackResponse = 7; command SkipForward(SkipForwardRequest): PlaybackResponse = 8; - command StartOver(): PlaybackResponse = 3; - command StopPlayback(): PlaybackResponse = 2; + command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command Seek(SeekRequest): PlaybackResponse = 11; } server cluster NetworkCommissioning = 49 { @@ -1297,8 +1297,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -1308,8 +1308,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -1318,21 +1318,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -1340,19 +1341,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OtaSoftwareUpdateProvider = 41 { @@ -1378,16 +1378,6 @@ server cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -1399,9 +1389,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -1415,9 +1410,14 @@ server cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } client cluster OnOff = 6 { @@ -1543,6 +1543,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -1551,37 +1563,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -1589,30 +1589,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster Scenes = 5 { @@ -1641,33 +1641,33 @@ server cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -1676,23 +1676,24 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -1701,22 +1702,21 @@ server cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } server cluster SoftwareDiagnostics = 52 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 5456c1c3a93ea5..f07ad114602d28 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -86,10 +86,6 @@ server cluster AdministratorCommissioning = 60 { readonly attribute int16u adminVendorId = 2; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -98,8 +94,12 @@ server cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -229,19 +229,19 @@ server cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } server cluster GeneralDiagnostics = 51 { @@ -453,8 +453,8 @@ server cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -464,8 +464,8 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -474,21 +474,22 @@ server cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -496,19 +497,18 @@ server cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } server cluster OperationalCredentials = 62 { @@ -548,6 +548,18 @@ server cluster OperationalCredentials = 62 { readonly attribute fabric_idx currentFabricIndex = 5; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -556,37 +568,25 @@ server cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -594,30 +594,30 @@ server cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } server cluster PowerSource = 47 { @@ -1036,13 +1036,17 @@ server cluster WindowCovering = 258 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct GoToLiftValueRequest { + INT16U liftValue = 0; + } + request struct GoToLiftPercentageRequest { Percent liftPercentageValue = 0; Percent100ths liftPercent100thsValue = 1; } - request struct GoToLiftValueRequest { - INT16U liftValue = 0; + request struct GoToTiltValueRequest { + INT16U tiltValue = 0; } request struct GoToTiltPercentageRequest { @@ -1050,17 +1054,13 @@ server cluster WindowCovering = 258 { Percent100ths tiltPercent100thsValue = 1; } - request struct GoToTiltValueRequest { - INT16U tiltValue = 0; - } - + command UpOrOpen(): DefaultSuccess = 0; command DownOrClose(): DefaultSuccess = 1; - command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; + command StopMotion(): DefaultSuccess = 2; command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4; - command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; + command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7; - command StopMotion(): DefaultSuccess = 2; - command UpOrOpen(): DefaultSuccess = 0; + command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; } diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 61edfa042933fe..87cb839d7528fc 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -115,10 +115,6 @@ client cluster AdministratorCommissioning = 60 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct OpenBasicCommissioningWindowRequest { - INT16U commissioningTimeout = 0; - } - request struct OpenCommissioningWindowRequest { INT16U commissioningTimeout = 0; OCTET_STRING PAKEVerifier = 1; @@ -127,8 +123,12 @@ client cluster AdministratorCommissioning = 60 { OCTET_STRING salt = 4; } - timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; + request struct OpenBasicCommissioningWindowRequest { + INT16U commissioningTimeout = 0; + } + timed command OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0; + timed command OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1; timed command RevokeCommissioning(): DefaultSuccess = 2; } @@ -187,10 +187,6 @@ client cluster ApplicationLauncher = 1292 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct HideAppRequest { - Application application = 0; - } - request struct LaunchAppRequest { Application application = 0; optional OCTET_STRING data = 1; @@ -200,14 +196,18 @@ client cluster ApplicationLauncher = 1292 { Application application = 0; } + request struct HideAppRequest { + Application application = 0; + } + response struct LauncherResponse { StatusEnum status = 0; OCTET_STRING data = 1; } - command HideApp(HideAppRequest): LauncherResponse = 2; command LaunchApp(LaunchAppRequest): LauncherResponse = 0; command StopApp(StopAppRequest): LauncherResponse = 1; + command HideApp(HideAppRequest): LauncherResponse = 2; } client cluster AudioOutput = 1291 { @@ -237,17 +237,17 @@ client cluster AudioOutput = 1291 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct RenameOutputRequest { + request struct SelectOutputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectOutputRequest { + request struct RenameOutputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; command SelectOutput(SelectOutputRequest): DefaultSuccess = 0; + command RenameOutput(RenameOutputRequest): DefaultSuccess = 1; } client cluster BarrierControl = 259 { @@ -427,37 +427,31 @@ client cluster BridgedActions = 37 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct DisableActionRequest { + request struct InstantActionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; } - request struct DisableActionWithDurationRequest { + request struct InstantActionWithTransitionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; - INT32U duration = 2; + INT16U transitionTime = 2; } - request struct EnableActionRequest { + request struct StartActionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; } - request struct EnableActionWithDurationRequest { + request struct StartActionWithDurationRequest { INT16U actionID = 0; optional INT32U invokeID = 1; INT32U duration = 2; } - request struct InstantActionRequest { - INT16U actionID = 0; - optional INT32U invokeID = 1; - } - - request struct InstantActionWithTransitionRequest { + request struct StopActionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; - INT16U transitionTime = 2; } request struct PauseActionRequest { @@ -476,34 +470,40 @@ client cluster BridgedActions = 37 { optional INT32U invokeID = 1; } - request struct StartActionRequest { + request struct EnableActionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; } - request struct StartActionWithDurationRequest { + request struct EnableActionWithDurationRequest { INT16U actionID = 0; optional INT32U invokeID = 1; INT32U duration = 2; } - request struct StopActionRequest { + request struct DisableActionRequest { INT16U actionID = 0; optional INT32U invokeID = 1; } - command DisableAction(DisableActionRequest): DefaultSuccess = 10; - command DisableActionWithDuration(DisableActionWithDurationRequest): DefaultSuccess = 11; - command EnableAction(EnableActionRequest): DefaultSuccess = 8; - command EnableActionWithDuration(EnableActionWithDurationRequest): DefaultSuccess = 9; + request struct DisableActionWithDurationRequest { + INT16U actionID = 0; + optional INT32U invokeID = 1; + INT32U duration = 2; + } + command InstantAction(InstantActionRequest): DefaultSuccess = 0; command InstantActionWithTransition(InstantActionWithTransitionRequest): DefaultSuccess = 1; - command PauseAction(PauseActionRequest): DefaultSuccess = 5; - command PauseActionWithDuration(PauseActionWithDurationRequest): DefaultSuccess = 6; - command ResumeAction(ResumeActionRequest): DefaultSuccess = 7; command StartAction(StartActionRequest): DefaultSuccess = 2; command StartActionWithDuration(StartActionWithDurationRequest): DefaultSuccess = 3; command StopAction(StopActionRequest): DefaultSuccess = 4; + command PauseAction(PauseActionRequest): DefaultSuccess = 5; + command PauseActionWithDuration(PauseActionWithDurationRequest): DefaultSuccess = 6; + command ResumeAction(ResumeActionRequest): DefaultSuccess = 7; + command EnableAction(EnableActionRequest): DefaultSuccess = 8; + command EnableActionWithDuration(EnableActionWithDurationRequest): DefaultSuccess = 9; + command DisableAction(DisableActionRequest): DefaultSuccess = 10; + command DisableActionWithDuration(DisableActionWithDurationRequest): DefaultSuccess = 11; } client cluster BridgedDeviceBasic = 57 { @@ -723,42 +723,62 @@ client cluster ColorControl = 768 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct ColorLoopSetRequest { - ColorLoopUpdateFlags updateFlags = 0; - ColorLoopAction action = 1; - ColorLoopDirection direction = 2; - INT16U time = 3; - INT16U startHue = 4; - BITMAP8 optionsMask = 5; - BITMAP8 optionsOverride = 6; + request struct MoveToHueRequest { + INT8U hue = 0; + HueDirection direction = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveHueRequest { + request struct MoveHueRequest { HueMoveMode moveMode = 0; - INT16U rate = 1; + INT8U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct EnhancedMoveToHueRequest { - INT16U enhancedHue = 0; - HueDirection direction = 1; - INT16U transitionTime = 2; + request struct StepHueRequest { + HueStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedMoveToHueAndSaturationRequest { - INT16U enhancedHue = 0; + request struct MoveToSaturationRequest { + INT8U saturation = 0; + INT16U transitionTime = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct MoveSaturationRequest { + SaturationMoveMode moveMode = 0; + INT8U rate = 1; + BITMAP8 optionsMask = 2; + BITMAP8 optionsOverride = 3; + } + + request struct StepSaturationRequest { + SaturationStepMode stepMode = 0; + INT8U stepSize = 1; + INT8U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; + } + + request struct MoveToHueAndSaturationRequest { + INT8U hue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct EnhancedStepHueRequest { - HueStepMode stepMode = 0; - INT16U stepSize = 1; + request struct MoveToColorRequest { + INT16U colorX = 0; + INT16U colorY = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; @@ -771,73 +791,74 @@ client cluster ColorControl = 768 { BITMAP8 optionsOverride = 3; } - request struct MoveColorTemperatureRequest { - HueMoveMode moveMode = 0; - INT16U rate = 1; - INT16U colorTemperatureMinimum = 2; - INT16U colorTemperatureMaximum = 3; - BITMAP8 optionsMask = 4; - BITMAP8 optionsOverride = 5; - } - - request struct MoveHueRequest { - HueMoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct StepColorRequest { + INT16S stepX = 0; + INT16S stepY = 1; + INT16U transitionTime = 2; + BITMAP8 optionsMask = 3; + BITMAP8 optionsOverride = 4; } - request struct MoveSaturationRequest { - SaturationMoveMode moveMode = 0; - INT8U rate = 1; + request struct MoveToColorTemperatureRequest { + INT16U colorTemperature = 0; + INT16U transitionTime = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToColorRequest { - INT16U colorX = 0; - INT16U colorY = 1; + request struct EnhancedMoveToHueRequest { + INT16U enhancedHue = 0; + HueDirection direction = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToColorTemperatureRequest { - INT16U colorTemperature = 0; - INT16U transitionTime = 1; + request struct EnhancedMoveHueRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; BITMAP8 optionsMask = 2; BITMAP8 optionsOverride = 3; } - request struct MoveToHueRequest { - INT8U hue = 0; - HueDirection direction = 1; + request struct EnhancedStepHueRequest { + HueStepMode stepMode = 0; + INT16U stepSize = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToHueAndSaturationRequest { - INT8U hue = 0; + request struct EnhancedMoveToHueAndSaturationRequest { + INT16U enhancedHue = 0; INT8U saturation = 1; INT16U transitionTime = 2; BITMAP8 optionsMask = 3; BITMAP8 optionsOverride = 4; } - request struct MoveToSaturationRequest { - INT8U saturation = 0; - INT16U transitionTime = 1; - BITMAP8 optionsMask = 2; - BITMAP8 optionsOverride = 3; + request struct ColorLoopSetRequest { + ColorLoopUpdateFlags updateFlags = 0; + ColorLoopAction action = 1; + ColorLoopDirection direction = 2; + INT16U time = 3; + INT16U startHue = 4; + BITMAP8 optionsMask = 5; + BITMAP8 optionsOverride = 6; } - request struct StepColorRequest { - INT16S stepX = 0; - INT16S stepY = 1; - INT16U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; + request struct StopMoveStepRequest { + BITMAP8 optionsMask = 0; + BITMAP8 optionsOverride = 1; + } + + request struct MoveColorTemperatureRequest { + HueMoveMode moveMode = 0; + INT16U rate = 1; + INT16U colorTemperatureMinimum = 2; + INT16U colorTemperatureMaximum = 3; + BITMAP8 optionsMask = 4; + BITMAP8 optionsOverride = 5; } request struct StepColorTemperatureRequest { @@ -850,46 +871,25 @@ client cluster ColorControl = 768 { BITMAP8 optionsOverride = 6; } - request struct StepHueRequest { - HueStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StepSaturationRequest { - SaturationStepMode stepMode = 0; - INT8U stepSize = 1; - INT8U transitionTime = 2; - BITMAP8 optionsMask = 3; - BITMAP8 optionsOverride = 4; - } - - request struct StopMoveStepRequest { - BITMAP8 optionsMask = 0; - BITMAP8 optionsOverride = 1; - } - - command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; - command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; - command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; - command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; - command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; - command MoveColor(MoveColorRequest): DefaultSuccess = 8; - command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; command MoveHue(MoveHueRequest): DefaultSuccess = 1; + command StepHue(StepHueRequest): DefaultSuccess = 2; + command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; command MoveSaturation(MoveSaturationRequest): DefaultSuccess = 4; - command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; - command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; - command MoveToHue(MoveToHueRequest): DefaultSuccess = 0; + command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; command MoveToHueAndSaturation(MoveToHueAndSaturationRequest): DefaultSuccess = 6; - command MoveToSaturation(MoveToSaturationRequest): DefaultSuccess = 3; + command MoveToColor(MoveToColorRequest): DefaultSuccess = 7; + command MoveColor(MoveColorRequest): DefaultSuccess = 8; command StepColor(StepColorRequest): DefaultSuccess = 9; - command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; - command StepHue(StepHueRequest): DefaultSuccess = 2; - command StepSaturation(StepSaturationRequest): DefaultSuccess = 5; + command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10; + command EnhancedMoveToHue(EnhancedMoveToHueRequest): DefaultSuccess = 64; + command EnhancedMoveHue(EnhancedMoveHueRequest): DefaultSuccess = 65; + command EnhancedStepHue(EnhancedStepHueRequest): DefaultSuccess = 66; + command EnhancedMoveToHueAndSaturation(EnhancedMoveToHueAndSaturationRequest): DefaultSuccess = 67; + command ColorLoopSet(ColorLoopSetRequest): DefaultSuccess = 68; command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71; + command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75; + command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76; } client cluster ContentLauncher = 1290 { @@ -1455,53 +1455,54 @@ client cluster DoorLock = 257 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + request struct LockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct ClearUserRequest { - INT16U userIndex = 0; + request struct UnlockDoorRequest { + optional OCTET_STRING pinCode = 0; } - request struct ClearWeekDayScheduleRequest { - INT8U weekDayIndex = 0; - INT16U userIndex = 1; + request struct UnlockWithTimeoutRequest { + INT16U timeout = 0; + optional OCTET_STRING pinCode = 1; } - request struct ClearYearDayScheduleRequest { - INT8U yearDayIndex = 0; + request struct SetWeekDayScheduleRequest { + INT8U weekDayIndex = 0; INT16U userIndex = 1; + DlDaysMaskMap daysMask = 2; + INT8U startHour = 3; + INT8U startMinute = 4; + INT8U endHour = 5; + INT8U endMinute = 6; } - request struct GetCredentialStatusRequest { - DlCredential credential = 0; - } - - request struct GetUserRequest { - INT16U userIndex = 0; + request struct GetWeekDayScheduleRequest { + INT8U weekDayIndex = 0; + INT16U userIndex = 1; } - request struct GetWeekDayScheduleRequest { + request struct ClearWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; } - request struct GetYearDayScheduleRequest { + request struct SetYearDayScheduleRequest { INT8U yearDayIndex = 0; INT16U userIndex = 1; + epoch_s localStartTime = 2; + epoch_s localEndTime = 3; } - request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct GetYearDayScheduleRequest { + INT8U yearDayIndex = 0; + INT16U userIndex = 1; } - request struct SetCredentialRequest { - DlDataOperationType operationType = 0; - DlCredential credential = 1; - LONG_OCTET_STRING credentialData = 2; - nullable INT16U userIndex = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; + request struct ClearYearDayScheduleRequest { + INT8U yearDayIndex = 0; + INT16U userIndex = 1; } request struct SetUserRequest { @@ -1514,49 +1515,29 @@ client cluster DoorLock = 257 { nullable DlCredentialRule credentialRule = 6; } - request struct SetWeekDayScheduleRequest { - INT8U weekDayIndex = 0; - INT16U userIndex = 1; - DlDaysMaskMap daysMask = 2; - INT8U startHour = 3; - INT8U startMinute = 4; - INT8U endHour = 5; - INT8U endMinute = 6; - } - - request struct SetYearDayScheduleRequest { - INT8U yearDayIndex = 0; - INT16U userIndex = 1; - epoch_s localStartTime = 2; - epoch_s localEndTime = 3; + request struct GetUserRequest { + INT16U userIndex = 0; } - request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + request struct ClearUserRequest { + INT16U userIndex = 0; } - request struct UnlockWithTimeoutRequest { - INT16U timeout = 0; - optional OCTET_STRING pinCode = 1; + request struct SetCredentialRequest { + DlDataOperationType operationType = 0; + DlCredential credential = 1; + LONG_OCTET_STRING credentialData = 2; + nullable INT16U userIndex = 3; + nullable DlUserStatus userStatus = 4; + nullable DlUserType userType = 5; } - response struct GetCredentialStatusResponse { - boolean credentialExists = 0; - nullable INT16U userIndex = 1; - nullable INT16U nextCredentialIndex = 2; + request struct GetCredentialStatusRequest { + DlCredential credential = 0; } - response struct GetUserResponse { - INT16U userIndex = 0; - nullable CHAR_STRING userName = 1; - nullable INT32U userUniqueId = 2; - nullable DlUserStatus userStatus = 3; - nullable DlUserType userType = 4; - nullable DlCredentialRule credentialRule = 5; - nullable DlCredential credentials[] = 6; - nullable fabric_idx creatorFabricIndex = 7; - nullable fabric_idx lastModifiedFabricIndex = 8; - nullable INT16U nextUserIndex = 9; + request struct ClearCredentialRequest { + nullable DlCredential credential = 0; } response struct GetWeekDayScheduleResponse { @@ -1578,27 +1559,46 @@ client cluster DoorLock = 257 { optional epoch_s localEndTime = 4; } + response struct GetUserResponse { + INT16U userIndex = 0; + nullable CHAR_STRING userName = 1; + nullable INT32U userUniqueId = 2; + nullable DlUserStatus userStatus = 3; + nullable DlUserType userType = 4; + nullable DlCredentialRule credentialRule = 5; + nullable DlCredential credentials[] = 6; + nullable fabric_idx creatorFabricIndex = 7; + nullable fabric_idx lastModifiedFabricIndex = 8; + nullable INT16U nextUserIndex = 9; + } + response struct SetCredentialResponse { DlStatus status = 0; nullable INT16U userIndex = 1; nullable INT16U nextCredentialIndex = 2; } - timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; - timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; + response struct GetCredentialStatusResponse { + boolean credentialExists = 0; + nullable INT16U userIndex = 1; + nullable INT16U nextCredentialIndex = 2; + } + + timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; + timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1; + timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3; + command SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11; + command GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12; command ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13; + command SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14; + command GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15; command ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16; - command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; + timed command SetUser(SetUserRequest): DefaultSuccess = 26; command GetUser(GetUserRequest): GetUserResponse = 27; - command GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12; - command GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15; - timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; + timed command ClearUser(ClearUserRequest): DefaultSuccess = 29; timed command SetCredential(SetCredentialRequest): SetCredentialResponse = 34; - timed command SetUser(SetUserRequest): DefaultSuccess = 26; - command SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11; - command SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14; - timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1; - timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3; + command GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36; + timed command ClearCredential(ClearCredentialRequest): DefaultSuccess = 38; } client cluster ElectricalMeasurement = 2820 { @@ -1726,19 +1726,19 @@ client cluster GeneralCommissioning = 48 { CHAR_STRING debugText = 1; } - response struct CommissioningCompleteResponse { + response struct SetRegulatoryConfigResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } - response struct SetRegulatoryConfigResponse { + response struct CommissioningCompleteResponse { CommissioningError errorCode = 0; CHAR_STRING debugText = 1; } command ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0; - command CommissioningComplete(): CommissioningCompleteResponse = 4; command SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2; + command CommissioningComplete(): CommissioningCompleteResponse = 4; } client cluster GeneralDiagnostics = 51 { @@ -1874,23 +1874,19 @@ client cluster GroupKeyManagement = 63 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct KeySetReadRequest { - INT16U groupKeySetID = 0; + request struct KeySetWriteRequest { + GroupKeySetStruct groupKeySet = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; + request struct KeySetReadRequest { + INT16U groupKeySetID = 0; } request struct KeySetRemoveRequest { INT16U groupKeySetID = 0; } - request struct KeySetWriteRequest { - GroupKeySetStruct groupKeySet = 0; - } - - response struct KeySetReadAllIndicesResponse { + request struct KeySetReadAllIndicesRequest { INT16U groupKeySetIDs[] = 0; } @@ -1898,10 +1894,14 @@ client cluster GroupKeyManagement = 63 { GroupKeySetStruct groupKeySet = 0; } + response struct KeySetReadAllIndicesResponse { + INT16U groupKeySetIDs[] = 0; + } + + command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; command KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; - command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; command KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - command KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; + command KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; } client cluster Groups = 4 { @@ -1916,9 +1916,8 @@ client cluster Groups = 4 { CHAR_STRING groupName = 1; } - request struct AddGroupIfIdentifyingRequest { + request struct ViewGroupRequest { group_id groupId = 0; - CHAR_STRING groupName = 1; } request struct GetGroupMembershipRequest { @@ -1929,8 +1928,9 @@ client cluster Groups = 4 { group_id groupId = 0; } - request struct ViewGroupRequest { + request struct AddGroupIfIdentifyingRequest { group_id groupId = 0; + CHAR_STRING groupName = 1; } response struct AddGroupResponse { @@ -1938,6 +1938,12 @@ client cluster Groups = 4 { group_id groupId = 1; } + response struct ViewGroupResponse { + ENUM8 status = 0; + group_id groupId = 1; + CHAR_STRING groupName = 2; + } + response struct GetGroupMembershipResponse { nullable INT8U capacity = 0; group_id groupList[] = 1; @@ -1948,18 +1954,12 @@ client cluster Groups = 4 { group_id groupId = 1; } - response struct ViewGroupResponse { - ENUM8 status = 0; - group_id groupId = 1; - CHAR_STRING groupName = 2; - } - command AddGroup(AddGroupRequest): AddGroupResponse = 0; - command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; + command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2; - command RemoveAllGroups(): DefaultSuccess = 4; command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3; - command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1; + command RemoveAllGroups(): DefaultSuccess = 4; + command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5; } client cluster Identify = 3 { @@ -2182,13 +2182,6 @@ client cluster LevelControl = 8 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct MoveRequest { - MoveMode moveMode = 0; - INT8U rate = 1; - BITMAP8 optionMask = 2; - BITMAP8 optionOverride = 3; - } - request struct MoveToLevelRequest { INT8U level = 0; INT16U transitionTime = 1; @@ -2196,14 +2189,11 @@ client cluster LevelControl = 8 { BITMAP8 optionOverride = 3; } - request struct MoveToLevelWithOnOffRequest { - INT8U level = 0; - INT16U transitionTime = 1; - } - - request struct MoveWithOnOffRequest { + request struct MoveRequest { MoveMode moveMode = 0; INT8U rate = 1; + BITMAP8 optionMask = 2; + BITMAP8 optionOverride = 3; } request struct StepRequest { @@ -2214,24 +2204,34 @@ client cluster LevelControl = 8 { BITMAP8 optionOverride = 4; } + request struct StopRequest { + BITMAP8 optionMask = 0; + BITMAP8 optionOverride = 1; + } + + request struct MoveToLevelWithOnOffRequest { + INT8U level = 0; + INT16U transitionTime = 1; + } + + request struct MoveWithOnOffRequest { + MoveMode moveMode = 0; + INT8U rate = 1; + } + request struct StepWithOnOffRequest { StepMode stepMode = 0; INT8U stepSize = 1; INT16U transitionTime = 2; } - request struct StopRequest { - BITMAP8 optionMask = 0; - BITMAP8 optionOverride = 1; - } - - command Move(MoveRequest): DefaultSuccess = 1; command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; + command Move(MoveRequest): DefaultSuccess = 1; + command Step(StepRequest): DefaultSuccess = 2; + command Stop(StopRequest): DefaultSuccess = 3; command MoveToLevelWithOnOff(MoveToLevelWithOnOffRequest): DefaultSuccess = 4; command MoveWithOnOff(MoveWithOnOffRequest): DefaultSuccess = 5; - command Step(StepRequest): DefaultSuccess = 2; command StepWithOnOff(StepWithOnOffRequest): DefaultSuccess = 6; - command Stop(StopRequest): DefaultSuccess = 3; command StopWithOnOff(): DefaultSuccess = 7; } @@ -2286,19 +2286,19 @@ client cluster MediaInput = 1287 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct RenameInputRequest { + request struct SelectInputRequest { INT8U index = 0; - CHAR_STRING name = 1; } - request struct SelectInputRequest { + request struct RenameInputRequest { INT8U index = 0; + CHAR_STRING name = 1; } - command HideInputStatus(): DefaultSuccess = 2; - command RenameInput(RenameInputRequest): DefaultSuccess = 3; command SelectInput(SelectInputRequest): DefaultSuccess = 0; command ShowInputStatus(): DefaultSuccess = 1; + command HideInputStatus(): DefaultSuccess = 2; + command RenameInput(RenameInputRequest): DefaultSuccess = 3; } client cluster MediaPlayback = 1286 { @@ -2335,16 +2335,16 @@ client cluster MediaPlayback = 1286 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct SeekRequest { - INT64U position = 0; + request struct SkipForwardRequest { + INT64U deltaPositionMilliseconds = 0; } request struct SkipBackwardRequest { INT64U deltaPositionMilliseconds = 0; } - request struct SkipForwardRequest { - INT64U deltaPositionMilliseconds = 0; + request struct SeekRequest { + INT64U position = 0; } response struct PlaybackResponse { @@ -2352,17 +2352,17 @@ client cluster MediaPlayback = 1286 { optional CHAR_STRING data = 1; } - command FastForward(): PlaybackResponse = 7; - command Next(): PlaybackResponse = 5; - command Pause(): PlaybackResponse = 1; command Play(): PlaybackResponse = 0; + command Pause(): PlaybackResponse = 1; + command StopPlayback(): PlaybackResponse = 2; + command StartOver(): PlaybackResponse = 3; command Previous(): PlaybackResponse = 4; + command Next(): PlaybackResponse = 5; command Rewind(): PlaybackResponse = 6; - command Seek(SeekRequest): PlaybackResponse = 11; - command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command FastForward(): PlaybackResponse = 7; command SkipForward(SkipForwardRequest): PlaybackResponse = 8; - command StartOver(): PlaybackResponse = 3; - command StopPlayback(): PlaybackResponse = 2; + command SkipBackward(SkipBackwardRequest): PlaybackResponse = 9; + command Seek(SeekRequest): PlaybackResponse = 11; } client cluster ModeSelect = 80 { @@ -2464,8 +2464,8 @@ client cluster NetworkCommissioning = 49 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct AddOrUpdateThreadNetworkRequest { - OCTET_STRING operationalDataset = 0; + request struct ScanNetworksRequest { + OCTET_STRING ssid = 0; INT64U breadcrumb = 1; } @@ -2475,8 +2475,8 @@ client cluster NetworkCommissioning = 49 { INT64U breadcrumb = 2; } - request struct ConnectNetworkRequest { - OCTET_STRING networkID = 0; + request struct AddOrUpdateThreadNetworkRequest { + OCTET_STRING operationalDataset = 0; INT64U breadcrumb = 1; } @@ -2485,21 +2485,22 @@ client cluster NetworkCommissioning = 49 { INT64U breadcrumb = 1; } + request struct ConnectNetworkRequest { + OCTET_STRING networkID = 0; + INT64U breadcrumb = 1; + } + request struct ReorderNetworkRequest { OCTET_STRING networkID = 0; INT8U networkIndex = 1; INT64U breadcrumb = 2; } - request struct ScanNetworksRequest { - OCTET_STRING ssid = 0; - INT64U breadcrumb = 1; - } - - response struct ConnectNetworkResponse { + response struct ScanNetworksResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - INT32S errorValue = 2; + optional WiFiInterfaceScanResult wiFiScanResults[] = 2; + optional ThreadInterfaceScanResult threadScanResults[] = 3; } response struct NetworkConfigResponse { @@ -2507,19 +2508,18 @@ client cluster NetworkCommissioning = 49 { CHAR_STRING debugText = 1; } - response struct ScanNetworksResponse { + response struct ConnectNetworkResponse { NetworkCommissioningStatus networkingStatus = 0; CHAR_STRING debugText = 1; - optional WiFiInterfaceScanResult wiFiScanResults[] = 2; - optional ThreadInterfaceScanResult threadScanResults[] = 3; + INT32S errorValue = 2; } - command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; + command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; command AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2; - command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; + command AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3; command RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4; + command ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6; command ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8; - command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0; } client cluster OtaSoftwareUpdateProvider = 41 { @@ -2546,16 +2546,6 @@ client cluster OtaSoftwareUpdateProvider = 41 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct ApplyUpdateRequestRequest { - OCTET_STRING updateToken = 0; - INT32U newVersion = 1; - } - - request struct NotifyUpdateAppliedRequest { - OCTET_STRING updateToken = 0; - INT32U softwareVersion = 1; - } - request struct QueryImageRequest { vendor_id vendorId = 0; INT16U productId = 1; @@ -2567,9 +2557,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForProvider = 7; } - response struct ApplyUpdateResponse { - OTAApplyUpdateAction action = 0; - INT32U delayedActionTime = 1; + request struct ApplyUpdateRequestRequest { + OCTET_STRING updateToken = 0; + INT32U newVersion = 1; + } + + request struct NotifyUpdateAppliedRequest { + OCTET_STRING updateToken = 0; + INT32U softwareVersion = 1; } response struct QueryImageResponse { @@ -2583,9 +2578,14 @@ client cluster OtaSoftwareUpdateProvider = 41 { optional OCTET_STRING metadataForRequestor = 7; } + response struct ApplyUpdateResponse { + OTAApplyUpdateAction action = 0; + INT32U delayedActionTime = 1; + } + + command QueryImage(QueryImageRequest): QueryImageResponse = 0; command ApplyUpdateRequest(ApplyUpdateRequestRequest): ApplyUpdateResponse = 2; command NotifyUpdateApplied(NotifyUpdateAppliedRequest): DefaultSuccess = 4; - command QueryImage(QueryImageRequest): QueryImageResponse = 0; } client cluster OtaSoftwareUpdateRequestor = 42 { @@ -2721,11 +2721,11 @@ client cluster OnOff = 6 { } command Off(): DefaultSuccess = 0; - command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command On(): DefaultSuccess = 1; + command Toggle(): DefaultSuccess = 2; + command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64; command OnWithRecallGlobalScene(): DefaultSuccess = 65; command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66; - command Toggle(): DefaultSuccess = 2; } client cluster OnOffSwitchConfiguration = 7 { @@ -2777,6 +2777,18 @@ client cluster OperationalCredentials = 62 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; + request struct AttestationRequestRequest { + OCTET_STRING attestationNonce = 0; + } + + request struct CertificateChainRequestRequest { + INT8U certificateType = 0; + } + + request struct CSRRequestRequest { + OCTET_STRING CSRNonce = 0; + } + request struct AddNOCRequest { OCTET_STRING NOCValue = 0; optional OCTET_STRING ICACValue = 1; @@ -2785,37 +2797,25 @@ client cluster OperationalCredentials = 62 { INT16U adminVendorId = 4; } - request struct AddTrustedRootCertificateRequest { - OCTET_STRING rootCertificate = 0; - } - - request struct AttestationRequestRequest { - OCTET_STRING attestationNonce = 0; - } - - request struct CSRRequestRequest { - OCTET_STRING CSRNonce = 0; + request struct UpdateNOCRequest { + OCTET_STRING NOCValue = 0; + optional OCTET_STRING ICACValue = 1; } - request struct CertificateChainRequestRequest { - INT8U certificateType = 0; + request struct UpdateFabricLabelRequest { + CHAR_STRING label = 0; } request struct RemoveFabricRequest { fabric_idx fabricIndex = 0; } - request struct RemoveTrustedRootCertificateRequest { - OCTET_STRING trustedRootIdentifier = 0; - } - - request struct UpdateFabricLabelRequest { - CHAR_STRING label = 0; + request struct AddTrustedRootCertificateRequest { + OCTET_STRING rootCertificate = 0; } - request struct UpdateNOCRequest { - OCTET_STRING NOCValue = 0; - optional OCTET_STRING ICACValue = 1; + request struct RemoveTrustedRootCertificateRequest { + OCTET_STRING trustedRootIdentifier = 0; } response struct AttestationResponse { @@ -2823,30 +2823,30 @@ client cluster OperationalCredentials = 62 { OCTET_STRING signature = 1; } + response struct CertificateChainResponse { + OCTET_STRING certificate = 0; + } + response struct CSRResponse { OCTET_STRING NOCSRElements = 0; OCTET_STRING attestationSignature = 1; } - response struct CertificateChainResponse { - OCTET_STRING certificate = 0; - } - response struct NOCResponse { OperationalCertStatus statusCode = 0; optional fabric_idx fabricIndex = 1; optional CHAR_STRING debugText = 2; } - command AddNOC(AddNOCRequest): NOCResponse = 6; - command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command AttestationRequest(AttestationRequestRequest): AttestationResponse = 0; - command CSRRequest(CSRRequestRequest): CSRResponse = 4; command CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2; + command CSRRequest(CSRRequestRequest): CSRResponse = 4; + command AddNOC(AddNOCRequest): NOCResponse = 6; + command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; + command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; command RemoveFabric(RemoveFabricRequest): NOCResponse = 10; + command AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11; command RemoveTrustedRootCertificate(RemoveTrustedRootCertificateRequest): DefaultSuccess = 12; - command UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9; - command UpdateNOC(UpdateNOCRequest): NOCResponse = 7; } client cluster PowerSource = 47 { @@ -3102,33 +3102,33 @@ client cluster Scenes = 5 { SceneExtensionFieldSet extensionFieldSets[] = 4; } - request struct GetSceneMembershipRequest { + request struct ViewSceneRequest { INT16U groupId = 0; + INT8U sceneId = 1; } - request struct RecallSceneRequest { + request struct RemoveSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; - INT16U transitionTime = 2; } request struct RemoveAllScenesRequest { INT16U groupId = 0; } - request struct RemoveSceneRequest { + request struct StoreSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; } - request struct StoreSceneRequest { + request struct RecallSceneRequest { INT16U groupId = 0; INT8U sceneId = 1; + INT16U transitionTime = 2; } - request struct ViewSceneRequest { + request struct GetSceneMembershipRequest { INT16U groupId = 0; - INT8U sceneId = 1; } response struct AddSceneResponse { @@ -3137,23 +3137,24 @@ client cluster Scenes = 5 { INT8U sceneId = 2; } - response struct GetSceneMembershipResponse { + response struct ViewSceneResponse { ENUM8 status = 0; - INT8U capacity = 1; - INT16U groupId = 2; - INT8U sceneCount = 3; - INT8U sceneList[] = 4; + INT16U groupId = 1; + INT8U sceneId = 2; + INT16U transitionTime = 3; + CHAR_STRING sceneName = 4; + SceneExtensionFieldSet extensionFieldSets[] = 5; } - response struct RemoveAllScenesResponse { + response struct RemoveSceneResponse { ENUM8 status = 0; INT16U groupId = 1; + INT8U sceneId = 2; } - response struct RemoveSceneResponse { + response struct RemoveAllScenesResponse { ENUM8 status = 0; INT16U groupId = 1; - INT8U sceneId = 2; } response struct StoreSceneResponse { @@ -3162,22 +3163,21 @@ client cluster Scenes = 5 { INT8U sceneId = 2; } - response struct ViewSceneResponse { + response struct GetSceneMembershipResponse { ENUM8 status = 0; - INT16U groupId = 1; - INT8U sceneId = 2; - INT16U transitionTime = 3; - CHAR_STRING sceneName = 4; - SceneExtensionFieldSet extensionFieldSets[] = 5; + INT8U capacity = 1; + INT16U groupId = 2; + INT8U sceneCount = 3; + INT8U sceneList[] = 4; } command AddScene(AddSceneRequest): AddSceneResponse = 0; - command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; - command RecallScene(RecallSceneRequest): DefaultSuccess = 5; - command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; + command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2; + command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3; command StoreScene(StoreSceneRequest): StoreSceneResponse = 4; - command ViewScene(ViewSceneRequest): ViewSceneResponse = 1; + command RecallScene(RecallSceneRequest): DefaultSuccess = 5; + command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6; } client cluster SoftwareDiagnostics = 52 { @@ -3487,76 +3487,72 @@ client cluster TestCluster = 1295 { readonly global attribute attrib_id attributeList[] = 65531; readonly global attribute int16u clusterRevision = 65533; - request struct SimpleStructEchoRequestRequest { - SimpleStruct arg1 = 0; - } - request struct TestAddArgumentsRequest { INT8U arg1 = 0; INT8U arg2 = 1; } - request struct TestEmitTestEventRequestRequest { - INT8U arg1 = 0; - SimpleEnum arg2 = 1; - BOOLEAN arg3 = 2; + request struct TestStructArgumentRequestRequest { + SimpleStruct arg1 = 0; } - request struct TestEnumsRequestRequest { - vendor_id arg1 = 0; - SimpleEnum arg2 = 1; + request struct TestNestedStructArgumentRequestRequest { + NestedStruct arg1 = 0; + } + + request struct TestListStructArgumentRequestRequest { + SimpleStruct arg1[] = 0; } request struct TestListInt8UArgumentRequestRequest { INT8U arg1[] = 0; } - request struct TestListInt8UReverseRequestRequest { - INT8U arg1[] = 0; + request struct TestNestedStructListArgumentRequestRequest { + NestedStructList arg1 = 0; } request struct TestListNestedStructListArgumentRequestRequest { NestedStructList arg1[] = 0; } - request struct TestListStructArgumentRequestRequest { - SimpleStruct arg1[] = 0; - } - - request struct TestNestedStructArgumentRequestRequest { - NestedStruct arg1 = 0; + request struct TestListInt8UReverseRequestRequest { + INT8U arg1[] = 0; } - request struct TestNestedStructListArgumentRequestRequest { - NestedStructList arg1 = 0; + request struct TestEnumsRequestRequest { + vendor_id arg1 = 0; + SimpleEnum arg2 = 1; } request struct TestNullableOptionalRequestRequest { optional nullable INT8U arg1 = 0; } - request struct TestSimpleOptionalArgumentRequestRequest { - optional BOOLEAN arg1 = 0; + request struct SimpleStructEchoRequestRequest { + SimpleStruct arg1 = 0; } - request struct TestStructArgumentRequestRequest { - SimpleStruct arg1 = 0; + request struct TestSimpleOptionalArgumentRequestRequest { + optional BOOLEAN arg1 = 0; } - response struct BooleanResponse { - BOOLEAN value = 0; + request struct TestEmitTestEventRequestRequest { + INT8U arg1 = 0; + SimpleEnum arg2 = 1; + BOOLEAN arg3 = 2; } - response struct SimpleStructResponse { - SimpleStruct arg1 = 0; + response struct TestSpecificResponse { + INT8U returnValue = 0; } response struct TestAddArgumentsResponse { INT8U returnValue = 0; } - response struct TestEmitTestEventResponse { - INT64U value = 0; + response struct TestListInt8UReverseResponse { + INT8U arg1[] = 0; } response struct TestEnumsResponse { @@ -3564,10 +3560,6 @@ client cluster TestCluster = 1295 { SimpleEnum arg2 = 1; } - response struct TestListInt8UReverseResponse { - INT8U arg1[] = 0; - } - response struct TestNullableOptionalResponse { BOOLEAN wasPresent = 0; optional BOOLEAN wasNull = 1; @@ -3575,28 +3567,36 @@ client cluster TestCluster = 1295 { optional nullable INT8U originalValue = 3; } - response struct TestSpecificResponse { - INT8U returnValue = 0; + response struct BooleanResponse { + BOOLEAN value = 0; + } + + response struct SimpleStructResponse { + SimpleStruct arg1 = 0; + } + + response struct TestEmitTestEventResponse { + INT64U value = 0; } - command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17; command Test(): DefaultSuccess = 0; + command TestNotHandled(): DefaultSuccess = 1; + command TestSpecific(): TestSpecificResponse = 2; + command TestUnknownCommand(): DefaultSuccess = 3; command TestAddArguments(TestAddArgumentsRequest): TestAddArgumentsResponse = 4; - command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20; - command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14; - command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10; - command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13; - command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12; - command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9; + command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7; command TestNestedStructArgumentRequest(TestNestedStructArgumentRequestRequest): BooleanResponse = 8; + command TestListStructArgumentRequest(TestListStructArgumentRequestRequest): BooleanResponse = 9; + command TestListInt8UArgumentRequest(TestListInt8UArgumentRequestRequest): BooleanResponse = 10; command TestNestedStructListArgumentRequest(TestNestedStructListArgumentRequestRequest): BooleanResponse = 11; - command TestNotHandled(): DefaultSuccess = 1; + command TestListNestedStructListArgumentRequest(TestListNestedStructListArgumentRequestRequest): BooleanResponse = 12; + command TestListInt8UReverseRequest(TestListInt8UReverseRequestRequest): TestListInt8UReverseResponse = 13; + command TestEnumsRequest(TestEnumsRequestRequest): TestEnumsResponse = 14; command TestNullableOptionalRequest(TestNullableOptionalRequestRequest): TestNullableOptionalResponse = 15; - command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19; - command TestSpecific(): TestSpecificResponse = 2; - command TestStructArgumentRequest(TestStructArgumentRequestRequest): BooleanResponse = 7; - command TestUnknownCommand(): DefaultSuccess = 3; + command SimpleStructEchoRequest(SimpleStructEchoRequestRequest): SimpleStructResponse = 17; timed command TimedInvokeRequest(): DefaultSuccess = 18; + command TestSimpleOptionalArgumentRequest(TestSimpleOptionalArgumentRequestRequest): DefaultSuccess = 19; + command TestEmitTestEventRequest(TestEmitTestEventRequestRequest): TestEmitTestEventResponse = 20; } client cluster Thermostat = 513 { @@ -3677,9 +3677,9 @@ client cluster Thermostat = 513 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; - request struct GetWeeklyScheduleRequest { - DayOfWeek daysToReturn = 0; - ModeForSequence modeToReturn = 1; + request struct SetpointRaiseLowerRequest { + SetpointAdjustMode mode = 0; + INT8S amount = 1; } request struct SetWeeklyScheduleRequest { @@ -3689,9 +3689,16 @@ client cluster Thermostat = 513 { INT8U payload[] = 3; } - request struct SetpointRaiseLowerRequest { - SetpointAdjustMode mode = 0; - INT8S amount = 1; + request struct GetWeeklyScheduleRequest { + DayOfWeek daysToReturn = 0; + ModeForSequence modeToReturn = 1; + } + + response struct GetWeeklyScheduleResponse { + ENUM8 numberOfTransitionsForSequence = 0; + DayOfWeek dayOfWeekForSequence = 1; + ModeForSequence modeForSequence = 2; + INT8U payload[] = 3; } response struct GetRelayStatusLogResponse { @@ -3703,18 +3710,11 @@ client cluster Thermostat = 513 { INT16U unreadEntries = 5; } - response struct GetWeeklyScheduleResponse { - ENUM8 numberOfTransitionsForSequence = 0; - DayOfWeek dayOfWeekForSequence = 1; - ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; - } - + command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; + command SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; + command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; command ClearWeeklySchedule(): DefaultSuccess = 3; command GetRelayStatusLog(): GetRelayStatusLogResponse = 4; - command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; - command SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; - command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; } client cluster ThermostatUserInterfaceConfiguration = 516 { @@ -4081,13 +4081,17 @@ client cluster WindowCovering = 258 { readonly global attribute bitmap32 featureMap = 65532; readonly global attribute int16u clusterRevision = 65533; + request struct GoToLiftValueRequest { + INT16U liftValue = 0; + } + request struct GoToLiftPercentageRequest { Percent liftPercentageValue = 0; Percent100ths liftPercent100thsValue = 1; } - request struct GoToLiftValueRequest { - INT16U liftValue = 0; + request struct GoToTiltValueRequest { + INT16U tiltValue = 0; } request struct GoToTiltPercentageRequest { @@ -4095,17 +4099,13 @@ client cluster WindowCovering = 258 { Percent100ths tiltPercent100thsValue = 1; } - request struct GoToTiltValueRequest { - INT16U tiltValue = 0; - } - + command UpOrOpen(): DefaultSuccess = 0; command DownOrClose(): DefaultSuccess = 1; - command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; + command StopMotion(): DefaultSuccess = 2; command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4; - command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; + command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5; command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7; - command StopMotion(): DefaultSuccess = 2; - command UpOrOpen(): DefaultSuccess = 0; + command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8; } diff --git a/third_party/zap/repo b/third_party/zap/repo index a1ddd5d56c4bd9..9c885cf9391fc0 160000 --- a/third_party/zap/repo +++ b/third_party/zap/repo @@ -1 +1 @@ -Subproject commit a1ddd5d56c4bd9b7ba52c63f13665d96a11134ce +Subproject commit 9c885cf9391fc09b450e5e8a8e40e381c4bee27d diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index ebcde4200d18d0..4ef1c41c39da80 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,94 +154,93 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ColorLoopSet::Id: { - Commands::ColorLoopSet::DecodableType commandData; + case Commands::MoveToHue::Id: { + Commands::MoveToHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterColorLoopSetCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveHue::Id: { - Commands::EnhancedMoveHue::DecodableType commandData; + case Commands::MoveHue::Id: { + Commands::MoveHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedMoveHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveToHue::Id: { - Commands::EnhancedMoveToHue::DecodableType commandData; + case Commands::StepHue::Id: { + Commands::StepHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedMoveToHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveToHueAndSaturation::Id: { - Commands::EnhancedMoveToHueAndSaturation::DecodableType commandData; + case Commands::MoveToSaturation::Id: { + Commands::MoveToSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedStepHue::Id: { - Commands::EnhancedStepHue::DecodableType commandData; + case Commands::MoveSaturation::Id: { + Commands::MoveSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedStepHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveColor::Id: { - Commands::MoveColor::DecodableType commandData; + case Commands::StepSaturation::Id: { + Commands::StepSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveColorTemperature::Id: { - Commands::MoveColorTemperature::DecodableType commandData; + case Commands::MoveToHueAndSaturation::Id: { + Commands::MoveToHueAndSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveHue::Id: { - Commands::MoveHue::DecodableType commandData; + case Commands::MoveToColor::Id: { + Commands::MoveToColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveSaturation::Id: { - Commands::MoveSaturation::DecodableType commandData; + case Commands::MoveColor::Id: { + Commands::MoveColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToColor::Id: { - Commands::MoveToColor::DecodableType commandData; + case Commands::StepColor::Id: { + Commands::StepColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepColorCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -254,75 +253,76 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::MoveToHue::Id: { - Commands::MoveToHue::DecodableType commandData; + case Commands::EnhancedMoveToHue::Id: { + Commands::EnhancedMoveToHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedMoveToHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToHueAndSaturation::Id: { - Commands::MoveToHueAndSaturation::DecodableType commandData; + case Commands::EnhancedMoveHue::Id: { + Commands::EnhancedMoveHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedMoveHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToSaturation::Id: { - Commands::MoveToSaturation::DecodableType commandData; + case Commands::EnhancedStepHue::Id: { + Commands::EnhancedStepHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedStepHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepColor::Id: { - Commands::StepColor::DecodableType commandData; + case Commands::EnhancedMoveToHueAndSaturation::Id: { + Commands::EnhancedMoveToHueAndSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepColorTemperature::Id: { - Commands::StepColorTemperature::DecodableType commandData; + case Commands::ColorLoopSet::Id: { + Commands::ColorLoopSet::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterColorLoopSetCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepHue::Id: { - Commands::StepHue::DecodableType commandData; + case Commands::StopMoveStep::Id: { + Commands::StopMoveStep::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepSaturation::Id: { - Commands::StepSaturation::DecodableType commandData; + case Commands::MoveColorTemperature::Id: { + Commands::MoveColorTemperature::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StopMoveStep::Id: { - Commands::StopMoveStep::DecodableType commandData; + case Commands::StepColorTemperature::Id: { + Commands::StepColorTemperature::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStopMoveStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -391,30 +391,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ClearCredential::Id: { - Commands::ClearCredential::DecodableType commandData; + case Commands::LockDoor::Id: { + Commands::LockDoor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearCredentialCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterLockDoorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearUser::Id: { - Commands::ClearUser::DecodableType commandData; + case Commands::UnlockDoor::Id: { + Commands::UnlockDoor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearUserCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetCredentialStatus::Id: { - Commands::GetCredentialStatus::DecodableType commandData; + case Commands::SetUser::Id: { + Commands::SetUser::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetCredentialStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetUserCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -427,12 +427,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::LockDoor::Id: { - Commands::LockDoor::DecodableType commandData; + case Commands::ClearUser::Id: { + Commands::ClearUser::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterLockDoorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearUserCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -445,21 +445,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetUser::Id: { - Commands::SetUser::DecodableType commandData; + case Commands::GetCredentialStatus::Id: { + Commands::GetCredentialStatus::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetUserCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetCredentialStatusCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UnlockDoor::Id: { - Commands::UnlockDoor::DecodableType commandData; + case Commands::ClearCredential::Id: { + Commands::ClearCredential::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearCredentialCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -537,22 +537,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -584,21 +584,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::KeySetRead::Id: { - Commands::KeySetRead::DecodableType commandData; + case Commands::KeySetWrite::Id: { + Commands::KeySetWrite::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::KeySetReadAllIndices::Id: { - Commands::KeySetReadAllIndices::DecodableType commandData; + case Commands::KeySetRead::Id: { + Commands::KeySetRead::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -611,12 +611,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::KeySetWrite::Id: { - Commands::KeySetWrite::DecodableType commandData; + case Commands::KeySetReadAllIndices::Id: { + Commands::KeySetReadAllIndices::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -657,12 +657,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -675,30 +675,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -822,6 +822,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::Move::Id: { Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -831,39 +840,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -876,17 +885,8 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::StopWithOnOff::Id: { - Commands::StopWithOnOff::DecodableType commandData; + case Commands::StopWithOnOff::Id: { + Commands::StopWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { @@ -996,13 +996,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1016,12 +1015,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1034,21 +1034,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1127,48 +1127,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::OffWithEffect::Id: { - Commands::OffWithEffect::DecodableType commandData; + case Commands::On::Id: { + Commands::On::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::On::Id: { - Commands::On::DecodableType commandData; + case Commands::Toggle::Id: { + Commands::Toggle::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithRecallGlobalScene::Id: { - Commands::OnWithRecallGlobalScene::DecodableType commandData; + case Commands::OffWithEffect::Id: { + Commands::OffWithEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithTimedOff::Id: { - Commands::OnWithTimedOff::DecodableType commandData; + case Commands::OnWithRecallGlobalScene::Id: { + Commands::OnWithRecallGlobalScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Toggle::Id: { - Commands::Toggle::DecodableType commandData; + case Commands::OnWithTimedOff::Id: { + Commands::OnWithTimedOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1200,88 +1200,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -1322,21 +1322,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1349,30 +1349,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1441,21 +1441,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::SimpleStructEchoRequest::Id: { - Commands::SimpleStructEchoRequest::DecodableType commandData; + case Commands::Test::Id: { + Commands::Test::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterSimpleStructEchoRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Test::Id: { - Commands::Test::DecodableType commandData; + case Commands::TestNotHandled::Id: { + Commands::TestNotHandled::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestNotHandledCallback(apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::TestSpecific::Id: { + Commands::TestSpecific::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfTestClusterClusterTestSpecificCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1468,31 +1477,32 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::TestEmitTestEventRequest::Id: { - Commands::TestEmitTestEventRequest::DecodableType commandData; + case Commands::TestStructArgumentRequest::Id: { + Commands::TestStructArgumentRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestEmitTestEventRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestEmitTestFabricScopedEventRequest::Id: { - Commands::TestEmitTestFabricScopedEventRequest::DecodableType commandData; + case Commands::TestNestedStructArgumentRequest::Id: { + Commands::TestNestedStructArgumentRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfTestClusterClusterTestEmitTestFabricScopedEventRequestCallback(apCommandObj, aCommandPath, commandData); + emberAfTestClusterClusterTestNestedStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestEnumsRequest::Id: { - Commands::TestEnumsRequest::DecodableType commandData; + case Commands::TestListStructArgumentRequest::Id: { + Commands::TestListStructArgumentRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestEnumsRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfTestClusterClusterTestListStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1505,12 +1515,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::TestListInt8UReverseRequest::Id: { - Commands::TestListInt8UReverseRequest::DecodableType commandData; + case Commands::TestNestedStructListArgumentRequest::Id: { + Commands::TestNestedStructListArgumentRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestListInt8UReverseRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfTestClusterClusterTestNestedStructListArgumentRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1524,51 +1535,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::TestListStructArgumentRequest::Id: { - Commands::TestListStructArgumentRequest::DecodableType commandData; + case Commands::TestListInt8UReverseRequest::Id: { + Commands::TestListInt8UReverseRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfTestClusterClusterTestListStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestListInt8UReverseRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestNestedStructArgumentRequest::Id: { - Commands::TestNestedStructArgumentRequest::DecodableType commandData; + case Commands::TestEnumsRequest::Id: { + Commands::TestEnumsRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfTestClusterClusterTestNestedStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestEnumsRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestNestedStructListArgumentRequest::Id: { - Commands::TestNestedStructListArgumentRequest::DecodableType commandData; + case Commands::TestNullableOptionalRequest::Id: { + Commands::TestNullableOptionalRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfTestClusterClusterTestNestedStructListArgumentRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestNullableOptionalRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestNotHandled::Id: { - Commands::TestNotHandled::DecodableType commandData; + case Commands::SimpleStructEchoRequest::Id: { + Commands::SimpleStructEchoRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestNotHandledCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterSimpleStructEchoRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TestNullableOptionalRequest::Id: { - Commands::TestNullableOptionalRequest::DecodableType commandData; + case Commands::TimedInvokeRequest::Id: { + Commands::TimedInvokeRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestNullableOptionalRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTimedInvokeRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1582,30 +1590,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::TestSpecific::Id: { - Commands::TestSpecific::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfTestClusterClusterTestSpecificCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::TestStructArgumentRequest::Id: { - Commands::TestStructArgumentRequest::DecodableType commandData; + case Commands::TestEmitTestEventRequest::Id: { + Commands::TestEmitTestEventRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTestStructArgumentRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTestClusterClusterTestEmitTestEventRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::TimedInvokeRequest::Id: { - Commands::TimedInvokeRequest::DecodableType commandData; + case Commands::TestEmitTestFabricScopedEventRequest::Id: { + Commands::TestEmitTestFabricScopedEventRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTestClusterClusterTimedInvokeRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfTestClusterClusterTestEmitTestFabricScopedEventRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1711,6 +1711,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::UpOrOpen::Id: { + Commands::UpOrOpen::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::DownOrClose::Id: { Commands::DownOrClose::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -1720,12 +1729,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToLiftPercentage::Id: { - Commands::GoToLiftPercentage::DecodableType commandData; + case Commands::StopMotion::Id: { + Commands::StopMotion::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1738,12 +1747,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToTiltPercentage::Id: { - Commands::GoToTiltPercentage::DecodableType commandData; + case Commands::GoToLiftPercentage::Id: { + Commands::GoToLiftPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1756,21 +1765,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::StopMotion::Id: { - Commands::StopMotion::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::UpOrOpen::Id: { - Commands::UpOrOpen::DecodableType commandData; + case Commands::GoToTiltPercentage::Id: { + Commands::GoToTiltPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index fe9b4ae81a0b16..0cb772bd587909 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -153,32 +153,32 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ - 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ - 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ 27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ + 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ + 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp index 2b40a3fde96c5b..10d76b6fc10dd3 100644 --- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,22 +154,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -201,66 +201,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -301,13 +301,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -321,12 +320,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -339,21 +339,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -440,88 +440,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/door-lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/door-lock-app/zap-generated/IMClusterCommandHandler.cpp index ec65341dc4eb5f..81d47b6767b72e 100644 --- a/zzz_generated/door-lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/door-lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -145,129 +145,129 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ClearCredential::Id: { - Commands::ClearCredential::DecodableType commandData; + case Commands::LockDoor::Id: { + Commands::LockDoor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearCredentialCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterLockDoorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearUser::Id: { - Commands::ClearUser::DecodableType commandData; + case Commands::UnlockDoor::Id: { + Commands::UnlockDoor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearUserCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearWeekDaySchedule::Id: { - Commands::ClearWeekDaySchedule::DecodableType commandData; + case Commands::SetWeekDaySchedule::Id: { + Commands::SetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearYearDaySchedule::Id: { - Commands::ClearYearDaySchedule::DecodableType commandData; + case Commands::GetWeekDaySchedule::Id: { + Commands::GetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetCredentialStatus::Id: { - Commands::GetCredentialStatus::DecodableType commandData; + case Commands::ClearWeekDaySchedule::Id: { + Commands::ClearWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetCredentialStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetUser::Id: { - Commands::GetUser::DecodableType commandData; + case Commands::SetYearDaySchedule::Id: { + Commands::SetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetUserCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetWeekDaySchedule::Id: { - Commands::GetWeekDaySchedule::DecodableType commandData; + case Commands::GetYearDaySchedule::Id: { + Commands::GetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetYearDaySchedule::Id: { - Commands::GetYearDaySchedule::DecodableType commandData; + case Commands::ClearYearDaySchedule::Id: { + Commands::ClearYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::LockDoor::Id: { - Commands::LockDoor::DecodableType commandData; + case Commands::SetUser::Id: { + Commands::SetUser::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterLockDoorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetUserCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetCredential::Id: { - Commands::SetCredential::DecodableType commandData; + case Commands::GetUser::Id: { + Commands::GetUser::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetCredentialCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetUserCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetUser::Id: { - Commands::SetUser::DecodableType commandData; + case Commands::ClearUser::Id: { + Commands::ClearUser::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetUserCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearUserCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetWeekDaySchedule::Id: { - Commands::SetWeekDaySchedule::DecodableType commandData; + case Commands::SetCredential::Id: { + Commands::SetCredential::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetCredentialCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetYearDaySchedule::Id: { - Commands::SetYearDaySchedule::DecodableType commandData; + case Commands::GetCredentialStatus::Id: { + Commands::GetCredentialStatus::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetCredentialStatusCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UnlockDoor::Id: { - Commands::UnlockDoor::DecodableType commandData; + case Commands::ClearCredential::Id: { + Commands::ClearCredential::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearCredentialCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -308,22 +308,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -355,13 +355,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -375,12 +374,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -393,21 +393,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -439,88 +439,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/door-lock-app/zap-generated/access.h b/zzz_generated/door-lock-app/zap-generated/access.h index d0873017c0cb20..da516c3943bdc8 100644 --- a/zzz_generated/door-lock-app/zap-generated/access.h +++ b/zzz_generated/door-lock-app/zap-generated/access.h @@ -123,50 +123,50 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ - 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ - 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ + 11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ + 12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ 13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ + 14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + 15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ 16, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ 27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ + 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp index b7c7ad946b2028..795401ad195231 100644 --- a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -191,22 +191,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -238,21 +238,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::KeySetRead::Id: { - Commands::KeySetRead::DecodableType commandData; + case Commands::KeySetWrite::Id: { + Commands::KeySetWrite::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::KeySetReadAllIndices::Id: { - Commands::KeySetReadAllIndices::DecodableType commandData; + case Commands::KeySetRead::Id: { + Commands::KeySetRead::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -265,12 +265,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::KeySetWrite::Id: { - Commands::KeySetWrite::DecodableType commandData; + case Commands::KeySetReadAllIndices::Id: { + Commands::KeySetReadAllIndices::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -311,12 +311,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -329,30 +329,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -439,13 +439,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -459,12 +458,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -477,21 +477,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -561,88 +561,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp index 0098a676aff474..616fa6db37d561 100644 --- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -108,94 +108,93 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ColorLoopSet::Id: { - Commands::ColorLoopSet::DecodableType commandData; + case Commands::MoveToHue::Id: { + Commands::MoveToHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterColorLoopSetCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveHue::Id: { - Commands::EnhancedMoveHue::DecodableType commandData; + case Commands::MoveHue::Id: { + Commands::MoveHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedMoveHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveToHue::Id: { - Commands::EnhancedMoveToHue::DecodableType commandData; + case Commands::StepHue::Id: { + Commands::StepHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedMoveToHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedMoveToHueAndSaturation::Id: { - Commands::EnhancedMoveToHueAndSaturation::DecodableType commandData; + case Commands::MoveToSaturation::Id: { + Commands::MoveToSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::EnhancedStepHue::Id: { - Commands::EnhancedStepHue::DecodableType commandData; + case Commands::MoveSaturation::Id: { + Commands::MoveSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterEnhancedStepHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveColor::Id: { - Commands::MoveColor::DecodableType commandData; + case Commands::StepSaturation::Id: { + Commands::StepSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveColorTemperature::Id: { - Commands::MoveColorTemperature::DecodableType commandData; + case Commands::MoveToHueAndSaturation::Id: { + Commands::MoveToHueAndSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveHue::Id: { - Commands::MoveHue::DecodableType commandData; + case Commands::MoveToColor::Id: { + Commands::MoveToColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveSaturation::Id: { - Commands::MoveSaturation::DecodableType commandData; + case Commands::MoveColor::Id: { + Commands::MoveColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToColor::Id: { - Commands::MoveToColor::DecodableType commandData; + case Commands::StepColor::Id: { + Commands::StepColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepColorCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -208,75 +207,76 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::MoveToHue::Id: { - Commands::MoveToHue::DecodableType commandData; + case Commands::EnhancedMoveToHue::Id: { + Commands::EnhancedMoveToHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedMoveToHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToHueAndSaturation::Id: { - Commands::MoveToHueAndSaturation::DecodableType commandData; + case Commands::EnhancedMoveHue::Id: { + Commands::EnhancedMoveHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedMoveHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToSaturation::Id: { - Commands::MoveToSaturation::DecodableType commandData; + case Commands::EnhancedStepHue::Id: { + Commands::EnhancedStepHue::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterEnhancedStepHueCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepColor::Id: { - Commands::StepColor::DecodableType commandData; + case Commands::EnhancedMoveToHueAndSaturation::Id: { + Commands::EnhancedMoveToHueAndSaturation::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepColorTemperature::Id: { - Commands::StepColorTemperature::DecodableType commandData; + case Commands::ColorLoopSet::Id: { + Commands::ColorLoopSet::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterColorLoopSetCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepHue::Id: { - Commands::StepHue::DecodableType commandData; + case Commands::StopMoveStep::Id: { + Commands::StopMoveStep::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepHueCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepSaturation::Id: { - Commands::StepSaturation::DecodableType commandData; + case Commands::MoveColorTemperature::Id: { + Commands::MoveColorTemperature::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStepSaturationCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StopMoveStep::Id: { - Commands::StopMoveStep::DecodableType commandData; + case Commands::StepColorTemperature::Id: { + Commands::StepColorTemperature::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterStopMoveStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -391,22 +391,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -438,21 +438,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::KeySetRead::Id: { - Commands::KeySetRead::DecodableType commandData; + case Commands::KeySetWrite::Id: { + Commands::KeySetWrite::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::KeySetReadAllIndices::Id: { - Commands::KeySetReadAllIndices::DecodableType commandData; + case Commands::KeySetRead::Id: { + Commands::KeySetRead::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -465,12 +465,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::KeySetWrite::Id: { - Commands::KeySetWrite::DecodableType commandData; + case Commands::KeySetReadAllIndices::Id: { + Commands::KeySetReadAllIndices::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -511,12 +511,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -529,30 +529,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -639,66 +639,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -739,13 +739,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -759,12 +758,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -777,21 +777,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -870,48 +870,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::OffWithEffect::Id: { - Commands::OffWithEffect::DecodableType commandData; + case Commands::On::Id: { + Commands::On::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::On::Id: { - Commands::On::DecodableType commandData; + case Commands::Toggle::Id: { + Commands::Toggle::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithRecallGlobalScene::Id: { - Commands::OnWithRecallGlobalScene::DecodableType commandData; + case Commands::OffWithEffect::Id: { + Commands::OffWithEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithTimedOff::Id: { - Commands::OnWithTimedOff::DecodableType commandData; + case Commands::OnWithRecallGlobalScene::Id: { + Commands::OnWithRecallGlobalScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Toggle::Id: { - Commands::Toggle::DecodableType commandData; + case Commands::OnWithTimedOff::Id: { + Commands::OnWithTimedOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -943,88 +943,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp index 6532e779bd69db..20f92d15ad95e0 100644 --- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -191,22 +191,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -238,13 +238,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -258,12 +257,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -276,21 +276,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -415,88 +415,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/log-source-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/log-source-app/zap-generated/IMClusterCommandHandler.cpp index adc0d189f813cd..46d11e98f9b497 100644 --- a/zzz_generated/log-source-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/log-source-app/zap-generated/IMClusterCommandHandler.cpp @@ -96,22 +96,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -143,13 +143,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -163,12 +162,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -181,21 +181,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -227,51 +227,50 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -284,12 +283,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp index a9f3f0710930c5..07c9453f0d7902 100644 --- a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp @@ -59,22 +59,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -106,13 +106,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -126,12 +125,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -144,21 +144,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -190,6 +190,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::QueryImage::Id: { + Commands::QueryImage::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::ApplyUpdateRequest::Id: { Commands::ApplyUpdateRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -210,15 +219,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::QueryImage::Id: { - Commands::QueryImage::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -247,51 +247,50 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -304,12 +303,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp index 703ed41c2ebd8d..947ef71a8200f2 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -117,22 +117,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -164,13 +164,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -184,12 +183,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -202,21 +202,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -286,88 +286,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp index ed53683dba764c..3187381f6a8126 100644 --- a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp @@ -50,21 +50,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::MoveColor::Id: { - Commands::MoveColor::DecodableType commandData; + case Commands::MoveToColor::Id: { + Commands::MoveToColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToColor::Id: { - Commands::MoveToColor::DecodableType commandData; + case Commands::MoveColor::Id: { + Commands::MoveColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -160,22 +160,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -216,12 +216,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -234,30 +234,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -372,66 +372,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -509,13 +509,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -529,12 +528,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -547,21 +547,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -602,48 +602,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::OffWithEffect::Id: { - Commands::OffWithEffect::DecodableType commandData; + case Commands::On::Id: { + Commands::On::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::On::Id: { - Commands::On::DecodableType commandData; + case Commands::Toggle::Id: { + Commands::Toggle::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithRecallGlobalScene::Id: { - Commands::OnWithRecallGlobalScene::DecodableType commandData; + case Commands::OffWithEffect::Id: { + Commands::OffWithEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithTimedOff::Id: { - Commands::OnWithTimedOff::DecodableType commandData; + case Commands::OnWithRecallGlobalScene::Id: { + Commands::OnWithRecallGlobalScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Toggle::Id: { - Commands::Toggle::DecodableType commandData; + case Commands::OnWithTimedOff::Id: { + Commands::OnWithTimedOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -675,88 +675,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -797,21 +797,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -824,30 +824,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -916,6 +916,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::UpOrOpen::Id: { + Commands::UpOrOpen::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::DownOrClose::Id: { Commands::DownOrClose::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -925,12 +934,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToLiftPercentage::Id: { - Commands::GoToLiftPercentage::DecodableType commandData; + case Commands::StopMotion::Id: { + Commands::StopMotion::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -943,12 +952,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToTiltPercentage::Id: { - Commands::GoToTiltPercentage::DecodableType commandData; + case Commands::GoToLiftPercentage::Id: { + Commands::GoToLiftPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -961,21 +970,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::StopMotion::Id: { - Commands::StopMotion::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::UpOrOpen::Id: { - Commands::UpOrOpen::DecodableType commandData; + case Commands::GoToTiltPercentage::Id: { + Commands::GoToTiltPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp index ed53683dba764c..3187381f6a8126 100644 --- a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp @@ -50,21 +50,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::MoveColor::Id: { - Commands::MoveColor::DecodableType commandData; + case Commands::MoveToColor::Id: { + Commands::MoveToColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToColor::Id: { - Commands::MoveToColor::DecodableType commandData; + case Commands::MoveColor::Id: { + Commands::MoveColor::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfColorControlClusterMoveToColorCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfColorControlClusterMoveColorCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -160,22 +160,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -216,12 +216,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -234,30 +234,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -372,66 +372,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -509,13 +509,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -529,12 +528,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -547,21 +547,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -602,48 +602,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::OffWithEffect::Id: { - Commands::OffWithEffect::DecodableType commandData; + case Commands::On::Id: { + Commands::On::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::On::Id: { - Commands::On::DecodableType commandData; + case Commands::Toggle::Id: { + Commands::Toggle::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithRecallGlobalScene::Id: { - Commands::OnWithRecallGlobalScene::DecodableType commandData; + case Commands::OffWithEffect::Id: { + Commands::OffWithEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithTimedOff::Id: { - Commands::OnWithTimedOff::DecodableType commandData; + case Commands::OnWithRecallGlobalScene::Id: { + Commands::OnWithRecallGlobalScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Toggle::Id: { - Commands::Toggle::DecodableType commandData; + case Commands::OnWithTimedOff::Id: { + Commands::OnWithTimedOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -675,88 +675,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -797,21 +797,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -824,30 +824,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -916,6 +916,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::UpOrOpen::Id: { + Commands::UpOrOpen::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::DownOrClose::Id: { Commands::DownOrClose::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -925,12 +934,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToLiftPercentage::Id: { - Commands::GoToLiftPercentage::DecodableType commandData; + case Commands::StopMotion::Id: { + Commands::StopMotion::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -943,12 +952,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToTiltPercentage::Id: { - Commands::GoToTiltPercentage::DecodableType commandData; + case Commands::GoToLiftPercentage::Id: { + Commands::GoToLiftPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -961,21 +970,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::StopMotion::Id: { - Commands::StopMotion::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::UpOrOpen::Id: { - Commands::UpOrOpen::DecodableType commandData; + case Commands::GoToTiltPercentage::Id: { + Commands::GoToTiltPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp index ac07c28bad8de1..39501ee8827bc2 100644 --- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,22 +154,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -201,21 +201,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::KeySetRead::Id: { - Commands::KeySetRead::DecodableType commandData; + case Commands::KeySetWrite::Id: { + Commands::KeySetWrite::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::KeySetReadAllIndices::Id: { - Commands::KeySetReadAllIndices::DecodableType commandData; + case Commands::KeySetRead::Id: { + Commands::KeySetRead::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -228,12 +228,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::KeySetWrite::Id: { - Commands::KeySetWrite::DecodableType commandData; + case Commands::KeySetReadAllIndices::Id: { + Commands::KeySetReadAllIndices::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -274,12 +274,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -292,30 +292,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -402,66 +402,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -502,13 +502,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -522,12 +521,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -540,21 +540,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -633,48 +633,48 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::OffWithEffect::Id: { - Commands::OffWithEffect::DecodableType commandData; + case Commands::On::Id: { + Commands::On::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::On::Id: { - Commands::On::DecodableType commandData; + case Commands::Toggle::Id: { + Commands::Toggle::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithRecallGlobalScene::Id: { - Commands::OnWithRecallGlobalScene::DecodableType commandData; + case Commands::OffWithEffect::Id: { + Commands::OffWithEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOffWithEffectCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::OnWithTimedOff::Id: { - Commands::OnWithTimedOff::DecodableType commandData; + case Commands::OnWithRecallGlobalScene::Id: { + Commands::OnWithRecallGlobalScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithRecallGlobalSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Toggle::Id: { - Commands::Toggle::DecodableType commandData; + case Commands::OnWithTimedOff::Id: { + Commands::OnWithTimedOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOnOffClusterToggleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOnOffClusterOnWithTimedOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -706,88 +706,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -828,21 +828,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -855,30 +855,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp index 0ec60468e7dafa..82dce5bce34992 100644 --- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,22 +154,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -201,21 +201,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::KeySetRead::Id: { - Commands::KeySetRead::DecodableType commandData; + case Commands::KeySetWrite::Id: { + Commands::KeySetWrite::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::KeySetReadAllIndices::Id: { - Commands::KeySetReadAllIndices::DecodableType commandData; + case Commands::KeySetRead::Id: { + Commands::KeySetRead::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -228,12 +228,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::KeySetWrite::Id: { - Commands::KeySetWrite::DecodableType commandData; + case Commands::KeySetReadAllIndices::Id: { + Commands::KeySetReadAllIndices::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupKeyManagementClusterKeySetWriteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupKeyManagementClusterKeySetReadAllIndicesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -274,12 +274,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -292,30 +292,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -402,13 +402,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -422,12 +421,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -440,21 +440,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -524,88 +524,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp index e8bc1ca06a36b5..ce1245902a327f 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,22 +154,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -201,22 +201,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateWiFiNetwork::Id: { - Commands::AddOrUpdateWiFiNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateWiFiNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateWiFiNetwork::Id: { + Commands::AddOrUpdateWiFiNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateWiFiNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -229,21 +229,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -275,88 +275,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp index 2430d91869ab5d..8046d4c147ff23 100644 --- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -154,22 +154,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -210,12 +210,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -228,30 +228,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -329,13 +329,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -349,12 +348,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -367,21 +367,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -413,6 +413,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::QueryImage::Id: { + Commands::QueryImage::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::ApplyUpdateRequest::Id: { Commands::ApplyUpdateRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -433,15 +442,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::QueryImage::Id: { - Commands::QueryImage::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -470,88 +470,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -592,21 +592,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -619,30 +619,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -674,21 +674,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ClearWeeklySchedule::Id: { - Commands::ClearWeeklySchedule::DecodableType commandData; + case Commands::SetpointRaiseLower::Id: { + Commands::SetpointRaiseLower::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfThermostatClusterClearWeeklyScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfThermostatClusterSetpointRaiseLowerCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetRelayStatusLog::Id: { - Commands::GetRelayStatusLog::DecodableType commandData; + case Commands::SetWeeklySchedule::Id: { + Commands::SetWeeklySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfThermostatClusterGetRelayStatusLogCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfThermostatClusterSetWeeklyScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -701,21 +701,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetWeeklySchedule::Id: { - Commands::SetWeeklySchedule::DecodableType commandData; + case Commands::ClearWeeklySchedule::Id: { + Commands::ClearWeeklySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfThermostatClusterSetWeeklyScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfThermostatClusterClearWeeklyScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetpointRaiseLower::Id: { - Commands::SetpointRaiseLower::DecodableType commandData; + case Commands::GetRelayStatusLog::Id: { + Commands::GetRelayStatusLog::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfThermostatClusterSetpointRaiseLowerCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfThermostatClusterGetRelayStatusLogCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp index d840c181baa6d9..2f0684a20266b2 100644 --- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp @@ -105,23 +105,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -163,15 +163,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::HideApp::Id: { - Commands::HideApp::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfApplicationLauncherClusterHideAppCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::LaunchApp::Id: { Commands::LaunchApp::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -190,6 +181,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } + case Commands::HideApp::Id: { + Commands::HideApp::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfApplicationLauncherClusterHideAppCallback(apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -218,21 +218,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::RenameOutput::Id: { - Commands::RenameOutput::DecodableType commandData; + case Commands::SelectOutput::Id: { + Commands::SelectOutput::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAudioOutputClusterRenameOutputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAudioOutputClusterSelectOutputCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SelectOutput::Id: { - Commands::SelectOutput::DecodableType commandData; + case Commands::RenameOutput::Id: { + Commands::RenameOutput::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAudioOutputClusterSelectOutputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAudioOutputClusterRenameOutputCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -411,22 +411,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -495,66 +495,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -632,39 +632,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::HideInputStatus::Id: { - Commands::HideInputStatus::DecodableType commandData; + case Commands::SelectInput::Id: { + Commands::SelectInput::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterHideInputStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterSelectInputCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RenameInput::Id: { - Commands::RenameInput::DecodableType commandData; + case Commands::ShowInputStatus::Id: { + Commands::ShowInputStatus::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterRenameInputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterShowInputStatusCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SelectInput::Id: { - Commands::SelectInput::DecodableType commandData; + case Commands::HideInputStatus::Id: { + Commands::HideInputStatus::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterSelectInputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterHideInputStatusCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ShowInputStatus::Id: { - Commands::ShowInputStatus::DecodableType commandData; + case Commands::RenameInput::Id: { + Commands::RenameInput::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterShowInputStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterRenameInputCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -696,39 +696,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::FastForward::Id: { - Commands::FastForward::DecodableType commandData; + case Commands::Play::Id: { + Commands::Play::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterFastForwardCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterPlayCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Next::Id: { - Commands::Next::DecodableType commandData; + case Commands::Pause::Id: { + Commands::Pause::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterNextCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterPauseCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Pause::Id: { - Commands::Pause::DecodableType commandData; + case Commands::StopPlayback::Id: { + Commands::StopPlayback::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterPauseCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterStopPlaybackCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Play::Id: { - Commands::Play::DecodableType commandData; + case Commands::StartOver::Id: { + Commands::StartOver::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterPlayCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterStartOverCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -741,30 +741,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::Rewind::Id: { - Commands::Rewind::DecodableType commandData; + case Commands::Next::Id: { + Commands::Next::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterRewindCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterNextCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Seek::Id: { - Commands::Seek::DecodableType commandData; + case Commands::Rewind::Id: { + Commands::Rewind::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterSeekCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterRewindCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SkipBackward::Id: { - Commands::SkipBackward::DecodableType commandData; + case Commands::FastForward::Id: { + Commands::FastForward::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterSkipBackwardCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterFastForwardCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -777,21 +777,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::StartOver::Id: { - Commands::StartOver::DecodableType commandData; + case Commands::SkipBackward::Id: { + Commands::SkipBackward::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterStartOverCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterSkipBackwardCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StopPlayback::Id: { - Commands::StopPlayback::DecodableType commandData; + case Commands::Seek::Id: { + Commands::Seek::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterStopPlaybackCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterSeekCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -823,13 +823,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -843,12 +842,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -861,21 +861,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -907,6 +907,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::QueryImage::Id: { + Commands::QueryImage::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::ApplyUpdateRequest::Id: { Commands::ApplyUpdateRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -927,15 +936,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::QueryImage::Id: { - Commands::QueryImage::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -1019,88 +1019,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index baa70ae59c8add..da463b537e2799 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -200,22 +200,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -256,12 +256,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::AddGroupIfIdentifying::Id: { - Commands::AddGroupIfIdentifying::DecodableType commandData; + case Commands::ViewGroup::Id: { + Commands::ViewGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -274,30 +274,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveAllGroups::Id: { - Commands::RemoveAllGroups::DecodableType commandData; + case Commands::RemoveGroup::Id: { + Commands::RemoveGroup::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveGroup::Id: { - Commands::RemoveGroup::DecodableType commandData; + case Commands::RemoveAllGroups::Id: { + Commands::RemoveAllGroups::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterRemoveGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewGroup::Id: { - Commands::ViewGroup::DecodableType commandData; + case Commands::AddGroupIfIdentifying::Id: { + Commands::AddGroupIfIdentifying::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGroupsClusterViewGroupCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -412,66 +412,66 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::Move::Id: { - Commands::Move::DecodableType commandData; + case Commands::MoveToLevel::Id: { + Commands::MoveToLevel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevel::Id: { - Commands::MoveToLevel::DecodableType commandData; + case Commands::Move::Id: { + Commands::Move::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveToLevelWithOnOff::Id: { - Commands::MoveToLevelWithOnOff::DecodableType commandData; + case Commands::Step::Id: { + Commands::Step::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MoveWithOnOff::Id: { - Commands::MoveWithOnOff::DecodableType commandData; + case Commands::Stop::Id: { + Commands::Stop::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Step::Id: { - Commands::Step::DecodableType commandData; + case Commands::MoveToLevelWithOnOff::Id: { + Commands::MoveToLevelWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StepWithOnOff::Id: { - Commands::StepWithOnOff::DecodableType commandData; + case Commands::MoveWithOnOff::Id: { + Commands::MoveWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Stop::Id: { - Commands::Stop::DecodableType commandData; + case Commands::StepWithOnOff::Id: { + Commands::StepWithOnOff::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfLevelControlClusterStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -512,13 +512,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -532,12 +531,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -550,21 +550,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -596,6 +596,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::QueryImage::Id: { + Commands::QueryImage::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::ApplyUpdateRequest::Id: { Commands::ApplyUpdateRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -616,15 +625,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::QueryImage::Id: { - Commands::QueryImage::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); @@ -708,88 +708,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -830,21 +830,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetSceneMembership::Id: { - Commands::GetSceneMembership::DecodableType commandData; + case Commands::ViewScene::Id: { + Commands::ViewScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RecallScene::Id: { - Commands::RecallScene::DecodableType commandData; + case Commands::RemoveScene::Id: { + Commands::RemoveScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -857,30 +857,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::RemoveScene::Id: { - Commands::RemoveScene::DecodableType commandData; + case Commands::StoreScene::Id: { + Commands::StoreScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterRemoveSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StoreScene::Id: { - Commands::StoreScene::DecodableType commandData; + case Commands::RecallScene::Id: { + Commands::RecallScene::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterStoreSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterRecallSceneCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ViewScene::Id: { - Commands::ViewScene::DecodableType commandData; + case Commands::GetSceneMembership::Id: { + Commands::GetSceneMembership::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfScenesClusterViewSceneCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp index cc8701d28acbf0..2b158764ac9a10 100644 --- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp @@ -50,23 +50,23 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::OpenBasicCommissioningWindow::Id: { - Commands::OpenBasicCommissioningWindow::DecodableType commandData; + case Commands::OpenCommissioningWindow::Id: { + Commands::OpenCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( - apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, + commandData); } break; } - case Commands::OpenCommissioningWindow::Id: { - Commands::OpenCommissioningWindow::DecodableType commandData; + case Commands::OpenBasicCommissioningWindow::Id: { + Commands::OpenBasicCommissioningWindow::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + apCommandObj, aCommandPath, commandData); } break; } @@ -117,22 +117,22 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::CommissioningComplete::Id: { - Commands::CommissioningComplete::DecodableType commandData; + case Commands::SetRegulatoryConfig::Id: { + Commands::SetRegulatoryConfig::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRegulatoryConfig::Id: { - Commands::SetRegulatoryConfig::DecodableType commandData; + case Commands::CommissioningComplete::Id: { + Commands::CommissioningComplete::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -219,13 +219,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddOrUpdateThreadNetwork::Id: { - Commands::AddOrUpdateThreadNetwork::DecodableType commandData; + case Commands::ScanNetworks::Id: { + Commands::ScanNetworks::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -239,12 +238,13 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ConnectNetwork::Id: { - Commands::ConnectNetwork::DecodableType commandData; + case Commands::AddOrUpdateThreadNetwork::Id: { + Commands::AddOrUpdateThreadNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfNetworkCommissioningClusterAddOrUpdateThreadNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -257,21 +257,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ReorderNetwork::Id: { - Commands::ReorderNetwork::DecodableType commandData; + case Commands::ConnectNetwork::Id: { + Commands::ConnectNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterConnectNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ScanNetworks::Id: { - Commands::ScanNetworks::DecodableType commandData; + case Commands::ReorderNetwork::Id: { + Commands::ReorderNetwork::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfNetworkCommissioningClusterReorderNetworkCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -303,88 +303,88 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::AddNOC::Id: { - Commands::AddNOC::DecodableType commandData; + case Commands::AttestationRequest::Id: { + Commands::AttestationRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AddTrustedRootCertificate::Id: { - Commands::AddTrustedRootCertificate::DecodableType commandData; + case Commands::CertificateChainRequest::Id: { + Commands::CertificateChainRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { wasHandled = - emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); + emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::AttestationRequest::Id: { - Commands::AttestationRequest::DecodableType commandData; + case Commands::CSRRequest::Id: { + Commands::CSRRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterAttestationRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CSRRequest::Id: { - Commands::CSRRequest::DecodableType commandData; + case Commands::AddNOC::Id: { + Commands::AddNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterCSRRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterAddNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::CertificateChainRequest::Id: { - Commands::CertificateChainRequest::DecodableType commandData; + case Commands::UpdateNOC::Id: { + Commands::UpdateNOC::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfOperationalCredentialsClusterCertificateChainRequestCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveFabric::Id: { - Commands::RemoveFabric::DecodableType commandData; + case Commands::UpdateFabricLabel::Id: { + Commands::UpdateFabricLabel::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RemoveTrustedRootCertificate::Id: { - Commands::RemoveTrustedRootCertificate::DecodableType commandData; + case Commands::RemoveFabric::Id: { + Commands::RemoveFabric::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, - commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateFabricLabel::Id: { - Commands::UpdateFabricLabel::DecodableType commandData; + case Commands::AddTrustedRootCertificate::Id: { + Commands::AddTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = + emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::UpdateNOC::Id: { - Commands::UpdateNOC::DecodableType commandData; + case Commands::RemoveTrustedRootCertificate::Id: { + Commands::RemoveTrustedRootCertificate::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfOperationalCredentialsClusterUpdateNOCCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(apCommandObj, aCommandPath, + commandData); } break; } @@ -490,6 +490,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { + case Commands::UpOrOpen::Id: { + Commands::UpOrOpen::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) + { + wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + } + break; + } case Commands::DownOrClose::Id: { Commands::DownOrClose::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); @@ -499,12 +508,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToLiftPercentage::Id: { - Commands::GoToLiftPercentage::DecodableType commandData; + case Commands::StopMotion::Id: { + Commands::StopMotion::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -517,12 +526,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GoToTiltPercentage::Id: { - Commands::GoToTiltPercentage::DecodableType commandData; + case Commands::GoToLiftPercentage::Id: { + Commands::GoToLiftPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToLiftPercentageCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -535,21 +544,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::StopMotion::Id: { - Commands::StopMotion::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfWindowCoveringClusterStopMotionCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - case Commands::UpOrOpen::Id: { - Commands::UpOrOpen::DecodableType commandData; + case Commands::GoToTiltPercentage::Id: { + Commands::GoToTiltPercentage::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfWindowCoveringClusterGoToTiltPercentageCallback(apCommandObj, aCommandPath, commandData); } break; }