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 01/16] 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; } From 927e23771ab85502341d09646da477a9ce0ee5d7 Mon Sep 17 00:00:00 2001 From: Marc Lepage <67919234+mlepage-google@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:11:09 -0400 Subject: [PATCH 02/16] Add custom privileges for opcreds cluster (#16590) One attribute and most commands require administer privilege. (This cluster has no events.) Commissioning chip-all-clusters-app via chip-tool on Linux results in the following commands and their required privilege: GeneralCommissioning/ArmFailSafe --> 0x30 0x0 --> operate GeneralCommissioning/SetRegulatoryConfig --> 0x30 0x2 --> operate OperationalCredentials/CertificateChainRequest --> 0x3e 0x2 --> administer OperationalCredentials/CertificateChainRequest --> 0x3e 0x2 --> administer OperationalCredentials/AttestationRequest --> 0x3e 0x0 --> administer OperationalCredentials/CSRRequest --> 0x3e 0x4 --> administer OperationalCredentials/AddTrustedRootCertificate --> 0x3e 0xb --> administer OperationalCredentials/AddNOC --> 0x3e 0x6 --> administer GeneralCommissioning/CommissioningComplete --> 0x30 0x4 --> operate The last is satisfied over CASE (via the AddNOC installed ACL) and the others before it are satisfied by implicit administer privilege over PASE during commissioning. --- .../chip/operational-credentials-cluster.xml | 14 ++++++++- .../all-clusters-app/zap-generated/access.h | 30 +++++++++++++++++++ .../bridge-app/zap-generated/access.h | 30 +++++++++++++++++++ .../door-lock-app/zap-generated/access.h | 30 +++++++++++++++++++ .../light-switch-app/zap-generated/access.h | 30 +++++++++++++++++++ .../lighting-app/zap-generated/access.h | 30 +++++++++++++++++++ zzz_generated/lock-app/zap-generated/access.h | 30 +++++++++++++++++++ .../log-source-app/zap-generated/access.h | 21 +++++++++++++ .../ota-provider-app/zap-generated/access.h | 24 +++++++++++++++ .../ota-requestor-app/zap-generated/access.h | 30 +++++++++++++++++++ .../placeholder/app1/zap-generated/access.h | 27 +++++++++++++++++ .../placeholder/app2/zap-generated/access.h | 27 +++++++++++++++++ zzz_generated/pump-app/zap-generated/access.h | 30 +++++++++++++++++++ .../zap-generated/access.h | 30 +++++++++++++++++++ .../zap-generated/access.h | 30 +++++++++++++++++++ .../thermostat/zap-generated/access.h | 30 +++++++++++++++++++ zzz_generated/tv-app/zap-generated/access.h | 30 +++++++++++++++++++ .../tv-casting-app/zap-generated/access.h | 30 +++++++++++++++++++ .../window-app/zap-generated/access.h | 30 +++++++++++++++++++ 19 files changed, 532 insertions(+), 1 deletion(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index b61590f299b1d9..e4dcb1e46433d3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -55,7 +55,10 @@ limitations under the License. OPERATIONAL_CREDENTIALS_CLUSTER This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. - NOCs + + NOCs + + Fabrics SupportedFabrics CommissionedFabrics @@ -65,6 +68,7 @@ limitations under the License. Sender is requesting attestation information from the receiver. + @@ -76,6 +80,7 @@ limitations under the License. Sender is requesting a device attestation certificate from the receiver. + @@ -86,6 +91,7 @@ limitations under the License. Sender is requesting a certificate signing request (CSR) from the receiver. + @@ -102,12 +108,14 @@ limitations under the License. + Sender is requesting to update the node operational certificates. + @@ -120,21 +128,25 @@ limitations under the License. This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. + This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. + This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. + This command SHALL remove a Trusted Root CA Certificate, provided as its CHIP Certificate representation. + diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index 0cb772bd587909..ce04636b5def99 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -44,6 +44,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -64,6 +65,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -84,6 +86,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -159,6 +162,15 @@ 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command @@ -169,6 +181,15 @@ 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command @@ -179,6 +200,15 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/bridge-app/zap-generated/access.h b/zzz_generated/bridge-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/bridge-app/zap-generated/access.h +++ b/zzz_generated/bridge-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/door-lock-app/zap-generated/access.h b/zzz_generated/door-lock-app/zap-generated/access.h index da516c3943bdc8..9cde59152c3061 100644 --- a/zzz_generated/door-lock-app/zap-generated/access.h +++ b/zzz_generated/door-lock-app/zap-generated/access.h @@ -40,6 +40,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -55,6 +56,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -70,6 +72,7 @@ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -135,6 +138,15 @@ 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command @@ -151,6 +163,15 @@ 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command @@ -167,6 +188,15 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/light-switch-app/zap-generated/access.h b/zzz_generated/light-switch-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/light-switch-app/zap-generated/access.h +++ b/zzz_generated/light-switch-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/lighting-app/zap-generated/access.h b/zzz_generated/lighting-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/lighting-app/zap-generated/access.h +++ b/zzz_generated/lighting-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/lock-app/zap-generated/access.h +++ b/zzz_generated/lock-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/log-source-app/zap-generated/access.h b/zzz_generated/log-source-app/zap-generated/access.h index f67cb03aee26a9..53d4533c1c1eb4 100644 --- a/zzz_generated/log-source-app/zap-generated/access.h +++ b/zzz_generated/log-source-app/zap-generated/access.h @@ -69,14 +69,35 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/ota-provider-app/zap-generated/access.h b/zzz_generated/ota-provider-app/zap-generated/access.h index f67cb03aee26a9..9ddfd7e5d08d5d 100644 --- a/zzz_generated/ota-provider-app/zap-generated/access.h +++ b/zzz_generated/ota-provider-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,35 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/ota-requestor-app/zap-generated/access.h b/zzz_generated/ota-requestor-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/access.h +++ b/zzz_generated/ota-requestor-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h index d654f8e81b7060..edd14ab9b3dcd0 100644 --- a/zzz_generated/placeholder/app1/zap-generated/access.h +++ b/zzz_generated/placeholder/app1/zap-generated/access.h @@ -63,14 +63,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h index d654f8e81b7060..edd14ab9b3dcd0 100644 --- a/zzz_generated/placeholder/app2/zap-generated/access.h +++ b/zzz_generated/placeholder/app2/zap-generated/access.h @@ -63,14 +63,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/pump-app/zap-generated/access.h b/zzz_generated/pump-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/pump-app/zap-generated/access.h +++ b/zzz_generated/pump-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/pump-controller-app/zap-generated/access.h b/zzz_generated/pump-controller-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/pump-controller-app/zap-generated/access.h +++ b/zzz_generated/pump-controller-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/temperature-measurement-app/zap-generated/access.h b/zzz_generated/temperature-measurement-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/access.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/thermostat/zap-generated/access.h +++ b/zzz_generated/thermostat/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/tv-app/zap-generated/access.h b/zzz_generated/tv-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/tv-app/zap-generated/access.h +++ b/zzz_generated/tv-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/tv-casting-app/zap-generated/access.h b/zzz_generated/tv-casting-app/zap-generated/access.h index f67cb03aee26a9..8da3ec86ed72da 100644 --- a/zzz_generated/tv-casting-app/zap-generated/access.h +++ b/zzz_generated/tv-casting-app/zap-generated/access.h @@ -31,18 +31,21 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -69,14 +72,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/window-app/zap-generated/access.h b/zzz_generated/window-app/zap-generated/access.h index 503df86a1df249..30484436e18450 100644 --- a/zzz_generated/window-app/zap-generated/access.h +++ b/zzz_generated/window-app/zap-generated/access.h @@ -31,6 +31,7 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__CLUSTER { \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -38,6 +39,7 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__ATTRIBUTE { \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -45,6 +47,7 @@ #define GENERATED_ACCESS_READ_ATTRIBUTE__PRIVILEGE { \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ } @@ -75,14 +78,41 @@ // Parallel array data (*cluster*, command, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__CLUSTER { \ + 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 62, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__COMMAND { \ + 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + 4, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + 6, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + 7, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + 9, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + 10, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + 11, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 12, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command #define GENERATED_ACCESS_INVOKE_COMMAND__PRIVILEGE { \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateNOC, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: RemoveTrustedRootCertificate, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// From a57bd4ddf6893d419e3662f948dfff338aba85b8 Mon Sep 17 00:00:00 2001 From: chrisdecenzo <61757564+chrisdecenzo@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:34:11 -0700 Subject: [PATCH 03/16] Address DNS-SD issues (#16625) * fix PH, allow for longer extended discovery timeout * ci fix * address comments * fix v6-only tv-app casting * fix CI --- .../tv-common/include/CHIPProjectAppConfig.h | 10 ++++++- src/app/server/Dnssd.cpp | 20 +++++++------- src/app/server/Dnssd.h | 4 +-- src/include/platform/CHIPDeviceConfig.h | 4 ++- .../UserDirectedCommissioningServer.cpp | 26 ++++++++++++++++--- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h b/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h index e660c0747b93f3..e1e7c4d913d559 100644 --- a/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h +++ b/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h @@ -33,19 +33,27 @@ // TVs need to be both commissioners and commissionees #define CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE 1 +// TVs that are not commissionees, +// or that don't automatically enter commissioning mode should set this to 0 +#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 1 + // TVs do not typically need this - enable for debugging // #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT 1 +// Enable extended discovery, set timeout to 24 hours #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 +#define CHIP_DEVICE_CONFIG_EXTENDED_DISCOVERY_TIMEOUT_SECS (24 * 60 * 60) +// Advertise TV device type in DNS-SD #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1 #define CHIP_DEVICE_CONFIG_DEVICE_TYPE 35 // 0x0023 = 35 = Video Player +// Include device name in discovery for casting use case #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_NAME 1 - #define CHIP_DEVICE_CONFIG_DEVICE_NAME "Test TV" +// Enable app platform #define CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED 1 // overrides CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT in CHIPProjectConfig diff --git a/src/app/server/Dnssd.cpp b/src/app/server/Dnssd.cpp index 59cefa261346da..e49255050ce448 100644 --- a/src/app/server/Dnssd.cpp +++ b/src/app/server/Dnssd.cpp @@ -84,15 +84,15 @@ bool DnssdServer::HaveOperationalCredentials() #if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY -void DnssdServer::SetExtendedDiscoveryTimeoutSecs(int16_t secs) +void DnssdServer::SetExtendedDiscoveryTimeoutSecs(int32_t secs) { - ChipLogDetail(Discovery, "Setting extended discovery timeout to %" PRId16 "s", secs); + ChipLogDetail(Discovery, "Setting extended discovery timeout to %" PRId32 "s", secs); chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Put(DefaultStorageKeyAllocator::DNSExtendedDiscoveryTimeout(), secs); } -int16_t DnssdServer::GetExtendedDiscoveryTimeoutSecs() +int32_t DnssdServer::GetExtendedDiscoveryTimeoutSecs() { - int16_t secs; + int32_t secs; CHIP_ERROR err = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Get( DefaultStorageKeyAllocator::DNSExtendedDiscoveryTimeout(), &secs); @@ -199,7 +199,7 @@ void DnssdServer::OnDiscoveryExpiration(System::Layer * aSystemLayer, void * aAp ChipLogDetail(Discovery, "OnDiscoveryExpiration callback for valid session"); #if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY - int16_t extTimeout = GetExtendedDiscoveryTimeoutSecs(); + int32_t extTimeout = GetExtendedDiscoveryTimeoutSecs(); if (extTimeout != CHIP_DEVICE_CONFIG_DISCOVERY_DISABLED) { CHIP_ERROR err = AdvertiseCommissionableNode(chip::Dnssd::CommissioningMode::kDisabled); @@ -232,16 +232,16 @@ CHIP_ERROR DnssdServer::ScheduleDiscoveryExpiration() #if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY CHIP_ERROR DnssdServer::ScheduleExtendedDiscoveryExpiration() { - int16_t extendedDiscoveryTimeoutSecs = GetExtendedDiscoveryTimeoutSecs(); + int32_t extendedDiscoveryTimeoutSecs = GetExtendedDiscoveryTimeoutSecs(); if (extendedDiscoveryTimeoutSecs == CHIP_DEVICE_CONFIG_DISCOVERY_NO_TIMEOUT) { return CHIP_NO_ERROR; } - ChipLogDetail(Discovery, "Scheduling extended discovery timeout in %" PRId16 "s", extendedDiscoveryTimeoutSecs); + ChipLogDetail(Discovery, "Scheduling extended discovery timeout in %" PRId32 "s", extendedDiscoveryTimeoutSecs); - mExtendedDiscoveryExpiration = mTimeSource.GetMonotonicTimestamp() + System::Clock::Seconds16(extendedDiscoveryTimeoutSecs); + mExtendedDiscoveryExpiration = mTimeSource.GetMonotonicTimestamp() + System::Clock::Seconds32(extendedDiscoveryTimeoutSecs); - return DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds16(extendedDiscoveryTimeoutSecs), + return DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds32(extendedDiscoveryTimeoutSecs), HandleExtendedDiscoveryExpiration, nullptr); } #endif // CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY @@ -378,7 +378,7 @@ CHIP_ERROR DnssdServer::Advertise(bool commissionableNode, chip::Dnssd::Commissi advertiseParameters.SetMRPConfig(GetLocalMRPConfig()).SetTcpSupported(Optional(INET_CONFIG_ENABLE_TCP_ENDPOINT)); - if (mode != chip::Dnssd::CommissioningMode::kEnabledEnhanced) + if (!HaveOperationalCredentials()) { if (DeviceLayer::ConfigurationMgr().GetInitialPairingHint(value) != CHIP_NO_ERROR) { diff --git a/src/app/server/Dnssd.h b/src/app/server/Dnssd.h index efc7b86ea5ce08..5724d84a2f3dc1 100644 --- a/src/app/server/Dnssd.h +++ b/src/app/server/Dnssd.h @@ -88,7 +88,7 @@ class DLL_EXPORT DnssdServer #if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY /// Sets the extended discovery timeout. Value will be persisted across reboots - void SetExtendedDiscoveryTimeoutSecs(int16_t secs); + void SetExtendedDiscoveryTimeoutSecs(int32_t secs); /// Callback from Extended Discovery Expiration timer /// Checks if extended discovery has expired and if so, @@ -173,7 +173,7 @@ class DLL_EXPORT DnssdServer #if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY /// get the current extended discovery timeout (from persistent storage) - int16_t GetExtendedDiscoveryTimeoutSecs(); + int32_t GetExtendedDiscoveryTimeoutSecs(); /// schedule next extended discovery expiration CHIP_ERROR ScheduleExtendedDiscoveryExpiration(); diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index 7dd950f32a825a..53405932479738 100644 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -1233,11 +1233,13 @@ * Default time in seconds that a device will advertise commissionable node discovery * after commissioning mode ends. This value can be overridden by the user. * - * Only valid when CCHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY==1 + * Only valid when CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY==1 */ #define CHIP_DEVICE_CONFIG_DISCOVERY_DISABLED 0 #define CHIP_DEVICE_CONFIG_DISCOVERY_NO_TIMEOUT -1 +#ifndef CHIP_DEVICE_CONFIG_EXTENDED_DISCOVERY_TIMEOUT_SECS #define CHIP_DEVICE_CONFIG_EXTENDED_DISCOVERY_TIMEOUT_SECS (15 * 60) +#endif /** * CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp index b5b7d43a8a507c..cf46a3c6e8afc4 100644 --- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp +++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp @@ -111,12 +111,12 @@ void UserDirectedCommissioningServer::OnCommissionableNodeFound(const Dnssd::Dis { if (nodeData.numIPs == 0) { - ChipLogError(AppServer, "SetUDCClientProcessingState no IP addresses returned for instance name=%s", nodeData.instanceName); + ChipLogError(AppServer, "OnCommissionableNodeFound no IP addresses returned for instance name=%s", nodeData.instanceName); return; } if (nodeData.port == 0) { - ChipLogError(AppServer, "SetUDCClientProcessingState no port returned for instance name=%s", nodeData.instanceName); + ChipLogError(AppServer, "OnCommissionableNodeFound no port returned for instance name=%s", nodeData.instanceName); return; } @@ -127,7 +127,8 @@ void UserDirectedCommissioningServer::OnCommissionableNodeFound(const Dnssd::Dis (int) client->GetUDCClientProcessingState(), (int) UDCClientProcessingState::kPromptingUser); client->SetUDCClientProcessingState(UDCClientProcessingState::kPromptingUser); - // currently IPv6 addresses do not work for some reason +#if INET_CONFIG_ENABLE_IPV4 + // prefer IPv4 if its an option bool foundV4 = false; for (unsigned i = 0; i < nodeData.numIPs; ++i) { @@ -143,6 +144,25 @@ void UserDirectedCommissioningServer::OnCommissionableNodeFound(const Dnssd::Dis { client->SetPeerAddress(chip::Transport::PeerAddress::UDP(nodeData.ipAddress[0], nodeData.port)); } +#else // INET_CONFIG_ENABLE_IPV4 + // if we only support V6, then try to find a v6 address + bool foundV6 = false; + for (unsigned i = 0; i < nodeData.numIPs; ++i) + { + if (nodeData.ipAddress[i].IsIPv6()) + { + foundV6 = true; + client->SetPeerAddress(chip::Transport::PeerAddress::UDP(nodeData.ipAddress[i], nodeData.port)); + break; + } + } + // last resort, try with what we have + if (!foundV6) + { + ChipLogError(AppServer, "OnCommissionableNodeFound no v6 returned for instance name=%s", nodeData.instanceName); + client->SetPeerAddress(chip::Transport::PeerAddress::UDP(nodeData.ipAddress[0], nodeData.port)); + } +#endif // INET_CONFIG_ENABLE_IPV4 client->SetDeviceName(nodeData.deviceName); client->SetLongDiscriminator(nodeData.longDiscriminator); From 680499a508e520b32a5d7fbed403cf835a120ba3 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 25 Mar 2022 18:42:37 -0400 Subject: [PATCH 04/16] Fix compile for iOS CHIPTool. (#16688) --- .../Temperature Sensor/TemperatureSensorViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/src/darwin/CHIPTool/CHIPTool/View Controllers/Temperature Sensor/TemperatureSensorViewController.m b/src/darwin/CHIPTool/CHIPTool/View Controllers/Temperature Sensor/TemperatureSensorViewController.m index bb003b634505ba..a701e7f5be1866 100644 --- a/src/darwin/CHIPTool/CHIPTool/View Controllers/Temperature Sensor/TemperatureSensorViewController.m +++ b/src/darwin/CHIPTool/CHIPTool/View Controllers/Temperature Sensor/TemperatureSensorViewController.m @@ -224,6 +224,7 @@ - (void)reportFromUserEnteredSettings minInterval:minIntervalSeconds maxInterval:maxIntervalSeconds params:nil + cacheContainer:nil reportHandler:^(NSArray * _Nullable reports, NSError * _Nullable error) { if (error) { NSLog(@"Status: update reportAttributeMeasuredValue completed with error %@", From fd52919f1ed813245859c811e1e49e35ae462aad Mon Sep 17 00:00:00 2001 From: Jean-Francois Penven <67962328+jepenven-silabs@users.noreply.github.com> Date: Fri, 25 Mar 2022 21:43:47 -0400 Subject: [PATCH 05/16] [Inet] Add TCPEndpointImpl for OpenThread (#16671) * Add TCPEndpointImpl for OpenThread --- examples/light-switch-app/efr32/args.gni | 1 - examples/lighting-app/efr32/args.gni | 1 - examples/lock-app/efr32/args.gni | 1 - examples/persistent-storage/qpg/args.gni | 2 +- examples/window-app/efr32/args.gni | 1 - src/app/server/Server.cpp | 4 +- src/inet/BUILD.gn | 26 +---- src/inet/EndPointStateOpenThread.h | 49 ++++++++++ src/inet/TCPEndPointImplOpenThread.cpp | 96 +++++++++++++++++++ src/inet/TCPEndPointImplOpenThread.h | 73 ++++++++++++++ ...read.cpp => UDPEndPointImplOpenThread.cpp} | 2 +- ...enThread.h => UDPEndPointImplOpenThread.h} | 3 +- src/inet/inet.gni | 4 +- src/platform/EFR32/args.gni | 3 + src/platform/EFR32/wifi_args.gni | 1 + ...ThreadStackManagerImpl_OpenThread_LwIP.cpp | 4 +- src/system/BUILD.gn | 2 +- src/system/SystemPacketBuffer.h | 4 +- src/system/system.gni | 4 +- src/test_driver/efr32/args.gni | 4 + src/transport/raw/UDP.h | 4 +- 21 files changed, 249 insertions(+), 40 deletions(-) create mode 100644 src/inet/EndPointStateOpenThread.h create mode 100644 src/inet/TCPEndPointImplOpenThread.cpp create mode 100644 src/inet/TCPEndPointImplOpenThread.h rename src/inet/{UDPEndPointImpl_OpenThread.cpp => UDPEndPointImplOpenThread.cpp} (99%) rename src/inet/{UDPEndPointImpl_OpenThread.h => UDPEndPointImplOpenThread.h} (95%) diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni index 076cf81f31943a..1a0052682125a4 100644 --- a/examples/light-switch-app/efr32/args.gni +++ b/examples/light-switch-app/efr32/args.gni @@ -25,4 +25,3 @@ declare_args() { pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" pw_assert_BACKEND = "$dir_pw_assert_log" chip_enable_openthread = true -chip_system_config_use_open_thread_udp = true diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni index 076cf81f31943a..1a0052682125a4 100644 --- a/examples/lighting-app/efr32/args.gni +++ b/examples/lighting-app/efr32/args.gni @@ -25,4 +25,3 @@ declare_args() { pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" pw_assert_BACKEND = "$dir_pw_assert_log" chip_enable_openthread = true -chip_system_config_use_open_thread_udp = true diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni index 672df17cd1488b..a32b60b7164b44 100644 --- a/examples/lock-app/efr32/args.gni +++ b/examples/lock-app/efr32/args.gni @@ -23,6 +23,5 @@ declare_args() { } chip_enable_openthread = true -chip_system_config_use_open_thread_udp = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" pw_assert_BACKEND = "$dir_pw_assert_log" diff --git a/examples/persistent-storage/qpg/args.gni b/examples/persistent-storage/qpg/args.gni index a21c418f1f82b0..f8ce0d24090dd7 100644 --- a/examples/persistent-storage/qpg/args.gni +++ b/examples/persistent-storage/qpg/args.gni @@ -18,7 +18,7 @@ import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_openthread = false chip_openthread_ftd = false -chip_system_config_use_open_thread_udp = false +chip_system_config_use_open_thread_inet_endpoints = false declare_args() { # Disable lock tracking, since our FreeRTOS configuration does not set diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni index 4a0c6a75120019..8db1cfbfb54ef0 100644 --- a/examples/window-app/efr32/args.gni +++ b/examples/window-app/efr32/args.gni @@ -26,4 +26,3 @@ declare_args() { pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" pw_assert_BACKEND = "$dir_pw_assert_log" chip_enable_openthread = true -chip_system_config_use_open_thread_udp = true diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 9967491c6dae24..3c550350934d6e 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -150,9 +150,9 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint err = mTransports.Init(UdpListenParameters(DeviceLayer::UDPEndPointManager()) .SetAddressType(IPAddressType::kIPv6) .SetListenPort(mSecuredServicePort) -#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT .SetNativeParams(chip::DeviceLayer::ThreadStackMgrImpl().OTInstance()) -#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT #if INET_CONFIG_ENABLE_IPV4 , diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn index 164c0076c5a546..6e671c0f7b358e 100644 --- a/src/inet/BUILD.gn +++ b/src/inet/BUILD.gn @@ -24,7 +24,7 @@ import("${chip_root}/src/lwip/lwip.gni") import("${chip_root}/src/platform/device.gni") import("inet.gni") -if (chip_system_config_use_open_thread_udp) { +if (chip_system_config_use_open_thread_inet_endpoints) { import("//build_overrides/openthread.gni") } @@ -55,13 +55,7 @@ buildconfig_header("inet_buildconfig") { } defines += [ "INET_TCP_END_POINT_IMPL_CONFIG_FILE=" ] - if (chip_system_config_use_open_thread_udp) { - defines += [ - "INET_UDP_END_POINT_IMPL_CONFIG_FILE=", - ] - } else { - defines += [ "INET_UDP_END_POINT_IMPL_CONFIG_FILE=" ] - } + defines += [ "INET_UDP_END_POINT_IMPL_CONFIG_FILE=" ] } source_set("inet_config_header") { @@ -113,7 +107,7 @@ static_library("inet") { public_deps += [ "${chip_root}/src/lwip" ] } - if (chip_system_config_use_open_thread_udp) { + if (chip_system_config_use_open_thread_inet_endpoints) { if (chip_openthread_ftd) { public_deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ] @@ -137,20 +131,10 @@ static_library("inet") { sources += [ "UDPEndPoint.cpp", "UDPEndPoint.h", + "UDPEndPointImpl${chip_system_config_inet}.cpp", + "UDPEndPointImpl${chip_system_config_inet}.h", "UDPEndPointImpl.h", ] - - if (chip_system_config_use_open_thread_udp) { - sources += [ - "UDPEndPointImpl_OpenThread.cpp", - "UDPEndPointImpl_OpenThread.h", - ] - } else { - sources += [ - "UDPEndPointImpl${chip_system_config_inet}.cpp", - "UDPEndPointImpl${chip_system_config_inet}.h", - ] - } } if (chip_with_nlfaultinjection) { diff --git a/src/inet/EndPointStateOpenThread.h b/src/inet/EndPointStateOpenThread.h new file mode 100644 index 00000000000000..8c32d6c48aeb24 --- /dev/null +++ b/src/inet/EndPointStateOpenThread.h @@ -0,0 +1,49 @@ +/* + * + * Copyright (c) 2020-2021 Project CHIP Authors + * Copyright (c) 2015-2017 Nest Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Shared state for OpenThread implementations of TCPEndPoint and UDPEndPoint. + */ + +#pragma once + +#include + +#include + +namespace chip { +namespace Inet { + +/** + * Definitions shared by all OpenThread EndPoint classes. + */ +class DLL_EXPORT EndPointStateOpenThread +{ +protected: + EndPointStateOpenThread() : mOpenThreadEndPointType(OpenThreadEndPointType::Unknown) {} + + enum class OpenThreadEndPointType : uint8_t + { + Unknown = 0, + UDP = 1, + TCP = 2 + } mOpenThreadEndPointType; +}; + +} // namespace Inet +} // namespace chip diff --git a/src/inet/TCPEndPointImplOpenThread.cpp b/src/inet/TCPEndPointImplOpenThread.cpp new file mode 100644 index 00000000000000..36522ca3c47459 --- /dev/null +++ b/src/inet/TCPEndPointImplOpenThread.cpp @@ -0,0 +1,96 @@ +/* + * + * Copyright (c) 2020-2021 Project CHIP Authors + * Copyright (c) 2018 Google LLC. + * Copyright (c) 2013-2018 Nest Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include +#include +#include + +#include + +#include + +namespace chip { +namespace Inet { + +CHIP_ERROR TCPEndPointImplOT::GetPeerInfo(IPAddress * retAddr, uint16_t * retPort) const +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::GetLocalInfo(IPAddress * retAddr, uint16_t * retPort) const +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::GetInterfaceId(InterfaceId * retInterface) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::EnableNoDelay() +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::EnableKeepAlive(uint16_t interval, uint16_t timeoutCount) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::DisableKeepAlive() +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::AckReceive(uint16_t len) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} + +CHIP_ERROR TCPEndPointImplOT::BindImpl(IPAddressType addrType, const IPAddress & addr, uint16_t port, bool reuseAddr) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::ListenImpl(uint16_t backlog) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::ConnectImpl(const IPAddress & addr, uint16_t port, InterfaceId intfId) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::SendQueuedImpl(bool queueWasEmpty) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::SetUserTimeoutImpl(uint32_t userTimeoutMillis) +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +CHIP_ERROR TCPEndPointImplOT::DriveSendingImpl() +{ + return CHIP_ERROR_NOT_IMPLEMENTED; +} +void TCPEndPointImplOT::HandleConnectCompleteImpl() +{ + // Not implemented +} +void TCPEndPointImplOT::DoCloseImpl(CHIP_ERROR err, State oldState) +{ + // Not implemented +} + +} // namespace Inet +} // namespace chip diff --git a/src/inet/TCPEndPointImplOpenThread.h b/src/inet/TCPEndPointImplOpenThread.h new file mode 100644 index 00000000000000..c62c63cdc85f55 --- /dev/null +++ b/src/inet/TCPEndPointImplOpenThread.h @@ -0,0 +1,73 @@ +/* + * + * Copyright (c) 2020-2021 Project CHIP Authors + * Copyright (c) 2018 Google LLC + * Copyright (c) 2013-2017 Nest Labs, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include + +namespace chip { +namespace Inet { + +class TCPEndPointImplOT : public TCPEndPoint, public EndPointStateOpenThread +{ +public: + TCPEndPointImplOT(EndPointManager & endPointManager) : + TCPEndPoint(endPointManager), mBoundIntfId(InterfaceId::Null()) + {} + + // TCPEndPoint overrides. + CHIP_ERROR GetPeerInfo(IPAddress * retAddr, uint16_t * retPort) const override; + CHIP_ERROR GetLocalInfo(IPAddress * retAddr, uint16_t * retPort) const override; + CHIP_ERROR GetInterfaceId(InterfaceId * retInterface) override; + CHIP_ERROR EnableNoDelay() override; + CHIP_ERROR EnableKeepAlive(uint16_t interval, uint16_t timeoutCount) override; + CHIP_ERROR DisableKeepAlive() override; + CHIP_ERROR AckReceive(uint16_t len) override; +#if INET_CONFIG_OVERRIDE_SYSTEM_TCP_USER_TIMEOUT + void TCPUserTimeoutHandler() override; +#endif // INET_CONFIG_OVERRIDE_SYSTEM_TCP_USER_TIMEOUT + +private: + // TCPEndPoint overrides. + CHIP_ERROR BindImpl(IPAddressType addrType, const IPAddress & addr, uint16_t port, bool reuseAddr) override; + CHIP_ERROR ListenImpl(uint16_t backlog) override; + CHIP_ERROR ConnectImpl(const IPAddress & addr, uint16_t port, InterfaceId intfId) override; + CHIP_ERROR SendQueuedImpl(bool queueWasEmpty) override; + CHIP_ERROR SetUserTimeoutImpl(uint32_t userTimeoutMillis) override; + CHIP_ERROR DriveSendingImpl() override; + void HandleConnectCompleteImpl() override; + void DoCloseImpl(CHIP_ERROR err, State oldState) override; + + InterfaceId mBoundIntfId; + uint16_t mBoundPort; + otInstance * mOTInstance = nullptr; +}; + +using TCPEndPointImpl = TCPEndPointImplOT; + +} // namespace Inet +} // namespace chip diff --git a/src/inet/UDPEndPointImpl_OpenThread.cpp b/src/inet/UDPEndPointImplOpenThread.cpp similarity index 99% rename from src/inet/UDPEndPointImpl_OpenThread.cpp rename to src/inet/UDPEndPointImplOpenThread.cpp index 4fb43b3d940083..e722d48783e98d 100644 --- a/src/inet/UDPEndPointImpl_OpenThread.cpp +++ b/src/inet/UDPEndPointImplOpenThread.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/src/inet/UDPEndPointImpl_OpenThread.h b/src/inet/UDPEndPointImplOpenThread.h similarity index 95% rename from src/inet/UDPEndPointImpl_OpenThread.h rename to src/inet/UDPEndPointImplOpenThread.h index e6299c40c95ea8..f1ad4eaf0451fc 100644 --- a/src/inet/UDPEndPointImpl_OpenThread.h +++ b/src/inet/UDPEndPointImplOpenThread.h @@ -19,6 +19,7 @@ #pragma once +#include #include #include @@ -31,7 +32,7 @@ namespace chip { namespace Inet { -class UDPEndPointImplOT : public UDPEndPoint +class UDPEndPointImplOT : public UDPEndPoint, public EndPointStateOpenThread { public: UDPEndPointImplOT(EndPointManager & endPointManager) : diff --git a/src/inet/inet.gni b/src/inet/inet.gni index 997ae034c8eaa4..1c19551da374c6 100644 --- a/src/inet/inet.gni +++ b/src/inet/inet.gni @@ -27,7 +27,9 @@ declare_args() { chip_inet_config_enable_tcp_endpoint = true # Inet implementation type. - if (chip_system_config_use_lwip) { + if (chip_system_config_use_open_thread_inet_endpoints) { + chip_system_config_inet = "OpenThread" + } else if (chip_system_config_use_lwip) { chip_system_config_inet = "LwIP" } else { chip_system_config_inet = "Sockets" diff --git a/src/platform/EFR32/args.gni b/src/platform/EFR32/args.gni index 73e2fc12c4be01..82f7ac5de6794f 100644 --- a/src/platform/EFR32/args.gni +++ b/src/platform/EFR32/args.gni @@ -32,6 +32,9 @@ lwip_platform = "efr32" chip_inet_config_enable_ipv4 = false +chip_inet_config_enable_tcp_endpoint = false +chip_system_config_use_open_thread_inet_endpoints = true + chip_build_tests = false openthread_core_config_platform_check_file = diff --git a/src/platform/EFR32/wifi_args.gni b/src/platform/EFR32/wifi_args.gni index fc6660bc825d73..344e8058adf86d 100644 --- a/src/platform/EFR32/wifi_args.gni +++ b/src/platform/EFR32/wifi_args.gni @@ -34,6 +34,7 @@ chip_device_platform = "efr32" chip_enable_openthread = false chip_inet_config_enable_ipv4 = true chip_inet_config_enable_dns_resolver = false +chip_inet_config_enable_tcp_endpoint = true chip_build_tests = false chip_config_memory_management = "platform" diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp index 9073db2d194b04..de0947b6c2796f 100644 --- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp +++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp @@ -233,14 +233,14 @@ void GenericThreadStackManagerImpl_OpenThread_LwIP::UpdateThreadInter // Multicast won't work with LWIP on top of OT // Duplication of listeners, unecessary timers, buffer duplication, hardfault etc... -#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT // Refresh Multicast listening if (GenericThreadStackManagerImpl_OpenThread::IsThreadAttachedNoLock()) { ChipLogDetail(DeviceLayer, "Thread Attached updating Multicast address"); Server::GetInstance().RejoinExistingMulticastGroups(); } -#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT } ChipLogDetail(DeviceLayer, "LwIP Thread interface addresses %s", isInterfaceUp ? "updated" : "cleared"); diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn index 680b431e406360..4d4dfccb05706b 100644 --- a/src/system/BUILD.gn +++ b/src/system/BUILD.gn @@ -59,7 +59,7 @@ buildconfig_header("system_buildconfig") { "CHIP_WITH_NLFAULTINJECTION=${chip_with_nlfaultinjection}", "CHIP_SYSTEM_CONFIG_USE_DISPATCH=${chip_system_config_use_dispatch}", "CHIP_SYSTEM_CONFIG_USE_LWIP=${chip_system_config_use_lwip}", - "CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP=${chip_system_config_use_open_thread_udp}", + "CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT=${chip_system_config_use_open_thread_inet_endpoints}", "CHIP_SYSTEM_CONFIG_USE_SOCKETS=${chip_system_config_use_sockets}", "CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=false", "CHIP_SYSTEM_CONFIG_POSIX_LOCKING=${chip_system_config_posix_locking}", diff --git a/src/system/SystemPacketBuffer.h b/src/system/SystemPacketBuffer.h index 1c1887055b0509..b576eb03fb1043 100644 --- a/src/system/SystemPacketBuffer.h +++ b/src/system/SystemPacketBuffer.h @@ -809,7 +809,7 @@ namespace Inet { class UDPEndPointImplLwIP; } // namespace Inet -#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT // TODO : Temp Implementation issue : 13085 // Still use LwIP buffer even if using OpenThread UDP implementation // since decoupling of LwIP from OpenThread is still in progress @@ -835,7 +835,7 @@ class LwIPPacketBufferView : public PacketBufferHandle */ static struct pbuf * UnsafeGetLwIPpbuf(const PacketBufferHandle & handle) { return PacketBufferHandle::GetLwIPpbuf(handle); } friend class Inet::UDPEndPointImplLwIP; -#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT // TODO : Temp Implementation issue : 13085 // Still use LwIP buffer even if using OpenThread UDP implementation // since decoupling of LwIP from OpenThread is still in progress diff --git a/src/system/system.gni b/src/system/system.gni index 71fb601192f99d..e2a3de5eef181c 100644 --- a/src/system/system.gni +++ b/src/system/system.gni @@ -32,8 +32,8 @@ declare_args() { # Enable metrics collection. chip_system_config_provide_statistics = true - # Use OpenThread UDP stack directly - chip_system_config_use_open_thread_udp = false + # Use OpenThread TCP/UDP stack directly + chip_system_config_use_open_thread_inet_endpoints = false } declare_args() { diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni index e617862aca0dfe..8e2506c8afb694 100644 --- a/src/test_driver/efr32/args.gni +++ b/src/test_driver/efr32/args.gni @@ -26,3 +26,7 @@ chip_build_tests = true chip_enable_openthread = true chip_openthread_ftd = true chip_monolithic_tests = true + +#Fix me : Test driver should use same config as examples +# Problem : Linker issue if set to true +chip_system_config_use_open_thread_inet_endpoints = false diff --git a/src/transport/raw/UDP.h b/src/transport/raw/UDP.h index 25fb5f3ed71839..bc8f60460fa472 100644 --- a/src/transport/raw/UDP.h +++ b/src/transport/raw/UDP.h @@ -34,9 +34,9 @@ #include #include -#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT struct otInstance; -#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_UDP +#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT namespace chip { namespace Transport { From bab351f243f51cd664d6b17b27b0699f6de975bd Mon Sep 17 00:00:00 2001 From: Carol Yang Date: Fri, 25 Mar 2022 19:57:36 -0700 Subject: [PATCH 06/16] [OTA] Update the READMEs related to software version and image header (#16690) --- .github/.wordlist.txt | 5 + examples/ota-provider-app/linux/README.md | 44 +++++--- examples/ota-requestor-app/linux/README.md | 102 ++++++++++++++---- .../clusters/ota-requestor/OTARequestor.cpp | 6 +- 4 files changed, 124 insertions(+), 33 deletions(-) diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt index 8c987aacb69624..807ce7b5edd996 100644 --- a/.github/.wordlist.txt +++ b/.github/.wordlist.txt @@ -895,6 +895,7 @@ OTADownloader otaDownloadPath otaImageList OTAImageProcessorDriver +OTAImageProcessorImpl OTAImageProcessorInterface OTAProvider OTAProviderIpAddress @@ -1176,6 +1177,7 @@ SulfurDioxideConcentrationMeasurement svg SVR SWD +SWU symlinks sysconfdir SysConfig @@ -1248,6 +1250,7 @@ TotalTrihalomethanesConcentrationMeasurement trackAlloc trackFree transitionTime +TransferSession TransportMgrBase TrustedRootCertificates TSG @@ -1354,12 +1357,14 @@ xab xaver xb xbef +xBEEF xc xcd Xcode xcodeproj xcworkspace xd +xDEAD xDEADBEEF xdeadbeefcafe xds diff --git a/examples/ota-provider-app/linux/README.md b/examples/ota-provider-app/linux/README.md index 7293b068867e0e..a52e87257c7b7f 100644 --- a/examples/ota-provider-app/linux/README.md +++ b/examples/ota-provider-app/linux/README.md @@ -3,7 +3,7 @@ This is a reference application that implements an example of an OTA Provider Cluster Server. -## Building +## Build Suggest doing the following: @@ -29,17 +29,15 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug c **Using `--filepath` and `--otaImageList`** - The two options cannot be supplied together -- If neither option is supplied, the application will respond with - `NotAvailable` status +- At least one option must be supplied - If `--filepath` is supplied, the application will automatically serve that - file to the OTA Requestor (SoftwareVersion will be requester software - version + 1) + file to the OTA Requestor - If `--otaImageList` is supplied, the application will parse the JSON file and extract all required data. The most recent/valid software version will be selected and the corresponding OTA file will be sent to the OTA Requestor - The SoftwareVersion and SoftwareVersionString sent in the QueryImageResponse is derived from the OTA image header. Please note that if the version in the - `--otaImageList` JSON file does not match that in the header, the + `--otaImageList` JSON file does not match that in the image header, the application will terminate. An example of the `--otaImageList` file contents: @@ -48,15 +46,38 @@ An example of the `--otaImageList` file contents: { "foo": 1, // ignored by parser "deviceSoftwareVersionModel": [ - { "vendorId": 1, "productId": 1, "softwareVersion": 10, "softwareVersionString": "1.0.0", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota.txt" }, - { "vendorId": 1, "productId": 1, "softwareVersion": 20, "softwareVersionString": "1.0.1", "cDVersionNumber": 18, "softwareVersionValid": false, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota.txt" }, - { "vendorId": 1, "productId": 1, "softwareVersion": 30, "softwareVersionString": "1.0.2", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota.txt" }, - { "vendorId": 1, "productId": 1, "softwareVersion": 40, "softwareVersionString": "1.1.0", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota.txt" }, - { "vendorId": 1, "productId": 1, "softwareVersion": 50, "softwareVersionString": "1.1.1", "cDVersionNumber": 18, "softwareVersionValid": false, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota.txt" } + { "vendorId": 1, "productId": 1, "softwareVersion": 10, "softwareVersionString": "1.0.0", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota_v10.bin" }, + { "vendorId": 1, "productId": 1, "softwareVersion": 20, "softwareVersionString": "1.0.1", "cDVersionNumber": 18, "softwareVersionValid": false, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota_v20.bin" }, + { "vendorId": 1, "productId": 1, "softwareVersion": 30, "softwareVersionString": "1.0.2", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota_v30.bin" }, + { "vendorId": 1, "productId": 1, "softwareVersion": 40, "softwareVersionString": "1.1.0", "cDVersionNumber": 18, "softwareVersionValid": true, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota_v40.bin" }, + { "vendorId": 1, "productId": 1, "softwareVersion": 50, "softwareVersionString": "1.1.1", "cDVersionNumber": 18, "softwareVersionValid": false, "minApplicableSoftwareVersion": 0, "maxApplicableSoftwareVersion": 100, "otaURL": "/tmp/ota_v50.bin" } ] } ``` +## Software Image Header + +All Matter software images must contain a header as defined in section 11.21.1 +of the specification. The +[ota_image_tool](https://github.com/project-chip/connectedhomeip/blob/master/src/app/ota_image_tool.py) +is available for generating the required header on a software image. + +All images supplied to the OTA Provider application (via `--filepath` or +`--otaImageList`) must contain the software image header. The OTA Provider +application will use the software version specified in the header to set the +`SoftwareVersion` field of the QueryImageResponse. For instance, if the image +supplied represents an image with software version 2, the tool can be used as +follows: + +``` +src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 2 -vs "2.0" -da sha256 firmware.bin firmware.ota +``` + +Please see this +[section](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-requestor-app/linux#generate-images) +for information on building an OTA Requestor application with a specific +software version. + ## Access Control Requirements Commissioner or Administrator SHOULD install necessary ACL entries at @@ -86,5 +107,4 @@ being 0xDEADBEEF on endpoint 0. - Synchronous BDX transfer only - Does not check VID/PID -- No configuration for `AwaitNextAction` - Only one transfer at a time (does not check incoming `UpdateTokens`) diff --git a/examples/ota-requestor-app/linux/README.md b/examples/ota-requestor-app/linux/README.md index ad610c9a56e870..17bab9bd823b1e 100644 --- a/examples/ota-requestor-app/linux/README.md +++ b/examples/ota-requestor-app/linux/README.md @@ -4,7 +4,7 @@ This is a reference application that is both a server for the OTA Requestor Cluster, as well as a client of the OTA Provider Cluster. It can initiate a software update with a given OTA Provider node, and download a file. -## Building +## Build Suggest doing the following: @@ -25,15 +25,70 @@ following command line options are available for the OTA Requestor application. | -u/--userConsentState | The user consent state for the first QueryImage command. For all subsequent commands, the value of granted will be used.
  • granted: Authorize OTA requestor to download an OTA image
  • denied: Forbid OTA requestor to download an OTA image
  • deferred: Defer obtaining user consent | | -a/--autoApplyImage | If supplied, apply the image immediately after download. Otherwise, the OTA update is complete after image download. | -## Software Image Header +## Software Image Version -All Matter software images must contain a header as defined in section 11.21.1 -of the specification. The -[ota_image_tool](https://github.com/project-chip/connectedhomeip/blob/master/src/app/ota_image_tool.py) -is available for generating the required header on a software image. Any -software images that the OTA Requestor application receives must contain the -required header. If the header is missing, the software download will not -succeed. +The current software version of the OTA Requestor application is defined by +`CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION` in +[CHIPProjectConfig.h](https://github.com/project-chip/connectedhomeip/blob/master/config/standalone/CHIPProjectConfig.h). +This value can be confirmed by reading the `SoftwareVersion` attribute of the +Basic Information cluster: + +``` +out/chip-tool basic read software-version 0x1234567890 0 +``` + +### Validations + +On receiving the QueryImageResponse from the OTA Provider application, the OTA +Requestor application will verify that the software version specified in the +`SoftwareVersion` field of the response contains a value newer than the current +running version. If the update supplied does not pass this version check, the +following log message should be expected, indicating the update will not +proceed: + +``` +[1648233572232] [48462:7613274] CHIP: [SWU] Available update version 1 is <= current version 1, update ignored +``` + +If the OTA update progresses to downloading, the process will abort if the +software image +[header](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-provider-app/linux#software-image-header) +is missing. The following log messages should be expected: + +``` +[1648246917398] [71786:7874994] CHIP: [SWU] Image does not contain a valid header +[1648246917399] [71786:7874994] CHIP: [BDX] TransferSession error +``` + +On booting into the new image, if the running version does not match the version +specified in the QueryImageResponse, the following log message should be +expected: + +``` +[1648244159295] [58606:7774255] CHIP: [SWU] Failed to confirm image: ../../examples/ota-requestor-app/linux/third_party/connectedhomeip/src/platform/Linux/OTAImageProcessorImpl.cpp:110: CHIP Error 0x00000003: Incorrect state +``` + +This message serves as a warning that the new image is not expected. However, +the OTA Requestor application will recover gracefully and return to a state +where another OTA update may be initiated. + +### Generate Images + +To validate booting into a newer OTA Requestor image on the Linux platform, the +following must be performed: + +1. Modify `CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION` to a value greater than + the current running version +2. [Build](https://github.com/project-chip/connectedhomeip/blob/master/examples/ota-requestor-app/linux/README.md#build) + an OTA Requestor application with the new version +3. Using the executable created in step 2, generate an image with a software + image + [header](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-provider-app/linux#software-image-header) + that matches the version in step 1 +4. Use this generated binary when supplying the image file to the OTA Provider + application +5. Launch the original application (an OTA Requestor application generated prior + to step 1) with the command line option `--autoApplyImage` ## Common Instructions @@ -47,7 +102,7 @@ are some common instructions for building and commissioning the applications. #### Build the OTA Provider application Follow instructions -[here](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-provider-app/linux#building) +[here](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-provider-app/linux#build) #### Run the OTA Provider application @@ -81,15 +136,15 @@ out/chip-tool pairing onnetwork-long ${PROVIDER_NODE_ID} 20202021 ${PROVIDER_LON ### OTA Requestor application -#### Build the OTA Provider application +#### Build the OTA Requestor application Follow instructions -[here](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-requestor-app/linux#building) +[here](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-requestor-app/linux#build) #### Run the OTA Requestor application: ``` -out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS} +out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --periodicQueryTimeout ${TIME_IN_SECONDS} --autoApplyImage ``` @@ -106,6 +161,9 @@ out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --sec - `${TIME_IN_SECONDS}` is the periodic timeout for querying providers in the default OTA provider list. If none or zero is supplied the timeout is set to every 24 hours. +- `--autoApplyImage` is supplied to indicate the image should be immediately + applied after download. If not supplied, the OTA update is complete after + image download. #### Commission the OTA Requestor application @@ -124,10 +182,18 @@ There are two methods for this reference application to connect to a device running OTA Provider server and download a software image. If the ACL entry on the provider has not been properly installed, the QueryImage -command will be denied. Follow instructions +command will be denied. Logs similar to the following may be observed on the OTA +Provider application: + +``` +[1648244658368] [59686:7786439] CHIP: [DMG] AccessControl: checking f=1 a=c s=0x000000000000FACE t= c=0x0000_0029 e=0 p=o +[1648244658368] [59686:7786439] CHIP: [DMG] AccessControl: denied +``` + +If this is encountered, follow instructions [here](https://github.com/project-chip/connectedhomeip/tree/master/examples/ota-provider-app/linux#access-control-requirements) -to install. Note that this only needs to be done once. There is no need to write -this ACL entry again unless the KVS store has been removed. +to install. Note that this only needs to be performed once. There is no need to +write this ACL entry again unless the KVS store has been removed. ### Trigger using AnnounceOTAProvider Command @@ -145,7 +211,7 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out chip_c **Run the OTA Provider application** ``` -out/chip-ota-provider-app --discriminator 22 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin +out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin ``` #### In terminal 2: @@ -203,7 +269,7 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out chip_c **Run the OTA Provider application** ``` -out/chip-ota-provider-app --discriminator 22 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin +out/chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin ``` #### In terminal 2: diff --git a/src/app/clusters/ota-requestor/OTARequestor.cpp b/src/app/clusters/ota-requestor/OTARequestor.cpp index 561c29f5c7f582..6e5b57fb145284 100644 --- a/src/app/clusters/ota-requestor/OTARequestor.cpp +++ b/src/app/clusters/ota-requestor/OTARequestor.cpp @@ -157,8 +157,8 @@ void OTARequestor::OnQueryImageResponse(void * context, const QueryImageResponse if (update.softwareVersion > requestorCore->mCurrentVersion) { - ChipLogDetail(SoftwareUpdate, "Update available from %" PRIu32 " to %" PRIu32 " version", - requestorCore->mCurrentVersion, update.softwareVersion); + ChipLogDetail(SoftwareUpdate, "Update available from version %" PRIu32 " to %" PRIu32, requestorCore->mCurrentVersion, + update.softwareVersion); MutableByteSpan updateToken(requestorCore->mUpdateTokenBuffer); // This function copies the bytespan to mutablebytespan only if size of mutablebytespan buffer is greater or equal to // bytespan otherwise we are copying data upto available size. @@ -188,7 +188,7 @@ void OTARequestor::OnQueryImageResponse(void * context, const QueryImageResponse } else { - ChipLogDetail(SoftwareUpdate, "Version %" PRIu32 " is older or same than current version %" PRIu32 ", not updating", + ChipLogDetail(SoftwareUpdate, "Available update version %" PRIu32 " is <= current version %" PRIu32 ", update ignored", update.softwareVersion, requestorCore->mCurrentVersion); requestorCore->RecordNewUpdateState(OTAUpdateStateEnum::kIdle, OTAChangeReasonEnum::kSuccess); From c62c73115c21b32d0c3b4e47fd0bc2f9113c9908 Mon Sep 17 00:00:00 2001 From: Wang Qixiang <43193572+wqx6@users.noreply.github.com> Date: Sat, 26 Mar 2022 11:43:54 +0800 Subject: [PATCH 07/16] Add NetworkStatusChangeCallback for ESP32 platform (#15850) --- src/platform/ESP32/BUILD.gn | 6 +- .../ESP32/ConnectivityManagerImpl_WiFi.cpp | 2 + src/platform/ESP32/ESP32Utils.cpp | 15 ++++ src/platform/ESP32/ESP32Utils.h | 1 + ...ver.cpp => NetworkCommissioningDriver.cpp} | 87 ++++++++++++++----- .../ESP32/NetworkCommissioningDriver.h | 12 +-- 6 files changed, 93 insertions(+), 30 deletions(-) rename src/platform/ESP32/{NetworkCommissioningWiFiDriver.cpp => NetworkCommissioningDriver.cpp} (83%) diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn index 7aa6ceb0434d47..bc0ddaef2a79a6 100644 --- a/src/platform/ESP32/BUILD.gn +++ b/src/platform/ESP32/BUILD.gn @@ -40,7 +40,6 @@ static_library("ESP32") { "KeyValueStoreManagerImpl.h", "Logging.cpp", "LwIPCoreLock.cpp", - "NetworkCommissioningDriver.h", "PlatformManagerImpl.cpp", "PlatformManagerImpl.h", "SystemTimeSupport.cpp", @@ -68,13 +67,16 @@ static_library("ESP32") { if (chip_enable_wifi) { sources += [ "ConnectivityManagerImpl_WiFi.cpp", - "NetworkCommissioningWiFiDriver.cpp", + "NetworkCommissioningDriver.cpp", + "NetworkCommissioningDriver.h", ] } if (chip_enable_openthread) { sources += [ "../OpenThread/DnssdImpl.cpp", + "../OpenThread/GenericNetworkCommissioningThreadDriver.cpp", + "../OpenThread/GenericNetworkCommissioningThreadDriver.h", "../OpenThread/OpenThreadUtils.cpp", "ThreadStackManagerImpl.cpp", "ThreadStackManagerImpl.h", diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp index f2e5156ca532de..fe21b21f665d52 100644 --- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp +++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp @@ -463,6 +463,7 @@ void ConnectivityManagerImpl::OnWiFiPlatformEvent(const ChipDeviceEvent * event) break; case WIFI_EVENT_STA_DISCONNECTED: ChipLogProgress(DeviceLayer, "WIFI_EVENT_STA_DISCONNECTED"); + NetworkCommissioning::ESPWiFiDriver::GetInstance().SetLastDisconnectReason(event); if (mWiFiStationState == kWiFiStationState_Connecting) { ChangeWiFiStationState(kWiFiStationState_Connecting_Failed); @@ -684,6 +685,7 @@ void ConnectivityManagerImpl::ChangeWiFiStationState(WiFiStationState newState) ChipLogProgress(DeviceLayer, "WiFi station state change: %s -> %s", WiFiStationStateToStr(mWiFiStationState), WiFiStationStateToStr(newState)); mWiFiStationState = newState; + SystemLayer().ScheduleLambda([]() { NetworkCommissioning::ESPWiFiDriver::GetInstance().OnNetworkStatusChange(); }); } } diff --git a/src/platform/ESP32/ESP32Utils.cpp b/src/platform/ESP32/ESP32Utils.cpp index e4f30791b0c81c..91d3352cc8fcf5 100644 --- a/src/platform/ESP32/ESP32Utils.cpp +++ b/src/platform/ESP32/ESP32Utils.cpp @@ -54,6 +54,21 @@ CHIP_ERROR ESP32Utils::IsAPEnabled(bool & apEnabled) return CHIP_NO_ERROR; } +CHIP_ERROR ESP32Utils::IsStationEnabled(bool & staEnabled) +{ + wifi_mode_t curWiFiMode; + esp_err_t err = esp_wifi_get_mode(&curWiFiMode); + if (err != ESP_OK) + { + ChipLogError(DeviceLayer, "esp_wifi_get_mode() failed: %s", esp_err_to_name(err)); + return ESP32Utils::MapError(err); + } + + staEnabled = (curWiFiMode == WIFI_MODE_STA || curWiFiMode == WIFI_MODE_APSTA); + + return CHIP_NO_ERROR; +} + bool ESP32Utils::IsStationProvisioned(void) { wifi_config_t stationConfig; diff --git a/src/platform/ESP32/ESP32Utils.h b/src/platform/ESP32/ESP32Utils.h index 9f7f6f0a8bb6be..94a98e0f8b281e 100644 --- a/src/platform/ESP32/ESP32Utils.h +++ b/src/platform/ESP32/ESP32Utils.h @@ -30,6 +30,7 @@ class ESP32Utils { public: static CHIP_ERROR IsAPEnabled(bool & apEnabled); + static CHIP_ERROR IsStationEnabled(bool & staEnabled); static bool IsStationProvisioned(void); static CHIP_ERROR IsStationConnected(bool & connected); static CHIP_ERROR StartWiFiLayer(void); diff --git a/src/platform/ESP32/NetworkCommissioningWiFiDriver.cpp b/src/platform/ESP32/NetworkCommissioningDriver.cpp similarity index 83% rename from src/platform/ESP32/NetworkCommissioningWiFiDriver.cpp rename to src/platform/ESP32/NetworkCommissioningDriver.cpp index 1e4fc0fb9c42d6..b1dda184f2900d 100644 --- a/src/platform/ESP32/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/ESP32/NetworkCommissioningDriver.cpp @@ -27,7 +27,7 @@ #include using namespace ::chip; -#if CHIP_DEVICE_CONFIG_ENABLE_WIFI +using namespace ::chip::DeviceLayer::Internal; namespace chip { namespace DeviceLayer { namespace NetworkCommissioning { @@ -59,14 +59,16 @@ CHIP_ERROR ESPWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChange mSavedNetwork.credentialsLen = credentialsLen; mSavedNetwork.ssidLen = ssidLen; - mStagingNetwork = mSavedNetwork; - mpScanCallback = nullptr; - mpConnectCallback = nullptr; + mStagingNetwork = mSavedNetwork; + mpScanCallback = nullptr; + mpConnectCallback = nullptr; + mpStatusChangeCallback = networkStatusChangeCallback; return err; } CHIP_ERROR ESPWiFiDriver::Shutdown() { + mpStatusChangeCallback = nullptr; return CHIP_NO_ERROR; } @@ -276,20 +278,7 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone() } } -void ESPWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback) -{ - if (callback != nullptr) - { - mpScanCallback = callback; - if (StartScanWiFiNetworks(ssid) != CHIP_NO_ERROR) - { - mpScanCallback = nullptr; - callback->OnFinished(Status::kUnknownError, CharSpan(), nullptr); - } - } -} - -CHIP_ERROR GetConnectedNetwork(Network & network) +CHIP_ERROR GetConfiguredNetwork(Network & network) { wifi_ap_record_t ap_info; esp_err_t err; @@ -308,6 +297,57 @@ CHIP_ERROR GetConnectedNetwork(Network & network) return CHIP_NO_ERROR; } +void ESPWiFiDriver::OnNetworkStatusChange() +{ + Network configuredNetwork; + bool staEnabled = false, staConnected = false; + VerifyOrReturn(ESP32Utils::IsStationEnabled(staEnabled) == CHIP_NO_ERROR); + VerifyOrReturn(staEnabled && mpStatusChangeCallback != nullptr); + CHIP_ERROR err = GetConfiguredNetwork(configuredNetwork); + if (err != CHIP_NO_ERROR) + { + ChipLogError(DeviceLayer, "Failed to get configured network when updating network status: %s", err.AsString()); + return; + } + VerifyOrReturn(ESP32Utils::IsStationConnected(staConnected) == CHIP_NO_ERROR); + if (staConnected) + { + mpStatusChangeCallback->OnNetworkingStatusChange( + Status::kSuccess, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)), NullOptional); + return; + } + mpStatusChangeCallback->OnNetworkingStatusChange( + Status::kUnknownError, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)), + MakeOptional(GetLastDisconnectReason())); +} + +void ESPWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback) +{ + if (callback != nullptr) + { + mpScanCallback = callback; + if (StartScanWiFiNetworks(ssid) != CHIP_NO_ERROR) + { + mpScanCallback = nullptr; + callback->OnFinished(Status::kUnknownError, CharSpan(), nullptr); + } + } +} + +CHIP_ERROR ESPWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event) +{ + VerifyOrReturnError(event->Type == DeviceEventType::kESPSystemEvent && event->Platform.ESPSystemEvent.Base == WIFI_EVENT && + event->Platform.ESPSystemEvent.Id == WIFI_EVENT_STA_DISCONNECTED, + CHIP_ERROR_INVALID_ARGUMENT); + mLastDisconnectedReason = event->Platform.ESPSystemEvent.Data.WiFiStaDisconnected.reason; + return CHIP_NO_ERROR; +} + +int32_t ESPWiFiDriver::GetLastDisconnectReason() +{ + return mLastDisconnectedReason; +} + size_t ESPWiFiDriver::WiFiNetworkIterator::Count() { return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1; @@ -324,12 +364,14 @@ bool ESPWiFiDriver::WiFiNetworkIterator::Next(Network & item) item.connected = false; mExhausted = true; - Network connectedNetwork; - CHIP_ERROR err = GetConnectedNetwork(connectedNetwork); + Network configuredNetwork; + CHIP_ERROR err = GetConfiguredNetwork(configuredNetwork); if (err == CHIP_NO_ERROR) { - if (connectedNetwork.networkIDLen == item.networkIDLen && - memcmp(connectedNetwork.networkID, item.networkID, item.networkIDLen) == 0) + bool isConnected = false; + err = ESP32Utils::IsStationConnected(isConnected); + if (err == CHIP_NO_ERROR && isConnected && configuredNetwork.networkIDLen == item.networkIDLen && + memcmp(configuredNetwork.networkID, item.networkID, item.networkIDLen) == 0) { item.connected = true; } @@ -340,4 +382,3 @@ bool ESPWiFiDriver::WiFiNetworkIterator::Next(Network & item) } // namespace NetworkCommissioning } // namespace DeviceLayer } // namespace chip -#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI diff --git a/src/platform/ESP32/NetworkCommissioningDriver.h b/src/platform/ESP32/NetworkCommissioningDriver.h index decc8e21771466..0370ef4396f4c8 100644 --- a/src/platform/ESP32/NetworkCommissioningDriver.h +++ b/src/platform/ESP32/NetworkCommissioningDriver.h @@ -22,7 +22,6 @@ namespace chip { namespace DeviceLayer { namespace NetworkCommissioning { -#if CHIP_DEVICE_CONFIG_ENABLE_WIFI namespace { constexpr uint8_t kMaxWiFiNetworks = 1; constexpr uint8_t kWiFiScanNetworksTimeOutSeconds = 10; @@ -110,6 +109,11 @@ class ESPWiFiDriver final : public WiFiDriver CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen); void OnConnectWiFiNetwork(); void OnScanWiFiNetworkDone(); + void OnNetworkStatusChange(); + + CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event); + int32_t GetLastDisconnectReason(); + static ESPWiFiDriver & GetInstance() { static ESPWiFiDriver instance; @@ -125,12 +129,10 @@ class ESPWiFiDriver final : public WiFiDriver WiFiNetwork mStagingNetwork; ScanCallback * mpScanCallback; ConnectCallback * mpConnectCallback; + NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr; + int32_t mLastDisconnectedReason; }; -#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI -#if CHIP_DEVICE_CONFIG_ENABLE_THREAD -// TODO: Add Thread Driver for ESP32H2 platform -#endif } // namespace NetworkCommissioning } // namespace DeviceLayer } // namespace chip From e78b14d5d1ddda87a38bc493ce521c0abc5f4179 Mon Sep 17 00:00:00 2001 From: krypton36 Date: Fri, 25 Mar 2022 20:45:07 -0700 Subject: [PATCH 08/16] Add option to pass in PICS file in runner and set default to ci-pics-values (#16541) --- scripts/tests/chiptest/test_definition.py | 5 +++-- scripts/tests/run_test_suite.py | 9 +++++++-- src/app/tests/suites/certification/PICS.yaml | 3 +++ src/app/tests/suites/certification/ci-pics-values | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/app/tests/suites/certification/ci-pics-values diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index f9a6463a80984e..31b39e99291725 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -201,7 +201,7 @@ class TestDefinition: run_name: str target: TestTarget - def Run(self, runner, apps_register, paths: ApplicationPaths): + def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str): """ Executes the given test case using the provided runner for execution. """ @@ -247,7 +247,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths): runner.RunSubprocess( tool_cmd + ['tests', self.run_name] + - ['--paa-trust-store-path', DEVELOPMENT_PAA_LIST], + ['--paa-trust-store-path', DEVELOPMENT_PAA_LIST] + + ['--PICS', pics_file], name='TEST', dependencies=[apps_register]) except Exception: diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py index 345c4835623548..25276b67772011 100755 --- a/scripts/tests/run_test_suite.py +++ b/scripts/tests/run_test_suite.py @@ -175,8 +175,13 @@ def cmd_list(context): '--tv-app', default=FindBinaryPath('chip-tv-app'), help='what tv app to use') +@click.option( + '--pics-file', + type=click.Path(exists=True), + default=FindBinaryPath("ci-pics-values"), + help='PICS file to use for test runs.') @click.pass_context -def cmd_run(context, iterations, all_clusters_app, door_lock_app, tv_app): +def cmd_run(context, iterations, all_clusters_app, door_lock_app, tv_app, pics_file): runner = chiptest.runner.Runner() # Command execution requires an array @@ -210,7 +215,7 @@ def cmd_run(context, iterations, all_clusters_app, door_lock_app, tv_app): for test in context.obj.tests: test_start = time.time() try: - test.Run(runner, apps_register, paths) + test.Run(runner, apps_register, paths, pics_file) test_end = time.time() logging.info('%-20s - Completed in %0.2f seconds' % (test.name, (test_end - test_start))) diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml index 8b8c0851521552..fe086caec192b6 100644 --- a/src/app/tests/suites/certification/PICS.yaml +++ b/src/app/tests/suites/certification/PICS.yaml @@ -299,3 +299,6 @@ PICS: - label: "The optional key PI MAY provide additional information for pairing." id: PI_KEY + + - label: "Prompts user for input. Unable to run in CI" + id: PICS_USER_PROMPT diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values new file mode 100644 index 00000000000000..07155f9a50d43e --- /dev/null +++ b/src/app/tests/suites/certification/ci-pics-values @@ -0,0 +1 @@ +PICS_USER_PROMPT=0 From c13c54a8202670d19e535e2514172a245c28ec30 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 25 Mar 2022 23:46:01 -0400 Subject: [PATCH 09/16] Dynamic response sender count (#16535) * Make tracking responders either static or dynamic based on compiler flags * Ensure linter does not complain about inclusion of std list * Change linux/android/darwin implementations and update tests * Restyle * Fix typo * Switch dynamic address setting to a bool * Review updates --- scripts/tools/check_includes_config.py | 2 + src/lib/core/BUILD.gn | 1 + src/lib/core/CHIPConfig.h | 14 ++++ src/lib/core/core.gni | 8 ++ src/lib/dnssd/minimal_mdns/ResponseSender.cpp | 75 ++++++++++++------- src/lib/dnssd/minimal_mdns/ResponseSender.h | 22 +++++- .../minimal_mdns/tests/TestAdvertiser.cpp | 11 +-- .../minimal_mdns/tests/TestResponseSender.cpp | 27 +++---- 8 files changed, 103 insertions(+), 57 deletions(-) diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py index 55b27e9e03e304..72e399bd695317 100644 --- a/scripts/tools/check_includes_config.py +++ b/scripts/tools/check_includes_config.py @@ -143,4 +143,6 @@ 'src/setup_payload/SetupPayloadHelper.h': {'string'}, 'src/setup_payload/SetupPayload.h': {'map', 'string', 'vector'}, + # Uses platform-define to switch between list and array + 'src/lib/dnssd/minimal_mdns/ResponseSender.h': {'list'}, } diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn index 3573f401d0745b..156d79fa5a52b2 100644 --- a/src/lib/core/BUILD.gn +++ b/src/lib/core/BUILD.gn @@ -59,6 +59,7 @@ buildconfig_header("chip_buildconfig") { "CHIP_CONFIG_MEMORY_DEBUG_DMALLOC=${chip_config_memory_debug_dmalloc}", "CHIP_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES=false", "CHIP_CONFIG_TRANSPORT_TRACE_ENABLED=${chip_enable_transport_trace}", + "CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST=${chip_config_minmdns_dynamic_operational_responder_list}", ] } diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h index 144f38465369b8..a256a0e3fc5123 100644 --- a/src/lib/core/CHIPConfig.h +++ b/src/lib/core/CHIPConfig.h @@ -1771,6 +1771,20 @@ extern const char CHIP_NON_PRODUCTION_MARKER[]; #define CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE 1003 #endif // CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE +/* + * @def CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST + * + * @brief Enables usage of heap in the minmdns DNSSD implementation + * for tracking active operational responder lists. + * + * When this is not set, CHIP_CONFIG_MAX_FABRICS is used to determine + * and statically allocate pointers needed to track active + * operational responder lists. + */ +#ifndef CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST +#define CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST 0 +#endif // CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST + /** * @} */ diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni index 38851271197f4c..44654616b415ba 100644 --- a/src/lib/core/core.gni +++ b/src/lib/core/core.gni @@ -53,6 +53,14 @@ declare_args() { # When enabled traces messages using pw_trace. chip_enable_transport_trace = false + + # Enables using dynamic memory for minmdns tracking of operational + # responders. + # + # When not set, CHIP_CONFIG_MAX_FABRICS is used for static allocation + # of tracking information for operational advertisement. + chip_config_minmdns_dynamic_operational_responder_list = + current_os == "linux" || current_os == "android" || current_os == "darwin" } if (chip_target_style == "") { diff --git a/src/lib/dnssd/minimal_mdns/ResponseSender.cpp b/src/lib/dnssd/minimal_mdns/ResponseSender.cpp index 5d84e851ce3cd3..f3119a27ed8c13 100644 --- a/src/lib/dnssd/minimal_mdns/ResponseSender.cpp +++ b/src/lib/dnssd/minimal_mdns/ResponseSender.cpp @@ -21,15 +21,6 @@ #include -#define RETURN_IF_ERROR(err) \ - do \ - { \ - if (err != CHIP_NO_ERROR) \ - { \ - return; \ - } \ - } while (false) - namespace mdns { namespace Minimal { @@ -61,30 +52,54 @@ bool ResponseSendingState::IncludeQuery() const CHIP_ERROR ResponseSender::AddQueryResponder(QueryResponderBase * queryResponder) { - for (size_t i = 0; i < kMaxQueryResponders; ++i) + // If already existing or we find a free slot, just use it + // Note that dynamic memory implementations are never expected to be nullptr + // + for (auto it = mResponders.begin(); it != mResponders.end(); it++) { - if (mResponder[i] == nullptr || mResponder[i] == queryResponder) + if (*it == nullptr || *it == queryResponder) { - mResponder[i] = queryResponder; + *it = queryResponder; return CHIP_NO_ERROR; } } + +#if CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST + mResponders.push_back(queryResponder); + return CHIP_NO_ERROR; +#else return CHIP_ERROR_NO_MEMORY; +#endif } CHIP_ERROR ResponseSender::RemoveQueryResponder(QueryResponderBase * queryResponder) { - for (size_t i = 0; i < kMaxQueryResponders; ++i) + for (auto it = mResponders.begin(); it != mResponders.end(); it++) { - if (mResponder[i] == queryResponder) + if (*it == queryResponder) { - mResponder[i] = nullptr; + *it = nullptr; +#if CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST + mResponders.erase(it); +#endif return CHIP_NO_ERROR; } } return CHIP_ERROR_NOT_FOUND; } +bool ResponseSender::HasQueryResponders() const +{ + for (auto it = mResponders.begin(); it != mResponders.end(); it++) + { + if (*it != nullptr) + { + return true; + } + } + return false; +} + CHIP_ERROR ResponseSender::Respond(uint32_t messageId, const QueryData & query, const chip::Inet::IPPacketInfo * querySource) { mSendState.Reset(messageId, query, querySource); @@ -92,11 +107,13 @@ CHIP_ERROR ResponseSender::Respond(uint32_t messageId, const QueryData & query, // Responder has a stateful 'additional replies required' that is used within the response // loop. 'no additionals required' is set at the start and additionals are marked as the query // reply is built. - for (size_t i = 0; i < kMaxQueryResponders; ++i) + for (auto it = mResponders.begin(); it != mResponders.end(); it++) { - if (mResponder[i] != nullptr) { - mResponder[i]->ResetAdditionals(); + if (*it != nullptr) + { + (*it)->ResetAdditionals(); + } } } @@ -117,18 +134,18 @@ CHIP_ERROR ResponseSender::Respond(uint32_t messageId, const QueryData & query, // broadcasts on one interface to throttle broadcasts on another interface. responseFilter.SetIncludeOnlyMulticastBeforeMS(kTimeNow - chip::System::Clock::Seconds32(1)); } - for (size_t i = 0; i < kMaxQueryResponders; ++i) + for (auto responder = mResponders.begin(); responder != mResponders.end(); responder++) { - if (mResponder[i] == nullptr) + if (*responder == nullptr) { continue; } - for (auto it = mResponder[i]->begin(&responseFilter); it != mResponder[i]->end(); it++) + for (auto it = (*responder)->begin(&responseFilter); it != (*responder)->end(); it++) { it->responder->AddAllResponses(querySource, this); ReturnErrorOnFailure(mSendState.GetError()); - mResponder[i]->MarkAdditionalRepliesFor(it); + (*responder)->MarkAdditionalRepliesFor(it); if (!mSendState.SendUnicast()) { @@ -150,13 +167,13 @@ CHIP_ERROR ResponseSender::Respond(uint32_t messageId, const QueryData & query, responseFilter .SetReplyFilter(&queryReplyFilter) // .SetIncludeAdditionalRepliesOnly(true); - for (size_t i = 0; i < kMaxQueryResponders; ++i) + for (auto responder = mResponders.begin(); responder != mResponders.end(); responder++) { - if (mResponder[i] == nullptr) + if (*responder == nullptr) { continue; } - for (auto it = mResponder[i]->begin(&responseFilter); it != mResponder[i]->end(); it++) + for (auto it = (*responder)->begin(&responseFilter); it != (*responder)->end(); it++) { it->responder->AddAllResponses(querySource, this); ReturnErrorOnFailure(mSendState.GetError()); @@ -212,12 +229,12 @@ CHIP_ERROR ResponseSender::PrepareNewReplyPacket() void ResponseSender::AddResponse(const ResourceRecord & record) { - RETURN_IF_ERROR(mSendState.GetError()); + ReturnOnFailure(mSendState.GetError()); if (!mResponseBuilder.HasPacketBuffer()) { mSendState.SetError(PrepareNewReplyPacket()); - RETURN_IF_ERROR(mSendState.GetError()); + ReturnOnFailure(mSendState.GetError()); } if (!mResponseBuilder.Ok()) @@ -235,8 +252,8 @@ void ResponseSender::AddResponse(const ResourceRecord & record) { mResponseBuilder.Header().SetFlags(mResponseBuilder.Header().GetFlags().SetTruncated(true)); - RETURN_IF_ERROR(mSendState.SetError(FlushReply())); - RETURN_IF_ERROR(mSendState.SetError(PrepareNewReplyPacket())); + ReturnOnFailure(mSendState.SetError(FlushReply())); + ReturnOnFailure(mSendState.SetError(PrepareNewReplyPacket())); mResponseBuilder.AddRecord(mSendState.GetResourceType(), record); if (!mResponseBuilder.Ok()) diff --git a/src/lib/dnssd/minimal_mdns/ResponseSender.h b/src/lib/dnssd/minimal_mdns/ResponseSender.h index 8e5a2abb063e33..8cba032bd9a771 100644 --- a/src/lib/dnssd/minimal_mdns/ResponseSender.h +++ b/src/lib/dnssd/minimal_mdns/ResponseSender.h @@ -25,6 +25,23 @@ #include +#if CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST + +#include +using QueryResponderPtrPool = std::list; +#else + +#include + +// Note: ptr storage is 2 + number of operational networks required, based on +// the current implementation of Advertiser_ImplMinimalMdns.cpp: +// - 1 for commissionable advertising +// - 1 for commissioner responder +// - extra for every operational advertisement +using QueryResponderPtrPool = std::array; + +#endif + namespace mdns { namespace Minimal { @@ -88,12 +105,11 @@ class ResponseSendingState class ResponseSender : public ResponderDelegate { public: - // TODO(cecille): Template this and set appropriately. Please see issue #8000. - static constexpr size_t kMaxQueryResponders = 7; ResponseSender(ServerBase * server) : mServer(server) {} CHIP_ERROR AddQueryResponder(QueryResponderBase * queryResponder); CHIP_ERROR RemoveQueryResponder(QueryResponderBase * queryResponder); + bool HasQueryResponders() const; /// Send back the response to a particular query CHIP_ERROR Respond(uint32_t messageId, const QueryData & query, const chip::Inet::IPPacketInfo * querySource); @@ -108,7 +124,7 @@ class ResponseSender : public ResponderDelegate CHIP_ERROR PrepareNewReplyPacket(); ServerBase * mServer; - QueryResponderBase * mResponder[kMaxQueryResponders] = {}; + QueryResponderPtrPool mResponders = {}; /// Current send state ResponseBuilder mResponseBuilder; // packet being built diff --git a/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp b/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp index 8de65b7aba222c..3acfa4a88951de 100644 --- a/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp +++ b/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp @@ -328,18 +328,11 @@ void OperationalAdverts(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, server.GetSendCalled()); NL_TEST_ASSERT(inSuite, server.GetHeaderFound()); - // We should be able to add several operational networks - // As these are platform::new allocated, there is no upper limit - // TODO: Responder still has an upper limit of responders, which gets checked - // here but should be removed as part of #8000 as we want to not have an - // upper bound on number of operational networks (or at least not memory - // enforced but rather policy enforced) + // All devices should support at least 5 operational network additions (spec min) + // however larger devices may support more. NL_TEST_ASSERT(inSuite, mdnsAdvertiser.Advertise(operationalParams3) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, mdnsAdvertiser.Advertise(operationalParams4) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, mdnsAdvertiser.Advertise(operationalParams5) == CHIP_NO_ERROR); - - // Adding a 6th should return an error - NL_TEST_ASSERT(inSuite, mdnsAdvertiser.Advertise(operationalParams6) == CHIP_ERROR_NO_MEMORY); } void CommissionableAdverts(nlTestSuite * inSuite, void * inContext) diff --git a/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp b/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp index 4a42cd2dcd96ea..c265bdab5a8604 100644 --- a/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp +++ b/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp @@ -253,34 +253,29 @@ void AddManyQueryResponders(nlTestSuite * inSuite, void * inContext) QueryResponder<1> q5; QueryResponder<1> q6; QueryResponder<1> q7; - QueryResponder<1> q8; // We should be able to re-add the same query responder as many times as we want. - for (size_t i = 0; i < ResponseSender::kMaxQueryResponders + 1; ++i) + // and it shold only count as one + constexpr size_t kAddLoopSize = 1000; + for (size_t i = 0; i < kAddLoopSize; ++i) { NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q1) == CHIP_NO_ERROR); } - // There are 7 total + // removing the only copy should clear out everything + responseSender.RemoveQueryResponder(&q1); + NL_TEST_ASSERT(inSuite, !responseSender.HasQueryResponders()); + + // At least 7 should be supported: + // - 5 is the spec minimum + // - 2 for commissionable and commisioner responders + NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q1) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q2) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q3) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q4) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q5) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q6) == CHIP_NO_ERROR); NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q7) == CHIP_NO_ERROR); - - // Last one should return a no memory error (no space) - NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q8) == CHIP_ERROR_NO_MEMORY); - - // can make space - NL_TEST_ASSERT(inSuite, responseSender.RemoveQueryResponder(&q3) == CHIP_NO_ERROR); - NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q8) == CHIP_NO_ERROR); - - // adding back does not fail - NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q8) == CHIP_NO_ERROR); - - // still full and cannot add more - NL_TEST_ASSERT(inSuite, responseSender.AddQueryResponder(&q3) == CHIP_ERROR_NO_MEMORY); } void PtrSrvTxtMultipleRespondersToInstance(nlTestSuite * inSuite, void * inContext) From 2d96f14210bc3625a805b51755b7380751206893 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 25 Mar 2022 23:56:44 -0400 Subject: [PATCH 10/16] Add spec-required checks to CommissioningComplete. (#16642) We were allowing CommissioningComplete over PASE (or group message, for that matter), not checking for a matching fail-safe, etc. --- .../general-commissioning-server.cpp | 43 ++++++++++++++----- src/include/platform/FailSafeContext.h | 2 +- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp index c46cfdd603fe21..fb3db979b8f130 100644 --- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp +++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp @@ -40,6 +40,8 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::GeneralCommissioning; using namespace chip::app::Clusters::GeneralCommissioning::Attributes; using namespace chip::DeviceLayer; +using Transport::SecureSession; +using Transport::Session; #define CheckSuccess(expr, code) \ do \ @@ -165,19 +167,40 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( const Commands::CommissioningComplete::DecodableType & commandData) { MATTER_TRACE_EVENT_SCOPE("CommissioningComplete", "GeneralCommissioning"); - DeviceControlServer * server = &DeviceLayer::DeviceControlServer::DeviceControlSvr(); - - /* - * Pass fabric of commissioner to DeviceControlSvr. - * This allows device to send messages back to commissioner. - * Once bindings are implemented, this may no longer be needed. - */ - SessionHandle handle = commandObj->GetExchangeContext()->GetSessionHandle(); - CheckSuccess(server->CommissioningComplete(handle->AsSecureSession()->GetPeerNodeId(), handle->GetFabricIndex()), Failure); + DeviceControlServer * server = &DeviceLayer::DeviceControlServer::DeviceControlSvr(); + const auto & failSafe = server->GetFailSafeContext(); Commands::CommissioningCompleteResponse::Type response; - response.errorCode = CommissioningError::kOk; + if (!failSafe.IsFailSafeArmed()) + { + response.errorCode = CommissioningError::kNoFailSafe; + } + else + { + SessionHandle handle = commandObj->GetExchangeContext()->GetSessionHandle(); + // If not a CASE session, or the fabric does not match the fail-safe, + // error out. + if (handle->GetSessionType() != Session::SessionType::kSecure || + handle->AsSecureSession()->GetSecureSessionType() != SecureSession::Type::kCASE || + !failSafe.MatchesFabricIndex(commandObj->GetAccessingFabricIndex())) + { + response.errorCode = CommissioningError::kInvalidAuthentication; + } + else + { + /* + * Pass fabric of commissioner to DeviceControlSvr. + * This allows device to send messages back to commissioner. + * Once bindings are implemented, this may no longer be needed. + */ + CheckSuccess(server->CommissioningComplete(handle->AsSecureSession()->GetPeerNodeId(), handle->GetFabricIndex()), + Failure); + + response.errorCode = CommissioningError::kOk; + } + } + CheckSuccess(commandObj->AddResponseData(commandPath, response), Failure); return true; diff --git a/src/include/platform/FailSafeContext.h b/src/include/platform/FailSafeContext.h index 314e9f90493813..7e8b41cb7d74c5 100644 --- a/src/include/platform/FailSafeContext.h +++ b/src/include/platform/FailSafeContext.h @@ -42,7 +42,7 @@ class FailSafeContext CHIP_ERROR ArmFailSafe(FabricIndex accessingFabricIndex, System::Clock::Timeout expiryLength); CHIP_ERROR DisarmFailSafe(); - inline bool IsFailSafeArmed(FabricIndex accessingFabricIndex) + inline bool IsFailSafeArmed(FabricIndex accessingFabricIndex) const { return mFailSafeArmed && MatchesFabricIndex(accessingFabricIndex); } From 44796214073cf017344aa8f376a68425117e931f Mon Sep 17 00:00:00 2001 From: wendythewan <99999710+wendythewan@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:57:25 -0700 Subject: [PATCH 11/16] Guard raw/Ble usage with CONFIG_NETWORK_LAYER_BLE (#16651) * Guard raw/Ble usage with CONFIG_NETWORK_LAYER_BLE * Guard raw/Ble usage with CONFIG_NETWORK_LAYER_BLE --- src/app/server/Server.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/server/Server.h b/src/app/server/Server.h index e05c4ae54b4cb2..b036f96eed08d7 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -39,7 +39,9 @@ #include #include #include +#if CONFIG_NETWORK_LAYER_BLE #include +#endif #include namespace chip { From f05afad3aa61a0d8e9a56efbb8ce2ddb13d198e3 Mon Sep 17 00:00:00 2001 From: Praveen Chandran Date: Fri, 25 Mar 2022 20:57:58 -0700 Subject: [PATCH 12/16] Update example apps for Infineon P6 Platform (#16652) --- examples/all-clusters-app/p6/args.gni | 6 ----- .../all-clusters-app/p6/include/AppTask.h | 2 +- examples/all-clusters-app/p6/src/AppTask.cpp | 18 ++++++++++----- examples/lighting-app/p6/args.gni | 6 ----- examples/lighting-app/p6/include/AppTask.h | 2 +- examples/lighting-app/p6/src/AppTask.cpp | 19 +++++++++------ examples/lock-app/p6/args.gni | 6 ----- examples/lock-app/p6/include/AppTask.h | 2 ++ examples/lock-app/p6/src/AppTask.cpp | 23 ++++++++++++++----- examples/ota-requestor-app/p6/README.md | 4 ++-- examples/ota-requestor-app/p6/args.gni | 4 ---- examples/ota-requestor-app/p6/src/AppTask.cpp | 14 +++++++---- .../p6/p6_sdk/configs/FreeRTOSConfig.h | 1 + 13 files changed, 58 insertions(+), 49 deletions(-) diff --git a/examples/all-clusters-app/p6/args.gni b/examples/all-clusters-app/p6/args.gni index 43a75f96144ea5..2a93385cf36bd6 100644 --- a/examples/all-clusters-app/p6/args.gni +++ b/examples/all-clusters-app/p6/args.gni @@ -18,9 +18,3 @@ import("${chip_root}/src/platform/P6/args.gni") p6_target_project = get_label_info(":all_clusters_app_sdk_sources", "label_no_toolchain") - -declare_args() { - # Disable lock tracking, since our FreeRTOS configuration does not set - # INCLUDE_xSemaphoreGetMutexHolder - chip_stack_lock_tracking = "none" -} diff --git a/examples/all-clusters-app/p6/include/AppTask.h b/examples/all-clusters-app/p6/include/AppTask.h index 29c06f08792c40..a5f606cc451b85 100644 --- a/examples/all-clusters-app/p6/include/AppTask.h +++ b/examples/all-clusters-app/p6/include/AppTask.h @@ -54,7 +54,7 @@ class AppTask static AppTask sAppTask; void DispatchEvent(AppEvent * event); - static void OnOffUpdateClusterState(void); + static void OnOffUpdateClusterState(intptr_t context); }; inline AppTask & GetAppTask(void) diff --git a/examples/all-clusters-app/p6/src/AppTask.cpp b/examples/all-clusters-app/p6/src/AppTask.cpp index 977730e5845631..927bfcf012683f 100644 --- a/examples/all-clusters-app/p6/src/AppTask.cpp +++ b/examples/all-clusters-app/p6/src/AppTask.cpp @@ -81,6 +81,15 @@ void NetWorkCommissioningInstInit() sWiFiNetworkCommissioningInstance.Init(); } +static void InitServer(intptr_t context) +{ + // Init ZCL Data Model + chip::Server::GetInstance().Init(); + + // Initialize device attestation config + SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); +} + CHIP_ERROR AppTask::StartAppTask() { sAppEventQueue = xQueueCreateStatic(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent), sAppEventQueueBuffer, &sAppEventQueueStruct); @@ -112,11 +121,8 @@ CHIP_ERROR AppTask::Init() } }, 0); - // Init ZCL Data Model - chip::Server::GetInstance().Init(); - // Initialize device attestation config - SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); + chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast(nullptr)); // Initialise WSTK buttons PB0 and PB1 (including debounce). ButtonHandler::Init(); @@ -166,7 +172,7 @@ void AppTask::LightActionEventHandler(AppEvent * aEvent) sLightLED.Invert(); /* Update OnOff Cluster state */ - sAppTask.OnOffUpdateClusterState(); + chip::DeviceLayer::PlatformMgr().ScheduleWork(OnOffUpdateClusterState, reinterpret_cast(nullptr)); } void AppTask::ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction) @@ -232,7 +238,7 @@ void AppTask::DispatchEvent(AppEvent * aEvent) } } -void AppTask::OnOffUpdateClusterState(void) +void AppTask::OnOffUpdateClusterState(intptr_t context) { uint8_t onoff = sLightLED.Get(); diff --git a/examples/lighting-app/p6/args.gni b/examples/lighting-app/p6/args.gni index 5f9b284655b922..f239efee01e5da 100644 --- a/examples/lighting-app/p6/args.gni +++ b/examples/lighting-app/p6/args.gni @@ -18,9 +18,3 @@ import("${chip_root}/src/platform/P6/args.gni") p6_target_project = get_label_info(":lighting_app_sdk_sources", "label_no_toolchain") - -declare_args() { - # Disable lock tracking, since our FreeRTOS configuration does not set - # INCLUDE_xSemaphoreGetMutexHolder - chip_stack_lock_tracking = "none" -} diff --git a/examples/lighting-app/p6/include/AppTask.h b/examples/lighting-app/p6/include/AppTask.h index c7f9a23f48a495..cf8feffb2c7f08 100644 --- a/examples/lighting-app/p6/include/AppTask.h +++ b/examples/lighting-app/p6/include/AppTask.h @@ -67,7 +67,7 @@ class AppTask static void LightActionEventHandler(AppEvent * aEvent); static void TimerEventHandler(TimerHandle_t xTimer); - static void UpdateClusterState(void); + static void UpdateClusterState(intptr_t context); void StartTimer(uint32_t aTimeoutMs); diff --git a/examples/lighting-app/p6/src/AppTask.cpp b/examples/lighting-app/p6/src/AppTask.cpp index ab50aefb66f9c3..5bcc08727672de 100644 --- a/examples/lighting-app/p6/src/AppTask.cpp +++ b/examples/lighting-app/p6/src/AppTask.cpp @@ -85,6 +85,15 @@ void NetWorkCommissioningInstInit() sWiFiNetworkCommissioningInstance.Init(); } +static void InitServer(intptr_t context) +{ + // Init ZCL Data Model + chip::Server::GetInstance().Init(); + + // Initialize device attestation config + SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); +} + CHIP_ERROR AppTask::StartAppTask() { sAppEventQueue = xQueueCreateStatic(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent), sAppEventQueueBuffer, &sAppEventQueueStruct); @@ -117,11 +126,8 @@ CHIP_ERROR AppTask::Init() } }, 0); - // Init ZCL Data Model - chip::Server::GetInstance().Init(); - // Initialize device attestation config - SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); + chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast(nullptr)); // Initialise WSTK buttons PB0 and PB1 (including debounce). ButtonHandler::Init(); @@ -153,7 +159,6 @@ CHIP_ERROR AppTask::Init() sStatusLED.Init(SYSTEM_STATE_LED); sLightLED.Init(LIGHT_LED); sLightLED.Set(LightMgr().IsLightOn()); - UpdateClusterState(); ConfigurationMgr().LogDeviceConfig(); @@ -445,7 +450,7 @@ void AppTask::ActionCompleted(LightingManager::Action_t aAction) if (sAppTask.mSyncClusterToButtonAction) { - UpdateClusterState(); + chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateClusterState, reinterpret_cast(nullptr)); sAppTask.mSyncClusterToButtonAction = false; } } @@ -504,7 +509,7 @@ void AppTask::DispatchEvent(AppEvent * aEvent) } } -void AppTask::UpdateClusterState(void) +void AppTask::UpdateClusterState(intptr_t context) { uint8_t newValue = LightMgr().IsLightOn(); diff --git a/examples/lock-app/p6/args.gni b/examples/lock-app/p6/args.gni index c0b6f98e878997..a83cf1abdcb38e 100644 --- a/examples/lock-app/p6/args.gni +++ b/examples/lock-app/p6/args.gni @@ -18,9 +18,3 @@ import("${chip_root}/src/platform/P6/args.gni") p6_target_project = get_label_info(":lock_app_sdk_sources", "label_no_toolchain") - -declare_args() { - # Disable lock tracking, since our FreeRTOS configuration does not set - # INCLUDE_xSemaphoreGetMutexHolder - chip_stack_lock_tracking = "none" -} diff --git a/examples/lock-app/p6/include/AppTask.h b/examples/lock-app/p6/include/AppTask.h index e4da2aba0aa403..854d70efdb9744 100644 --- a/examples/lock-app/p6/include/AppTask.h +++ b/examples/lock-app/p6/include/AppTask.h @@ -68,6 +68,8 @@ class AppTask static void LockActionEventHandler(AppEvent * event); static void TimerEventHandler(TimerHandle_t timer); + static void UpdateCluster(intptr_t context); + void StartTimer(uint32_t aTimeoutMs); enum class Function diff --git a/examples/lock-app/p6/src/AppTask.cpp b/examples/lock-app/p6/src/AppTask.cpp index a4e0cbb5e35739..3f0b37e2f340e5 100644 --- a/examples/lock-app/p6/src/AppTask.cpp +++ b/examples/lock-app/p6/src/AppTask.cpp @@ -83,6 +83,15 @@ void NetWorkCommissioningInstInit() sWiFiNetworkCommissioningInstance.Init(); } +static void InitServer(intptr_t context) +{ + // Init ZCL Data Model + chip::Server::GetInstance().Init(); + + // Initialize device attestation config + SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); +} + CHIP_ERROR AppTask::StartAppTask() { sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent)); @@ -115,11 +124,8 @@ CHIP_ERROR AppTask::Init() } }, 0); - // Init ZCL Data Model - chip::Server::GetInstance().Init(); - // Initialize device attestation config - SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); + chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast(nullptr)); // Initialise WSTK buttons PB0 and PB1 (including debounce). ButtonHandler::Init(); @@ -151,7 +157,6 @@ CHIP_ERROR AppTask::Init() sStatusLED.Init(SYSTEM_STATE_LED); sLockLED.Init(LOCK_STATE_LED); sLockLED.Set(!BoltLockMgr().IsUnlocked()); - UpdateClusterState(); ConfigurationMgr().LogDeviceConfig(); @@ -490,7 +495,7 @@ void AppTask::DispatchEvent(AppEvent * event) } } -void AppTask::UpdateClusterState(void) +void AppTask::UpdateCluster(intptr_t context) { uint8_t newValue = !BoltLockMgr().IsUnlocked(); @@ -502,6 +507,12 @@ void AppTask::UpdateClusterState(void) P6_LOG("ERR: updating on/off %x", status); } } + +void AppTask::UpdateClusterState(void) +{ + chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateCluster, reinterpret_cast(nullptr)); +} + void vApplicationStackOverflowHook(TaskHandle_t pxTask, char * pcTaskName) { (void) pxTask; diff --git a/examples/ota-requestor-app/p6/README.md b/examples/ota-requestor-app/p6/README.md index 73c5361389fe6b..e63b3a5842444f 100644 --- a/examples/ota-requestor-app/p6/README.md +++ b/examples/ota-requestor-app/p6/README.md @@ -54,11 +54,11 @@ will then join the network. * Build the P6 OTA Requestor application from the chip root dir: - $ ./examples/ota-requestor-app/examples/ota_base_build.sh + $ ./examples/ota-requestor-app/p6/ota_base_build.sh * Build the P6 OTA Update application from the chip root dir: - $ ./examples/ota-requestor-app/examples/ota_update_build.sh + $ ./examples/ota-requestor-app/p6/ota_update_build.sh * On a RPi4: Build the Linux OTA Provider application from the chip root dir: diff --git a/examples/ota-requestor-app/p6/args.gni b/examples/ota-requestor-app/p6/args.gni index 0afa5bc4780513..43c58836f60ddf 100644 --- a/examples/ota-requestor-app/p6/args.gni +++ b/examples/ota-requestor-app/p6/args.gni @@ -18,10 +18,6 @@ import("${chip_root}/src/platform/P6/args.gni") declare_args() { chip_enable_ota_requestor = true - - # Disable lock tracking, since our FreeRTOS configuration does not set - # INCLUDE_xSemaphoreGetMutexHolder - chip_stack_lock_tracking = "none" } p6_target_project = diff --git a/examples/ota-requestor-app/p6/src/AppTask.cpp b/examples/ota-requestor-app/p6/src/AppTask.cpp index 5a6018a039a324..1e4333037aefa6 100644 --- a/examples/ota-requestor-app/p6/src/AppTask.cpp +++ b/examples/ota-requestor-app/p6/src/AppTask.cpp @@ -112,6 +112,15 @@ void NetWorkCommissioningInstInit() sWiFiNetworkCommissioningInstance.Init(); } +static void InitServer(intptr_t context) +{ + // Init ZCL Data Model + chip::Server::GetInstance().Init(); + + // Initialize device attestation config + SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); +} + CHIP_ERROR AppTask::StartAppTask() { sAppEventQueue = xQueueCreateStatic(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent), sAppEventQueueBuffer, &sAppEventQueueStruct); @@ -151,11 +160,8 @@ CHIP_ERROR AppTask::Init() } }, 0); - // Init ZCL Data Model - chip::Server::GetInstance().Init(); - // Initialize device attestation config - SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider()); + chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast(nullptr)); // Initialise WSTK buttons PB0 and PB1 (including debounce). ButtonHandler::Init(); diff --git a/third_party/p6/p6_sdk/configs/FreeRTOSConfig.h b/third_party/p6/p6_sdk/configs/FreeRTOSConfig.h index df4d89c52c93a4..38e058fbec9fbf 100644 --- a/third_party/p6/p6_sdk/configs/FreeRTOSConfig.h +++ b/third_party/p6/p6_sdk/configs/FreeRTOSConfig.h @@ -155,6 +155,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 #define INCLUDE_xTaskIsTaskFinished 1 #define INCLUDE_xTimerPendFunctionCall 1 +#define INCLUDE_xSemaphoreGetMutexHolder 1 /* Normal assert() semantics without relying on the provision of an assert.h header file. */ From 30b833024ef9f854ea57a952a223a848c9978c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Kr=C3=B3lik?= <66667989+Damian-Nordic@users.noreply.github.com> Date: Sat, 26 Mar 2022 04:59:46 +0100 Subject: [PATCH 13/16] [general-diagnostics] Use type-safe BootReasonType enum (#16556) * [general-diagnostics] Use type-safe BootReaonType enum 1. Switch from EmberAfBootReasonType to type-safe BootReasonType. 2. Use BootReasonType in DiagnosticDataProvider interface. * Fix K32W build --- examples/platform/linux/AppMain.cpp | 14 +++++----- .../general-diagnostics-server.cpp | 13 +++------- src/app/zap-templates/templates/app/helper.js | 1 - src/include/platform/DiagnosticDataProvider.h | 16 +++--------- .../internal/GenericPlatformManagerImpl.ipp | 4 +-- .../Ameba/ConfigurationManagerImpl.cpp | 2 +- .../Ameba/DiagnosticDataProviderImpl.cpp | 4 +-- .../Ameba/DiagnosticDataProviderImpl.h | 2 +- .../Darwin/ConfigurationManagerImpl.cpp | 2 +- .../EFR32/ConfigurationManagerImpl.cpp | 26 +++++++++---------- .../EFR32/DiagnosticDataProviderImpl.cpp | 4 +-- .../EFR32/DiagnosticDataProviderImpl.h | 2 +- .../ESP32/DiagnosticDataProviderImpl.cpp | 14 +++++----- .../ESP32/DiagnosticDataProviderImpl.h | 2 +- .../Linux/ConfigurationManagerImpl.cpp | 2 +- .../Linux/DiagnosticDataProviderImpl.cpp | 4 +-- .../Linux/DiagnosticDataProviderImpl.h | 2 +- .../P6/DiagnosticDataProviderImpl.cpp | 12 ++++----- src/platform/P6/DiagnosticDataProviderImpl.h | 2 +- .../Zephyr/DiagnosticDataProviderImpl.cpp | 18 ++++++------- .../Zephyr/DiagnosticDataProviderImpl.h | 4 +-- .../fake/DiagnosticDataProviderImpl.h | 2 +- .../k32w/k32w0/ConfigurationManagerImpl.cpp | 18 ++++++------- .../k32w/k32w0/DiagnosticDataProviderImpl.cpp | 4 +-- .../k32w/k32w0/DiagnosticDataProviderImpl.h | 2 +- .../app-common/zap-generated/cluster-enums.h | 6 ----- .../app-common/zap-generated/enums.h | 12 --------- 27 files changed, 80 insertions(+), 114 deletions(-) diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp index a3901bd2c990da..22d9052686fac2 100644 --- a/examples/platform/linux/AppMain.cpp +++ b/examples/platform/linux/AppMain.cpp @@ -104,26 +104,26 @@ void OnSignalHandler(int signum) // The BootReason attribute SHALL indicate the reason for the Node’s most recent boot, the real usecase // for this attribute is embedded system. In Linux simulation, we use different signals to tell the current // running process to terminate with different reasons. - BootReasonType bootReason = BootReasonType::Unspecified; + BootReasonType bootReason = BootReasonType::kUnspecified; switch (signum) { case SIGVTALRM: - bootReason = BootReasonType::PowerOnReboot; + bootReason = BootReasonType::kPowerOnReboot; break; case SIGALRM: - bootReason = BootReasonType::BrownOutReset; + bootReason = BootReasonType::kBrownOutReset; break; case SIGILL: - bootReason = BootReasonType::SoftwareWatchdogReset; + bootReason = BootReasonType::kSoftwareWatchdogReset; break; case SIGTRAP: - bootReason = BootReasonType::HardwareWatchdogReset; + bootReason = BootReasonType::kHardwareWatchdogReset; break; case SIGIO: - bootReason = BootReasonType::SoftwareUpdateCompleted; + bootReason = BootReasonType::kSoftwareUpdateCompleted; break; case SIGINT: - bootReason = BootReasonType::SoftwareReset; + bootReason = BootReasonType::kSoftwareReset; break; default: IgnoreUnusedVariable(bootReason); diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp index 8608c1f99a9748..cc6ec9d355f2ad 100644 --- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp +++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp @@ -36,13 +36,6 @@ using chip::DeviceLayer::ConnectivityMgr; using chip::DeviceLayer::DiagnosticDataProvider; using chip::DeviceLayer::GetDiagnosticDataProvider; -static_assert(sizeof(chip::DeviceLayer::BootReasonType) == sizeof(EmberAfBootReasonType), - "BootReasonType size doesn't match EmberAfBootReasonType size"); -static_assert(static_cast(chip::DeviceLayer::BootReasonType::Unspecified) == EMBER_ZCL_BOOT_REASON_TYPE_UNSPECIFIED && - static_cast(chip::DeviceLayer::BootReasonType::SoftwareReset) == - EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_RESET, - "BootReasonType and EmberAfBootReasonType values does not match."); - namespace { class GeneralDiagosticsAttrAccess : public AttributeAccessInterface @@ -71,7 +64,7 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (DiagnosticDa CHIP_ERROR err = (GetDiagnosticDataProvider().*getter)(data); if (err == CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE) { - data = 0; + data = {}; } else if (err != CHIP_NO_ERROR) { @@ -195,7 +188,7 @@ class GeneralDiagnosticsDelegate : public DeviceLayer::ConnectivityManagerDelega } // Gets called when the device has been rebooted. - void OnDeviceRebooted(chip::DeviceLayer::BootReasonType bootReason) override + void OnDeviceRebooted(BootReasonType bootReason) override { ChipLogDetail(Zcl, "GeneralDiagnosticsDelegate: OnDeviceRebooted"); @@ -203,7 +196,7 @@ class GeneralDiagnosticsDelegate : public DeviceLayer::ConnectivityManagerDelega // GeneralDiagnostics cluster should exist only for endpoint 0. - Events::BootReason::Type event{ static_cast(bootReason) }; + Events::BootReason::Type event{ bootReason }; EventNumber eventNumber; CHIP_ERROR err = LogEvent(event, 0, eventNumber); diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js index 04817befafbd26..326960bc6e1f01 100644 --- a/src/app/zap-templates/templates/app/helper.js +++ b/src/app/zap-templates/templates/app/helper.js @@ -754,7 +754,6 @@ function isWeaklyTypedEnum(label) "AttributeWritePermission", "BarrierControlBarrierPosition", "BarrierControlMovingState", - "BootReasonType", "ColorControlOptions", "ColorLoopAction", "ColorLoopDirection", diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h index 1c634f63a6ed67..0d576e4ae1c103 100644 --- a/src/include/platform/DiagnosticDataProvider.h +++ b/src/include/platform/DiagnosticDataProvider.h @@ -23,6 +23,7 @@ #pragma once #include +#include #include #include @@ -41,16 +42,7 @@ constexpr size_t kMaxIPv6AddrSize = 16; constexpr size_t kMaxIPv4AddrCount = 4; constexpr size_t kMaxIPv6AddrCount = 8; -enum BootReasonType : uint8_t -{ - Unspecified = 0, - PowerOnReboot = 1, - BrownOutReset = 2, - SoftwareWatchdogReset = 3, - HardwareWatchdogReset = 4, - SoftwareUpdateCompleted = 5, - SoftwareReset = 6, -}; +using BootReasonType = app::Clusters::GeneralDiagnostics::BootReasonType; struct ThreadMetrics : public app::Clusters::SoftwareDiagnostics::Structs::ThreadMetrics::Type { @@ -168,7 +160,7 @@ class DiagnosticDataProvider virtual CHIP_ERROR GetRebootCount(uint16_t & rebootCount); virtual CHIP_ERROR GetUpTime(uint64_t & upTime); virtual CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours); - virtual CHIP_ERROR GetBootReason(uint8_t & bootReason); + virtual CHIP_ERROR GetBootReason(BootReasonType & bootReason); virtual CHIP_ERROR GetActiveHardwareFaults(GeneralFaults & hardwareFaults); virtual CHIP_ERROR GetActiveRadioFaults(GeneralFaults & radioFaults); virtual CHIP_ERROR GetActiveNetworkFaults(GeneralFaults & networkFaults); @@ -296,7 +288,7 @@ inline CHIP_ERROR DiagnosticDataProvider::GetTotalOperationalHours(uint32_t & to return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; } -inline CHIP_ERROR DiagnosticDataProvider::GetBootReason(uint8_t & bootReason) +inline CHIP_ERROR DiagnosticDataProvider::GetBootReason(BootReasonType & bootReason) { return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; } diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.ipp b/src/include/platform/internal/GenericPlatformManagerImpl.ipp index cc14a287abba2e..9bb7dd8065e654 100644 --- a/src/include/platform/internal/GenericPlatformManagerImpl.ipp +++ b/src/include/platform/internal/GenericPlatformManagerImpl.ipp @@ -207,10 +207,10 @@ void GenericPlatformManagerImpl::_HandleServerStarted() if (generalDiagnosticsDelegate != nullptr) { - uint8_t bootReason; + BootReasonType bootReason; if (GetDiagnosticDataProvider().GetBootReason(bootReason) == CHIP_NO_ERROR) - generalDiagnosticsDelegate->OnDeviceRebooted(static_cast(bootReason)); + generalDiagnosticsDelegate->OnDeviceRebooted(bootReason); } } diff --git a/src/platform/Ameba/ConfigurationManagerImpl.cpp b/src/platform/Ameba/ConfigurationManagerImpl.cpp index 44485c1d12e94f..64abfe8a6bcbed 100644 --- a/src/platform/Ameba/ConfigurationManagerImpl.cpp +++ b/src/platform/Ameba/ConfigurationManagerImpl.cpp @@ -80,7 +80,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!AmebaConfig::ConfigValueExists(AmebaConfig::kCounterKey_BootReason)) { - err = StoreBootReason(BootReasonType::Unspecified); + err = StoreBootReason(to_underlying(BootReasonType::kUnspecified)); SuccessOrExit(err); } diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp index a9cf100558f315..19330b84472b7a 100644 --- a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp @@ -103,7 +103,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_ERROR_INVALID_TIME; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { uint32_t reason = 0; @@ -112,7 +112,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) if (err == CHIP_NO_ERROR) { VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE); - bootReason = static_cast(reason); + bootReason = static_cast(reason); } return err; diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.h b/src/platform/Ameba/DiagnosticDataProviderImpl.h index 9190c1a3bdc9e8..0d07a529731ce7 100644 --- a/src/platform/Ameba/DiagnosticDataProviderImpl.h +++ b/src/platform/Ameba/DiagnosticDataProviderImpl.h @@ -44,7 +44,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; diff --git a/src/platform/Darwin/ConfigurationManagerImpl.cpp b/src/platform/Darwin/ConfigurationManagerImpl.cpp index d48f7e21e77afe..2d1ae1b8921e35 100644 --- a/src/platform/Darwin/ConfigurationManagerImpl.cpp +++ b/src/platform/Darwin/ConfigurationManagerImpl.cpp @@ -160,7 +160,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!PosixConfig::ConfigValueExists(PosixConfig::kCounterKey_BootReason)) { - ReturnErrorOnFailure(StoreBootReason(BootReasonType::Unspecified)); + ReturnErrorOnFailure(StoreBootReason(to_underlying(BootReasonType::kUnspecified))); } if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_RegulatoryLocation)) diff --git a/src/platform/EFR32/ConfigurationManagerImpl.cpp b/src/platform/EFR32/ConfigurationManagerImpl.cpp index c99bfa734caca5..a333ff00988325 100644 --- a/src/platform/EFR32/ConfigurationManagerImpl.cpp +++ b/src/platform/EFR32/ConfigurationManagerImpl.cpp @@ -107,57 +107,57 @@ CHIP_ERROR ConfigurationManagerImpl::IncreaseBootCount(void) uint32_t ConfigurationManagerImpl::GetBootReason(void) { // rebootCause is obtained at bootup. - uint32_t matterBootCause; + BootReasonType matterBootCause; #if defined(_SILICON_LABS_32B_SERIES_1) if (rebootCause & RMU_RSTCAUSE_PORST || rebootCause & RMU_RSTCAUSE_EXTRST) // PowerOn or External pin reset { - matterBootCause = BootReasonType::PowerOnReboot; + matterBootCause = BootReasonType::kPowerOnReboot; } else if (rebootCause & RMU_RSTCAUSE_AVDDBOD || rebootCause & RMU_RSTCAUSE_DVDDBOD || rebootCause & RMU_RSTCAUSE_DECBOD) { - matterBootCause = BootReasonType::BrownOutReset; + matterBootCause = BootReasonType::kBrownOutReset; } else if (rebootCause & RMU_RSTCAUSE_SYSREQRST) { - matterBootCause = BootReasonType::SoftwareReset; + matterBootCause = BootReasonType::kSoftwareReset; } else if (rebootCause & RMU_RSTCAUSE_WDOGRST) { - matterBootCause = BootReasonType::SoftwareWatchdogReset; + matterBootCause = BootReasonType::kSoftwareWatchdogReset; } else { - matterBootCause = BootReasonType::Unspecified; + matterBootCause = BootReasonType::kUnspecified; } // Not tracked HARDWARE_WATCHDOG_RESET && SOFTWARE_UPDATE_COMPLETED #elif defined(_SILICON_LABS_32B_SERIES_2) if (rebootCause & EMU_RSTCAUSE_POR || rebootCause & EMU_RSTCAUSE_PIN) // PowerOn or External pin reset { - matterBootCause = BootReasonType::PowerOnReboot; + matterBootCause = BootReasonType::kPowerOnReboot; } else if (rebootCause & EMU_RSTCAUSE_AVDDBOD || rebootCause & EMU_RSTCAUSE_DVDDBOD || rebootCause & EMU_RSTCAUSE_DECBOD || rebootCause & EMU_RSTCAUSE_VREGIN || rebootCause & EMU_RSTCAUSE_IOVDD0BOD || rebootCause & EMU_RSTCAUSE_DVDDLEBOD) { - matterBootCause = BootReasonType::BrownOutReset; + matterBootCause = BootReasonType::kBrownOutReset; } else if (rebootCause & EMU_RSTCAUSE_SYSREQ) { - matterBootCause = BootReasonType::SoftwareReset; + matterBootCause = BootReasonType::kSoftwareReset; } else if (rebootCause & EMU_RSTCAUSE_WDOG0 || rebootCause & EMU_RSTCAUSE_WDOG1) { - matterBootCause = BootReasonType::SoftwareWatchdogReset; + matterBootCause = BootReasonType::kSoftwareWatchdogReset; } else { - matterBootCause = BootReasonType::Unspecified; + matterBootCause = BootReasonType::kUnspecified; } // Not tracked HARDWARE_WATCHDOG_RESET && SOFTWARE_UPDATE_COMPLETED #else - matterBootCause = BootReasonType::Unspecified; + matterBootCause = BootReasonType::kUnspecified; #endif - return matterBootCause; + return to_underlying(matterBootCause); } CHIP_ERROR ConfigurationManagerImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours) diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp index bea3c052e0d428..442f51174369db 100644 --- a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp +++ b/src/platform/EFR32/DiagnosticDataProviderImpl.cpp @@ -98,7 +98,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetRebootCount(uint16_t & rebootCount) return err; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { uint32_t reason = 0; CHIP_ERROR err = ConfigurationMgr().GetBootReason(reason); @@ -106,7 +106,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) if (err == CHIP_NO_ERROR) { VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE); - bootReason = static_cast(reason); + bootReason = static_cast(reason); } return err; diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.h b/src/platform/EFR32/DiagnosticDataProviderImpl.h index f2618e0fae6d80..a10259e6f7b336 100644 --- a/src/platform/EFR32/DiagnosticDataProviderImpl.h +++ b/src/platform/EFR32/DiagnosticDataProviderImpl.h @@ -43,7 +43,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override; CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override; CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; CHIP_ERROR GetActiveHardwareFaults(GeneralFaults & hardwareFaults) override; diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp index 62e942ee5a4316..ecab9d96252190 100644 --- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp +++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp @@ -165,30 +165,30 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_ERROR_INVALID_TIME; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { - bootReason = BootReasonType::Unspecified; + bootReason = BootReasonType::kUnspecified; uint8_t reason; reason = static_cast(esp_reset_reason()); if (reason == ESP_RST_UNKNOWN) { - bootReason = BootReasonType::Unspecified; + bootReason = BootReasonType::kUnspecified; } else if (reason == ESP_RST_POWERON) { - bootReason = BootReasonType::PowerOnReboot; + bootReason = BootReasonType::kPowerOnReboot; } else if (reason == ESP_RST_BROWNOUT) { - bootReason = BootReasonType::BrownOutReset; + bootReason = BootReasonType::kBrownOutReset; } else if (reason == ESP_RST_SW) { - bootReason = BootReasonType::SoftwareReset; + bootReason = BootReasonType::kSoftwareReset; } else if (reason == ESP_RST_INT_WDT) { - bootReason = BootReasonType::SoftwareWatchdogReset; + bootReason = BootReasonType::kSoftwareWatchdogReset; /* Reboot can be due to hardware or software watchdog*/ } return CHIP_NO_ERROR; diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.h b/src/platform/ESP32/DiagnosticDataProviderImpl.h index 46257d5ce1a0d6..1142a7dcdcbb9c 100644 --- a/src/platform/ESP32/DiagnosticDataProviderImpl.h +++ b/src/platform/ESP32/DiagnosticDataProviderImpl.h @@ -46,7 +46,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; diff --git a/src/platform/Linux/ConfigurationManagerImpl.cpp b/src/platform/Linux/ConfigurationManagerImpl.cpp index 64b14d3067ec97..4d96e3ddfaf830 100644 --- a/src/platform/Linux/ConfigurationManagerImpl.cpp +++ b/src/platform/Linux/ConfigurationManagerImpl.cpp @@ -88,7 +88,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!PosixConfig::ConfigValueExists(PosixConfig::kCounterKey_BootReason)) { - err = StoreBootReason(BootReasonType::Unspecified); + err = StoreBootReason(to_underlying(BootReasonType::kUnspecified)); SuccessOrExit(err); } diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp index 12beb5a882589a..a869d9373371d4 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp @@ -368,7 +368,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_ERROR_INVALID_TIME; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { uint32_t reason = 0; @@ -377,7 +377,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) if (err == CHIP_NO_ERROR) { VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE); - bootReason = static_cast(reason); + bootReason = static_cast(reason); } return err; diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h index f143c041661de8..36e5f221878dbb 100644 --- a/src/platform/Linux/DiagnosticDataProviderImpl.h +++ b/src/platform/Linux/DiagnosticDataProviderImpl.h @@ -48,7 +48,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetActiveHardwareFaults(GeneralFaults & hardwareFaults) override; CHIP_ERROR GetActiveRadioFaults(GeneralFaults & radioFaults) override; diff --git a/src/platform/P6/DiagnosticDataProviderImpl.cpp b/src/platform/P6/DiagnosticDataProviderImpl.cpp index 9f04ab543dbaf5..d5df791b23cbae 100644 --- a/src/platform/P6/DiagnosticDataProviderImpl.cpp +++ b/src/platform/P6/DiagnosticDataProviderImpl.cpp @@ -114,28 +114,28 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_ERROR_INVALID_TIME; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { cyhal_reset_reason_t reset_reason = cyhal_system_get_reset_reason(); if (reset_reason == CYHAL_SYSTEM_RESET_NONE) { - bootReason = BootReasonType::PowerOnReboot; + bootReason = BootReasonType::kPowerOnReboot; } else if (reset_reason == CYHAL_SYSTEM_RESET_WDT) { - bootReason = BootReasonType::SoftwareWatchdogReset; + bootReason = BootReasonType::kSoftwareWatchdogReset; } else if (reset_reason == CYHAL_SYSTEM_RESET_SOFT) { - bootReason = BootReasonType::SoftwareReset; + bootReason = BootReasonType::kSoftwareReset; } else if (reset_reason == CYHAL_SYSTEM_RESET_HIB_WAKEUP) { - bootReason = BootReasonType::HardwareWatchdogReset; + bootReason = BootReasonType::kHardwareWatchdogReset; } else { - bootReason = BootReasonType::Unspecified; + bootReason = BootReasonType::kUnspecified; } return CHIP_NO_ERROR; } diff --git a/src/platform/P6/DiagnosticDataProviderImpl.h b/src/platform/P6/DiagnosticDataProviderImpl.h index aa0af35c04ce94..908f28afdbf2a7 100644 --- a/src/platform/P6/DiagnosticDataProviderImpl.h +++ b/src/platform/P6/DiagnosticDataProviderImpl.h @@ -71,7 +71,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp index b6958451aa0001..8d16ac3df55d9d 100644 --- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp @@ -40,14 +40,14 @@ namespace DeviceLayer { namespace { -uint8_t DetermineBootReason() +BootReasonType DetermineBootReason() { #ifdef CONFIG_HWINFO uint32_t reason; if (hwinfo_get_reset_cause(&reason) != 0) { - return BootReasonType::Unspecified; + return BootReasonType::kUnspecified; } // Bits returned by hwinfo_get_reset_cause() are accumulated between subsequent resets, so @@ -58,17 +58,17 @@ uint8_t DetermineBootReason() // If no reset cause is provided, it indicates a power-on-reset. if (reason == 0 || reason & (RESET_POR | RESET_PIN)) { - return BootReasonType::PowerOnReboot; + return BootReasonType::kPowerOnReboot; } if (reason & RESET_WATCHDOG) { - return BootReasonType::HardwareWatchdogReset; + return BootReasonType::kHardwareWatchdogReset; } if (reason & RESET_BROWNOUT) { - return BootReasonType::BrownOutReset; + return BootReasonType::kBrownOutReset; } if (reason & RESET_SOFTWARE) @@ -76,14 +76,14 @@ uint8_t DetermineBootReason() #ifdef CONFIG_MCUBOOT_IMG_MANAGER if (mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT) { - return BootReasonType::SoftwareUpdateCompleted; + return BootReasonType::kSoftwareUpdateCompleted; } #endif - return BootReasonType::SoftwareReset; + return BootReasonType::kSoftwareReset; } #endif - return BootReasonType::Unspecified; + return BootReasonType::kUnspecified; } } // namespace @@ -180,7 +180,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_NO_ERROR; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { #if CONFIG_HWINFO bootReason = mBootReason; diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.h b/src/platform/Zephyr/DiagnosticDataProviderImpl.h index b8b05591332b2f..a90cf4eb43e24d 100644 --- a/src/platform/Zephyr/DiagnosticDataProviderImpl.h +++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.h @@ -46,14 +46,14 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override; void ReleaseNetworkInterfaces(NetworkInterface * netifp) override; private: DiagnosticDataProviderImpl(); - const uint8_t mBootReason; + const BootReasonType mBootReason; }; } // namespace DeviceLayer diff --git a/src/platform/fake/DiagnosticDataProviderImpl.h b/src/platform/fake/DiagnosticDataProviderImpl.h index f58c6d712d81cf..dd69739f15563b 100644 --- a/src/platform/fake/DiagnosticDataProviderImpl.h +++ b/src/platform/fake/DiagnosticDataProviderImpl.h @@ -48,7 +48,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; CHIP_ERROR GetActiveHardwareFaults(GeneralFaults & hardwareFaults) override; CHIP_ERROR GetActiveRadioFaults(GeneralFaults & radioFaults) override; diff --git a/src/platform/nxp/k32w/k32w0/ConfigurationManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/ConfigurationManagerImpl.cpp index 947e0194df35a2..bf8c73c578c801 100644 --- a/src/platform/nxp/k32w/k32w0/ConfigurationManagerImpl.cpp +++ b/src/platform/nxp/k32w/k32w0/ConfigurationManagerImpl.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -75,7 +76,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!K32WConfig::ConfigValueExists(K32WConfig::kCounterKey_BootReason)) { - err = StoreBootReason(EMBER_ZCL_BOOT_REASON_TYPE_UNSPECIFIED); + err = StoreBootReason(to_underlying(BootReasonType::kUnspecified)); SuccessOrExit(err); } @@ -119,29 +120,28 @@ CHIP_ERROR ConfigurationManagerImpl::StoreTotalOperationalHours(uint32_t totalOp CHIP_ERROR ConfigurationManagerImpl::GetBootReason(uint32_t & bootReason) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_UNSPECIFIED; - uint8_t reason; - reason = POWER_GetResetCause(); + bootReason = to_underlying(BootReasonType::kUnspecified); + uint8_t reason = POWER_GetResetCause(); if (reason == RESET_UNDEFINED) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_UNSPECIFIED; + bootReason = to_underlying(BootReasonType::kUnspecified); } else if ((reason == RESET_POR) || (reason == RESET_EXT_PIN)) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_POWER_ON_REBOOT; + bootReason = to_underlying(BootReasonType::kPowerOnReboot); } else if (reason == RESET_BOR) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_BROWN_OUT_RESET; + bootReason = to_underlying(BootReasonType::kBrownOutReset); } else if (reason == RESET_SW_REQ) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_RESET; + bootReason = to_underlying(BootReasonType::kSoftwareReset); } else if (reason == RESET_WDT) { - bootReason = EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_WATCHDOG_RESET; + bootReason = to_underlying(BootReasonType::kSoftwareWatchdogReset); /* Reboot can be due to hardware or software watchdog */ } diff --git a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp index 58d6503b869fad..14e4126a066166 100644 --- a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp +++ b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp @@ -117,7 +117,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total return CHIP_ERROR_INVALID_TIME; } -CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) +CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason) { uint32_t reason = 0; @@ -126,7 +126,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(uint8_t & bootReason) if (err == CHIP_NO_ERROR) { VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE); - bootReason = static_cast(reason); + bootReason = static_cast(reason); } return err; diff --git a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h index cd33af8885df15..dadada68c197a5 100644 --- a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h +++ b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.h @@ -46,7 +46,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override; CHIP_ERROR GetUpTime(uint64_t & upTime) override; CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override; - CHIP_ERROR GetBootReason(uint8_t & bootReason) override; + CHIP_ERROR GetBootReason(BootReasonType & bootReason) override; }; } // namespace DeviceLayer diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 2eba257609d968..8143c3ba3653b4 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -652,9 +652,6 @@ enum class LogsTransferProtocol : uint8_t namespace GeneralDiagnostics { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Enum for BootReasonType enum class BootReasonType : uint8_t { @@ -666,9 +663,6 @@ enum class BootReasonType : uint8_t kSoftwareUpdateCompleted = 0x05, kSoftwareReset = 0x06, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using BootReasonType = EmberAfBootReasonType; -#endif // Need to convert consumers to using the new enum classes, so we // don't just have casts all over. diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index e2fd7404f342ba..0d9a75d32f1371 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -52,18 +52,6 @@ enum EmberAfBarrierControlMovingState : uint8_t EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2, }; -// Enum for BootReasonType -enum EmberAfBootReasonType : uint8_t -{ - EMBER_ZCL_BOOT_REASON_TYPE_UNSPECIFIED = 0, - EMBER_ZCL_BOOT_REASON_TYPE_POWER_ON_REBOOT = 1, - EMBER_ZCL_BOOT_REASON_TYPE_BROWN_OUT_RESET = 2, - EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_WATCHDOG_RESET = 3, - EMBER_ZCL_BOOT_REASON_TYPE_HARDWARE_WATCHDOG_RESET = 4, - EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_UPDATE_COMPLETED = 5, - EMBER_ZCL_BOOT_REASON_TYPE_SOFTWARE_RESET = 6, -}; - // Enum for ColorControlOptions enum EmberAfColorControlOptions : uint8_t { From e5c39d460974a2819ace470d3f508a933cfdca93 Mon Sep 17 00:00:00 2001 From: krypton36 Date: Fri, 25 Mar 2022 21:01:08 -0700 Subject: [PATCH 14/16] Add Door Lock management to all clusters app. (#16687) --- examples/all-clusters-app/linux/BUILD.gn | 9 +- examples/door-lock-app/linux/BUILD.gn | 1 + examples/door-lock-app/linux/main.cpp | 93 ------------------- .../linux/src/ZCLDoorLockCallbacks.cpp | 91 ++++++++++++++++++ 4 files changed, 99 insertions(+), 95 deletions(-) create mode 100644 examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn index 36d3d0aa3c10a9..c2b386767c7f96 100644 --- a/examples/all-clusters-app/linux/BUILD.gn +++ b/examples/all-clusters-app/linux/BUILD.gn @@ -23,6 +23,9 @@ source_set("chip-all-clusters-common") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", + "${chip_root}/examples/door-lock-app/linux/src/LockEndpoint.cpp", + "${chip_root}/examples/door-lock-app/linux/src/LockManager.cpp", + "${chip_root}/examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp", "include/tv-callbacks.cpp", "include/tv-callbacks.h", "main-common.cpp", @@ -34,8 +37,10 @@ source_set("chip-all-clusters-common") { "${chip_root}/src/lib", ] - include_dirs = - [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ] + include_dirs = [ + "${chip_root}/examples/all-clusters-app/all-clusters-common/include", + "${chip_root}/examples/door-lock-app/linux/include", + ] cflags = [ "-Wconversion" ] diff --git a/examples/door-lock-app/linux/BUILD.gn b/examples/door-lock-app/linux/BUILD.gn index ff0f13d217d852..90dd96b3d23bb1 100644 --- a/examples/door-lock-app/linux/BUILD.gn +++ b/examples/door-lock-app/linux/BUILD.gn @@ -20,6 +20,7 @@ executable("chip-door-lock-app") { "main.cpp", "src/LockEndpoint.cpp", "src/LockManager.cpp", + "src/ZCLDoorLockCallbacks.cpp", ] deps = [ diff --git a/examples/door-lock-app/linux/main.cpp b/examples/door-lock-app/linux/main.cpp index 542d901191e5d2..5f7f27c7d9d96e 100644 --- a/examples/door-lock-app/linux/main.cpp +++ b/examples/door-lock-app/linux/main.cpp @@ -16,101 +16,8 @@ * limitations under the License. */ -#include -#include - -#include "LockManager.h" - #include "AppMain.h" -using namespace chip; -using namespace chip::app::Clusters; -using namespace chip::app::Clusters::DoorLock; - -// App handles physical aspects of locking but not locking logic. That is it -// should wait for door to be locked on lock command and return success) but -// door lock server should check pin before even calling the lock-door -// callback. -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) -{ - return LockManager::Instance().Lock(endpointId, pinCode, err); -} - -bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) -{ - return LockManager::Instance().Unlock(endpointId, pinCode, err); -} - -bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) -{ - return LockManager::Instance().GetUser(endpointId, userIndex, user); -} - -bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId, - DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule, - const DlCredential * credentials, size_t totalCredentials) -{ - - return LockManager::Instance().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, - credentialRule, credentials, totalCredentials); -} - -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, - EmberAfPluginDoorLockCredentialInfo & credential) -{ - return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential); -} - -bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) -{ - return LockManager::Instance().SetCredential(endpointId, credentialIndex, credentialStatus, credentialType, credentialData); -} - -DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - EmberAfPluginDoorLockWeekDaySchedule & schedule) -{ - return LockManager::Instance().GetSchedule(endpointId, weekdayIndex, userIndex, schedule); -} - -DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, - uint8_t endHour, uint8_t endMinute) -{ - return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, - endHour, endMinute); -} - -DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, - DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime) -{ - return LockManager::Instance().SetSchedule(endpointId, yearDayIndex, userIndex, status, localStartTime, localEndTime); -} - -DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, - EmberAfPluginDoorLockYearDaySchedule & schedule) -{ - return LockManager::Instance().GetSchedule(endpointId, yearDayIndex, userIndex, schedule); -} - -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, - uint16_t size, uint8_t * value) -{ - // TODO: Watch for LockState, DoorState, Mode, etc changes and trigger appropriate action - if (attributePath.mClusterId == DoorLock::Id) - { - emberAfDoorLockClusterPrintln("Door Lock attribute changed"); - } -} - -void emberAfDoorLockClusterInitCallback(EndpointId endpoint) -{ - DoorLockServer::Instance().InitServer(endpoint); - LockManager::Instance().InitEndpoint(endpoint); -} - void ApplicationInit() {} int main(int argc, char * argv[]) diff --git a/examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp b/examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp new file mode 100644 index 00000000000000..24a17b8f1131a2 --- /dev/null +++ b/examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp @@ -0,0 +1,91 @@ +#include +#include + +#include "LockManager.h" + +using namespace chip; +using namespace chip::app::Clusters; +using namespace chip::app::Clusters::DoorLock; +// App handles physical aspects of locking but not locking logic. That is it +// should wait for door to be locked on lock command and return success) but +// door lock server should check pin before even calling the lock-door +// callback. +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +{ + return LockManager::Instance().Lock(endpointId, pinCode, err); +} + +bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, + DlOperationError & err) +{ + return LockManager::Instance().Unlock(endpointId, pinCode, err); +} + +bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) +{ + return LockManager::Instance().GetUser(endpointId, userIndex, user); +} + +bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, + chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId, + DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule, + const DlCredential * credentials, size_t totalCredentials) +{ + + return LockManager::Instance().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, + credentialRule, credentials, totalCredentials); +} + +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + EmberAfPluginDoorLockCredentialInfo & credential) +{ + return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential); +} + +bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialStatus credentialStatus, + DlCredentialType credentialType, const chip::ByteSpan & credentialData) +{ + return LockManager::Instance().SetCredential(endpointId, credentialIndex, credentialStatus, credentialType, credentialData); +} + +DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, + EmberAfPluginDoorLockWeekDaySchedule & schedule) +{ + return LockManager::Instance().GetSchedule(endpointId, weekdayIndex, userIndex, schedule); +} + +DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, + DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + uint8_t endHour, uint8_t endMinute) +{ + return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, + endHour, endMinute); +} + +DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, + DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime) +{ + return LockManager::Instance().SetSchedule(endpointId, yearDayIndex, userIndex, status, localStartTime, localEndTime); +} + +DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, + EmberAfPluginDoorLockYearDaySchedule & schedule) +{ + return LockManager::Instance().GetSchedule(endpointId, yearDayIndex, userIndex, schedule); +} + +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, + uint16_t size, uint8_t * value) +{ + // TODO: Watch for LockState, DoorState, Mode, etc changes and trigger appropriate action + if (attributePath.mClusterId == DoorLock::Id) + { + emberAfDoorLockClusterPrintln("Door Lock attribute changed"); + } +} + +void emberAfDoorLockClusterInitCallback(EndpointId endpoint) +{ + DoorLockServer::Instance().InitServer(endpoint); + LockManager::Instance().InitEndpoint(endpoint); +} From 4eb825dbdf524868e67255e1ba56bbd8b9112153 Mon Sep 17 00:00:00 2001 From: Marc Lepage <67919234+mlepage-google@users.noreply.github.com> Date: Sat, 26 Mar 2022 01:36:59 -0400 Subject: [PATCH 15/16] Add RemoveFabric to AccessControl (#16685) Use the "public" API to delete entries for a fabric. Tested (on Linux using chip-all-clusters-app and chip-tool) by commissioning on three fabrics, with 3, 2, and 2 distinct ACLs, then removing the second (middle) fabric, and verifying that the remaining 5 ACLs are preserved, even after restart. Part of issue #13876 (fabric removal and factory reset) --- src/access/AccessControl.cpp | 16 ++++++++++++++++ src/access/AccessControl.h | 2 ++ src/app/server/Server.h | 1 + 3 files changed, 19 insertions(+) diff --git a/src/access/AccessControl.cpp b/src/access/AccessControl.cpp index 2a2f37beb40fa7..f9cb48a20f18b2 100644 --- a/src/access/AccessControl.cpp +++ b/src/access/AccessControl.cpp @@ -188,6 +188,22 @@ CHIP_ERROR AccessControl::Finish() return retval; } +CHIP_ERROR AccessControl::RemoveFabric(FabricIndex fabricIndex) +{ + ChipLogProgress(DataManagement, "AccessControl: removing fabric %u", fabricIndex); + + CHIP_ERROR err; + do + { + err = DeleteEntry(0, &fabricIndex); + } while (err == CHIP_NO_ERROR); + + // Sentinel error is OK, just means there was no such entry. + ReturnErrorCodeIf(err != CHIP_ERROR_SENTINEL, err); + + return CHIP_NO_ERROR; +} + CHIP_ERROR AccessControl::Check(const SubjectDescriptor & subjectDescriptor, const RequestPath & requestPath, Privilege requestPrivilege) { diff --git a/src/access/AccessControl.h b/src/access/AccessControl.h index dd74167f0891d5..be1c268e3628b5 100644 --- a/src/access/AccessControl.h +++ b/src/access/AccessControl.h @@ -468,6 +468,8 @@ class AccessControl return mDelegate->DeleteEntry(index, fabricIndex); } + CHIP_ERROR RemoveFabric(FabricIndex fabricIndex); + /** * Iterates over entries in the access control list. * diff --git a/src/app/server/Server.h b/src/app/server/Server.h index b036f96eed08d7..ca5bdcfa99a394 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -223,6 +223,7 @@ class Server { groupDataProvider->RemoveFabric(fabricIndex); } + Access::GetAccessControl().RemoveFabric(fabricIndex); }; void OnFabricRetrievedFromStorage(FabricInfo * fabricInfo) override { (void) fabricInfo; } From 58cd5fb0ab06e2233ef52c1e575e0d750d13a833 Mon Sep 17 00:00:00 2001 From: krypton36 Date: Sat, 26 Mar 2022 20:29:26 -0700 Subject: [PATCH 16/16] Add BLE and thread pairing capabilities to chip-tool-darwin. (#16126) --- .../commands/pairing/Commands.h | 23 ++++++++---- .../commands/pairing/PairingCommandBridge.h | 36 +++++++++++++++++-- .../commands/pairing/PairingCommandBridge.mm | 34 ++++++++++++++++-- .../commands/pairing/PairingDelegateBridge.h | 3 ++ .../commands/pairing/PairingDelegateBridge.mm | 14 ++++++-- src/darwin/Framework/CHIP/BUILD.gn | 1 + 6 files changed, 98 insertions(+), 13 deletions(-) diff --git a/examples/chip-tool-darwin/commands/pairing/Commands.h b/examples/chip-tool-darwin/commands/pairing/Commands.h index dcfd6fc789c7cb..4e88b1ea3a502a 100644 --- a/examples/chip-tool-darwin/commands/pairing/Commands.h +++ b/examples/chip-tool-darwin/commands/pairing/Commands.h @@ -23,19 +23,31 @@ class PairQRCode : public PairingCommandBridge { public: - PairQRCode() : PairingCommandBridge("qrcode", PairingMode::QRCode) {} + PairQRCode() : PairingCommandBridge("qrcode", PairingMode::QRCode, PairingNetworkType::None) {} }; class PairManualCode : public PairingCommandBridge { public: - PairManualCode() : PairingCommandBridge("manualcode", PairingMode::ManualCode) {} + PairManualCode() : PairingCommandBridge("manualcode", PairingMode::ManualCode, PairingNetworkType::None) {} }; class PairWithIPAddress : public PairingCommandBridge { public: - PairWithIPAddress() : PairingCommandBridge("ethernet", PairingMode::Ethernet) {} + PairWithIPAddress() : PairingCommandBridge("ethernet", PairingMode::Ethernet, PairingNetworkType::Ethernet) {} +}; + +class PairBleWiFi : public PairingCommandBridge +{ +public: + PairBleWiFi() : PairingCommandBridge("ble-wifi", PairingMode::Ble, PairingNetworkType::WiFi) {} +}; + +class PairBleThread : public PairingCommandBridge +{ +public: + PairBleThread() : PairingCommandBridge("ble-thread", PairingMode::Ble, PairingNetworkType::Thread) {} }; void registerCommandsPairing(Commands & commands) @@ -43,9 +55,8 @@ void registerCommandsPairing(Commands & commands) const char * clusterName = "Pairing"; commands_list clusterCommands = { - make_unique(), - make_unique(), - make_unique(), + make_unique(), make_unique(), make_unique(), + make_unique(), make_unique(), }; commands.Register(clusterName, clusterCommands); diff --git a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h b/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h index 917d7e2bf9521d..92dcff9b3cf072 100644 --- a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h +++ b/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.h @@ -25,15 +25,38 @@ enum class PairingMode { QRCode, ManualCode, - Ethernet + Ethernet, + Ble, +}; + +enum class PairingNetworkType +{ + None, + WiFi, + Thread, + Ethernet, }; class PairingCommandBridge : public CHIPCommandBridge { public: - PairingCommandBridge(const char * commandName, PairingMode mode) : CHIPCommandBridge(commandName), mPairingMode(mode) + PairingCommandBridge(const char * commandName, PairingMode mode, PairingNetworkType networkType) : + CHIPCommandBridge(commandName), mPairingMode(mode), mNetworkType(networkType) { AddArgument("node-id", 0, UINT64_MAX, &mNodeId); + switch (networkType) + { + case PairingNetworkType::None: + case PairingNetworkType::Ethernet: + break; + case PairingNetworkType::WiFi: + AddArgument("ssid", &mSSID); + AddArgument("password", &mPassword); + break; + case PairingNetworkType::Thread: + AddArgument("operationalDataset", &mOperationalDataset); + break; + } switch (mode) { @@ -49,6 +72,10 @@ class PairingCommandBridge : public CHIPCommandBridge AddArgument("device-remote-ip", &ipAddress); AddArgument("device-remote-port", 0, UINT16_MAX, &mRemotePort); break; + case PairingMode::Ble: + AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode); + AddArgument("discriminator", 0, 4096, &mDiscriminator); + break; } } @@ -58,10 +85,15 @@ class PairingCommandBridge : public CHIPCommandBridge private: void PairWithCode(NSError * __autoreleasing * error); + void PairWithPayload(NSError * __autoreleasing * error); void PairWithIPAddress(NSError * __autoreleasing * error); void SetUpPairingDelegate(); const PairingMode mPairingMode; + const PairingNetworkType mNetworkType; + chip::ByteSpan mOperationalDataset; + chip::ByteSpan mSSID; + chip::ByteSpan mPassword; chip::NodeId mNodeId; uint16_t mRemotePort; uint16_t mDiscriminator; diff --git a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm b/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm index 31c2e73fffbfbd..3b90ece6bbdf72 100644 --- a/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm +++ b/examples/chip-tool-darwin/commands/pairing/PairingCommandBridge.mm @@ -16,7 +16,10 @@ * */ +#import #import +#import +#import #include "../common/CHIPCommandBridge.h" #include "PairingCommandBridge.h" @@ -31,9 +34,25 @@ { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.pairing", DISPATCH_QUEUE_SERIAL); CHIPToolPairingDelegate * pairing = [[CHIPToolPairingDelegate alloc] init]; + CHIPCommissioningParameters * params = [[CHIPCommissioningParameters alloc] init]; - pairing.deviceID = mNodeId; - pairing.commandBridge = this; + [pairing setDeviceID:mNodeId]; + switch (mNetworkType) { + case PairingNetworkType::None: + case PairingNetworkType::Ethernet: + break; + case PairingNetworkType::WiFi: + [params setWifiSSID:[NSData dataWithBytes:mSSID.data() length:mSSID.size()]]; + [params setWifiCredentials:[NSData dataWithBytes:mPassword.data() length:mPassword.size()]]; + break; + case PairingNetworkType::Thread: + [params setThreadOperationalDataset:[NSData dataWithBytes:mOperationalDataset.data() length:mOperationalDataset.size()]]; + break; + } + + [pairing setCommandBridge:this]; + [pairing setParams:params]; + [pairing setCommissioner:CurrentCommissioner()]; [CurrentCommissioner() setPairingDelegate:pairing queue:callbackQueue]; } @@ -44,17 +63,26 @@ switch (mPairingMode) { case PairingMode::QRCode: case PairingMode::ManualCode: - PairWithCode(&error); + PairWithPayload(&error); break; case PairingMode::Ethernet: PairWithIPAddress(&error); break; + case PairingMode::Ble: + PairWithCode(&error); + break; } return [CHIPError errorToCHIPErrorCode:error]; } void PairingCommandBridge::PairWithCode(NSError * __autoreleasing * error) +{ + SetUpPairingDelegate(); + [CurrentCommissioner() pairDevice:mNodeId discriminator:mDiscriminator setupPINCode:mSetupPINCode error:error]; +} + +void PairingCommandBridge::PairWithPayload(NSError * __autoreleasing * error) { NSString * payload = [NSString stringWithUTF8String:mOnboardingPayload]; diff --git a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h b/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h index fbe026e398f15b..641ac77e79501a 100644 --- a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h +++ b/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.h @@ -21,6 +21,9 @@ @interface CHIPToolPairingDelegate : NSObject @property PairingCommandBridge * commandBridge; @property chip::NodeId deviceID; +@property CHIPDeviceController * commissioner; +@property CHIPCommissioningParameters * params; + - (void)onPairingComplete:(NSError *)error; - (void)onPairingDeleted:(NSError *)error; - (void)onCommissioningComplete:(NSError *)error; diff --git a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm b/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm index 4a52f65ce10455..b35b22737a3b20 100644 --- a/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm +++ b/examples/chip-tool-darwin/commands/pairing/PairingDelegateBridge.mm @@ -17,6 +17,7 @@ */ #include "PairingDelegateBridge.h" +#import #import @interface CHIPToolPairingDelegate () @@ -41,10 +42,19 @@ - (void)onStatusUpdate:(CHIPPairingStatus)status - (void)onPairingComplete:(NSError *)error { + NSError * __block commissionError; CHIP_ERROR err = [CHIPError errorToCHIPErrorCode:error]; + if (err != CHIP_NO_ERROR) { + _commandBridge->SetCommandExitStatus(err); + return; + } ChipLogProgress(chipTool, "Pairing Complete: %s", chip::ErrorStr(err)); - - _commandBridge->SetCommandExitStatus(err); + [_commissioner commissionDevice:_deviceID commissioningParams:_params error:&commissionError]; + err = [CHIPError errorToCHIPErrorCode:commissionError]; + if (err != CHIP_NO_ERROR) { + _commandBridge->SetCommandExitStatus(err); + return; + } } - (void)onPairingDeleted:(NSError *)error diff --git a/src/darwin/Framework/CHIP/BUILD.gn b/src/darwin/Framework/CHIP/BUILD.gn index 198fdf371da18a..31ef2e0d94ecaa 100644 --- a/src/darwin/Framework/CHIP/BUILD.gn +++ b/src/darwin/Framework/CHIP/BUILD.gn @@ -30,6 +30,7 @@ static_library("framework") { sources = [ "CHIP.h", "CHIPCluster.mm", + "CHIPCommissioningParameters.m", "CHIPControllerAccessControl.h", "CHIPControllerAccessControl.mm", "CHIPDevice.h",