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 26ef094c0d7b84..7bf43efc3b4cf1 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 @@ -1813,7 +1813,7 @@ server cluster ModeSelect = 80 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1824,13 +1824,13 @@ server cluster DoorLock = 257 { kForcedUser = 8; } - enum DlCredentialRule : ENUM8 { + enum CredentialRuleEnum : ENUM8 { kSingle = 0; - kDouble = 1; + kDual = 1; kTri = 2; } - enum DlCredentialType : ENUM8 { + enum CredentialTypeEnum : ENUM8 { kProgrammingPIN = 0; kPin = 1; kRfid = 2; @@ -1839,40 +1839,12 @@ server cluster DoorLock = 257 { kFace = 5; } - enum DlDataOperationType : ENUM8 { + enum DataOperationTypeEnum : ENUM8 { kAdd = 0; kClear = 1; kModify = 2; } - enum DlDoorState : ENUM8 { - kDoorOpen = 0; - kDoorClosed = 1; - kDoorJammed = 2; - kDoorForcedOpen = 3; - kDoorUnspecifiedError = 4; - kDoorAjar = 5; - } - - enum DlLockDataType : ENUM8 { - kUnspecified = 0; - kProgrammingCode = 1; - kUserIndex = 2; - kWeekDaySchedule = 3; - kYearDaySchedule = 4; - kHolidaySchedule = 5; - kPin = 6; - kRfid = 7; - kFingerprint = 8; - } - - enum DlLockOperationType : ENUM8 { - kLock = 0; - kUnlock = 1; - kNonAccessUserEvent = 2; - kForcedUserEvent = 3; - } - enum DlLockState : ENUM8 { kNotFullyLocked = 0; kLocked = 1; @@ -1893,35 +1865,6 @@ server cluster DoorLock = 257 { kDoorFurniture = 10; } - enum DlOperatingMode : ENUM8 { - kNormal = 0; - kVacation = 1; - kPrivacy = 2; - kNoRemoteLockUnlock = 3; - kPassage = 4; - } - - enum DlOperationError : ENUM8 { - kUnspecified = 0; - kInvalidCredential = 1; - kDisabledUserDenied = 2; - kRestricted = 3; - kInsufficientBattery = 4; - } - - enum DlOperationSource : ENUM8 { - kUnspecified = 0; - kManual = 1; - kProprietaryRemote = 2; - kKeypad = 3; - kAuto = 4; - kButton = 5; - kSchedule = 6; - kRemote = 7; - kRfid = 8; - kBiometric = 9; - } - enum DlStatus : ENUM8 { kSuccess = 0; kFailure = 1; @@ -1932,25 +1875,6 @@ server cluster DoorLock = 257 { kNotFound = 139; } - enum DlUserStatus : ENUM8 { - kAvailable = 0; - kOccupiedEnabled = 1; - kOccupiedDisabled = 3; - } - - enum DlUserType : ENUM8 { - kUnrestrictedUser = 0; - kYearDayScheduleUser = 1; - kWeekDayScheduleUser = 2; - kProgrammingUser = 3; - kNonAccessUser = 4; - kForcedUser = 5; - kDisposableUser = 6; - kExpiringUser = 7; - kScheduleRestrictedUser = 8; - kRemoteOnlyUser = 9; - } - enum DoorLockOperationEventCode : ENUM8 { kUnknownOrMfgSpecific = 0; kLock = 1; @@ -2002,19 +1926,83 @@ server cluster DoorLock = 257 { kNotSupported = 255; } - bitmap DlCredentialRuleMask : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum DoorStateEnum : ENUM8 { + kDoorOpen = 0; + kDoorClosed = 1; + kDoorJammed = 2; + kDoorForcedOpen = 3; + kDoorUnspecifiedError = 4; + kDoorAjar = 5; } - bitmap DlCredentialRulesSupport : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum LockDataTypeEnum : ENUM8 { + kUnspecified = 0; + kProgrammingCode = 1; + kUserIndex = 2; + kWeekDaySchedule = 3; + kYearDaySchedule = 4; + kHolidaySchedule = 5; + kPin = 6; + kRfid = 7; + kFingerprint = 8; + } + + enum LockOperationTypeEnum : ENUM8 { + kLock = 0; + kUnlock = 1; + kNonAccessUserEvent = 2; + kForcedUserEvent = 3; + } + + enum OperatingModeEnum : ENUM8 { + kNormal = 0; + kVacation = 1; + kPrivacy = 2; + kNoRemoteLockUnlock = 3; + kPassage = 4; + } + + enum OperationErrorEnum : ENUM8 { + kUnspecified = 0; + kInvalidCredential = 1; + kDisabledUserDenied = 2; + kRestricted = 3; + kInsufficientBattery = 4; + } + + enum OperationSourceEnum : ENUM8 { + kUnspecified = 0; + kManual = 1; + kProprietaryRemote = 2; + kKeypad = 3; + kAuto = 4; + kButton = 5; + kSchedule = 6; + kRemote = 7; + kRfid = 8; + kBiometric = 9; + } + + enum UserStatusEnum : ENUM8 { + kAvailable = 0; + kOccupiedEnabled = 1; + kOccupiedDisabled = 3; + } + + enum UserTypeEnum : ENUM8 { + kUnrestrictedUser = 0; + kYearDayScheduleUser = 1; + kWeekDayScheduleUser = 2; + kProgrammingUser = 3; + kNonAccessUser = 4; + kForcedUser = 5; + kDisposableUser = 6; + kExpiringUser = 7; + kScheduleRestrictedUser = 8; + kRemoteOnlyUser = 9; } - bitmap DlDaysMaskMap : BITMAP8 { + bitmap DaysMaskMap : BITMAP8 { kSunday = 0x1; kMonday = 0x2; kTuesday = 0x4; @@ -2024,6 +2012,18 @@ server cluster DoorLock = 257 { kSaturday = 0x40; } + bitmap DlCredentialRuleMask : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + + bitmap DlCredentialRulesSupport : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + bitmap DlDefaultConfigurationRegister : BITMAP16 { kEnableLocalProgrammingEnabled = 0x1; kKeypadInterfaceDefaultAccessEnabled = 0x2; @@ -2128,56 +2128,56 @@ server cluster DoorLock = 257 { } bitmap DoorLockFeature : BITMAP32 { - kPINCredentials = 0x1; - kRFIDCredentials = 0x2; + kPinCredential = 0x1; + kRfidCredential = 0x2; kFingerCredentials = 0x4; kLogging = 0x8; - kWeekDaySchedules = 0x10; + kWeekDayAccessSchedules = 0x10; kDoorPositionSensor = 0x20; kFaceCredentials = 0x40; - kCredentialsOTA = 0x80; - kUsersManagement = 0x100; - kNotifications = 0x200; - kYearDaySchedules = 0x400; + kCredentialsOverTheAirAccess = 0x80; + kUser = 0x100; + kNotification = 0x200; + kYearDayAccessSchedules = 0x400; kHolidaySchedules = 0x800; } - struct DlCredential { - DlCredentialType credentialType = 0; + struct CredentialStruct { + CredentialTypeEnum credentialType = 0; int16u credentialIndex = 1; } critical event DoorLockAlarm = 0 { - DlAlarmCode alarmCode = 0; + AlarmCodeEnum alarmCode = 0; } critical event DoorStateChange = 1 { - DlDoorState doorState = 0; + DoorStateEnum doorState = 0; } critical event LockOperation = 2 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; nullable INT16U userIndex = 2; nullable fabric_idx fabricIndex = 3; nullable NODE_ID sourceNode = 4; - optional nullable DlCredential credentials[] = 5; + optional nullable CredentialStruct credentials[] = 5; } critical event LockOperationError = 3 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; - DlOperationError operationError = 2; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; + OperationErrorEnum operationError = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; - optional nullable DlCredential credentials[] = 6; + optional nullable CredentialStruct credentials[] = 6; } info event LockUserChange = 4 { - DlLockDataType lockDataType = 0; - DlDataOperationType dataOperationType = 1; - DlOperationSource operationSource = 2; + LockDataTypeEnum lockDataType = 0; + DataOperationTypeEnum dataOperationType = 1; + OperationSourceEnum operationSource = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; @@ -2187,7 +2187,7 @@ server cluster DoorLock = 257 { readonly attribute nullable DlLockState lockState = 0; readonly attribute DlLockType lockType = 1; readonly attribute boolean actuatorEnabled = 2; - readonly attribute nullable DlDoorState doorState = 3; + readonly attribute nullable DoorStateEnum doorState = 3; attribute access(write: manage) int32u doorOpenEvents = 4; attribute access(write: manage) int32u doorClosedEvents = 5; attribute access(write: manage) int16u openPeriod = 6; @@ -2206,7 +2206,7 @@ server cluster DoorLock = 257 { attribute access(write: manage) char_string<3> language = 33; attribute access(write: manage) int32u autoRelockTime = 35; attribute access(write: manage) int8u soundVolume = 36; - attribute access(write: manage) DlOperatingMode operatingMode = 37; + attribute access(write: manage) OperatingModeEnum operatingMode = 37; readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38; readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39; attribute access(write: manage) boolean enableOneTouchLocking = 41; @@ -2219,22 +2219,22 @@ server cluster DoorLock = 257 { readonly attribute int16u clusterRevision = 65533; request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockWithTimeoutRequest { INT16U timeout = 0; - optional OCTET_STRING pinCode = 1; + optional OCTET_STRING PINCode = 1; } request struct SetWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; - DlDaysMaskMap daysMask = 2; + DaysMaskMap daysMask = 2; INT8U startHour = 3; INT8U startMinute = 4; INT8U endHour = 5; @@ -2264,13 +2264,13 @@ server cluster DoorLock = 257 { } request struct SetUserRequest { - DlDataOperationType operationType = 0; + DataOperationTypeEnum 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; + nullable INT32U userUniqueID = 3; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; + nullable CredentialRuleEnum credentialRule = 6; } request struct GetUserRequest { @@ -2282,30 +2282,30 @@ server cluster DoorLock = 257 { } request struct SetCredentialRequest { - DlDataOperationType operationType = 0; - DlCredential credential = 1; + DataOperationTypeEnum operationType = 0; + CredentialStruct credential = 1; LONG_OCTET_STRING credentialData = 2; nullable INT16U userIndex = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; } request struct GetCredentialStatusRequest { - DlCredential credential = 0; + CredentialStruct credential = 0; } request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + nullable CredentialStruct credential = 0; } response struct GetUserResponse = 28 { 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 INT32U userUniqueID = 2; + nullable UserStatusEnum userStatus = 3; + nullable UserTypeEnum userType = 4; + nullable CredentialRuleEnum credentialRule = 5; + nullable CredentialStruct credentials[] = 6; nullable fabric_idx creatorFabricIndex = 7; nullable fabric_idx lastModifiedFabricIndex = 8; nullable INT16U nextUserIndex = 9; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 8c1eacfd85e048..9b5bef1e5a6ebd 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -6221,7 +6221,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6301,7 +6301,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -13031,7 +13031,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13351,7 +13351,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22985,7 +22985,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -23065,7 +23065,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp index 0ab2703cb268b2..068b990444b4f5 100644 --- a/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp +++ b/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp @@ -30,15 +30,16 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL); // Provided some empty callbacks and replaced feature map // to simulate DoorLock endpoint for All-Clusters-App example -// without using kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials +// without using kUser|kAccessSchedules|kRfidCredential|kPinCredential -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { return true; } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { return true; } @@ -48,7 +49,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) DoorLockServer::Instance().InitServer(endpoint); // Set FeatureMap to 0, default is: - // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113 + // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113 EmberAfStatus status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp index edaa86e44d5125..ddf996bfc48f2c 100644 --- a/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp +++ b/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp @@ -30,15 +30,16 @@ LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL); // Provided some empty callbacks and replaced feature map // to simulate DoorLock endpoint for All-Clusters-App example -// without using kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials +// without using kUser|kAccessSchedules|kRfidCredential|kPinCredential -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { return true; } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { return true; } @@ -48,7 +49,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) DoorLockServer::Instance().InitServer(endpoint); // Set FeatureMap to 0, default is: - // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113 + // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113 EmberAfStatus status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index e645546562046d..13af6c99f6204d 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1655,7 +1655,7 @@ server cluster ModeSelect = 80 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1666,13 +1666,13 @@ server cluster DoorLock = 257 { kForcedUser = 8; } - enum DlCredentialRule : ENUM8 { + enum CredentialRuleEnum : ENUM8 { kSingle = 0; - kDouble = 1; + kDual = 1; kTri = 2; } - enum DlCredentialType : ENUM8 { + enum CredentialTypeEnum : ENUM8 { kProgrammingPIN = 0; kPin = 1; kRfid = 2; @@ -1681,40 +1681,12 @@ server cluster DoorLock = 257 { kFace = 5; } - enum DlDataOperationType : ENUM8 { + enum DataOperationTypeEnum : ENUM8 { kAdd = 0; kClear = 1; kModify = 2; } - enum DlDoorState : ENUM8 { - kDoorOpen = 0; - kDoorClosed = 1; - kDoorJammed = 2; - kDoorForcedOpen = 3; - kDoorUnspecifiedError = 4; - kDoorAjar = 5; - } - - enum DlLockDataType : ENUM8 { - kUnspecified = 0; - kProgrammingCode = 1; - kUserIndex = 2; - kWeekDaySchedule = 3; - kYearDaySchedule = 4; - kHolidaySchedule = 5; - kPin = 6; - kRfid = 7; - kFingerprint = 8; - } - - enum DlLockOperationType : ENUM8 { - kLock = 0; - kUnlock = 1; - kNonAccessUserEvent = 2; - kForcedUserEvent = 3; - } - enum DlLockState : ENUM8 { kNotFullyLocked = 0; kLocked = 1; @@ -1735,35 +1707,6 @@ server cluster DoorLock = 257 { kDoorFurniture = 10; } - enum DlOperatingMode : ENUM8 { - kNormal = 0; - kVacation = 1; - kPrivacy = 2; - kNoRemoteLockUnlock = 3; - kPassage = 4; - } - - enum DlOperationError : ENUM8 { - kUnspecified = 0; - kInvalidCredential = 1; - kDisabledUserDenied = 2; - kRestricted = 3; - kInsufficientBattery = 4; - } - - enum DlOperationSource : ENUM8 { - kUnspecified = 0; - kManual = 1; - kProprietaryRemote = 2; - kKeypad = 3; - kAuto = 4; - kButton = 5; - kSchedule = 6; - kRemote = 7; - kRfid = 8; - kBiometric = 9; - } - enum DlStatus : ENUM8 { kSuccess = 0; kFailure = 1; @@ -1774,25 +1717,6 @@ server cluster DoorLock = 257 { kNotFound = 139; } - enum DlUserStatus : ENUM8 { - kAvailable = 0; - kOccupiedEnabled = 1; - kOccupiedDisabled = 3; - } - - enum DlUserType : ENUM8 { - kUnrestrictedUser = 0; - kYearDayScheduleUser = 1; - kWeekDayScheduleUser = 2; - kProgrammingUser = 3; - kNonAccessUser = 4; - kForcedUser = 5; - kDisposableUser = 6; - kExpiringUser = 7; - kScheduleRestrictedUser = 8; - kRemoteOnlyUser = 9; - } - enum DoorLockOperationEventCode : ENUM8 { kUnknownOrMfgSpecific = 0; kLock = 1; @@ -1844,19 +1768,83 @@ server cluster DoorLock = 257 { kNotSupported = 255; } - bitmap DlCredentialRuleMask : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum DoorStateEnum : ENUM8 { + kDoorOpen = 0; + kDoorClosed = 1; + kDoorJammed = 2; + kDoorForcedOpen = 3; + kDoorUnspecifiedError = 4; + kDoorAjar = 5; } - bitmap DlCredentialRulesSupport : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum LockDataTypeEnum : ENUM8 { + kUnspecified = 0; + kProgrammingCode = 1; + kUserIndex = 2; + kWeekDaySchedule = 3; + kYearDaySchedule = 4; + kHolidaySchedule = 5; + kPin = 6; + kRfid = 7; + kFingerprint = 8; + } + + enum LockOperationTypeEnum : ENUM8 { + kLock = 0; + kUnlock = 1; + kNonAccessUserEvent = 2; + kForcedUserEvent = 3; + } + + enum OperatingModeEnum : ENUM8 { + kNormal = 0; + kVacation = 1; + kPrivacy = 2; + kNoRemoteLockUnlock = 3; + kPassage = 4; + } + + enum OperationErrorEnum : ENUM8 { + kUnspecified = 0; + kInvalidCredential = 1; + kDisabledUserDenied = 2; + kRestricted = 3; + kInsufficientBattery = 4; + } + + enum OperationSourceEnum : ENUM8 { + kUnspecified = 0; + kManual = 1; + kProprietaryRemote = 2; + kKeypad = 3; + kAuto = 4; + kButton = 5; + kSchedule = 6; + kRemote = 7; + kRfid = 8; + kBiometric = 9; + } + + enum UserStatusEnum : ENUM8 { + kAvailable = 0; + kOccupiedEnabled = 1; + kOccupiedDisabled = 3; + } + + enum UserTypeEnum : ENUM8 { + kUnrestrictedUser = 0; + kYearDayScheduleUser = 1; + kWeekDayScheduleUser = 2; + kProgrammingUser = 3; + kNonAccessUser = 4; + kForcedUser = 5; + kDisposableUser = 6; + kExpiringUser = 7; + kScheduleRestrictedUser = 8; + kRemoteOnlyUser = 9; } - bitmap DlDaysMaskMap : BITMAP8 { + bitmap DaysMaskMap : BITMAP8 { kSunday = 0x1; kMonday = 0x2; kTuesday = 0x4; @@ -1866,6 +1854,18 @@ server cluster DoorLock = 257 { kSaturday = 0x40; } + bitmap DlCredentialRuleMask : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + + bitmap DlCredentialRulesSupport : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + bitmap DlDefaultConfigurationRegister : BITMAP16 { kEnableLocalProgrammingEnabled = 0x1; kKeypadInterfaceDefaultAccessEnabled = 0x2; @@ -1970,56 +1970,56 @@ server cluster DoorLock = 257 { } bitmap DoorLockFeature : BITMAP32 { - kPINCredentials = 0x1; - kRFIDCredentials = 0x2; + kPinCredential = 0x1; + kRfidCredential = 0x2; kFingerCredentials = 0x4; kLogging = 0x8; - kWeekDaySchedules = 0x10; + kWeekDayAccessSchedules = 0x10; kDoorPositionSensor = 0x20; kFaceCredentials = 0x40; - kCredentialsOTA = 0x80; - kUsersManagement = 0x100; - kNotifications = 0x200; - kYearDaySchedules = 0x400; + kCredentialsOverTheAirAccess = 0x80; + kUser = 0x100; + kNotification = 0x200; + kYearDayAccessSchedules = 0x400; kHolidaySchedules = 0x800; } - struct DlCredential { - DlCredentialType credentialType = 0; + struct CredentialStruct { + CredentialTypeEnum credentialType = 0; int16u credentialIndex = 1; } critical event DoorLockAlarm = 0 { - DlAlarmCode alarmCode = 0; + AlarmCodeEnum alarmCode = 0; } critical event DoorStateChange = 1 { - DlDoorState doorState = 0; + DoorStateEnum doorState = 0; } critical event LockOperation = 2 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; nullable INT16U userIndex = 2; nullable fabric_idx fabricIndex = 3; nullable NODE_ID sourceNode = 4; - optional nullable DlCredential credentials[] = 5; + optional nullable CredentialStruct credentials[] = 5; } critical event LockOperationError = 3 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; - DlOperationError operationError = 2; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; + OperationErrorEnum operationError = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; - optional nullable DlCredential credentials[] = 6; + optional nullable CredentialStruct credentials[] = 6; } info event LockUserChange = 4 { - DlLockDataType lockDataType = 0; - DlDataOperationType dataOperationType = 1; - DlOperationSource operationSource = 2; + LockDataTypeEnum lockDataType = 0; + DataOperationTypeEnum dataOperationType = 1; + OperationSourceEnum operationSource = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; @@ -2030,17 +2030,17 @@ server cluster DoorLock = 257 { readonly attribute DlLockType lockType = 1; readonly attribute boolean actuatorEnabled = 2; attribute access(write: manage) int32u autoRelockTime = 35; - attribute access(write: manage) DlOperatingMode operatingMode = 37; + attribute access(write: manage) OperatingModeEnum operatingMode = 37; readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index fed5c819c95ecb..31383a7181442f 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -6221,7 +6221,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6301,7 +6301,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -12651,7 +12651,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -12971,7 +12971,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -22547,7 +22547,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -22627,7 +22627,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp index f170d306ff9ff3..e9e7438449c160 100644 --- a/examples/chef/common/stubs.cpp +++ b/examples/chef/common/stubs.cpp @@ -9,17 +9,17 @@ #include bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const chip::Optional & pinCode, - chip::app::Clusters::DoorLock::DlOperationError & err) + chip::app::Clusters::DoorLock::OperationErrorEnum & err) { - err = DlOperationError::kUnspecified; + err = OperationErrorEnum::kUnspecified; // TBD: LockManager, check pinCode, ... return DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked); } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const chip::Optional & pinCode, - chip::app::Clusters::DoorLock::DlOperationError & err) + chip::app::Clusters::DoorLock::OperationErrorEnum & err) { - err = DlOperationError::kUnspecified; + err = OperationErrorEnum::kUnspecified; // TBD: LockManager, check pinCode, ... return DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlocked); } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 56f3be8455f82c..79850905e39b05 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1028,7 +1028,7 @@ server cluster FixedLabel = 64 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1039,13 +1039,13 @@ server cluster DoorLock = 257 { kForcedUser = 8; } - enum DlCredentialRule : ENUM8 { + enum CredentialRuleEnum : ENUM8 { kSingle = 0; - kDouble = 1; + kDual = 1; kTri = 2; } - enum DlCredentialType : ENUM8 { + enum CredentialTypeEnum : ENUM8 { kProgrammingPIN = 0; kPin = 1; kRfid = 2; @@ -1054,40 +1054,12 @@ server cluster DoorLock = 257 { kFace = 5; } - enum DlDataOperationType : ENUM8 { + enum DataOperationTypeEnum : ENUM8 { kAdd = 0; kClear = 1; kModify = 2; } - enum DlDoorState : ENUM8 { - kDoorOpen = 0; - kDoorClosed = 1; - kDoorJammed = 2; - kDoorForcedOpen = 3; - kDoorUnspecifiedError = 4; - kDoorAjar = 5; - } - - enum DlLockDataType : ENUM8 { - kUnspecified = 0; - kProgrammingCode = 1; - kUserIndex = 2; - kWeekDaySchedule = 3; - kYearDaySchedule = 4; - kHolidaySchedule = 5; - kPin = 6; - kRfid = 7; - kFingerprint = 8; - } - - enum DlLockOperationType : ENUM8 { - kLock = 0; - kUnlock = 1; - kNonAccessUserEvent = 2; - kForcedUserEvent = 3; - } - enum DlLockState : ENUM8 { kNotFullyLocked = 0; kLocked = 1; @@ -1108,35 +1080,6 @@ server cluster DoorLock = 257 { kDoorFurniture = 10; } - enum DlOperatingMode : ENUM8 { - kNormal = 0; - kVacation = 1; - kPrivacy = 2; - kNoRemoteLockUnlock = 3; - kPassage = 4; - } - - enum DlOperationError : ENUM8 { - kUnspecified = 0; - kInvalidCredential = 1; - kDisabledUserDenied = 2; - kRestricted = 3; - kInsufficientBattery = 4; - } - - enum DlOperationSource : ENUM8 { - kUnspecified = 0; - kManual = 1; - kProprietaryRemote = 2; - kKeypad = 3; - kAuto = 4; - kButton = 5; - kSchedule = 6; - kRemote = 7; - kRfid = 8; - kBiometric = 9; - } - enum DlStatus : ENUM8 { kSuccess = 0; kFailure = 1; @@ -1147,25 +1090,6 @@ server cluster DoorLock = 257 { kNotFound = 139; } - enum DlUserStatus : ENUM8 { - kAvailable = 0; - kOccupiedEnabled = 1; - kOccupiedDisabled = 3; - } - - enum DlUserType : ENUM8 { - kUnrestrictedUser = 0; - kYearDayScheduleUser = 1; - kWeekDayScheduleUser = 2; - kProgrammingUser = 3; - kNonAccessUser = 4; - kForcedUser = 5; - kDisposableUser = 6; - kExpiringUser = 7; - kScheduleRestrictedUser = 8; - kRemoteOnlyUser = 9; - } - enum DoorLockOperationEventCode : ENUM8 { kUnknownOrMfgSpecific = 0; kLock = 1; @@ -1217,19 +1141,83 @@ server cluster DoorLock = 257 { kNotSupported = 255; } - bitmap DlCredentialRuleMask : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum DoorStateEnum : ENUM8 { + kDoorOpen = 0; + kDoorClosed = 1; + kDoorJammed = 2; + kDoorForcedOpen = 3; + kDoorUnspecifiedError = 4; + kDoorAjar = 5; } - bitmap DlCredentialRulesSupport : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum LockDataTypeEnum : ENUM8 { + kUnspecified = 0; + kProgrammingCode = 1; + kUserIndex = 2; + kWeekDaySchedule = 3; + kYearDaySchedule = 4; + kHolidaySchedule = 5; + kPin = 6; + kRfid = 7; + kFingerprint = 8; + } + + enum LockOperationTypeEnum : ENUM8 { + kLock = 0; + kUnlock = 1; + kNonAccessUserEvent = 2; + kForcedUserEvent = 3; + } + + enum OperatingModeEnum : ENUM8 { + kNormal = 0; + kVacation = 1; + kPrivacy = 2; + kNoRemoteLockUnlock = 3; + kPassage = 4; + } + + enum OperationErrorEnum : ENUM8 { + kUnspecified = 0; + kInvalidCredential = 1; + kDisabledUserDenied = 2; + kRestricted = 3; + kInsufficientBattery = 4; + } + + enum OperationSourceEnum : ENUM8 { + kUnspecified = 0; + kManual = 1; + kProprietaryRemote = 2; + kKeypad = 3; + kAuto = 4; + kButton = 5; + kSchedule = 6; + kRemote = 7; + kRfid = 8; + kBiometric = 9; + } + + enum UserStatusEnum : ENUM8 { + kAvailable = 0; + kOccupiedEnabled = 1; + kOccupiedDisabled = 3; + } + + enum UserTypeEnum : ENUM8 { + kUnrestrictedUser = 0; + kYearDayScheduleUser = 1; + kWeekDayScheduleUser = 2; + kProgrammingUser = 3; + kNonAccessUser = 4; + kForcedUser = 5; + kDisposableUser = 6; + kExpiringUser = 7; + kScheduleRestrictedUser = 8; + kRemoteOnlyUser = 9; } - bitmap DlDaysMaskMap : BITMAP8 { + bitmap DaysMaskMap : BITMAP8 { kSunday = 0x1; kMonday = 0x2; kTuesday = 0x4; @@ -1239,6 +1227,18 @@ server cluster DoorLock = 257 { kSaturday = 0x40; } + bitmap DlCredentialRuleMask : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + + bitmap DlCredentialRulesSupport : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + bitmap DlDefaultConfigurationRegister : BITMAP16 { kEnableLocalProgrammingEnabled = 0x1; kKeypadInterfaceDefaultAccessEnabled = 0x2; @@ -1343,51 +1343,51 @@ server cluster DoorLock = 257 { } bitmap DoorLockFeature : BITMAP32 { - kPINCredentials = 0x1; - kRFIDCredentials = 0x2; + kPinCredential = 0x1; + kRfidCredential = 0x2; kFingerCredentials = 0x4; kLogging = 0x8; - kWeekDaySchedules = 0x10; + kWeekDayAccessSchedules = 0x10; kDoorPositionSensor = 0x20; kFaceCredentials = 0x40; - kCredentialsOTA = 0x80; - kUsersManagement = 0x100; - kNotifications = 0x200; - kYearDaySchedules = 0x400; + kCredentialsOverTheAirAccess = 0x80; + kUser = 0x100; + kNotification = 0x200; + kYearDayAccessSchedules = 0x400; kHolidaySchedules = 0x800; } critical event DoorLockAlarm = 0 { - DlAlarmCode alarmCode = 0; + AlarmCodeEnum alarmCode = 0; } critical event DoorStateChange = 1 { - DlDoorState doorState = 0; + DoorStateEnum doorState = 0; } critical event LockOperation = 2 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; nullable INT16U userIndex = 2; nullable fabric_idx fabricIndex = 3; nullable NODE_ID sourceNode = 4; - optional nullable DlCredential credentials[] = 5; + optional nullable CredentialStruct credentials[] = 5; } critical event LockOperationError = 3 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; - DlOperationError operationError = 2; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; + OperationErrorEnum operationError = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; - optional nullable DlCredential credentials[] = 6; + optional nullable CredentialStruct credentials[] = 6; } info event LockUserChange = 4 { - DlLockDataType lockDataType = 0; - DlDataOperationType dataOperationType = 1; - DlOperationSource operationSource = 2; + LockDataTypeEnum lockDataType = 0; + DataOperationTypeEnum dataOperationType = 1; + OperationSourceEnum operationSource = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; @@ -1401,7 +1401,7 @@ server cluster DoorLock = 257 { readonly attribute int8u maxPINCodeLength = 23; readonly attribute int8u minPINCodeLength = 24; attribute access(write: manage) int32u autoRelockTime = 35; - attribute access(write: manage) DlOperatingMode operatingMode = 37; + attribute access(write: manage) OperatingModeEnum operatingMode = 37; readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38; attribute access(write: administer) int8u wrongCodeEntryLimit = 48; attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49; @@ -1414,11 +1414,11 @@ server cluster DoorLock = 257 { readonly attribute int16u clusterRevision = 65533; request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } timed command LockDoor(LockDoorRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 9f065c2c6e4ce8..f0ae9d5c3b6428 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -7067,7 +7067,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7371,7 +7371,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/genio/include/LockManager.h b/examples/lock-app/genio/include/LockManager.h old mode 100755 new mode 100644 index 084b77a029884d..6361706e11a5e8 --- a/examples/lock-app/genio/include/LockManager.h +++ b/examples/lock-app/genio/include/LockManager.h @@ -146,25 +146,26 @@ class LockManager typedef void (*Callback_fn_completed)(Action_t); void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus SetWeekdaySchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); @@ -175,16 +176,16 @@ class LockManager DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, - uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localEndTime, OperatingModeEnum operatingMode); bool IsValidUserIndex(uint16_t userIndex); - bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type); + bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type); bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex); bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex); bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex); bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err); + OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; bool ReadConfigValues(); @@ -212,7 +213,7 @@ class LockManager char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE]; uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize]; - DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser]; + CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser]; static LockManager sLock; MT793XDoorLock::LockInitParams::LockParam LockParams; diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index 05455f579ad1d3..929013fbb717b3 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -96,8 +96,8 @@ chip::app::Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningIns } // namespace using chip::app::Clusters::DoorLock::DlLockState; -using chip::app::Clusters::DoorLock::DlOperationError; -using chip::app::Clusters::DoorLock::DlOperationSource; +using chip::app::Clusters::DoorLock::OperationErrorEnum; +using chip::app::Clusters::DoorLock::OperationSourceEnum; using namespace chip; using namespace ::chip::DeviceLayer; @@ -596,7 +596,7 @@ void AppTask::UpdateClusterState(intptr_t context) bool unlocked = LockMgr().NextState(); DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked; - DlOperationSource source = DlOperationSource::kUnspecified; + OperationSourceEnum source = OperationSourceEnum::kUnspecified; // write the new lock value EmberAfStatus status = diff --git a/examples/lock-app/genio/src/LockManager.cpp b/examples/lock-app/genio/src/LockManager.cpp index 9ae7e4288695ea..66e394bd00c744 100644 --- a/examples/lock-app/genio/src/LockManager.cpp +++ b/examples/lock-app/genio/src/LockManager.cpp @@ -104,9 +104,9 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex) return (userIndex < kMaxUsers); } -bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type) +bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type) { - if (DlCredentialType::kProgrammingPIN == type) + if (CredentialTypeEnum::kProgrammingPIN == type) { return (0 == credentialIndex); // 0 is required index for Programming PIN } @@ -144,7 +144,7 @@ bool LockManager::ReadConfigValues() sizeof(mCredentialData), outLen); MT793XConfig::ReadConfigValueBin(MT793XConfig::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, outLen); MT793XConfig::ReadConfigValueBin(MT793XConfig::kConfigKey_WeekDaySchedules, reinterpret_cast(mWeekdaySchedule), @@ -283,12 +283,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent) } } -bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kLocked, pin, err); } -bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kUnlocked, pin, err); } @@ -306,14 +306,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember const auto & userInDb = mLockUsers[userIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId); return true; } user.userName = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size()); - user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); + user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -336,8 +336,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "Door Lock App: LockManager::SetUser " @@ -381,14 +381,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: mCredentials[userIndex][i] = credentials[i]; } - userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); + userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); // Save user information in NVM flash MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_LockUser, reinterpret_cast(&mLockUsers), sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers); MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_LockUserName, reinterpret_cast(mUserNames), sizeof(mUserNames)); @@ -398,11 +398,11 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: return true; } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false); // programming pin index is only index allowed to contain 0 @@ -441,11 +441,11 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false); // programming pin index is only index allowed to contain 0 @@ -507,7 +507,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we } DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { @@ -607,7 +607,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho } DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed @@ -648,7 +648,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const } bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err) + OperationErrorEnum & err) { // Assume pin is required until told otherwise @@ -678,14 +678,14 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat { for (uint8_t j = 0; j < kMaxCredentialsPerUser; j++) { - if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialType != DlCredentialType::kPin || + if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialType != CredentialTypeEnum::kPin || mLockCredentials[mCredentials[i][j].CredentialIndex - 1].status == DlCredentialStatus::kAvailable) { continue; } if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialData.data_equal(pin.Value()) && - mLockUsers[i].userStatus != DlUserStatus::kOccupiedDisabled) + mLockUsers[i].userStatus != UserStatusEnum::kOccupiedDisabled) { ChipLogDetail( Zcl, "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]", @@ -702,6 +702,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat "[endpointId=%d]", lockStateToString(lockState), mEndpointId); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } diff --git a/examples/lock-app/genio/src/ZclCallbacks.cpp b/examples/lock-app/genio/src/ZclCallbacks.cpp index cca3ef947c9d86..91a867bc38c25e 100644 --- a/examples/lock-app/genio/src/ZclCallbacks.cpp +++ b/examples/lock-app/genio/src/ZclCallbacks.cpp @@ -92,7 +92,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) // Note: Due to current logic of credential, do not enable PIN and RFID // at the same time. - // Set FeatureMap to (kUsersManagement|kPINCredentials) + // Set FeatureMap to (kUser|kPinCredential) status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101); if (status != EMBER_ZCL_STATUS_SUCCESS) { @@ -100,7 +100,8 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) } } -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId); bool status = LockMgr().Lock(endpointId, pinCode, err); @@ -112,7 +113,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId); bool status = LockMgr().Unlock(endpointId, pinCode, err); @@ -124,7 +125,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const return status; } -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -132,7 +133,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -145,8 +146,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials) { return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, @@ -172,7 +173,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, @@ -186,7 +187,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode); } diff --git a/examples/lock-app/infineon/cyw30739/include/LockManager.h b/examples/lock-app/infineon/cyw30739/include/LockManager.h index 8f4cdf658d7375..19a336bb094fa9 100644 --- a/examples/lock-app/infineon/cyw30739/include/LockManager.h +++ b/examples/lock-app/infineon/cyw30739/include/LockManager.h @@ -142,29 +142,30 @@ class LockManager typedef void (*Callback_fn_completed)(Action_t); void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool SetDoorState(chip::EndpointId endpointId, DlDoorState newState); + bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum newState); - DlDoorState GetDoorState() const; + DoorStateEnum GetDoorState() const; - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus SetWeekdaySchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); @@ -175,16 +176,16 @@ class LockManager DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, - uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localEndTime, OperatingModeEnum operatingMode); bool IsValidUserIndex(uint16_t userIndex); - bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type); + bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type); bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex); bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex); bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex); bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err); + OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; @@ -194,7 +195,7 @@ class LockManager friend LockManager & LockMgr(); chip::EndpointId mEndpointId; State_t mState; - DlDoorState mDoorState; + DoorStateEnum mDoorState; Callback_fn_initiated mActionInitiated_CB; Callback_fn_completed mActionCompleted_CB; @@ -212,7 +213,7 @@ class LockManager HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules]; char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE]; uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize]; - DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser]; + CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser]; static LockManager sLock; CYW30739DoorLock::LockInitParams::LockParam LockParams; diff --git a/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp index bd5e301259e81d..3161272d070a17 100644 --- a/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp +++ b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp @@ -90,12 +90,12 @@ CHIP_ERROR AppCommandLockHandler(int argc, char * argv[]) else if (strcmp(argv[0], "open") == 0) { streamer_printf(streamer_get(), "open ...\n"); - LockMgr().SetDoorState(endpointId, DlDoorState::kDoorOpen); + LockMgr().SetDoorState(endpointId, DoorStateEnum::kDoorOpen); } else if (strcmp(argv[0], "close") == 0) { streamer_printf(streamer_get(), "close ...\n"); - LockMgr().SetDoorState(endpointId, DlDoorState::kDoorClosed); + LockMgr().SetDoorState(endpointId, DoorStateEnum::kDoorClosed); } else { diff --git a/examples/lock-app/infineon/cyw30739/src/LockManager.cpp b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp index 598e454f2e4d1a..bc11e6128291a2 100644 --- a/examples/lock-app/infineon/cyw30739/src/LockManager.cpp +++ b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp @@ -98,10 +98,10 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex) return (userIndex < kMaxUsers); } -bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type) +bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type) { // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only - if (DlCredentialType::kProgrammingPIN == type) + if (CredentialTypeEnum::kProgrammingPIN == type) { return (0 == credentialIndex); } @@ -140,7 +140,7 @@ bool LockManager::ReadConfigValues() sizeof(mCredentialData), outLen); CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, outLen); CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_WeekDaySchedules, reinterpret_cast(mWeekdaySchedule), @@ -186,7 +186,7 @@ bool LockManager::InitiateAction(int32_t aActor, Action_t aAction) ChipLogProgress(Zcl, "Sending a lock jammed event"); /* Generating Door Lock Jammed event */ - DoorLockServer::Instance().SendLockAlarmEvent(1, DlAlarmCode::kLockJammed); + DoorLockServer::Instance().SendLockAlarmEvent(1, AlarmCodeEnum::kLockJammed); return true; } @@ -288,12 +288,12 @@ int LockManager::ActuatorMovementTimerEventHandler(void * data) return 0; } -bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kLocked, pin, err); } -bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kUnlocked, pin, err); } @@ -311,14 +311,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember const auto & userInDb = mLockUsers[userIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId); return true; } user.userName = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size()); - user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); + user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -341,8 +341,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "Door Lock App: LockManager::SetUser " @@ -388,14 +388,15 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: mCredentials[userIndex][i].CredentialIndex = i + 1; } - userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); + userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); // Save user information in NVM flash CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_LockUser, reinterpret_cast(&mLockUsers), sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers); CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); + sizeof(CredentialStruct) * LockParams.numberOfUsers * + LockParams.numberOfCredentialsPerUser); CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_LockUserName, reinterpret_cast(mUserNames), sizeof(mUserNames)); @@ -405,7 +406,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: return true; } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { @@ -418,7 +419,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d", to_underlying(credentialType), credentialIndex); - if (credentialType == DlCredentialType::kProgrammingPIN) + if (credentialType == CredentialTypeEnum::kProgrammingPIN) { ChipLogError(Zcl, "Programming user not supported [credentialType=%u], credentialIndex=%d", to_underlying(credentialType), credentialIndex); @@ -452,7 +453,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { VerifyOrReturnValue(credentialIndex > 0, false); // indices are one-indexed @@ -513,7 +514,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we } DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { @@ -613,7 +614,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho } DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed @@ -654,7 +655,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const } bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err) + OperationErrorEnum & err) { // Assume pin is required until told otherwise bool requirePin = true; @@ -684,7 +685,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat // Check the PIN code for (uint8_t i = 0; i < kMaxCredentials; i++) { - if (mLockCredentials[i].credentialType != DlCredentialType::kPin || + if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin || mLockCredentials[i].status == DlCredentialStatus::kAvailable) { continue; @@ -707,11 +708,11 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat "[endpointId=%d]", lockStateToString(lockState), endpointId); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } -bool LockManager::SetDoorState(chip::EndpointId endpointId, DlDoorState newState) +bool LockManager::SetDoorState(chip::EndpointId endpointId, DoorStateEnum newState) { if (mDoorState != newState) { diff --git a/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp index 1607c9e053ec91..d1efc819761bf4 100644 --- a/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp +++ b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp @@ -54,7 +54,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & } } -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId); bool status = LockMgr().Lock(endpointId, pinCode, err); @@ -66,7 +67,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId); bool status = LockMgr().Unlock(endpointId, pinCode, err); @@ -78,7 +79,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const return status; } -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -86,7 +87,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -99,8 +100,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials) { return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, @@ -126,7 +127,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, @@ -140,7 +141,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode); } diff --git a/examples/lock-app/infineon/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp index 7483536fa4fe15..be32b550205bf4 100644 --- a/examples/lock-app/infineon/cyw30739/src/main.cpp +++ b/examples/lock-app/infineon/cyw30739/src/main.cpp @@ -47,8 +47,8 @@ #include using chip::app::Clusters::DoorLock::DlLockState; -using chip::app::Clusters::DoorLock::DlOperationError; -using chip::app::Clusters::DoorLock::DlOperationSource; +using chip::app::Clusters::DoorLock::OperationErrorEnum; +using chip::app::Clusters::DoorLock::OperationSourceEnum; using namespace chip; using namespace ::chip::DeviceLayer::Internal; @@ -308,7 +308,7 @@ void UpdateClusterState(intptr_t context) bool unlocked = LockMgr().NextState(); DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked; - DlOperationSource source = DlOperationSource::kUnspecified; + OperationSourceEnum source = OperationSourceEnum::kUnspecified; // write the new lock value EmberAfStatus status = diff --git a/examples/lock-app/infineon/psoc6/include/LockManager.h b/examples/lock-app/infineon/psoc6/include/LockManager.h index 1dbdf58d85487e..ab3eb96c0a92c6 100644 --- a/examples/lock-app/infineon/psoc6/include/LockManager.h +++ b/examples/lock-app/infineon/psoc6/include/LockManager.h @@ -145,25 +145,26 @@ class LockManager typedef void (*Callback_fn_completed)(Action_t); void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus SetWeekdaySchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); @@ -174,16 +175,16 @@ class LockManager DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, - uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localEndTime, OperatingModeEnum operatingMode); bool IsValidUserIndex(uint16_t userIndex); - bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type); + bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type); bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex); bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex); bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex); bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err); + OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; bool ReadConfigValues(); @@ -211,7 +212,7 @@ class LockManager char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE]; uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize]; - DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser]; + CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser]; static LockManager sLock; P6DoorLock::LockInitParams::LockParam LockParams; diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp index a06f1ca687dca0..39e04aa48303d6 100644 --- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp @@ -80,8 +80,8 @@ using namespace ::chip::System; #define APP_EVENT_QUEUE_SIZE 10 using chip::app::Clusters::DoorLock::DlLockState; -using chip::app::Clusters::DoorLock::DlOperationError; -using chip::app::Clusters::DoorLock::DlOperationSource; +using chip::app::Clusters::DoorLock::OperationErrorEnum; +using chip::app::Clusters::DoorLock::OperationSourceEnum; namespace { TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer. @@ -407,7 +407,7 @@ void AppTask::LockActionEventHandler(AppEvent * event) P6_LOG("Sending a lock jammed event"); /* Generating Door Lock Jammed event */ - DoorLockServer::Instance().SendLockAlarmEvent(1 /* Endpoint Id */, DlAlarmCode::kLockJammed); + DoorLockServer::Instance().SendLockAlarmEvent(1 /* Endpoint Id */, AlarmCodeEnum::kLockJammed); return; } @@ -663,7 +663,7 @@ void AppTask::UpdateCluster(intptr_t context) bool unlocked = LockMgr().NextState(); DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked; - DlOperationSource source = DlOperationSource::kUnspecified; + OperationSourceEnum source = OperationSourceEnum::kUnspecified; // write the new lock value EmberAfStatus status = diff --git a/examples/lock-app/infineon/psoc6/src/LockManager.cpp b/examples/lock-app/infineon/psoc6/src/LockManager.cpp index 05db9aec0d5098..6d218073cc97be 100644 --- a/examples/lock-app/infineon/psoc6/src/LockManager.cpp +++ b/examples/lock-app/infineon/psoc6/src/LockManager.cpp @@ -107,10 +107,10 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex) return (userIndex < kMaxUsers); } -bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type) +bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type) { // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only - if (DlCredentialType::kProgrammingPIN == type) + if (CredentialTypeEnum::kProgrammingPIN == type) { return (0 == credentialIndex); } @@ -149,7 +149,8 @@ bool LockManager::ReadConfigValues() sizeof(mCredentialData), outLen); P6Config::ReadConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, outLen); + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, + outLen); P6Config::ReadConfigValueBin(P6Config::kConfigKey_WeekDaySchedules, reinterpret_cast(mWeekdaySchedule), sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser * @@ -287,12 +288,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent) } } -bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kLocked, pin, err); } -bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kUnlocked, pin, err); } @@ -310,14 +311,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember const auto & userInDb = mLockUsers[userIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", mEndpointId); return true; } user.userName = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size()); - user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); + user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -340,8 +341,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "Door Lock App: LockManager::SetUser " @@ -387,14 +388,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: mCredentials[userIndex][i].CredentialIndex = i + 1; } - userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); + userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); // Save user information in NVM flash P6Config::WriteConfigValueBin(P6Config::kConfigKey_LockUser, reinterpret_cast(&mLockUsers), sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers); P6Config::WriteConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); P6Config::WriteConfigValueBin(P6Config::kConfigKey_LockUserName, reinterpret_cast(mUserNames), sizeof(mUserNames)); @@ -404,7 +405,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: return true; } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { @@ -417,7 +418,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d", to_underlying(credentialType), credentialIndex); - if (credentialType == DlCredentialType::kProgrammingPIN) + if (credentialType == CredentialTypeEnum::kProgrammingPIN) { ChipLogError(Zcl, "Programming user not supported [credentialType=%u], credentialIndex=%d", to_underlying(credentialType), credentialIndex); @@ -451,7 +452,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { @@ -513,7 +514,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we } DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { @@ -613,7 +614,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho } DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed @@ -653,7 +654,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const } bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err) + OperationErrorEnum & err) { // Assume pin is required until told otherwise @@ -684,7 +685,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat // Check the PIN code for (uint8_t i = 0; i < kMaxCredentials; i++) { - if (mLockCredentials[i].credentialType != DlCredentialType::kPin || + if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin || mLockCredentials[i].status == DlCredentialStatus::kAvailable) { continue; @@ -707,6 +708,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat "[endpointId=%d]", lockStateToString(lockState), endpointId); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } diff --git a/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp b/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp index cdfd3a8d27e883..91936419d458a6 100644 --- a/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp +++ b/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp @@ -58,7 +58,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & */ void emberAfOnOffClusterInitCallback(EndpointId endpoint) {} -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId); bool status = LockMgr().Lock(endpointId, pinCode, err); @@ -70,7 +71,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId); bool status = LockMgr().Unlock(endpointId, pinCode, err); @@ -82,7 +83,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const return status; } -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -90,7 +91,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -103,8 +104,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials) { return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, @@ -127,7 +128,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, @@ -150,7 +151,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode); // return DlStatus::kFailure; diff --git a/examples/lock-app/linux/include/LockEndpoint.h b/examples/lock-app/linux/include/LockEndpoint.h index 91a4b4f71b727d..0e0b32fd3b775b 100644 --- a/examples/lock-app/linux/include/LockEndpoint.h +++ b/examples/lock-app/linux/include/LockEndpoint.h @@ -25,10 +25,10 @@ struct LockUserInfo { char userName[DOOR_LOCK_USER_NAME_BUFFER_SIZE]; uint32_t userUniqueId; - DlUserStatus userStatus; - DlUserType userType; - DlCredentialRule credentialRule; - std::vector credentials; + UserStatusEnum userStatus; + UserTypeEnum userType; + CredentialRuleEnum credentialRule; + std::vector credentials; chip::FabricIndex createdBy; chip::FabricIndex lastModifiedBy; }; @@ -47,7 +47,7 @@ class LockEndpoint uint8_t weekDaySchedulesPerUser, uint8_t yearDaySchedulesPerUser, uint8_t numberOfCredentialsPerUser, uint8_t numberOfHolidaySchedules) : mEndpointId{ endpointId }, - mLockState{ DlLockState::kLocked }, mDoorState{ DlDoorState::kDoorClosed }, mLockUsers(numberOfLockUsersSupported), + mLockState{ DlLockState::kLocked }, mDoorState{ DoorStateEnum::kDoorClosed }, mLockUsers(numberOfLockUsersSupported), mLockCredentials(numberOfCredentialsSupported + 1), mWeekDaySchedules(numberOfLockUsersSupported, std::vector(weekDaySchedulesPerUser)), mYearDaySchedules(numberOfLockUsersSupported, std::vector(yearDaySchedulesPerUser)), @@ -63,39 +63,40 @@ class LockEndpoint inline chip::EndpointId GetEndpointId() const { return mEndpointId; } - bool Lock(const Optional & pin, DlOperationError & err); - bool Unlock(const Optional & pin, DlOperationError & err); + bool Lock(const Optional & pin, OperationErrorEnum & err); + bool Unlock(const Optional & pin, OperationErrorEnum & err); bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const; bool SetUser(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); + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials); - bool SetDoorState(DlDoorState newState); + bool SetDoorState(DoorStateEnum newState); - DlDoorState GetDoorState() const; + DoorStateEnum GetDoorState() const; - bool SendLockAlarm(DlAlarmCode alarmCode) const; + bool SendLockAlarm(AlarmCodeEnum alarmCode) const; - bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const; bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus GetSchedule(uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); DlStatus GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); - DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask, - uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); + DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime); DlStatus SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime, - DlOperatingMode operatingMode); + OperatingModeEnum operatingMode); private: - bool setLockState(DlLockState lockState, const Optional & pin, DlOperationError & err); + bool setLockState(DlLockState lockState, const Optional & pin, OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; bool weekDayScheduleInAction(uint16_t userIndex) const; @@ -103,7 +104,7 @@ class LockEndpoint chip::EndpointId mEndpointId; DlLockState mLockState; - DlDoorState mDoorState; + DoorStateEnum mDoorState; // This is very naive implementation of users/credentials/schedules database and by no means the best practice. Proper storage // of those items is out of scope of this example. @@ -117,7 +118,7 @@ class LockEndpoint struct LockCredentialInfo { DlCredentialStatus status; - DlCredentialType credentialType; + CredentialTypeEnum credentialType; chip::FabricIndex createdBy; chip::FabricIndex modifiedBy; uint8_t credentialData[DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE]; diff --git a/examples/lock-app/linux/include/LockManager.h b/examples/lock-app/linux/include/LockManager.h index a517e07580af3a..07123df607bf46 100644 --- a/examples/lock-app/linux/include/LockManager.h +++ b/examples/lock-app/linux/include/LockManager.h @@ -31,23 +31,24 @@ class LockManager bool InitEndpoint(chip::EndpointId endpointId); - bool SetDoorState(chip::EndpointId endpointId, DlDoorState doorState); + bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum doorState); - bool SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCode); + bool SendLockAlarm(chip::EndpointId endpointId, AlarmCodeEnum alarmCode); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); @@ -56,11 +57,11 @@ class LockManager DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); DlStatus SetSchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime); DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, - uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localEndTime, OperatingModeEnum operatingMode); static LockManager & Instance(); diff --git a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp index 9268d37f4e9c3f..92602a70c022c2 100644 --- a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp +++ b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp @@ -107,11 +107,11 @@ void LockAppCommandHandler::HandleCommand(intptr_t context) ChipLogError(NotSpecified, "Lock App: Unable to execute command to set the door state: invalid type for DoorState")); auto doorState = params["DoorState"].asUInt(); - VerifyOrExit(doorState < to_underlying(DlDoorState::kUnknownEnumValue), + VerifyOrExit(doorState < to_underlying(DoorStateEnum::kUnknownEnumValue), ChipLogError(NotSpecified, "Lock App: Unable to execute command to set door state: DoorState is out of range [doorState=%u]", doorState)); - LockManager::Instance().SetDoorState(endpointId, static_cast(doorState)); + LockManager::Instance().SetDoorState(endpointId, static_cast(doorState)); } else if (self->mCommandName == "SendDoorLockAlarm") { @@ -125,11 +125,11 @@ void LockAppCommandHandler::HandleCommand(intptr_t context) auto alarmCode = params["AlarmCode"].asUInt(); VerifyOrExit( - alarmCode < to_underlying(DlAlarmCode::kUnknownEnumValue), + alarmCode < to_underlying(AlarmCodeEnum::kUnknownEnumValue), ChipLogError(NotSpecified, "Lock App: Unable to execute command to send lock alarm: AlarmCode is out of range [alarmCode=%u]", alarmCode)); - LockManager::Instance().SendLockAlarm(endpointId, static_cast(alarmCode)); + LockManager::Instance().SendLockAlarm(endpointId, static_cast(alarmCode)); } else { diff --git a/examples/lock-app/linux/src/LockEndpoint.cpp b/examples/lock-app/linux/src/LockEndpoint.cpp index c3d52c69a08603..6ed9592df0c0f9 100644 --- a/examples/lock-app/linux/src/LockEndpoint.cpp +++ b/examples/lock-app/linux/src/LockEndpoint.cpp @@ -21,12 +21,12 @@ using chip::to_underlying; -bool LockEndpoint::Lock(const Optional & pin, DlOperationError & err) +bool LockEndpoint::Lock(const Optional & pin, OperationErrorEnum & err) { return setLockState(DlLockState::kLocked, pin, err); } -bool LockEndpoint::Unlock(const Optional & pin, DlOperationError & err) +bool LockEndpoint::Unlock(const Optional & pin, OperationErrorEnum & err) { return setLockState(DlLockState::kUnlocked, pin, err); } @@ -45,14 +45,14 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u const auto & userInDb = mLockUsers[adjustedUserIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d,adjustedIndex=%hu]", mEndpointId, adjustedUserIndex); return true; } user.userName = chip::CharSpan(userInDb.userName, strlen(userInDb.userName)); - user.credentials = chip::Span(userInDb.credentials.data(), userInDb.credentials.size()); + user.credentials = chip::Span(userInDb.credentials.data(), userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -75,8 +75,8 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u } bool LockEndpoint::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "Lock App: LockEndpoint::SetUser " @@ -134,12 +134,12 @@ bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip:: return true; } -DlDoorState LockEndpoint::GetDoorState() const +DoorStateEnum LockEndpoint::GetDoorState() const { return mDoorState; } -bool LockEndpoint::SetDoorState(DlDoorState newState) +bool LockEndpoint::SetDoorState(DoorStateEnum newState) { if (mDoorState != newState) { @@ -152,19 +152,20 @@ bool LockEndpoint::SetDoorState(DlDoorState newState) return true; } -bool LockEndpoint::SendLockAlarm(DlAlarmCode alarmCode) const +bool LockEndpoint::SendLockAlarm(AlarmCodeEnum alarmCode) const { ChipLogProgress(Zcl, "Sending the LockAlarm event [endpointId=%d,alarmCode=%u]", mEndpointId, to_underlying(alarmCode)); return DoorLockServer::Instance().SendLockAlarmEvent(mEndpointId, alarmCode); } -bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, +bool LockEndpoint::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const { ChipLogProgress(Zcl, "Lock App: LockEndpoint::GetCredential [endpoint=%d,credentialIndex=%u,credentialType=%u]", mEndpointId, credentialIndex, to_underlying(credentialType)); - if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType)) + if (credentialIndex >= mLockCredentials.size() || + (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; @@ -195,7 +196,7 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType cred } bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { ChipLogProgress( @@ -205,7 +206,8 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre mEndpointId, credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType), static_cast(credentialData.size()), creator, modifier); - if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType)) + if (credentialIndex >= mLockCredentials.size() || + (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot set the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; @@ -258,7 +260,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, Emb return DlStatus::kSuccess; } -DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask, +DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { if (0 == userIndex || userIndex > mWeekDaySchedules.size()) @@ -345,7 +347,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHo } DlStatus LockEndpoint::SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime, - DlOperatingMode operatingMode) + OperatingModeEnum operatingMode) { if (0 == holidayIndex || holidayIndex > mHolidaySchedules.size()) { @@ -361,7 +363,7 @@ DlStatus LockEndpoint::SetSchedule(uint8_t holidayIndex, DlScheduleStatus status return DlStatus::kSuccess; } -bool LockEndpoint::setLockState(DlLockState lockState, const Optional & pin, DlOperationError & err) +bool LockEndpoint::setLockState(DlLockState lockState, const Optional & pin, OperationErrorEnum & err) { // Assume pin is required until told otherwise bool requirePin = true; @@ -390,7 +392,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional(credential - mLockCredentials.begin()); auto user = std::find_if(mLockUsers.begin(), mLockUsers.end(), [credential, credentialIndex](const LockUserInfo & u) { - return std::any_of(u.credentials.begin(), u.credentials.end(), [&credential, credentialIndex](const DlCredential & c) { + return std::any_of(u.credentials.begin(), u.credentials.end(), [&credential, credentialIndex](const CredentialStruct & c) { return c.CredentialIndex == credentialIndex && c.CredentialType == to_underlying(credential->credentialType); }); }); @@ -422,17 +424,17 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional(user - mLockUsers.begin()); // Check if schedules affect the user - if ((user->userType == DlUserType::kScheduleRestrictedUser || user->userType == DlUserType::kWeekDayScheduleUser) && + if ((user->userType == UserTypeEnum::kScheduleRestrictedUser || user->userType == UserTypeEnum::kWeekDayScheduleUser) && !weekDayScheduleInAction(userIndex)) { - if ((user->userType == DlUserType::kScheduleRestrictedUser || user->userType == DlUserType::kYearDayScheduleUser) && + if ((user->userType == UserTypeEnum::kScheduleRestrictedUser || user->userType == UserTypeEnum::kYearDayScheduleUser) && !yearDayScheduleInAction(userIndex)) { ChipLogDetail(Zcl, "Lock App: associated user is not allowed to operate the lock due to schedules" "[endpointId=%d,userIndex=%u]", mEndpointId, userIndex); - err = DlOperationError::kRestricted; + err = OperationErrorEnum::kRestricted; return false; } } @@ -450,7 +452,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const OptionalSetDoorState(doorState); } -bool LockManager::SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCode) +bool LockManager::SendLockAlarm(chip::EndpointId endpointId, AlarmCodeEnum alarmCode) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -134,7 +134,7 @@ bool LockManager::SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCo return lockEndpoint->SendLockAlarm(alarmCode); } -bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -145,7 +145,7 @@ bool LockManager::Lock(chip::EndpointId endpointId, const OptionalLock(pin, err); } -bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -168,8 +168,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -181,7 +181,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: credentials, totalCredentials); } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { auto lockEndpoint = getEndpoint(endpointId); @@ -194,7 +194,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { auto lockEndpoint = getEndpoint(endpointId); @@ -220,8 +220,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIn } DlStatus LockManager::SetSchedule(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) + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -273,7 +272,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t holidayIn } DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) diff --git a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp index fa7cc2dff164cf..a0670f2abf7f0c 100644 --- a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp +++ b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp @@ -10,13 +10,14 @@ using namespace chip::app::Clusters::DoorLock; // 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) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { return LockManager::Instance().Lock(endpointId, pinCode, err); } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { return LockManager::Instance().Unlock(endpointId, pinCode, err); } @@ -28,15 +29,15 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * 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, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -44,7 +45,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockManager::Instance().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -63,7 +64,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, @@ -83,7 +84,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return LockManager::Instance().SetSchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode); } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 62f0a5bf4edea4..4786b06b8bf246 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1313,7 +1313,7 @@ server cluster UserLabel = 65 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1324,13 +1324,13 @@ server cluster DoorLock = 257 { kForcedUser = 8; } - enum DlCredentialRule : ENUM8 { + enum CredentialRuleEnum : ENUM8 { kSingle = 0; - kDouble = 1; + kDual = 1; kTri = 2; } - enum DlCredentialType : ENUM8 { + enum CredentialTypeEnum : ENUM8 { kProgrammingPIN = 0; kPin = 1; kRfid = 2; @@ -1339,40 +1339,12 @@ server cluster DoorLock = 257 { kFace = 5; } - enum DlDataOperationType : ENUM8 { + enum DataOperationTypeEnum : ENUM8 { kAdd = 0; kClear = 1; kModify = 2; } - enum DlDoorState : ENUM8 { - kDoorOpen = 0; - kDoorClosed = 1; - kDoorJammed = 2; - kDoorForcedOpen = 3; - kDoorUnspecifiedError = 4; - kDoorAjar = 5; - } - - enum DlLockDataType : ENUM8 { - kUnspecified = 0; - kProgrammingCode = 1; - kUserIndex = 2; - kWeekDaySchedule = 3; - kYearDaySchedule = 4; - kHolidaySchedule = 5; - kPin = 6; - kRfid = 7; - kFingerprint = 8; - } - - enum DlLockOperationType : ENUM8 { - kLock = 0; - kUnlock = 1; - kNonAccessUserEvent = 2; - kForcedUserEvent = 3; - } - enum DlLockState : ENUM8 { kNotFullyLocked = 0; kLocked = 1; @@ -1393,35 +1365,6 @@ server cluster DoorLock = 257 { kDoorFurniture = 10; } - enum DlOperatingMode : ENUM8 { - kNormal = 0; - kVacation = 1; - kPrivacy = 2; - kNoRemoteLockUnlock = 3; - kPassage = 4; - } - - enum DlOperationError : ENUM8 { - kUnspecified = 0; - kInvalidCredential = 1; - kDisabledUserDenied = 2; - kRestricted = 3; - kInsufficientBattery = 4; - } - - enum DlOperationSource : ENUM8 { - kUnspecified = 0; - kManual = 1; - kProprietaryRemote = 2; - kKeypad = 3; - kAuto = 4; - kButton = 5; - kSchedule = 6; - kRemote = 7; - kRfid = 8; - kBiometric = 9; - } - enum DlStatus : ENUM8 { kSuccess = 0; kFailure = 1; @@ -1432,25 +1375,6 @@ server cluster DoorLock = 257 { kNotFound = 139; } - enum DlUserStatus : ENUM8 { - kAvailable = 0; - kOccupiedEnabled = 1; - kOccupiedDisabled = 3; - } - - enum DlUserType : ENUM8 { - kUnrestrictedUser = 0; - kYearDayScheduleUser = 1; - kWeekDayScheduleUser = 2; - kProgrammingUser = 3; - kNonAccessUser = 4; - kForcedUser = 5; - kDisposableUser = 6; - kExpiringUser = 7; - kScheduleRestrictedUser = 8; - kRemoteOnlyUser = 9; - } - enum DoorLockOperationEventCode : ENUM8 { kUnknownOrMfgSpecific = 0; kLock = 1; @@ -1502,19 +1426,83 @@ server cluster DoorLock = 257 { kNotSupported = 255; } - bitmap DlCredentialRuleMask : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum DoorStateEnum : ENUM8 { + kDoorOpen = 0; + kDoorClosed = 1; + kDoorJammed = 2; + kDoorForcedOpen = 3; + kDoorUnspecifiedError = 4; + kDoorAjar = 5; } - bitmap DlCredentialRulesSupport : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum LockDataTypeEnum : ENUM8 { + kUnspecified = 0; + kProgrammingCode = 1; + kUserIndex = 2; + kWeekDaySchedule = 3; + kYearDaySchedule = 4; + kHolidaySchedule = 5; + kPin = 6; + kRfid = 7; + kFingerprint = 8; + } + + enum LockOperationTypeEnum : ENUM8 { + kLock = 0; + kUnlock = 1; + kNonAccessUserEvent = 2; + kForcedUserEvent = 3; + } + + enum OperatingModeEnum : ENUM8 { + kNormal = 0; + kVacation = 1; + kPrivacy = 2; + kNoRemoteLockUnlock = 3; + kPassage = 4; + } + + enum OperationErrorEnum : ENUM8 { + kUnspecified = 0; + kInvalidCredential = 1; + kDisabledUserDenied = 2; + kRestricted = 3; + kInsufficientBattery = 4; + } + + enum OperationSourceEnum : ENUM8 { + kUnspecified = 0; + kManual = 1; + kProprietaryRemote = 2; + kKeypad = 3; + kAuto = 4; + kButton = 5; + kSchedule = 6; + kRemote = 7; + kRfid = 8; + kBiometric = 9; + } + + enum UserStatusEnum : ENUM8 { + kAvailable = 0; + kOccupiedEnabled = 1; + kOccupiedDisabled = 3; + } + + enum UserTypeEnum : ENUM8 { + kUnrestrictedUser = 0; + kYearDayScheduleUser = 1; + kWeekDayScheduleUser = 2; + kProgrammingUser = 3; + kNonAccessUser = 4; + kForcedUser = 5; + kDisposableUser = 6; + kExpiringUser = 7; + kScheduleRestrictedUser = 8; + kRemoteOnlyUser = 9; } - bitmap DlDaysMaskMap : BITMAP8 { + bitmap DaysMaskMap : BITMAP8 { kSunday = 0x1; kMonday = 0x2; kTuesday = 0x4; @@ -1524,6 +1512,18 @@ server cluster DoorLock = 257 { kSaturday = 0x40; } + bitmap DlCredentialRuleMask : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + + bitmap DlCredentialRulesSupport : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + bitmap DlDefaultConfigurationRegister : BITMAP16 { kEnableLocalProgrammingEnabled = 0x1; kKeypadInterfaceDefaultAccessEnabled = 0x2; @@ -1628,56 +1628,56 @@ server cluster DoorLock = 257 { } bitmap DoorLockFeature : BITMAP32 { - kPINCredentials = 0x1; - kRFIDCredentials = 0x2; + kPinCredential = 0x1; + kRfidCredential = 0x2; kFingerCredentials = 0x4; kLogging = 0x8; - kWeekDaySchedules = 0x10; + kWeekDayAccessSchedules = 0x10; kDoorPositionSensor = 0x20; kFaceCredentials = 0x40; - kCredentialsOTA = 0x80; - kUsersManagement = 0x100; - kNotifications = 0x200; - kYearDaySchedules = 0x400; + kCredentialsOverTheAirAccess = 0x80; + kUser = 0x100; + kNotification = 0x200; + kYearDayAccessSchedules = 0x400; kHolidaySchedules = 0x800; } - struct DlCredential { - DlCredentialType credentialType = 0; + struct CredentialStruct { + CredentialTypeEnum credentialType = 0; int16u credentialIndex = 1; } critical event DoorLockAlarm = 0 { - DlAlarmCode alarmCode = 0; + AlarmCodeEnum alarmCode = 0; } critical event DoorStateChange = 1 { - DlDoorState doorState = 0; + DoorStateEnum doorState = 0; } critical event LockOperation = 2 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; nullable INT16U userIndex = 2; nullable fabric_idx fabricIndex = 3; nullable NODE_ID sourceNode = 4; - optional nullable DlCredential credentials[] = 5; + optional nullable CredentialStruct credentials[] = 5; } critical event LockOperationError = 3 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; - DlOperationError operationError = 2; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; + OperationErrorEnum operationError = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; - optional nullable DlCredential credentials[] = 6; + optional nullable CredentialStruct credentials[] = 6; } info event LockUserChange = 4 { - DlLockDataType lockDataType = 0; - DlDataOperationType dataOperationType = 1; - DlOperationSource operationSource = 2; + LockDataTypeEnum lockDataType = 0; + DataOperationTypeEnum dataOperationType = 1; + OperationSourceEnum operationSource = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; @@ -1687,7 +1687,7 @@ server cluster DoorLock = 257 { readonly attribute nullable DlLockState lockState = 0; readonly attribute DlLockType lockType = 1; readonly attribute boolean actuatorEnabled = 2; - readonly attribute nullable DlDoorState doorState = 3; + readonly attribute nullable DoorStateEnum doorState = 3; readonly attribute int16u numberOfTotalUsersSupported = 17; readonly attribute int16u numberOfPINUsersSupported = 18; readonly attribute int16u numberOfRFIDUsersSupported = 19; @@ -1703,7 +1703,7 @@ server cluster DoorLock = 257 { attribute access(write: manage) char_string<3> language = 33; attribute access(write: manage) int32u autoRelockTime = 35; attribute access(write: manage) int8u soundVolume = 36; - attribute access(write: manage) DlOperatingMode operatingMode = 37; + attribute access(write: manage) OperatingModeEnum operatingMode = 37; readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38; attribute access(write: manage) boolean enableOneTouchLocking = 41; attribute access(write: manage) boolean enablePrivacyModeButton = 43; @@ -1714,22 +1714,22 @@ server cluster DoorLock = 257 { readonly attribute int16u clusterRevision = 65533; request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockWithTimeoutRequest { INT16U timeout = 0; - optional OCTET_STRING pinCode = 1; + optional OCTET_STRING PINCode = 1; } request struct SetWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; - DlDaysMaskMap daysMask = 2; + DaysMaskMap daysMask = 2; INT8U startHour = 3; INT8U startMinute = 4; INT8U endHour = 5; @@ -1767,7 +1767,7 @@ server cluster DoorLock = 257 { INT8U holidayIndex = 0; epoch_s localStartTime = 1; epoch_s localEndTime = 2; - DlOperatingMode operatingMode = 3; + OperatingModeEnum operatingMode = 3; } request struct GetHolidayScheduleRequest { @@ -1779,13 +1779,13 @@ server cluster DoorLock = 257 { } request struct SetUserRequest { - DlDataOperationType operationType = 0; + DataOperationTypeEnum 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; + nullable INT32U userUniqueID = 3; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; + nullable CredentialRuleEnum credentialRule = 6; } request struct GetUserRequest { @@ -1797,27 +1797,27 @@ server cluster DoorLock = 257 { } request struct SetCredentialRequest { - DlDataOperationType operationType = 0; - DlCredential credential = 1; + DataOperationTypeEnum operationType = 0; + CredentialStruct credential = 1; LONG_OCTET_STRING credentialData = 2; nullable INT16U userIndex = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; } request struct GetCredentialStatusRequest { - DlCredential credential = 0; + CredentialStruct credential = 0; } request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + nullable CredentialStruct credential = 0; } response struct GetWeekDayScheduleResponse = 12 { INT8U weekDayIndex = 0; INT16U userIndex = 1; DlStatus status = 2; - optional DlDaysMaskMap daysMask = 3; + optional DaysMaskMap daysMask = 3; optional INT8U startHour = 4; optional INT8U startMinute = 5; optional INT8U endHour = 6; @@ -1837,17 +1837,17 @@ server cluster DoorLock = 257 { DlStatus status = 1; optional epoch_s localStartTime = 2; optional epoch_s localEndTime = 3; - optional DlOperatingMode operatingMode = 4; + optional OperatingModeEnum operatingMode = 4; } response struct GetUserResponse = 28 { 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 INT32U userUniqueID = 2; + nullable UserStatusEnum userStatus = 3; + nullable UserTypeEnum userType = 4; + nullable CredentialRuleEnum credentialRule = 5; + nullable CredentialStruct credentials[] = 6; nullable fabric_idx creatorFabricIndex = 7; nullable fabric_idx lastModifiedFabricIndex = 8; nullable INT16U nextUserIndex = 9; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index a5701dca56208c..22ed9149422708 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -7031,7 +7031,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7351,7 +7351,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/nrfconnect/main/BoltLockManager.cpp b/examples/lock-app/nrfconnect/main/BoltLockManager.cpp index 9f82f856063aa6..fc3d30bbbf93ef 100644 --- a/examples/lock-app/nrfconnect/main/BoltLockManager.cpp +++ b/examples/lock-app/nrfconnect/main/BoltLockManager.cpp @@ -41,14 +41,14 @@ bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo user = mUsers[userIndex - 1]; ChipLogProgress(Zcl, "Getting lock user %u: %s", static_cast(userIndex), - user.userStatus == DlUserStatus::kAvailable ? "available" : "occupied"); + user.userStatus == UserStatusEnum::kAvailable ? "available" : "occupied"); return true; } bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricIndex modifier, const CharSpan & userName, - uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule, - const DlCredential * credentials, size_t totalCredentials) + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { // userIndex is guaranteed by the caller to be between 1 and CONFIG_LOCK_NUM_USERS UserData & userData = mUserData[userIndex - 1]; @@ -58,10 +58,10 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd VerifyOrReturnError(totalCredentials <= CONFIG_LOCK_NUM_CREDENTIALS_PER_USER, false); Platform::CopyString(userData.mName, userName); - memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(DlCredential)); + memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(CredentialStruct)); user.userName = CharSpan(userData.mName, userName.size()); - user.credentials = Span(userData.mCredentials, totalCredentials); + user.credentials = Span(userData.mCredentials, totalCredentials); user.userUniqueId = uniqueId; user.userStatus = userStatus; user.userType = userType; @@ -72,12 +72,12 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd user.lastModifiedBy = modifier; ChipLogProgress(Zcl, "Setting lock user %u: %s", static_cast(userIndex), - userStatus == DlUserStatus::kAvailable ? "available" : "occupied"); + userStatus == UserStatusEnum::kAvailable ? "available" : "occupied"); return true; } -bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, +bool BoltLockManager::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const { VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false); @@ -91,7 +91,7 @@ bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType c } bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const ByteSpan & secret) + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret) { VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false); VerifyOrReturnError(secret.size() <= kMaxCredentialLength, false); @@ -118,7 +118,7 @@ bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creato return true; } -bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperationError & err) const +bool BoltLockManager::ValidatePIN(const Optional & pinCode, OperationErrorEnum & err) const { // Optionality of the PIN code is validated by the caller, so assume it is OK not to provide the PIN code. if (!pinCode.HasValue()) @@ -129,7 +129,7 @@ bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperatio // Check the PIN code for (const auto & credential : mCredentials) { - if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != DlCredentialType::kPin) + if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != CredentialTypeEnum::kPin) { continue; } @@ -142,7 +142,7 @@ bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperatio } ChipLogDetail(Zcl, "Invalid lock PIN code provided"); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp index 48ab16bb839b7d..49cdbfb84e754a 100644 --- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp @@ -55,27 +55,27 @@ bool emberAfPluginDoorLockGetUser(EndpointId endpointId, uint16_t userIndex, Emb } bool emberAfPluginDoorLockSetUser(EndpointId endpointId, uint16_t userIndex, FabricIndex creator, FabricIndex modifier, - const CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, - DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials) + const CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { return BoltLockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, userType, credentialRule, credentials, totalCredentials); } -bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return BoltLockMgr().GetCredential(credentialIndex, credentialType, credential); } bool emberAfPluginDoorLockSetCredential(EndpointId endpointId, uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret) { return BoltLockMgr().SetCredential(credentialIndex, creator, modifier, credentialStatus, credentialType, secret); } -bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optional & pinCode, OperationErrorEnum & err) { bool result = BoltLockMgr().ValidatePIN(pinCode, err); @@ -88,7 +88,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optiona return result; } -bool emberAfPluginDoorLockOnDoorUnlockCommand(EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorUnlockCommand(EndpointId endpointId, const Optional & pinCode, OperationErrorEnum & err) { bool result = BoltLockMgr().ValidatePIN(pinCode, err); @@ -119,8 +119,8 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER), "number of credentials per user"); - // Set FeatureMap to (kUsersManagement|kPINCredentials), default is: - // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113 + // Set FeatureMap to (kUser|kPinCredential), default is: + // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113 logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map"); AppTask::Instance().UpdateClusterState(BoltLockMgr().GetState(), BoltLockManager::OperationSource::kUnspecified); diff --git a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h index b5b5b66b9b1aef..bd107f7f77626f 100644 --- a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h +++ b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h @@ -45,7 +45,7 @@ class BoltLockManager struct UserData { char mName[DOOR_LOCK_USER_NAME_BUFFER_SIZE]; - DlCredential mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER]; + CredentialStruct mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER]; }; struct CredentialData @@ -53,7 +53,7 @@ class BoltLockManager chip::Platform::ScopedMemoryBuffer mSecret; }; - using OperationSource = chip::app::Clusters::DoorLock::DlOperationSource; + using OperationSource = chip::app::Clusters::DoorLock::OperationSourceEnum; using StateChangeCallback = void (*)(State, OperationSource); static constexpr uint32_t kActuatorMovementTimeMs = 2000; @@ -65,15 +65,15 @@ class BoltLockManager bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const; bool SetUser(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); + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const; bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & secret); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & secret); - bool ValidatePIN(const Optional & pinCode, DlOperationError & err) const; + bool ValidatePIN(const Optional & pinCode, OperationErrorEnum & err) const; void Lock(OperationSource source); void Unlock(OperationSource source); diff --git a/examples/lock-app/openiotsdk/main/LockEndpoint.cpp b/examples/lock-app/openiotsdk/main/LockEndpoint.cpp index 82e91a53aceb23..453520c6470cca 100644 --- a/examples/lock-app/openiotsdk/main/LockEndpoint.cpp +++ b/examples/lock-app/openiotsdk/main/LockEndpoint.cpp @@ -21,12 +21,12 @@ using chip::to_underlying; -bool LockEndpoint::Lock(const Optional & pin, DlOperationError & err) +bool LockEndpoint::Lock(const Optional & pin, OperationErrorEnum & err) { return setLockState(DlLockState::kLocked, pin, err); } -bool LockEndpoint::Unlock(const Optional & pin, DlOperationError & err) +bool LockEndpoint::Unlock(const Optional & pin, OperationErrorEnum & err) { return setLockState(DlLockState::kUnlocked, pin, err); } @@ -45,14 +45,14 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u const auto & userInDb = mLockUsers[adjustedUserIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d,adjustedIndex=%hu]", mEndpointId, adjustedUserIndex); return true; } user.userName = chip::CharSpan(userInDb.userName, strlen(userInDb.userName)); - user.credentials = chip::Span(userInDb.credentials.data(), userInDb.credentials.size()); + user.credentials = chip::Span(userInDb.credentials.data(), userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -71,8 +71,8 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u } bool LockEndpoint::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "SetUser " @@ -130,13 +130,14 @@ bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip:: return true; } -bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, +bool LockEndpoint::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const { ChipLogDetail(Zcl, "GetCredential [endpoint=%d,credentialIndex=%u,credentialType=%u]", mEndpointId, credentialIndex, to_underlying(credentialType)); - if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType)) + if (credentialIndex >= mLockCredentials.size() || + (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; @@ -163,7 +164,7 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType cred } bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { ChipLogDetail( @@ -173,7 +174,8 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre mEndpointId, credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType), static_cast(credentialData.size()), creator, modifier); - if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType)) + if (credentialIndex >= mLockCredentials.size() || + (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot set the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; @@ -226,7 +228,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, Emb return DlStatus::kSuccess; } -DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask, +DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { if (0 == userIndex || userIndex > mWeekDaySchedules.size()) @@ -295,7 +297,7 @@ DlStatus LockEndpoint::SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlS return DlStatus::kSuccess; } -bool LockEndpoint::setLockState(DlLockState lockState, const Optional & pin, DlOperationError & err) +bool LockEndpoint::setLockState(DlLockState lockState, const Optional & pin, OperationErrorEnum & err) { if (!pin.HasValue()) { @@ -308,7 +310,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -118,7 +118,7 @@ bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -144,8 +144,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) @@ -157,7 +157,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: credentials, totalCredentials); } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { auto lockEndpoint = getEndpoint(endpointId); @@ -170,7 +170,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { auto lockEndpoint = getEndpoint(endpointId); @@ -196,8 +196,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIn } DlStatus LockManager::SetSchedule(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) + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { auto lockEndpoint = getEndpoint(endpointId); if (nullptr == lockEndpoint) diff --git a/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp b/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp index f383377cfd77f7..0ebcf686bbebcc 100644 --- a/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp +++ b/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp @@ -25,13 +25,14 @@ using namespace chip; using namespace chip::app::Clusters; using namespace chip::app::Clusters::DoorLock; -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { return LockManager::Instance().Lock(endpointId, pinCode, err); } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { return LockManager::Instance().Unlock(endpointId, pinCode, err); } @@ -43,15 +44,15 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * 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, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -59,7 +60,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockManager::Instance().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -72,7 +73,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t w } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, diff --git a/examples/lock-app/openiotsdk/main/include/LockEndpoint.h b/examples/lock-app/openiotsdk/main/include/LockEndpoint.h index bee91e7265239f..069ab270707f1f 100644 --- a/examples/lock-app/openiotsdk/main/include/LockEndpoint.h +++ b/examples/lock-app/openiotsdk/main/include/LockEndpoint.h @@ -25,10 +25,10 @@ struct LockUserInfo { char userName[DOOR_LOCK_USER_NAME_BUFFER_SIZE]; uint32_t userUniqueId; - DlUserStatus userStatus; - DlUserType userType; - DlCredentialRule credentialRule; - std::vector credentials; + UserStatusEnum userStatus; + UserTypeEnum userType; + CredentialRuleEnum credentialRule; + std::vector credentials; chip::FabricIndex createdBy; chip::FabricIndex lastModifiedBy; }; @@ -58,29 +58,30 @@ class LockEndpoint inline chip::EndpointId GetEndpointId() const { return mEndpointId; } - bool Lock(const Optional & pin, DlOperationError & err); - bool Unlock(const Optional & pin, DlOperationError & err); + bool Lock(const Optional & pin, OperationErrorEnum & err); + bool Unlock(const Optional & pin, OperationErrorEnum & err); bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const; bool SetUser(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); + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const; bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus GetSchedule(uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); - DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask, - uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); + DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime); private: - bool setLockState(DlLockState lockState, const Optional & pin, DlOperationError & err); + bool setLockState(DlLockState lockState, const Optional & pin, OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; chip::EndpointId mEndpointId; @@ -97,7 +98,7 @@ class LockEndpoint struct LockCredentialInfo { DlCredentialStatus status; - DlCredentialType credentialType; + CredentialTypeEnum credentialType; chip::FabricIndex createdBy; chip::FabricIndex modifiedBy; uint8_t credentialData[DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE]; diff --git a/examples/lock-app/openiotsdk/main/include/LockManager.h b/examples/lock-app/openiotsdk/main/include/LockManager.h index 2fccdc9745f7a7..349fee22adee8a 100644 --- a/examples/lock-app/openiotsdk/main/include/LockManager.h +++ b/examples/lock-app/openiotsdk/main/include/LockManager.h @@ -31,26 +31,27 @@ class LockManager bool InitEndpoint(chip::EndpointId endpointId); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); DlStatus SetSchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime); diff --git a/examples/lock-app/qpg/include/BoltLockManager.h b/examples/lock-app/qpg/include/BoltLockManager.h index 005dd8711b5161..c80e3555fc8d3d 100644 --- a/examples/lock-app/qpg/include/BoltLockManager.h +++ b/examples/lock-app/qpg/include/BoltLockManager.h @@ -55,7 +55,7 @@ class BoltLockManager struct UserData { char mName[DOOR_LOCK_USER_NAME_BUFFER_SIZE]; - DlCredential mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER]; + CredentialStruct mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER]; }; struct CredentialData @@ -75,15 +75,15 @@ class BoltLockManager void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const; bool SetUser(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); + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const; bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & secret); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & secret); - bool ValidatePIN(const Optional & pinCode, DlOperationError & err) const; + bool ValidatePIN(const Optional & pinCode, OperationErrorEnum & err) const; private: friend BoltLockManager & BoltLockMgr(void); diff --git a/examples/lock-app/qpg/src/BoltLockManager.cpp b/examples/lock-app/qpg/src/BoltLockManager.cpp index f407648b4166a9..44bb81abaebdc8 100644 --- a/examples/lock-app/qpg/src/BoltLockManager.cpp +++ b/examples/lock-app/qpg/src/BoltLockManager.cpp @@ -97,14 +97,14 @@ bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo user = mUsers[userIndex - 1]; ChipLogProgress(Zcl, "Getting lock user %u: %s", static_cast(userIndex), - user.userStatus == DlUserStatus::kAvailable ? "available" : "occupied"); + user.userStatus == UserStatusEnum::kAvailable ? "available" : "occupied"); return true; } bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricIndex modifier, const CharSpan & userName, - uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule, - const DlCredential * credentials, size_t totalCredentials) + uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { UserData & userData = mUserData[userIndex - 1]; auto & user = mUsers[userIndex - 1]; @@ -113,10 +113,10 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd VerifyOrReturnError(totalCredentials <= CONFIG_LOCK_NUM_CREDENTIALS_PER_USER, false); Platform::CopyString(userData.mName, userName); - memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(DlCredential)); + memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(CredentialStruct)); user.userName = CharSpan(userData.mName, userName.size()); - user.credentials = Span(userData.mCredentials, totalCredentials); + user.credentials = Span(userData.mCredentials, totalCredentials); user.userUniqueId = uniqueId; user.userStatus = userStatus; user.userType = userType; @@ -127,12 +127,12 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd user.lastModifiedBy = modifier; ChipLogProgress(Zcl, "Setting lock user %u: %s", static_cast(userIndex), - userStatus == DlUserStatus::kAvailable ? "available" : "occupied"); + userStatus == UserStatusEnum::kAvailable ? "available" : "occupied"); return true; } -bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType, +bool BoltLockManager::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) const { VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false); @@ -146,7 +146,7 @@ bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType c } bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const ByteSpan & secret) + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret) { VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false); VerifyOrReturnError(secret.size() <= kMaxCredentialLength, false); @@ -173,7 +173,7 @@ bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creato return true; } -bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperationError & err) const +bool BoltLockManager::ValidatePIN(const Optional & pinCode, OperationErrorEnum & err) const { // Optionality of the PIN code is validated by the caller, so assume it is OK not to provide the PIN code. if (!pinCode.HasValue()) @@ -185,7 +185,7 @@ bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperatio // Check the PIN code for (const auto & credential : mCredentials) { - if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != DlCredentialType::kPin) + if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != CredentialTypeEnum::kPin) { continue; } @@ -198,7 +198,7 @@ bool BoltLockManager::ValidatePIN(const Optional & pinCode, DlOperatio } ChipLogDetail(Zcl, "Invalid lock PIN code provided"); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } diff --git a/examples/lock-app/qpg/src/ZclCallbacks.cpp b/examples/lock-app/qpg/src/ZclCallbacks.cpp index bc175fbab81ffe..698c04b017d5a3 100644 --- a/examples/lock-app/qpg/src/ZclCallbacks.cpp +++ b/examples/lock-app/qpg/src/ZclCallbacks.cpp @@ -53,27 +53,28 @@ bool emberAfPluginDoorLockGetUser(EndpointId endpointId, uint16_t userIndex, Emb } bool emberAfPluginDoorLockSetUser(EndpointId endpointId, uint16_t userIndex, FabricIndex creator, FabricIndex modifier, - const CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, - DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials) + const CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { return BoltLockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, userType, credentialRule, credentials, totalCredentials); } -bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return BoltLockMgr().GetCredential(credentialIndex, credentialType, credential); } bool emberAfPluginDoorLockSetCredential(EndpointId endpointId, uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret) { return BoltLockMgr().SetCredential(credentialIndex, creator, modifier, credentialStatus, credentialType, secret); } -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { bool returnValue = false; @@ -86,7 +87,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { bool returnValue = false; @@ -116,7 +117,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER), "number of credentials per user"); - // Set FeatureMap to (kUsersManagement|kPINCredentials), default is: - // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113 + // Set FeatureMap to (kUser|kPinCredential), default is: + // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113 logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map"); } diff --git a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h b/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h index 3ad9f11cbf2fdc..e915e472750da4 100644 --- a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h +++ b/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h @@ -27,13 +27,13 @@ class EventData class AlarmEventData : public EventData { public: - DlAlarmCode alarmCode; + AlarmCodeEnum alarmCode; }; class DoorStateEventData : public EventData { public: - DlDoorState doorState; + DoorStateEnum doorState; }; CHIP_ERROR RegisterLockEvents(); diff --git a/examples/lock-app/silabs/efr32/include/LockManager.h b/examples/lock-app/silabs/efr32/include/LockManager.h index e2a6b7f586978d..018a9ff72c767f 100644 --- a/examples/lock-app/silabs/efr32/include/LockManager.h +++ b/examples/lock-app/silabs/efr32/include/LockManager.h @@ -141,25 +141,26 @@ class LockManager typedef void (*Callback_fn_completed)(Action_t); void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); - bool Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); - bool Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err); + bool Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); + bool Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err); bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user); bool SetUser(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); + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials); - bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, + bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, - DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData); + DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, + const chip::ByteSpan & credentialData); DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule); DlStatus SetWeekdaySchedule(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); + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule); @@ -170,16 +171,16 @@ class LockManager DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule); DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, - uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localEndTime, OperatingModeEnum operatingMode); bool IsValidUserIndex(uint16_t userIndex); - bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type); + bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type); bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex); bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex); bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex); bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err); + OperationErrorEnum & err); const char * lockStateToString(DlLockState lockState) const; bool ReadConfigValues(); @@ -206,7 +207,7 @@ class LockManager char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE]; uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize]; - DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser]; + CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser]; static LockManager sLock; EFR32DoorLock::LockInitParams::LockParam LockParams; diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/efr32/src/AppTask.cpp index 8cd16f2a5a52cd..241c49319fa01b 100644 --- a/examples/lock-app/silabs/efr32/src/AppTask.cpp +++ b/examples/lock-app/silabs/efr32/src/AppTask.cpp @@ -66,8 +66,8 @@ #define APP_LOCK_SWITCH &sl_button_btn1 using chip::app::Clusters::DoorLock::DlLockState; -using chip::app::Clusters::DoorLock::DlOperationError; -using chip::app::Clusters::DoorLock::DlOperationSource; +using chip::app::Clusters::DoorLock::OperationErrorEnum; +using chip::app::Clusters::DoorLock::OperationSourceEnum; using namespace chip; using namespace ::chip::DeviceLayer; @@ -434,7 +434,7 @@ void AppTask::UpdateClusterState(intptr_t context) bool unlocked = LockMgr().NextState(); DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked; - DlOperationSource source = DlOperationSource::kUnspecified; + OperationSourceEnum source = OperationSourceEnum::kUnspecified; // write the new lock value EmberAfStatus status = diff --git a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp b/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp index 02979f56238a23..ef79290bd1961f 100644 --- a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp +++ b/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp @@ -104,7 +104,7 @@ CHIP_ERROR AlarmEventHandler(int argc, char ** argv) AlarmEventData * data = Platform::New(); data->eventId = Events::DoorLockAlarm::Id; - data->alarmCode = static_cast(atoi(argv[0])); + data->alarmCode = static_cast(atoi(argv[0])); DeviceLayer::PlatformMgr().ScheduleWork(EventWorkerFunction, reinterpret_cast(data)); @@ -136,7 +136,7 @@ CHIP_ERROR DoorStateEventHandler(int argc, char ** argv) DoorStateEventData * data = Platform::New(); data->eventId = Events::DoorStateChange::Id; - data->doorState = static_cast(atoi(argv[0])); + data->doorState = static_cast(atoi(argv[0])); DeviceLayer::PlatformMgr().ScheduleWork(EventWorkerFunction, reinterpret_cast(data)); diff --git a/examples/lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/silabs/efr32/src/LockManager.cpp index abc7b4513e2f71..54bd876147d1c3 100644 --- a/examples/lock-app/silabs/efr32/src/LockManager.cpp +++ b/examples/lock-app/silabs/efr32/src/LockManager.cpp @@ -104,9 +104,9 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex) return (userIndex < kMaxUsers); } -bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type) +bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type) { - if (DlCredentialType::kProgrammingPIN == type) + if (CredentialTypeEnum::kProgrammingPIN == type) { return (0 == credentialIndex); // 0 is required index for Programming PIN } @@ -144,7 +144,7 @@ bool LockManager::ReadConfigValues() sizeof(mCredentialData), outLen); SILABSConfig::ReadConfigValueBin(SILABSConfig::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, outLen); SILABSConfig::ReadConfigValueBin(SILABSConfig::kConfigKey_WeekDaySchedules, reinterpret_cast(mWeekdaySchedule), @@ -283,12 +283,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent) } } -bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Lock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kLocked, pin, err); } -bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, DlOperationError & err) +bool LockManager::Unlock(chip::EndpointId endpointId, const Optional & pin, OperationErrorEnum & err) { return setLockState(endpointId, DlLockState::kUnlocked, pin, err); } @@ -306,14 +306,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember const auto & userInDb = mLockUsers[userIndex]; user.userStatus = userInDb.userStatus; - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId); return true; } user.userName = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size()); - user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); + user.credentials = chip::Span(mCredentials[userIndex], userInDb.credentials.size()); user.userUniqueId = userInDb.userUniqueId; user.userType = userInDb.userType; user.credentialRule = userInDb.credentialRule; @@ -336,8 +336,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember } bool LockManager::SetUser(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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { ChipLogProgress(Zcl, "Door Lock App: LockManager::SetUser " @@ -383,14 +383,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: mCredentials[userIndex][i].CredentialIndex = i + 1; } - userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); + userInStorage.credentials = chip::Span(mCredentials[userIndex], totalCredentials); // Save user information in NVM flash SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_LockUser, reinterpret_cast(&mLockUsers), sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers); SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_UserCredentials, reinterpret_cast(mCredentials), - sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); + sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser); SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_LockUserName, reinterpret_cast(mUserNames), sizeof(mUserNames)); @@ -400,11 +400,11 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip: return true; } -bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false); // programming pin index is only index allowed to contain 0 @@ -443,11 +443,11 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential } bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false); // programming pin index is only index allowed to contain 0 @@ -509,7 +509,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we } DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { @@ -609,7 +609,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho } DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed @@ -650,7 +650,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const } bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional & pin, - DlOperationError & err) + OperationErrorEnum & err) { // Assume pin is required until told otherwise @@ -681,7 +681,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat // Check the PIN code for (uint8_t i = 0; i < kMaxCredentials; i++) { - if (mLockCredentials[i].credentialType != DlCredentialType::kPin || + if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin || mLockCredentials[i].status == DlCredentialStatus::kAvailable) { continue; @@ -704,6 +704,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat "[endpointId=%d]", lockStateToString(lockState), endpointId); - err = DlOperationError::kInvalidCredential; + err = OperationErrorEnum::kInvalidCredential; return false; } diff --git a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp index 9c1812a90c0a04..778637e250a5a5 100644 --- a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp +++ b/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp @@ -58,7 +58,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & */ void emberAfDoorLockClusterInitCallback(EndpointId endpoint) {} -bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId); bool status = LockMgr().Lock(endpointId, pinCode, err); @@ -70,7 +71,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O } bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err) + OperationErrorEnum & err) { ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId); bool status = LockMgr().Unlock(endpointId, pinCode, err); @@ -82,7 +83,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const return status; } -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential); @@ -90,7 +91,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData) + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType, credentialData); @@ -103,8 +104,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde 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) + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials) { return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule, @@ -130,7 +131,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, @@ -144,7 +145,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y } DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode); } diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index 36521f83142409..0d1093307c1ba9 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -2045,7 +2045,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -2125,7 +2125,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 56d5935f595c42..2c6c4b3df449eb 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -3477,7 +3477,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -3557,7 +3557,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index 826f48046abf0f..c95e65fb19da5f 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -3531,7 +3531,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -3611,7 +3611,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 0ed802607047d6..5c874eb1042838 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -5509,7 +5509,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5589,7 +5589,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10057,7 +10057,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10137,7 +10137,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 32ac0ccddd9b07..0457316fa9d80e 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -5319,7 +5319,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5399,7 +5399,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 3f02dbe3232670..e418a417012ff8 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -5171,7 +5171,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -5251,7 +5251,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -9385,7 +9385,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9625,7 +9625,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14821,7 +14821,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -14901,7 +14901,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp index 77c38d1f9d5d9f..4e3b6e37193a07 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp @@ -47,16 +47,16 @@ using namespace chip::app::Clusters::DoorLock; // ============================================================================= bool __attribute__((weak)) -emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, OperationErrorEnum & err) { - err = DlOperationError::kUnspecified; + err = OperationErrorEnum::kUnspecified; return false; } bool __attribute__((weak)) -emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err) +emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, OperationErrorEnum & err) { - err = DlOperationError::kUnspecified; + err = OperationErrorEnum::kUnspecified; return false; } @@ -133,14 +133,14 @@ emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, Em bool __attribute__((weak)) 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) + const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, + CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials) { return false; } bool __attribute__((weak)) -emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential) { return false; @@ -148,8 +148,8 @@ emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credent bool __attribute__((weak)) emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, - chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType, - const chip::ByteSpan & credentialData) + chip::FabricIndex modifier, DlCredentialStatus credentialStatus, + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData) { return false; } @@ -174,7 +174,7 @@ emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayInd DlStatus __attribute__((weak)) 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) + DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { return DlStatus::kFailure; } @@ -188,7 +188,7 @@ emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayInd DlStatus __attribute__((weak)) emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode) { return DlStatus::kFailure; } diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp index 86f6b10fe7b7d4..35fc3c954dc40d 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server.cpp @@ -106,12 +106,12 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo return SetAttribute(endpointId, Attributes::LockState::Id, Attributes::LockState::Set, newLockState); } -bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource) +bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState, OperationSourceEnum opSource) { bool success = SetLockState(endpointId, newLockState); // Remote operations are handled separately as they use more data unavailable here - VerifyOrReturnError(DlOperationSource::kRemote != opSource, success); + VerifyOrReturnError(OperationSourceEnum::kRemote != opSource, success); // DlLockState::kNotFullyLocked has no appropriate event to send. Also it is unclear whether // it should schedule auto-relocking. So skip it here. Check for supported states explicitly @@ -119,13 +119,13 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo VerifyOrReturnError(DlLockState::kLocked == newLockState || DlLockState::kUnlocked == newLockState, success); // Send LockOperation event - auto opType = (DlLockState::kLocked == newLockState) ? DlLockOperationType::kLock : DlLockOperationType::kUnlock; + auto opType = (DlLockState::kLocked == newLockState) ? LockOperationTypeEnum::kLock : LockOperationTypeEnum::kUnlock; - SendLockOperationEvent(endpointId, opType, opSource, DlOperationError::kUnspecified, Nullable(), + SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, Nullable(), Nullable(), Nullable(), nullptr, 0, success); // Schedule auto-relocking - if (success && DlLockOperationType::kUnlock == opType) + if (success && LockOperationTypeEnum::kUnlock == opType) { // appclusters.pdf 5.3.3.25: // The number of seconds to wait after unlocking a lock before it automatically locks again. 0=disabled. If set, unlock @@ -145,7 +145,7 @@ bool DoorLockServer::SetActuatorEnabled(chip::EndpointId endpointId, bool newAct return SetAttribute(endpointId, Attributes::ActuatorEnabled::Id, Attributes::ActuatorEnabled::Set, newActuatorState); } -bool DoorLockServer::SetDoorState(chip::EndpointId endpointId, DlDoorState newDoorState) +bool DoorLockServer::SetDoorState(chip::EndpointId endpointId, DoorStateEnum newDoorState) { bool success = SetAttribute(endpointId, Attributes::DoorState::Id, Attributes::DoorState::Set, newDoorState); @@ -294,7 +294,7 @@ bool DoorLockServer::GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpo Attributes::NumberOfHolidaySchedulesSupported::Get, numberOfHolidaySchedules); } -bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode alarmCode) +bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, AlarmCodeEnum alarmCode) { Events::DoorLockAlarm::Type event{ alarmCode }; SendEvent(endpointId, event); @@ -305,10 +305,10 @@ bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode namespace { // Check whether this is valid UserStatus for a SetUser or SetCredential // command. -bool IsValidUserStatusForSet(const Nullable & userStatus) +bool IsValidUserStatusForSet(const Nullable & userStatus) { - return userStatus.IsNull() || (userStatus.Value() == DlUserStatus::kOccupiedEnabled) || - (userStatus.Value() == DlUserStatus::kOccupiedDisabled); + return userStatus.IsNull() || (userStatus.Value() == UserStatusEnum::kOccupiedEnabled) || + (userStatus.Value() == UserStatusEnum::kOccupiedDisabled); } } // anonymous namespace @@ -346,7 +346,7 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb auto & operationType = commandData.operationType; auto & userName = commandData.userName; - auto & userUniqueId = commandData.userUniqueId; + auto & userUniqueId = commandData.userUniqueID; auto & userStatus = commandData.userStatus; auto & userType = commandData.userType; auto & credentialRule = commandData.credentialRule; @@ -380,7 +380,8 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb return; } - if (!userType.IsNull() && (userType.Value() < DlUserType::kUnrestrictedUser || userType.Value() > DlUserType::kRemoteOnlyUser)) + if (!userType.IsNull() && + (userType.Value() < UserTypeEnum::kUnrestrictedUser || userType.Value() > UserTypeEnum::kRemoteOnlyUser)) { emberAfDoorLockClusterPrintln( "[SetUser] Unable to set the user: user type is out of range [endpointId=%d,userIndex=%d,userType=%u]", @@ -393,15 +394,15 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; switch (operationType) { - case DlDataOperationType::kAdd: + case DataOperationTypeEnum::kAdd: status = createUser(commandPath.mEndpointId, fabricIdx, sourceNodeId, userIndex, userName, userUniqueId, userStatus, userType, credentialRule); break; - case DlDataOperationType::kModify: + case DataOperationTypeEnum::kModify: status = modifyUser(commandPath.mEndpointId, fabricIdx, sourceNodeId, userIndex, userName, userUniqueId, userStatus, userType, credentialRule); break; - case DlDataOperationType::kClear: + case DataOperationTypeEnum::kClear: default: // appclusters, 5.2.4.34: SetUser command allow only kAdd/kModify, we should respond with INVALID_COMMAND if we got kClear // or anything else @@ -449,7 +450,7 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb using ResponseFields = Commands::GetUserResponse::Fields; // appclusters, 5.2.4.36: we should not add user-specific field if the user status is set to Available - if (DlUserStatus::kAvailable != user.userStatus) + if (UserStatusEnum::kAvailable != user.userStatus) { emberAfDoorLockClusterPrintln("Found user in storage: " "[userIndex=%d,userName=\"%.*s\",userStatus=%u,userType=%u" @@ -461,7 +462,7 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb SuccessOrExit(err = writer->PutString(TLV::ContextTag(to_underlying(ResponseFields::kUserName)), user.userName)); if (0xFFFFFFFFU != user.userUniqueId) { - SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserUniqueId)), user.userUniqueId)); + SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserUniqueID)), user.userUniqueId)); } SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserStatus)), user.userStatus)); SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserType)), user.userType)); @@ -473,9 +474,9 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb TLV::kTLVType_Array, credentialsContainer)); for (size_t i = 0; i < user.credentials.size(); ++i) { - Structs::DlCredential::Type credential; + Structs::CredentialStruct::Type credential; credential.credentialIndex = user.credentials.data()[i].CredentialIndex; - credential.credentialType = static_cast(user.credentials.data()[i].CredentialType); + credential.credentialType = static_cast(user.credentials.data()[i].CredentialType); SuccessOrExit(err = credential.Encode(*writer, TLV::AnonymousTag())); } SuccessOrExit(err = writer->EndContainer(credentialsContainer)); @@ -581,7 +582,7 @@ void DoorLockServer::clearUserCommandHandler(chip::app::CommandHandler * command } emberAfDoorLockClusterPrintln("[ClearUser] Removed all users from storage [users=%d]", maxNumberOfUsers); - sendRemoteLockUserChange(commandPath.mEndpointId, DlLockDataType::kUserIndex, DlDataOperationType::kClear, sourceNodeId, + sendRemoteLockUserChange(commandPath.mEndpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kClear, sourceNodeId, fabricIdx, 0xFFFE, 0xFFFE); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); @@ -649,7 +650,7 @@ void DoorLockServer::setCredentialCommandHandler( } // appclusters, 5.2.4.41.1: we should return DUPLICATE in the response if we're trying to create duplicated credential entry - for (uint16_t i = 1; DlCredentialType::kProgrammingPIN != credentialType && (i <= maxNumberOfCredentials); ++i) + for (uint16_t i = 1; CredentialTypeEnum::kProgrammingPIN != credentialType && (i <= maxNumberOfCredentials); ++i) { EmberAfPluginDoorLockCredentialInfo currentCredential; if (!emberAfPluginDoorLockGetCredential(commandPath.mEndpointId, i, credentialType, currentCredential)) @@ -693,7 +694,8 @@ void DoorLockServer::setCredentialCommandHandler( return; } - if (!userType.IsNull() && (userType.Value() < DlUserType::kUnrestrictedUser || userType.Value() > DlUserType::kRemoteOnlyUser)) + if (!userType.IsNull() && + (userType.Value() < UserTypeEnum::kUnrestrictedUser || userType.Value() > UserTypeEnum::kRemoteOnlyUser)) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: user type is out of range " "[endpointId=%d,credentialIndex=%d,userType=%u]", @@ -704,7 +706,7 @@ void DoorLockServer::setCredentialCommandHandler( switch (operationType) { - case DlDataOperationType::kAdd: { + case DataOperationTypeEnum::kAdd: { uint16_t createdUserIndex = 0; status = createCredential(commandPath.mEndpointId, fabricIdx, sourceNodeId, credentialIndex, credentialType, @@ -713,7 +715,7 @@ void DoorLockServer::setCredentialCommandHandler( sendSetCredentialResponse(commandObj, commandPath, status, createdUserIndex, nextAvailableCredentialSlot); return; } - case DlDataOperationType::kModify: { + case DataOperationTypeEnum::kModify: { // appclusters, 5.2.4.41.1: should send the INVALID_COMMAND in the response when the credential is in use if (DlCredentialStatus::kAvailable == existingCredential.status) { @@ -739,7 +741,7 @@ void DoorLockServer::setCredentialCommandHandler( sendSetCredentialResponse(commandObj, commandPath, status, 0, nextAvailableCredentialSlot); return; } - case DlDataOperationType::kClear: + case DataOperationTypeEnum::kClear: default: // appclusters, 5.2.4.40: set credential command supports only Add and Modify operational type. sendSetCredentialResponse(commandObj, commandPath, DlStatus::kInvalidField, 0, nextAvailableCredentialSlot); @@ -748,7 +750,7 @@ void DoorLockServer::setCredentialCommandHandler( void DoorLockServer::getCredentialStatusCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - DlCredentialType credentialType, uint16_t credentialIndex) + CredentialTypeEnum credentialType, uint16_t credentialIndex) { emberAfDoorLockClusterPrintln("[GetCredentialStatus] Incoming command [endpointId=%d]", commandPath.mEndpointId); @@ -801,8 +803,9 @@ void DoorLockServer::getCredentialStatusCommandHandler(chip::app::CommandHandler } void DoorLockServer::sendGetCredentialResponse(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, DlCredentialType credentialType, - uint16_t credentialIndex, uint16_t userIndexWithCredential, + const chip::app::ConcreteCommandPath & commandPath, + CredentialTypeEnum credentialType, uint16_t credentialIndex, + uint16_t userIndexWithCredential, EmberAfPluginDoorLockCredentialInfo * credentialInfo, bool credentialExists) { Commands::GetCredentialStatusResponse::Type response{ .credentialExists = credentialExists }; @@ -882,7 +885,7 @@ void DoorLockServer::clearCredentialCommandHandler( void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t weekDayIndex, - uint16_t userIndex, const chip::BitMask & daysMask, + uint16_t userIndex, const chip::BitMask & daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { auto endpointId = commandPath.mEndpointId; @@ -983,7 +986,7 @@ void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler "[endpointId=%d,weekDayIndex=%d,userIndex=%d,daysMask=%d,startTime=\"%d:%d\",endTime=\"%d:%d\"]", endpointId, weekDayIndex, userIndex, daysMask.Raw(), startHour, startMinute, endHour, endMinute); - sendRemoteLockUserChange(endpointId, DlLockDataType::kWeekDaySchedule, DlDataOperationType::kAdd, sourceNodeId, fabricIdx, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kWeekDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx, userIndex, static_cast(weekDayIndex)); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); @@ -1103,7 +1106,7 @@ void DoorLockServer::clearWeekDayScheduleCommandHandler(chip::app::CommandHandle return; } - sendRemoteLockUserChange(endpointId, DlLockDataType::kWeekDaySchedule, DlDataOperationType::kClear, sourceNodeId, fabricIdx, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kWeekDaySchedule, DataOperationTypeEnum::kClear, sourceNodeId, fabricIdx, userIndex, static_cast(weekDayIndex)); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); @@ -1183,7 +1186,7 @@ void DoorLockServer::setYearDayScheduleCommandHandler(chip::app::CommandHandler "[endpointId=%d,yearDayIndex=%d,userIndex=%d,localStartTime=%" PRIu32 ",endTime=%" PRIu32 "]", endpointId, yearDayIndex, userIndex, localStartTime, localEndTime); - sendRemoteLockUserChange(endpointId, DlLockDataType::kYearDaySchedule, DlDataOperationType::kAdd, sourceNodeId, fabricIdx, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kYearDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx, userIndex, static_cast(yearDayIndex)); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); @@ -1301,7 +1304,7 @@ void DoorLockServer::clearYearDayScheduleCommandHandler(chip::app::CommandHandle return; } - sendRemoteLockUserChange(endpointId, DlLockDataType::kYearDaySchedule, DlDataOperationType::kClear, sourceNodeId, fabricIdx, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kYearDaySchedule, DataOperationTypeEnum::kClear, sourceNodeId, fabricIdx, userIndex, static_cast(yearDayIndex)); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); @@ -1406,16 +1409,16 @@ bool DoorLockServer::userExists(chip::EndpointId endpointId, uint16_t userIndex) userIndex); return false; } - return DlUserStatus::kAvailable != user.userStatus; + return UserStatusEnum::kAvailable != user.userStatus; } -bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex) +bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex) { uint16_t maxCredentials = 0; return credentialIndexValid(endpointId, type, credentialIndex, maxCredentials); } -bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex, +bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex, uint16_t & maxNumberOfCredentials) { if (!getMaxNumberOfCredentials(endpointId, type, maxNumberOfCredentials)) @@ -1424,7 +1427,7 @@ bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredent } // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only - if (DlCredentialType::kProgrammingPIN == type) + if (CredentialTypeEnum::kProgrammingPIN == type) { return (0 == credentialIndex); } @@ -1437,7 +1440,7 @@ bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredent return true; } -DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId, DlCredentialType type, +DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId, CredentialTypeEnum type, const chip::ByteSpan & credentialData) { bool statusMin = true, statusMax = true; @@ -1445,12 +1448,12 @@ DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId switch (type) { - case DlCredentialType::kProgrammingPIN: - case DlCredentialType::kPin: + case CredentialTypeEnum::kProgrammingPIN: + case CredentialTypeEnum::kPin: statusMin = GetAttribute(endpointId, Attributes::MinPINCodeLength::Id, Attributes::MinPINCodeLength::Get, minLen); statusMax = GetAttribute(endpointId, Attributes::MaxPINCodeLength::Id, Attributes::MaxPINCodeLength::Get, maxLen); break; - case DlCredentialType::kRfid: + case CredentialTypeEnum::kRfid: statusMin = GetAttribute(endpointId, Attributes::MinRFIDCodeLength::Id, Attributes::MinRFIDCodeLength::Get, minLen); statusMax = GetAttribute(endpointId, Attributes::MaxRFIDCodeLength::Id, Attributes::MaxRFIDCodeLength::Get, maxLen); break; @@ -1477,20 +1480,20 @@ DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId return DlStatus::kSuccess; } -bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, +bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t & maxNumberOfCredentials) { maxNumberOfCredentials = 0; bool status = false; switch (credentialType) { - case DlCredentialType::kProgrammingPIN: + case CredentialTypeEnum::kProgrammingPIN: maxNumberOfCredentials = 1; return true; - case DlCredentialType::kPin: + case CredentialTypeEnum::kPin: status = GetNumberOfPINCredentialsSupported(endpointId, maxNumberOfCredentials); break; - case DlCredentialType::kRfid: + case CredentialTypeEnum::kRfid: status = GetNumberOfRFIDCredentialsSupported(endpointId, maxNumberOfCredentials); break; default: @@ -1517,7 +1520,7 @@ bool DoorLockServer::findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t return false; } - if (DlUserStatus::kAvailable != user.userStatus) + if (UserStatusEnum::kAvailable != user.userStatus) { userIndex = i; return true; @@ -1548,7 +1551,7 @@ bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_ return false; } - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { userIndex = i; return true; @@ -1557,7 +1560,7 @@ bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_ return false; } -bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex, +bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex, uint16_t & credentialIndex) { uint16_t maxNumberOfCredentials = 0; @@ -1568,7 +1571,7 @@ bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlC // Programming PIN index starts with 0, and it is assumed that it is unique. Therefore different bounds checking for that // credential type - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { maxNumberOfCredentials--; } @@ -1593,8 +1596,8 @@ bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlC return false; } -bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex, - uint16_t & credentialIndex) +bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, + uint16_t startIndex, uint16_t & credentialIndex) { uint16_t maxNumberOfCredentials = 0; if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials)) @@ -1604,7 +1607,7 @@ bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, D // Programming PIN index starts with 0, and it is assumed that it is unique. Therefor different bounds checking for that // credential type - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { maxNumberOfCredentials--; } @@ -1629,7 +1632,7 @@ bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, D return false; } -bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, +bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t credentialIndex, uint16_t & userIndex) { uint16_t maxNumberOfUsers = 0; @@ -1648,7 +1651,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr } // Go through occupied users only - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { continue; } @@ -1667,7 +1670,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr return false; } -bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, +bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, chip::ByteSpan credentialData, uint16_t & userIndex, uint16_t & credentialIndex, EmberAfPluginDoorLockUserInfo & userInfo) { @@ -1687,7 +1690,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr } // Go through occupied users only - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { continue; } @@ -1736,9 +1739,10 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId, uint16_t userIndex, const Nullable & userName, - const Nullable & userUniqueId, const Nullable & userStatus, - const Nullable & userType, const Nullable & credentialRule, - const Nullable & credential) + const Nullable & userUniqueId, const Nullable & userStatus, + const Nullable & userType, + const Nullable & credentialRule, + const Nullable & credential) { EmberAfPluginDoorLockUserInfo user; if (!emberAfPluginDoorLockGetUser(endpointId, userIndex, user)) @@ -1748,20 +1752,20 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr } // appclusters, 5.2.4.34: to modify user its status should be set to Available. If it is we should return OCCUPIED. - if (DlUserStatus::kAvailable != user.userStatus) + if (UserStatusEnum::kAvailable != user.userStatus) { emberAfDoorLockClusterPrintln("[createUser] Unable to overwrite existing user [endpointId=%d,userIndex=%d]", endpointId, userIndex); return static_cast(DlStatus::kOccupied); } - const auto & newUserName = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString(""); - auto newUserUniqueId = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value(); - auto newUserStatus = userStatus.IsNull() ? DlUserStatus::kOccupiedEnabled : userStatus.Value(); - auto newUserType = userType.IsNull() ? DlUserType::kUnrestrictedUser : userType.Value(); - auto newCredentialRule = credentialRule.IsNull() ? DlCredentialRule::kSingle : credentialRule.Value(); - const DlCredential * newCredentials = nullptr; - size_t newTotalCredentials = 0; + const auto & newUserName = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString(""); + auto newUserUniqueId = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value(); + auto newUserStatus = userStatus.IsNull() ? UserStatusEnum::kOccupiedEnabled : userStatus.Value(); + auto newUserType = userType.IsNull() ? UserTypeEnum::kUnrestrictedUser : userType.Value(); + auto newCredentialRule = credentialRule.IsNull() ? CredentialRuleEnum::kSingle : credentialRule.Value(); + const CredentialStruct * newCredentials = nullptr; + size_t newTotalCredentials = 0; if (!credential.IsNull()) { newCredentials = &credential.Value(); @@ -1789,7 +1793,7 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr newUserUniqueId, to_underlying(newUserStatus), to_underlying(newUserType), to_underlying(newCredentialRule), static_cast(newTotalCredentials)); - sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kAdd, sourceNodeId, creatorFabricIdx, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kAdd, sourceNodeId, creatorFabricIdx, userIndex, userIndex); return EMBER_ZCL_STATUS_SUCCESS; @@ -1797,8 +1801,9 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId, uint16_t userIndex, const Nullable & userName, - const Nullable & userUniqueId, const Nullable & userStatus, - const Nullable & userType, const Nullable & credentialRule) + const Nullable & userUniqueId, const Nullable & userStatus, + const Nullable & userType, + const Nullable & credentialRule) { // We should get the user by that index first EmberAfPluginDoorLockUserInfo user; @@ -1809,7 +1814,7 @@ EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::Fabr } // appclusters, 5.2.4.34: to modify user its status should NOT be set to Available. If it is we should return INVALID_COMMAND. - if (DlUserStatus::kAvailable == user.userStatus) + if (UserStatusEnum::kAvailable == user.userStatus) { emberAfDoorLockClusterPrintln("[modifyUser] Unable to modify non-existing user [endpointId=%d,userIndex=%d]", endpointId, userIndex); @@ -1860,7 +1865,7 @@ EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::Fabr newUserName.data(), newUserUniqueId, to_underlying(newUserStatus), to_underlying(newUserType), to_underlying(newCredentialRule)); - sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kModify, sourceNodeId, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kModify, sourceNodeId, modifierFabricIndex, userIndex, userIndex); return EMBER_ZCL_STATUS_SUCCESS; @@ -1890,7 +1895,7 @@ EmberAfStatus DoorLockServer::clearUser(chip::EndpointId endpointId, chip::Fabri if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, DlCredentialStatus::kAvailable, - static_cast(credential.CredentialType), chip::ByteSpan())) + static_cast(credential.CredentialType), chip::ByteSpan())) { ChipLogError(Zcl, "[ClearUser] Unable to remove credentials associated with user - internal error " @@ -1910,15 +1915,15 @@ EmberAfStatus DoorLockServer::clearUser(chip::EndpointId endpointId, chip::Fabri // Remove the user entry if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, chip::CharSpan(""), 0, - DlUserStatus::kAvailable, DlUserType::kUnrestrictedUser, DlCredentialRule::kSingle, nullptr, - 0)) + UserStatusEnum::kAvailable, UserTypeEnum::kUnrestrictedUser, CredentialRuleEnum::kSingle, + nullptr, 0)) { return EMBER_ZCL_STATUS_FAILURE; } if (sendUserChangeEvent) { - sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kClear, sourceNodeId, + sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kClear, sourceNodeId, modifierFabricId, userIndex, userIndex); } return EMBER_ZCL_STATUS_SUCCESS; @@ -1943,7 +1948,7 @@ bool DoorLockServer::clearFabricFromUsers(chip::EndpointId endpointId, chip::Fab } // Filter out unoccupied slots and users that don't have corresponding fabricIndex in the created/modified fields - if (DlUserStatus::kAvailable == user.userStatus || (fabricIndex != user.createdBy && fabricIndex != user.lastModifiedBy)) + if (UserStatusEnum::kAvailable == user.userStatus || (fabricIndex != user.createdBy && fabricIndex != user.lastModifiedBy)) { continue; } @@ -1972,8 +1977,8 @@ bool DoorLockServer::clearFabricFromUsers(chip::EndpointId endpointId, chip::Fab } DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, - chip::NodeId sourceNodeId, const Nullable & userStatus, - const Nullable & userType, const DlCredential & credential, + chip::NodeId sourceNodeId, const Nullable & userStatus, + const Nullable & userType, const CredentialStruct & credential, const chip::ByteSpan & credentialData, uint16_t & createdUserIndex) { uint16_t availableUserIndex = 0; @@ -1987,7 +1992,7 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, auto status = createUser(endpointId, creatorFabricIdx, sourceNodeId, availableUserIndex, Nullable(), Nullable(), - userStatus, userType, Nullable(), Nullable(credential)); + userStatus, userType, Nullable(), Nullable(credential)); if (EMBER_ZCL_STATUS_SUCCESS != status) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to create new user for credential: internal error " @@ -1997,8 +2002,8 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, } if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, creatorFabricIdx, creatorFabricIdx, - DlCredentialStatus::kOccupied, static_cast(credential.CredentialType), - credentialData)) + DlCredentialStatus::kOccupied, + static_cast(credential.CredentialType), credentialData)) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: app error " "[endpointId=%d,credentialIndex=%d,credentialType=%u,dataLength=%u]", @@ -2017,7 +2022,7 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, } DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, - uint16_t userIndex, const DlCredential & credential, + uint16_t userIndex, const CredentialStruct & credential, const chip::ByteSpan & credentialData) { if (!userIndexValid(endpointId, userIndex)) @@ -2039,7 +2044,7 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp } // Not in the spec, but common sense: I don't think we need to modify the credential if user slot is not occupied - if (user.userStatus == DlUserStatus::kAvailable) + if (user.userStatus == UserStatusEnum::kAvailable) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to add credential to user: user slot is empty " "[endpointId=%d,credentialIndex=%d,userIndex=%d]", @@ -2058,8 +2063,8 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp } if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, modifierFabricIdx, modifierFabricIdx, - DlCredentialStatus::kOccupied, static_cast(credential.CredentialType), - credentialData)) + DlCredentialStatus::kOccupied, + static_cast(credential.CredentialType), credentialData)) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: app error " "[endpointId=%d,credentialIndex=%d,credentialType=%u,dataLength=%u]", @@ -2072,7 +2077,7 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp } DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex, - const DlCredential & credential) + const CredentialStruct & credential) { // We should get the user by that index first EmberAfPluginDoorLockUserInfo user; @@ -2118,7 +2123,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip:: return DlStatus::kResourceExhausted; } - chip::Platform::ScopedMemoryBuffer newCredentials; + chip::Platform::ScopedMemoryBuffer newCredentials; if (!newCredentials.Alloc(user.credentials.size() + 1)) { ChipLogError(Zcl, @@ -2128,7 +2133,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip:: return DlStatus::kFailure; } - memcpy(newCredentials.Get(), user.credentials.data(), sizeof(DlCredential) * user.credentials.size()); + memcpy(newCredentials.Get(), user.credentials.data(), sizeof(CredentialStruct) * user.credentials.size()); newCredentials[user.credentials.size()] = credential; if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, user.createdBy, modifierFabricIdx, user.userName, user.userUniqueId, @@ -2152,7 +2157,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip:: } DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, - uint16_t userIndex, const DlCredential & credential) + uint16_t userIndex, const CredentialStruct & credential) { // We should get the user by that index first EmberAfPluginDoorLockUserInfo user; @@ -2168,7 +2173,7 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch // appclusters, 5.2.4.40: user should already be associated with given credentialIndex if (user.credentials.data()[i].CredentialIndex == credential.CredentialIndex) { - chip::Platform::ScopedMemoryBuffer newCredentials; + chip::Platform::ScopedMemoryBuffer newCredentials; if (!newCredentials.Alloc(user.credentials.size())) { ChipLogError(Zcl, @@ -2178,7 +2183,7 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch credential.CredentialIndex); return DlStatus::kFailure; } - memcpy(newCredentials.Get(), user.credentials.data(), sizeof(DlCredential) * user.credentials.size()); + memcpy(newCredentials.Get(), user.credentials.data(), sizeof(CredentialStruct) * user.credentials.size()); newCredentials[i] = credential; emberAfDoorLockClusterPrintln( @@ -2218,10 +2223,10 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch } DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, - chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType, + chip::NodeId sourceNodeId, uint16_t credentialIndex, CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData, Nullable userIndex, - const Nullable & userStatus, Nullable userType, + const Nullable & userStatus, Nullable userType, uint16_t & createdUserIndex) { // appclusters, 5.2.4.41.1: should send the OCCUPIED in the response when the credential is in use @@ -2234,7 +2239,7 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab return DlStatus::kOccupied; } - if (!userType.IsNull() && DlUserType::kProgrammingUser == userType.Value()) + if (!userType.IsNull() && UserTypeEnum::kProgrammingUser == userType.Value()) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: user type is invalid " "[endpointId=%d,credentialIndex=%d,userType=%u]", @@ -2243,7 +2248,7 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab return DlStatus::kInvalidField; } - DlCredential credential{ to_underlying(credentialType), credentialIndex }; + CredentialStruct credential{ to_underlying(credentialType), credentialIndex }; // appclusters, 5.2.4.40: if userIndex is not provided we should create new user DlStatus status = DlStatus::kSuccess; if (userIndex.IsNull()) @@ -2262,19 +2267,21 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab if (DlStatus::kSuccess == status) { - sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kAdd, sourceNodeId, - creatorFabricIdx, createdUserIndex == 0 ? userIndex.Value() : createdUserIndex, credentialIndex); + sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kAdd, + sourceNodeId, creatorFabricIdx, createdUserIndex == 0 ? userIndex.Value() : createdUserIndex, + credentialIndex); } return status; } DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, - chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType, + chip::NodeId sourceNodeId, uint16_t credentialIndex, + CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData) { - if (DlCredentialType::kProgrammingPIN != credentialType || 0 != credentialIndex) + if (CredentialTypeEnum::kProgrammingPIN != credentialType || 0 != credentialIndex) { emberAfDoorLockClusterPrintln( "[SetCredential] Unable to modify programming PIN: invalid argument [endpointId=%d,credentialIndex=%d]", endpointId, @@ -2287,7 +2294,7 @@ DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip: credentialIndex); uint16_t relatedUserIndex = 0; - if (!findUserIndexByCredential(endpointId, DlCredentialType::kProgrammingPIN, 0, relatedUserIndex)) + if (!findUserIndexByCredential(endpointId, CredentialTypeEnum::kProgrammingPIN, 0, relatedUserIndex)) { ChipLogError(Zcl, "[SetCredential] Unable to modify PIN - related user not found (internal error) [endpointId=%d]", endpointId); @@ -2309,21 +2316,21 @@ DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip: endpointId, credentialIndex, to_underlying(credentialType), static_cast(credentialData.size())); - sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kModify, sourceNodeId, + sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kModify, sourceNodeId, modifierFabricIndex, relatedUserIndex, credentialIndex); return DlStatus::kSuccess; } DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, - chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType, + chip::NodeId sourceNodeId, uint16_t credentialIndex, CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData, uint16_t userIndex, - const Nullable & userStatus, Nullable userType) + const Nullable & userStatus, Nullable userType) { // appclusters, 5.2.4.40: when modifying a credential, userStatus and userType shall both be NULL. - if (!userStatus.IsNull() || (!userType.IsNull() && DlUserType::kProgrammingUser != userType.Value())) + if (!userStatus.IsNull() || (!userType.IsNull() && UserTypeEnum::kProgrammingUser != userType.Value())) { emberAfDoorLockClusterPrintln("[SetCredential] Unable to modify the credential: invalid arguments " "[endpointId=%d,credentialIndex=%d,credentialType=%u]", @@ -2331,7 +2338,7 @@ DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::Fab return DlStatus::kInvalidField; } - DlCredential credential{ to_underlying(credentialType), credentialIndex }; + CredentialStruct credential{ to_underlying(credentialType), credentialIndex }; auto status = modifyCredentialForUser(endpointId, modifierFabricIndex, userIndex, credential); if (DlStatus::kSuccess == status) @@ -2352,7 +2359,7 @@ DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::Fab endpointId, credentialIndex, to_underlying(credentialType), static_cast(credentialData.size())); - sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kModify, + sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kModify, sourceNodeId, modifierFabricIndex, userIndex, credentialIndex); } return status; @@ -2375,14 +2382,14 @@ void DoorLockServer::sendSetCredentialResponse(chip::app::CommandHandler * comma commandObj->AddResponse(commandPath, command); } -bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, DlCredentialType type) +bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, CredentialTypeEnum type) { switch (type) { - case DlCredentialType::kProgrammingPIN: - case DlCredentialType::kPin: + case CredentialTypeEnum::kProgrammingPIN: + case CredentialTypeEnum::kPin: return SupportsPIN(endpointId); - case DlCredentialType::kRfid: + case CredentialTypeEnum::kRfid: return SupportsRFID(endpointId); default: return false; @@ -2409,7 +2416,7 @@ bool DoorLockServer::weekDayIndexValid(chip::EndpointId endpointId, uint8_t week DlStatus DoorLockServer::clearWeekDaySchedule(chip::EndpointId endpointId, uint16_t userIndex, uint8_t weekDayIndex) { auto status = emberAfPluginDoorLockSetSchedule(endpointId, weekDayIndex, userIndex, DlScheduleStatus::kAvailable, - DlDaysMaskMap(0), 0, 0, 0, 0); + DaysMaskMap(0), 0, 0, 0, 0); if (DlStatus::kSuccess != status && DlStatus::kNotFound != status) { ChipLogError(Zcl, @@ -2468,7 +2475,7 @@ DlStatus DoorLockServer::clearSchedules(chip::EndpointId endpointId, uint16_t us void DoorLockServer::sendGetWeekDayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t weekdayIndex, - uint16_t userIndex, DlStatus status, DlDaysMaskMap daysMask, uint8_t startHour, + uint16_t userIndex, DlStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { VerifyOrDie(nullptr != commandObj); @@ -2479,7 +2486,7 @@ void DoorLockServer::sendGetWeekDayScheduleResponse(chip::app::CommandHandler * response.status = status; if (DlStatus::kSuccess == status) { - response.daysMask = Optional>(daysMask); + response.daysMask = Optional>(daysMask); response.startHour = Optional(startHour); response.startMinute = Optional(startMinute); response.endHour = Optional(endHour); @@ -2577,7 +2584,7 @@ bool DoorLockServer::holidayIndexValid(chip::EndpointId endpointId, uint8_t holi DlStatus DoorLockServer::clearHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex) { auto status = - emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kAvailable, 0, 0, DlOperatingMode::kNormal); + emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kAvailable, 0, 0, OperatingModeEnum::kNormal); if (DlStatus::kSuccess != status && DlStatus::kNotFound != status) { ChipLogError( @@ -2610,7 +2617,7 @@ DlStatus DoorLockServer::clearHolidaySchedules(chip::EndpointId endpointId) void DoorLockServer::sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex, DlStatus status, uint32_t localStartTime, uint32_t localEndTime, - DlOperatingMode operatingMode) + OperatingModeEnum operatingMode) { VerifyOrDie(nullptr != commandObj); @@ -2619,15 +2626,15 @@ void DoorLockServer::sendHolidayScheduleResponse(chip::app::CommandHandler * com { response.localStartTime = Optional(localStartTime); response.localEndTime = Optional(localEndTime); - response.operatingMode = Optional(operatingMode); + response.operatingMode = Optional(operatingMode); } commandObj->AddResponse(commandPath, response); } EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId, - DlCredentialType credentialType, uint16_t credentialIndex, bool sendUserChangeEvent) + CredentialTypeEnum credentialType, uint16_t credentialIndex, bool sendUserChangeEvent) { - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { emberAfDoorLockClusterPrintln("[clearCredential] Cannot clear programming PIN credentials " "[endpointId=%d,credentialType=%u,credentialIndex=%d,modifier=%d]", @@ -2746,7 +2753,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip: return EMBER_ZCL_STATUS_FAILURE; } - chip::Platform::ScopedMemoryBuffer newCredentials; + chip::Platform::ScopedMemoryBuffer newCredentials; if (!newCredentials.Alloc(relatedUser.credentials.size())) { ChipLogError(Zcl, @@ -2760,7 +2767,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip: size_t newCredentialsCount = 0; for (const auto & c : relatedUser.credentials) { - if (static_cast(c.CredentialType) == credentialType && c.CredentialIndex == credentialIndex) + if (static_cast(c.CredentialType) == credentialType && c.CredentialIndex == credentialIndex) { continue; } @@ -2788,7 +2795,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip: if (sendUserChangeEvent) { - sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kClear, + sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kClear, sourceNodeId, modifier, relatedUserIndex, credentialIndex); } @@ -2799,7 +2806,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip { if (SupportsPIN(endpointId)) { - auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kPin); + auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kPin); if (EMBER_ZCL_STATUS_SUCCESS != status) { ChipLogError(Zcl, "[clearCredentials] Unable to clear all PIN credentials [endpointId=%d,status=%d]", endpointId, @@ -2812,7 +2819,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip if (SupportsRFID(endpointId)) { - auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kRfid); + auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kRfid); if (EMBER_ZCL_STATUS_SUCCESS != status) { ChipLogError(Zcl, "[clearCredentials] Unable to clear all RFID credentials [endpointId=%d,status=%d]", endpointId, @@ -2824,7 +2831,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip if (SupportsFingers(endpointId)) { - auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFingerprint); + auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFingerprint); if (EMBER_ZCL_STATUS_SUCCESS != status) { ChipLogError(Zcl, "[clearCredentials] Unable to clear all Fingerprint credentials [endpointId=%d,status=%d]", @@ -2832,7 +2839,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip return status; } - status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFingerVein); + status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFingerVein); if (EMBER_ZCL_STATUS_SUCCESS != status) { ChipLogError(Zcl, "[clearCredentials] Unable to clear all Finger Vein credentials [endpointId=%d,status=%d]", @@ -2845,7 +2852,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip if (SupportsFace(endpointId)) { - auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFace); + auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFace); if (EMBER_ZCL_STATUS_SUCCESS != status) { ChipLogError(Zcl, "[clearCredentials] Unable to clear all face credentials [endpointId=%d,status=%d]", endpointId, @@ -2859,7 +2866,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip } EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId, - DlCredentialType credentialType) + CredentialTypeEnum credentialType) { uint16_t maxNumberOfCredentials = 0; if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials)) @@ -2884,13 +2891,13 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip } } - sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kClear, sourceNodeId, + sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kClear, sourceNodeId, modifier, 0xFFFE, 0xFFFE); return EMBER_ZCL_STATUS_SUCCESS; } -bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, +bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType, chip::FabricIndex fabricToRemove) { uint16_t maxNumberOfCredentials = 0; @@ -2906,7 +2913,7 @@ bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, DlC uint16_t startIndex = 1; // Programming PIN is a special case -- it is unique and its index assumed to be 0. - if (DlCredentialType::kProgrammingPIN == credentialType) + if (CredentialTypeEnum::kProgrammingPIN == credentialType) { startIndex = 0; maxNumberOfCredentials--; @@ -2961,38 +2968,38 @@ bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, chi { if (SupportsRFID(endpointId)) { - clearFabricFromCredentials(endpointId, DlCredentialType::kRfid, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kRfid, fabricToRemove); } if (SupportsPIN(endpointId)) { - clearFabricFromCredentials(endpointId, DlCredentialType::kPin, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kPin, fabricToRemove); } if (SupportsFingers(endpointId)) { - clearFabricFromCredentials(endpointId, DlCredentialType::kFingerprint, fabricToRemove); - clearFabricFromCredentials(endpointId, DlCredentialType::kFingerVein, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFingerprint, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFingerVein, fabricToRemove); } if (SupportsFace(endpointId)) { - clearFabricFromCredentials(endpointId, DlCredentialType::kFace, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFace, fabricToRemove); } - clearFabricFromCredentials(endpointId, DlCredentialType::kProgrammingPIN, fabricToRemove); + clearFabricFromCredentials(endpointId, CredentialTypeEnum::kProgrammingPIN, fabricToRemove); return true; } -bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation, - chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex, - uint16_t dataIndex) +bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, LockDataTypeEnum dataType, + DataOperationTypeEnum operation, chip::NodeId nodeId, chip::FabricIndex fabricIndex, + uint16_t userIndex, uint16_t dataIndex) { Events::LockUserChange::Type event; event.lockDataType = dataType; event.dataOperationType = operation; - event.operationSource = DlOperationSource::kRemote; + event.operationSource = OperationSourceEnum::kRemote; if (0 != userIndex) { event.userIndex.SetNonNull(userIndex); @@ -3019,28 +3026,28 @@ bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLoc return true; } -DlLockDataType DoorLockServer::credentialTypeToLockDataType(DlCredentialType credentialType) +LockDataTypeEnum DoorLockServer::credentialTypeToLockDataType(CredentialTypeEnum credentialType) { switch (credentialType) { - case DlCredentialType::kProgrammingPIN: - return DlLockDataType::kProgrammingCode; - case DlCredentialType::kPin: - return DlLockDataType::kPin; - case DlCredentialType::kRfid: - return DlLockDataType::kRfid; - case DlCredentialType::kFingerprint: - return DlLockDataType::kFingerprint; - case DlCredentialType::kFingerVein: - return DlLockDataType::kFingerprint; - case DlCredentialType::kFace: + case CredentialTypeEnum::kProgrammingPIN: + return LockDataTypeEnum::kProgrammingCode; + case CredentialTypeEnum::kPin: + return LockDataTypeEnum::kPin; + case CredentialTypeEnum::kRfid: + return LockDataTypeEnum::kRfid; + case CredentialTypeEnum::kFingerprint: + return LockDataTypeEnum::kFingerprint; + case CredentialTypeEnum::kFingerVein: + return LockDataTypeEnum::kFingerprint; + case CredentialTypeEnum::kFace: // So far there's no distinct data type for face credentials - return DlLockDataType::kUnspecified; - case DlCredentialType::kUnknownEnumValue: - return DlLockDataType::kUnspecified; + return LockDataTypeEnum::kUnspecified; + case CredentialTypeEnum::kUnknownEnumValue: + return LockDataTypeEnum::kUnspecified; } - return DlLockDataType::kUnspecified; + return LockDataTypeEnum::kUnspecified; } bool DoorLockServer::isUserScheduleRestricted(chip::EndpointId endpointId, const EmberAfPluginDoorLockUserInfo & user) @@ -3050,7 +3057,8 @@ bool DoorLockServer::isUserScheduleRestricted(chip::EndpointId endpointId, const void DoorLockServer::setHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode) + uint32_t localStartTime, uint32_t localEndTime, + OperatingModeEnum operatingMode) { VerifyOrDie(nullptr != commandObj); @@ -3082,7 +3090,7 @@ void DoorLockServer::setHolidayScheduleCommandHandler(chip::app::CommandHandler return; } - if (operatingMode > DlOperatingMode::kPassage || operatingMode < DlOperatingMode::kNormal) + if (operatingMode > OperatingModeEnum::kPassage || operatingMode < OperatingModeEnum::kNormal) { emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Unable to add schedule - operating mode is out of range" "[endpointId=%d,scheduleIndex=%d,localStarTime=%" PRIu32 ",localEndTime=%" PRIu32 @@ -3193,10 +3201,10 @@ void DoorLockServer::clearHolidayScheduleCommandHandler(chip::app::CommandHandle bool DoorLockServer::RemoteOperationEnabled(chip::EndpointId endpointId) const { - DlOperatingMode mode; + OperatingModeEnum mode; return GetAttribute(endpointId, Attributes::OperatingMode::Id, Attributes::OperatingMode::Get, mode) && - mode != DlOperatingMode::kPrivacy && mode != DlOperatingMode::kNoRemoteLockUnlock; + mode != OperatingModeEnum::kPrivacy && mode != OperatingModeEnum::kNoRemoteLockUnlock; } CHIP_ERROR DoorLockServer::sendClusterResponse(chip::app::CommandHandler * commandObj, @@ -3229,14 +3237,14 @@ EmberAfDoorLockEndpointContext * DoorLockServer::getContext(chip::EndpointId end } bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, DlLockOperationType opType, + const chip::app::ConcreteCommandPath & commandPath, LockOperationTypeEnum opType, RemoteLockOpHandler opHandler, const Optional & pinCode) { - VerifyOrDie(DlLockOperationType::kLock == opType || DlLockOperationType::kUnlock == opType); + VerifyOrDie(LockOperationTypeEnum::kLock == opType || LockOperationTypeEnum::kUnlock == opType); VerifyOrDie(nullptr != opHandler); - EndpointId endpoint = commandPath.mEndpointId; - DlOperationError reason = DlOperationError::kUnspecified; + EndpointId endpoint = commandPath.mEndpointId; + OperationErrorEnum reason = OperationErrorEnum::kUnspecified; Nullable pinUserIdx; // Will get set to non-null if we find a user for the PIN. Optional pinCredIdx; // Will get set to a value if the PIN is one we know about. bool success = false; @@ -3246,7 +3254,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma EmberAfDoorLockEndpointContext * endpointContext; - VerifyOrExit(RemoteOperationEnabled(endpoint), reason = DlOperationError::kUnspecified); + VerifyOrExit(RemoteOperationEnabled(endpoint), reason = OperationErrorEnum::kUnspecified); // appclusters.pdf 5.3.4.1: // When the PINCode field is provided an invalid PIN will count towards the WrongCodeEntryLimit and the @@ -3277,7 +3285,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma EmberAfPluginDoorLockUserInfo user; uint16_t userIdx; uint16_t credIdx; - if (findUserIndexByCredential(endpoint, DlCredentialType::kPin, pinCode.Value(), userIdx, credIdx, user)) + if (findUserIndexByCredential(endpoint, CredentialTypeEnum::kPin, pinCode.Value(), userIdx, credIdx, user)) { pinUserIdx.SetNonNull(userIdx); pinCredIdx.Emplace(credIdx); @@ -3286,13 +3294,13 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma { emberAfDoorLockClusterPrintln("Rejecting lock operation: unknown PIN provided [endpoint=%d, lock_op=%d]", endpoint, to_underlying(opType)); - reason = DlOperationError::kInvalidCredential; + reason = OperationErrorEnum::kInvalidCredential; goto exit; } // If the user status is OccupiedDisabled we should deny the access and send out the appropriate event - VerifyOrExit(user.userStatus != DlUserStatus::kOccupiedDisabled, { - reason = DlOperationError::kDisabledUserDenied; + VerifyOrExit(user.userStatus != UserStatusEnum::kOccupiedDisabled, { + reason = OperationErrorEnum::kDisabledUserDenied; emberAfDoorLockClusterPrintln( "Unable to perform remote lock operation: user is disabled [endpoint=%d, lock_op=%d, userIndex=%d]", endpoint, to_underlying(opType), userIdx); @@ -3315,7 +3323,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma } // If the PIN is required but not provided we should exit VerifyOrExit(!requirePin, { - reason = DlOperationError::kInvalidCredential; + reason = OperationErrorEnum::kInvalidCredential; emberAfDoorLockClusterPrintln("Checking credentials failed: PIN is not provided when it is required"); }); } @@ -3324,7 +3332,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma success = opHandler(endpoint, pinCode, reason); // The app should trigger the lock state change as it may take a while before the lock actually locks/unlocks exit: - if (!success && reason == DlOperationError::kInvalidCredential) + if (!success && reason == OperationErrorEnum::kInvalidCredential) { TrackWrongCodeEntry(endpoint); } @@ -3340,7 +3348,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma // Send LockOperation/LockOperationError event. The credential index in // foundCred will be filled in if we actually have a value to fill in. - LockOpCredentials foundCred[] = { { DlCredentialType::kPin, UINT16_MAX } }; + LockOpCredentials foundCred[] = { { CredentialTypeEnum::kPin, UINT16_MAX } }; LockOpCredentials * credList = nullptr; size_t credListSize = 0; @@ -3353,18 +3361,18 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma credListSize = 1; } - SendLockOperationEvent(endpoint, opType, DlOperationSource::kRemote, reason, pinUserIdx, + SendLockOperationEvent(endpoint, opType, OperationSourceEnum::kRemote, reason, pinUserIdx, Nullable(getFabricIndex(commandObj)), Nullable(getNodeId(commandObj)), credList, credListSize, success); return success; } -void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, DlLockOperationType opType, DlOperationSource opSource, - DlOperationError opErr, const Nullable & userId, +void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, LockOperationTypeEnum opType, OperationSourceEnum opSource, + OperationErrorEnum opErr, const Nullable & userId, const Nullable & fabricIdx, const Nullable & nodeId, LockOpCredentials * credList, size_t credListSize, bool opSuccess) { - Nullable> credentials{}; + Nullable> credentials{}; // appclusters.pdf 5.3.5.3, 5.3.5.4: // The list of credentials used in performing the lock operation. This SHALL be null if no credentials were involved. @@ -3374,7 +3382,7 @@ void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, DlLockO } else { - credentials.SetNonNull(List(credList, credListSize)); + credentials.SetNonNull(List(credList, credListSize)); } // TODO: if [USR] feature is not supported then credentials should be omitted (Optional.HasValue()==false)? @@ -3460,8 +3468,8 @@ bool emberAfDoorLockClusterLockDoorCallback(chip::app::CommandHandler * commandO const chip::app::Clusters::DoorLock::Commands::LockDoor::DecodableType & commandData) { emberAfDoorLockClusterPrintln("Received command: LockDoor"); - DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kLock, - emberAfPluginDoorLockOnDoorLockCommand, commandData.pinCode); + DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kLock, + emberAfPluginDoorLockOnDoorLockCommand, commandData.PINCode); return true; } @@ -3471,8 +3479,8 @@ bool emberAfDoorLockClusterUnlockDoorCallback( { emberAfDoorLockClusterPrintln("Received command: UnlockDoor"); - if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kUnlock, - emberAfPluginDoorLockOnDoorUnlockCommand, commandData.pinCode)) + if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kUnlock, + emberAfPluginDoorLockOnDoorUnlockCommand, commandData.PINCode)) { // appclusters.pdf 5.3.3.25: // The number of seconds to wait after unlocking a lock before it automatically locks again. 0=disabled. If set, unlock @@ -3493,8 +3501,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback( { emberAfDoorLockClusterPrintln("Received command: UnlockWithTimeout"); - if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kUnlock, - emberAfPluginDoorLockOnDoorUnlockCommand, commandData.pinCode)) + if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kUnlock, + emberAfPluginDoorLockOnDoorUnlockCommand, commandData.PINCode)) { // appclusters.pdf 5.3.4.3: // This command causes the lock device to unlock the door with a timeout parameter. After the time in seconds specified in @@ -3772,6 +3780,6 @@ void DoorLockServer::DoorLockOnAutoRelockCallback(chip::EndpointId endpointId) { emberAfDoorLockClusterPrintln("Door Auto relock timer expired. Locking..."); emberEventControlSetInactive(&DoorLockServer::Instance().AutolockEvent); - DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, DlOperationSource::kAuto); + DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto); emberAfPluginDoorLockOnAutoRelock(endpointId); } diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h index 67314c63a158f6..edf6a439e7042a 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.h +++ b/src/app/clusters/door-lock-server/door-lock-server.h @@ -36,28 +36,29 @@ #endif using chip::Optional; -using chip::app::Clusters::DoorLock::DlAlarmCode; -using chip::app::Clusters::DoorLock::DlCredentialRule; -using chip::app::Clusters::DoorLock::DlCredentialType; -using chip::app::Clusters::DoorLock::DlDataOperationType; -using chip::app::Clusters::DoorLock::DlDaysMaskMap; -using chip::app::Clusters::DoorLock::DlDoorState; -using chip::app::Clusters::DoorLock::DlLockDataType; -using chip::app::Clusters::DoorLock::DlLockOperationType; +using chip::app::Clusters::DoorLock::AlarmCodeEnum; +using chip::app::Clusters::DoorLock::CredentialRuleEnum; +using chip::app::Clusters::DoorLock::CredentialTypeEnum; +using chip::app::Clusters::DoorLock::DataOperationTypeEnum; +using chip::app::Clusters::DoorLock::DaysMaskMap; using chip::app::Clusters::DoorLock::DlLockState; -using chip::app::Clusters::DoorLock::DlOperatingMode; -using chip::app::Clusters::DoorLock::DlOperationError; -using chip::app::Clusters::DoorLock::DlOperationSource; using chip::app::Clusters::DoorLock::DlStatus; -using chip::app::Clusters::DoorLock::DlUserStatus; -using chip::app::Clusters::DoorLock::DlUserType; using chip::app::Clusters::DoorLock::DoorLockFeature; +using chip::app::Clusters::DoorLock::DoorStateEnum; +using chip::app::Clusters::DoorLock::LockDataTypeEnum; +using chip::app::Clusters::DoorLock::LockOperationTypeEnum; +using chip::app::Clusters::DoorLock::OperatingModeEnum; +using chip::app::Clusters::DoorLock::OperationErrorEnum; +using chip::app::Clusters::DoorLock::OperationSourceEnum; +using chip::app::Clusters::DoorLock::UserStatusEnum; +using chip::app::Clusters::DoorLock::UserTypeEnum; using chip::app::DataModel::List; using chip::app::DataModel::Nullable; -using LockOpCredentials = chip::app::Clusters::DoorLock::Structs::DlCredential::Type; +using LockOpCredentials = chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type; -typedef bool (*RemoteLockOpHandler)(chip::EndpointId endpointId, const Optional & pinCode, DlOperationError & err); +typedef bool (*RemoteLockOpHandler)(chip::EndpointId endpointId, const Optional & pinCode, + OperationErrorEnum & err); static constexpr size_t DOOR_LOCK_MAX_USER_NAME_SIZE = 10; /**< Maximum size of the user name (in characters). */ static constexpr size_t DOOR_LOCK_USER_NAME_BUFFER_SIZE = @@ -93,7 +94,7 @@ class DoorLockServer * * @return true on success, false on failure. */ - bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource); + bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState, OperationSourceEnum opSource); /** * Updates the LockState attribute with new value. @@ -107,7 +108,7 @@ class DoorLockServer */ bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState); bool SetActuatorEnabled(chip::EndpointId endpointId, bool newActuatorState); - bool SetDoorState(chip::EndpointId endpointId, DlDoorState newDoorState); + bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum newDoorState); bool SetLanguage(chip::EndpointId endpointId, chip::CharSpan newLanguage); bool SetAutoRelockTime(chip::EndpointId endpointId, uint32_t newAutoRelockTimeSec); @@ -127,13 +128,13 @@ class DoorLockServer bool GetNumberOfCredentialsSupportedPerUser(chip::EndpointId endpointId, uint8_t & numberOfCredentialsSupportedPerUser); bool GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpointId, uint8_t & numberOfHolidaySchedules); - bool SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode alarmCode); + bool SendLockAlarmEvent(chip::EndpointId endpointId, AlarmCodeEnum alarmCode); chip::BitFlags GetFeatures(chip::EndpointId endpointId); - inline bool SupportsPIN(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kPINCredentials); } + inline bool SupportsPIN(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kPinCredential); } - inline bool SupportsRFID(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kRFIDCredentials); } + inline bool SupportsRFID(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kRfidCredential); } inline bool SupportsFingers(chip::EndpointId endpointId) { @@ -144,12 +145,12 @@ class DoorLockServer inline bool SupportsWeekDaySchedules(chip::EndpointId endpointId) { - return GetFeatures(endpointId).Has(DoorLockFeature::kWeekDaySchedules); + return GetFeatures(endpointId).Has(DoorLockFeature::kWeekDayAccessSchedules); } inline bool SupportsYearDaySchedules(chip::EndpointId endpointId) { - return GetFeatures(endpointId).Has(DoorLockFeature::kYearDaySchedules); + return GetFeatures(endpointId).Has(DoorLockFeature::kYearDayAccessSchedules); } inline bool SupportsHolidaySchedules(chip::EndpointId endpointId) @@ -160,19 +161,19 @@ class DoorLockServer inline bool SupportsAnyCredential(chip::EndpointId endpointId) { return GetFeatures(endpointId) - .HasAny(DoorLockFeature::kPINCredentials, DoorLockFeature::kRFIDCredentials, DoorLockFeature::kFingerCredentials, + .HasAny(DoorLockFeature::kPinCredential, DoorLockFeature::kRfidCredential, DoorLockFeature::kFingerCredentials, DoorLockFeature::kFaceCredentials); } inline bool SupportsCredentialsOTA(chip::EndpointId endpointId) { - return GetFeatures(endpointId).Has(DoorLockFeature::kCredentialsOTA); + return GetFeatures(endpointId).Has(DoorLockFeature::kCredentialsOverTheAirAccess); } inline bool SupportsUSR(chip::EndpointId endpointId) { // appclusters, 5.2.2: USR feature has conformance [PIN | RID | FGP | FACE] - return GetFeatures(endpointId).Has(DoorLockFeature::kUsersManagement) && SupportsAnyCredential(endpointId); + return GetFeatures(endpointId).Has(DoorLockFeature::kUser) && SupportsAnyCredential(endpointId); } bool OnFabricRemoved(chip::EndpointId endpointId, chip::FabricIndex fabricIndex); @@ -185,37 +186,39 @@ class DoorLockServer bool userIndexValid(chip::EndpointId endpointId, uint16_t userIndex, uint16_t & maxNumberOfUser); bool userExists(chip::EndpointId endpointId, uint16_t userIndex); - bool credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex); - bool credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex, + bool credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex); + bool credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex, uint16_t & maxNumberOfCredentials); - DlStatus credentialLengthWithinRange(chip::EndpointId endpointId, DlCredentialType type, const chip::ByteSpan & credentialData); - bool getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t & maxNumberOfCredentials); + DlStatus credentialLengthWithinRange(chip::EndpointId endpointId, CredentialTypeEnum type, + const chip::ByteSpan & credentialData); + bool getMaxNumberOfCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType, + uint16_t & maxNumberOfCredentials); bool findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex); bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t & userIndex); bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex); - bool findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex, + bool findOccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex, uint16_t & credentialIndex); - bool findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex, + bool findUnoccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex, uint16_t & credentialIndex); - bool findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t credentialIndex, + bool findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t credentialIndex, uint16_t & userIndex); - bool findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, chip::ByteSpan credentialData, + bool findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, chip::ByteSpan credentialData, uint16_t & userIndex, uint16_t & credentialIndex, EmberAfPluginDoorLockUserInfo & userInfo); EmberAfStatus createUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId, uint16_t userIndex, const Nullable & userName, const Nullable & userUniqueId, - const Nullable & userStatus, const Nullable & userType, - const Nullable & credentialRule, - const Nullable & credential = Nullable()); + const Nullable & userStatus, const Nullable & userType, + const Nullable & credentialRule, + const Nullable & credential = Nullable()); EmberAfStatus modifyUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId, uint16_t userIndex, const Nullable & userName, const Nullable & userUniqueId, - const Nullable & userStatus, const Nullable & userType, - const Nullable & credentialRule); + const Nullable & userStatus, const Nullable & userType, + const Nullable & credentialRule); EmberAfStatus clearUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricId, chip::NodeId sourceNodeId, uint16_t userIndex, bool sendUserChangeEvent); EmberAfStatus clearUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricId, chip::NodeId sourceNodeId, @@ -224,38 +227,39 @@ class DoorLockServer bool clearFabricFromUsers(chip::EndpointId endpointId, chip::FabricIndex fabricIndex); DlStatus createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId, - const Nullable & userStatus, const Nullable & userType, - const DlCredential & credential, const chip::ByteSpan & credentialData, + const Nullable & userStatus, const Nullable & userType, + const CredentialStruct & credential, const chip::ByteSpan & credentialData, uint16_t & createdUserIndex); DlStatus createNewCredentialAndAddItToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex, - const DlCredential & credential, const chip::ByteSpan & credentialData); + const CredentialStruct & credential, const chip::ByteSpan & credentialData); DlStatus addCredentialToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex, - const DlCredential & credential); + const CredentialStruct & credential); DlStatus modifyCredentialForUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex, - const DlCredential & credential); + const CredentialStruct & credential); DlStatus createCredential(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId, - uint16_t credentialIndex, DlCredentialType credentialType, + uint16_t credentialIndex, CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData, - Nullable userIndex, const Nullable & userStatus, - Nullable userType, uint16_t & createdUserIndex); + Nullable userIndex, const Nullable & userStatus, + Nullable userType, uint16_t & createdUserIndex); DlStatus modifyProgrammingPIN(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId, - uint16_t credentialIndex, DlCredentialType credentialType, + uint16_t credentialIndex, CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData); DlStatus modifyCredential(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId, - uint16_t credentialIndex, DlCredentialType credentialType, + uint16_t credentialIndex, CredentialTypeEnum credentialType, const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData, - uint16_t userIndex, const Nullable & userStatus, Nullable userType); + uint16_t userIndex, const Nullable & userStatus, Nullable userType); EmberAfStatus clearCredential(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId, - DlCredentialType credentialType, uint16_t credentialIndex, bool sendUserChangeEvent); + CredentialTypeEnum credentialType, uint16_t credentialIndex, bool sendUserChangeEvent); EmberAfStatus clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId); EmberAfStatus clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId, - DlCredentialType credentialType); + CredentialTypeEnum credentialType); - bool clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, chip::FabricIndex fabricToRemove); + bool clearFabricFromCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType, + chip::FabricIndex fabricToRemove); bool clearFabricFromCredentials(chip::EndpointId endpointId, chip::FabricIndex fabricToRemove); void sendSetCredentialResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, @@ -264,7 +268,7 @@ class DoorLockServer // TODO: Maybe use CHIP_APPLICATION_ERROR instead of boolean in class methods? // OPTIMIZE: there are a lot of methods such as this that could be made static which could help reduce the stack footprint // in case of multiple lock endpoints - bool credentialTypeSupported(chip::EndpointId endpointId, DlCredentialType type); + bool credentialTypeSupported(chip::EndpointId endpointId, CredentialTypeEnum type); bool weekDayIndexValid(chip::EndpointId endpointId, uint8_t weekDayIndex); @@ -274,7 +278,7 @@ class DoorLockServer void sendGetWeekDayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t weekdayIndex, uint16_t userIndex, DlStatus status, - DlDaysMaskMap daysMask = DlDaysMaskMap(0), uint8_t startHour = 0, uint8_t startMinute = 0, + DaysMaskMap daysMask = DaysMaskMap(0), uint8_t startHour = 0, uint8_t startMinute = 0, uint8_t endHour = 0, uint8_t endMinute = 0); bool yearDayIndexValid(chip::EndpointId endpointId, uint8_t yearDayIndex); @@ -293,13 +297,13 @@ class DoorLockServer void sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex, DlStatus status, uint32_t localStartTime = 0, uint32_t localEndTime = 0, - DlOperatingMode operatingMode = DlOperatingMode::kNormal); + OperatingModeEnum operatingMode = OperatingModeEnum::kNormal); - bool sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation, + bool sendRemoteLockUserChange(chip::EndpointId endpointId, LockDataTypeEnum dataType, DataOperationTypeEnum operation, chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex = 0, uint16_t dataIndex = 0); - DlLockDataType credentialTypeToLockDataType(DlCredentialType credentialType); + LockDataTypeEnum credentialTypeToLockDataType(CredentialTypeEnum credentialType); bool isUserScheduleRestricted(chip::EndpointId endpointId, const EmberAfPluginDoorLockUserInfo & user); @@ -316,11 +320,11 @@ class DoorLockServer const chip::app::Clusters::DoorLock::Commands::SetCredential::DecodableType & commandData); void getCredentialStatusCommandHandler(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, DlCredentialType credentialType, + const chip::app::ConcreteCommandPath & commandPath, CredentialTypeEnum credentialType, uint16_t credentialIndex); void sendGetCredentialResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - DlCredentialType credentialType, uint16_t credentialIndex, uint16_t userIndexWithCredential, + CredentialTypeEnum credentialType, uint16_t credentialIndex, uint16_t userIndexWithCredential, EmberAfPluginDoorLockCredentialInfo * credentialInfo, bool credentialExists); void clearCredentialCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, @@ -328,7 +332,7 @@ class DoorLockServer void setWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t weekDayIndex, - uint16_t userIndex, const chip::BitMask & daysMask, uint8_t startHour, + uint16_t userIndex, const chip::BitMask & daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); void getWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj, @@ -351,7 +355,7 @@ class DoorLockServer void setHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode); void getHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex); @@ -380,7 +384,7 @@ class DoorLockServer * @return false if error happened during lock/unlock */ bool HandleRemoteLockOperation(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - DlLockOperationType opType, RemoteLockOpHandler opHandler, + LockOperationTypeEnum opType, RemoteLockOpHandler opHandler, const chip::Optional & pinCode); /** @@ -397,8 +401,8 @@ class DoorLockServer * @param credListSize size of credentials list (if 0, then no credentials were used) * @param opSuccess flags if operation was successful or not */ - void SendLockOperationEvent(chip::EndpointId endpointId, DlLockOperationType opType, DlOperationSource opSource, - DlOperationError opErr, const Nullable & userId, + void SendLockOperationEvent(chip::EndpointId endpointId, LockOperationTypeEnum opType, OperationSourceEnum opSource, + OperationErrorEnum opErr, const Nullable & userId, const Nullable & fabricIdx, const Nullable & nodeId, LockOpCredentials * credList, size_t credListSize, bool opSuccess = true); @@ -555,9 +559,9 @@ enum class DlAssetSource : uint8_t */ struct EmberAfPluginDoorLockCredentialInfo { - DlCredentialStatus status; /**< Indicates if credential slot is occupied or not. */ - DlCredentialType credentialType; /**< Specifies the type of the credential (PIN, RFID, etc.). */ - chip::ByteSpan credentialData; /**< Credential data bytes. */ + DlCredentialStatus status; /**< Indicates if credential slot is occupied or not. */ + CredentialTypeEnum credentialType; /**< Specifies the type of the credential (PIN, RFID, etc.). */ + chip::ByteSpan credentialData; /**< Credential data bytes. */ DlAssetSource creationSource; chip::FabricIndex createdBy; /**< Index of the fabric that created the user. */ @@ -571,12 +575,12 @@ struct EmberAfPluginDoorLockCredentialInfo */ struct EmberAfPluginDoorLockUserInfo { - chip::CharSpan userName; /**< Name of the user. */ - chip::Span credentials; /**< Credentials that are associated with user (without data).*/ - uint32_t userUniqueId; /**< Unique user identifier. */ - DlUserStatus userStatus = DlUserStatus::kAvailable; /**< Status of the user slot (available/occupied). */ - DlUserType userType; /**< Type of the user. */ - DlCredentialRule credentialRule; /**< Number of supported credentials. */ + chip::CharSpan userName; /**< Name of the user. */ + chip::Span credentials; /**< Credentials that are associated with user (without data).*/ + uint32_t userUniqueId; /**< Unique user identifier. */ + UserStatusEnum userStatus = UserStatusEnum::kAvailable; /**< Status of the user slot (available/occupied). */ + UserTypeEnum userType; /**< Type of the user. */ + CredentialRuleEnum credentialRule; /**< Number of supported credentials. */ DlAssetSource creationSource; chip::FabricIndex createdBy; /**< ID of the fabric that created the user. */ @@ -599,11 +603,11 @@ enum class DlScheduleStatus : uint8_t */ struct EmberAfPluginDoorLockWeekDaySchedule { - DlDaysMaskMap daysMask; /** Indicates the days of the week the Week Day schedule applies for. */ - uint8_t startHour; /** Starting hour for the Week Day schedule. */ - uint8_t startMinute; /** Starting minute for the Week Day schedule. */ - uint8_t endHour; /** Ending hour for the Week Day schedule. */ - uint8_t endMinute; /** Ending minute for the Week Day schedule. */ + DaysMaskMap daysMask; /** Indicates the days of the week the Week Day schedule applies for. */ + uint8_t startHour; /** Starting hour for the Week Day schedule. */ + uint8_t startMinute; /** Starting minute for the Week Day schedule. */ + uint8_t endHour; /** Ending hour for the Week Day schedule. */ + uint8_t endMinute; /** Ending minute for the Week Day schedule. */ }; /** @@ -626,7 +630,7 @@ struct EmberAfPluginDoorLockHolidaySchedule on the local timezone and DST offset on the day represented by the value. */ uint32_t localEndTime; /** The ending time for the Holiday schedule in Epoch Time in Seconds with local time offset based on * the local timezone and DST offset on the day represented by the value. */ - DlOperatingMode operatingMode; /** Operating mode during the schedule. */ + OperatingModeEnum operatingMode; /** Operating mode during the schedule. */ }; /** @@ -700,7 +704,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h * @retval DlStatus::kFailure in case of any other failure */ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, - DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, + DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief This callback is called when Door Lock cluster needs to create, modify or clear the year day schedule in schedules @@ -747,7 +751,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y * @retval DlStatus::kFailure in case of any other failure */ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, - uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode); + uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode); // ============================================================================= // Pre-change callbacks for cluster attributes @@ -872,7 +876,7 @@ emberAfPluginDoorLockOnUnhandledAttributeChange(chip::EndpointId EndpointId, con * @retval false if error happenned (err should be set to appropriate error code) */ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err); + OperationErrorEnum & err); /** * @brief User handler for UnlockDoor command (server) @@ -885,7 +889,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O * @retval false if error happenned (err should be set to appropriate error code) */ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional & pinCode, - DlOperationError & err); + OperationErrorEnum & err); /** * @brief This callback is called when the AutoRelock timer is expired. @@ -933,8 +937,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde */ 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); + UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule, + const CredentialStruct * credentials, size_t totalCredentials); /** * @brief This callback is called when Door Lock cluster needs to access the credential in credentials database. @@ -953,7 +957,7 @@ bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userInde * @retval true, if the credential pointed by \p credentialIndex was found and \p credential parameter was written with valid data. * @retval false, if error occurred. */ -bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType, +bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType, EmberAfPluginDoorLockCredentialInfo & credential); /** @@ -979,7 +983,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr */ bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier, DlCredentialStatus credentialStatus, - DlCredentialType credentialType, const chip::ByteSpan & credentialData); + CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData); /** * @brief This callback is called when the Door Lock server starts the lockout so the app could be notified about it. diff --git a/src/app/common/templates/legacy-struct-list.yaml b/src/app/common/templates/legacy-struct-list.yaml index 974298a68d61be..9ad0cfec369a94 100644 --- a/src/app/common/templates/legacy-struct-list.yaml +++ b/src/app/common/templates/legacy-struct-list.yaml @@ -1,4 +1,4 @@ # List of structs for which we output a legacy definition in af-structs.h # Ideally this list should become empty. -- DlCredential +- CredentialStruct - ApplicationBasicApplication diff --git a/src/app/zap-templates/partials/idl/command_request_response.zapt b/src/app/zap-templates/partials/idl/command_request_response.zapt index 3f6babd4a40863..fed6c421c2c581 100644 --- a/src/app/zap-templates/partials/idl/command_request_response.zapt +++ b/src/app/zap-templates/partials/idl/command_request_response.zapt @@ -18,7 +18,7 @@ {{~/first~}} {{~/zcl_command_arguments~}} ): {{#if responseName~}} - {{responseName}} + {{asUpperCamelCase responseName}} {{~else~}} DefaultSuccess {{~/if~}} diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt index f88a85f578974b..660a3178878f0f 100644 --- a/src/app/zap-templates/templates/app/cluster-objects.zapt +++ b/src/app/zap-templates/templates/app/cluster-objects.zapt @@ -105,7 +105,7 @@ public: using ResponseType = {{~#if responseName}} - Clusters::{{asUpperCamelCase parent.name}}::Commands::{{responseName}}::DecodableType; + Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase responseName}}::DecodableType; {{else}} DataModel::NullObjectType; {{/if}} diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml index b14ebd36e33317..bfae76e66edf89 100644 --- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -71,7 +71,7 @@ limitations under the License. LockType ActuatorEnabled - DoorState + DoorState DoorOpenEvents @@ -134,7 +134,7 @@ limitations under the License. - + OperatingMode @@ -202,241 +202,241 @@ limitations under the License. This command causes the lock device to lock the door. - + This command causes the lock device to unlock the door. - + This command causes the lock device to unlock the door with a timeout parameter. - + - + Set a weekly repeating schedule for a specified user. - - - - - - - + + + + + + + Retrieve the specific weekly schedule for the specific user. - - + + Returns the weekly repeating schedule data for the specified schedule index. - - - - - - - - + + + + + + + + Clear the specific weekly schedule or all weekly schedules for the specific user. - - + + Set a time-specific schedule ID for a specified user. - - - - + + + + Returns the year day schedule data for the specified schedule and user indexes. - - + + Returns the year day schedule data for the specified schedule and user indexes. - - - - - + + + + + Clears the specific year day schedule or all year day schedules for the specific user. - - + + Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode. - - - - + + + + Get the holiday schedule for the specified index. - + Returns the Holiday Schedule Entry for the specified Holiday ID. - - - - - + + + + + Clears the holiday schedule or all holiday schedules. - + Set User into the lock. - - - - - - - + + + + + + + Retrieve User. - + Returns the User for the specified UserIndex. - - - - - - - - - - + + + + + + + + + + Clears a User or all Users. - + Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser. - - - - - - + + + + + + Returns the status for setting the specified credential. - - - + + + Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index. - + Returns the status for the specified credential. - - - - - + + + + + Clear one, one type, or all credentials except ProgrammingPIN credential. - + The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock. - + The door lock server sends out a DoorStateChange event when the door lock door state changes. - + The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources. - - + + - + The door lock server sends out a LockOperationError event when a lock operation fails for various reasons. - - - + + + - + The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred. - - - + + + @@ -446,7 +446,7 @@ limitations under the License. - + @@ -458,10 +458,10 @@ limitations under the License. - + - + @@ -472,13 +472,13 @@ limitations under the License. - + - + - + @@ -488,14 +488,14 @@ limitations under the License. - + - + @@ -506,7 +506,7 @@ limitations under the License. - + @@ -516,7 +516,7 @@ limitations under the License. - + @@ -529,7 +529,7 @@ limitations under the License. - + @@ -537,7 +537,7 @@ limitations under the License. - + @@ -546,7 +546,7 @@ limitations under the License. - + @@ -555,7 +555,7 @@ limitations under the License. - + @@ -569,14 +569,14 @@ limitations under the License. - + - + @@ -595,7 +595,7 @@ limitations under the License. - + @@ -603,15 +603,15 @@ limitations under the License. - + - - - - + + + + @@ -750,17 +750,17 @@ limitations under the License. - - - + + + - - - - - - - - + + + + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 01db4c376ae587..43271ab64f42a0 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2057,7 +2057,7 @@ client cluster ModeSelect = 80 { } client cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -2068,13 +2068,13 @@ client cluster DoorLock = 257 { kForcedUser = 8; } - enum DlCredentialRule : ENUM8 { + enum CredentialRuleEnum : ENUM8 { kSingle = 0; - kDouble = 1; + kDual = 1; kTri = 2; } - enum DlCredentialType : ENUM8 { + enum CredentialTypeEnum : ENUM8 { kProgrammingPIN = 0; kPin = 1; kRfid = 2; @@ -2083,40 +2083,12 @@ client cluster DoorLock = 257 { kFace = 5; } - enum DlDataOperationType : ENUM8 { + enum DataOperationTypeEnum : ENUM8 { kAdd = 0; kClear = 1; kModify = 2; } - enum DlDoorState : ENUM8 { - kDoorOpen = 0; - kDoorClosed = 1; - kDoorJammed = 2; - kDoorForcedOpen = 3; - kDoorUnspecifiedError = 4; - kDoorAjar = 5; - } - - enum DlLockDataType : ENUM8 { - kUnspecified = 0; - kProgrammingCode = 1; - kUserIndex = 2; - kWeekDaySchedule = 3; - kYearDaySchedule = 4; - kHolidaySchedule = 5; - kPin = 6; - kRfid = 7; - kFingerprint = 8; - } - - enum DlLockOperationType : ENUM8 { - kLock = 0; - kUnlock = 1; - kNonAccessUserEvent = 2; - kForcedUserEvent = 3; - } - enum DlLockState : ENUM8 { kNotFullyLocked = 0; kLocked = 1; @@ -2137,35 +2109,6 @@ client cluster DoorLock = 257 { kDoorFurniture = 10; } - enum DlOperatingMode : ENUM8 { - kNormal = 0; - kVacation = 1; - kPrivacy = 2; - kNoRemoteLockUnlock = 3; - kPassage = 4; - } - - enum DlOperationError : ENUM8 { - kUnspecified = 0; - kInvalidCredential = 1; - kDisabledUserDenied = 2; - kRestricted = 3; - kInsufficientBattery = 4; - } - - enum DlOperationSource : ENUM8 { - kUnspecified = 0; - kManual = 1; - kProprietaryRemote = 2; - kKeypad = 3; - kAuto = 4; - kButton = 5; - kSchedule = 6; - kRemote = 7; - kRfid = 8; - kBiometric = 9; - } - enum DlStatus : ENUM8 { kSuccess = 0; kFailure = 1; @@ -2176,25 +2119,6 @@ client cluster DoorLock = 257 { kNotFound = 139; } - enum DlUserStatus : ENUM8 { - kAvailable = 0; - kOccupiedEnabled = 1; - kOccupiedDisabled = 3; - } - - enum DlUserType : ENUM8 { - kUnrestrictedUser = 0; - kYearDayScheduleUser = 1; - kWeekDayScheduleUser = 2; - kProgrammingUser = 3; - kNonAccessUser = 4; - kForcedUser = 5; - kDisposableUser = 6; - kExpiringUser = 7; - kScheduleRestrictedUser = 8; - kRemoteOnlyUser = 9; - } - enum DoorLockOperationEventCode : ENUM8 { kUnknownOrMfgSpecific = 0; kLock = 1; @@ -2246,19 +2170,83 @@ client cluster DoorLock = 257 { kNotSupported = 255; } - bitmap DlCredentialRuleMask : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum DoorStateEnum : ENUM8 { + kDoorOpen = 0; + kDoorClosed = 1; + kDoorJammed = 2; + kDoorForcedOpen = 3; + kDoorUnspecifiedError = 4; + kDoorAjar = 5; } - bitmap DlCredentialRulesSupport : BITMAP8 { - kSingle = 0x1; - kDual = 0x2; - kTri = 0x4; + enum LockDataTypeEnum : ENUM8 { + kUnspecified = 0; + kProgrammingCode = 1; + kUserIndex = 2; + kWeekDaySchedule = 3; + kYearDaySchedule = 4; + kHolidaySchedule = 5; + kPin = 6; + kRfid = 7; + kFingerprint = 8; + } + + enum LockOperationTypeEnum : ENUM8 { + kLock = 0; + kUnlock = 1; + kNonAccessUserEvent = 2; + kForcedUserEvent = 3; + } + + enum OperatingModeEnum : ENUM8 { + kNormal = 0; + kVacation = 1; + kPrivacy = 2; + kNoRemoteLockUnlock = 3; + kPassage = 4; + } + + enum OperationErrorEnum : ENUM8 { + kUnspecified = 0; + kInvalidCredential = 1; + kDisabledUserDenied = 2; + kRestricted = 3; + kInsufficientBattery = 4; + } + + enum OperationSourceEnum : ENUM8 { + kUnspecified = 0; + kManual = 1; + kProprietaryRemote = 2; + kKeypad = 3; + kAuto = 4; + kButton = 5; + kSchedule = 6; + kRemote = 7; + kRfid = 8; + kBiometric = 9; + } + + enum UserStatusEnum : ENUM8 { + kAvailable = 0; + kOccupiedEnabled = 1; + kOccupiedDisabled = 3; + } + + enum UserTypeEnum : ENUM8 { + kUnrestrictedUser = 0; + kYearDayScheduleUser = 1; + kWeekDayScheduleUser = 2; + kProgrammingUser = 3; + kNonAccessUser = 4; + kForcedUser = 5; + kDisposableUser = 6; + kExpiringUser = 7; + kScheduleRestrictedUser = 8; + kRemoteOnlyUser = 9; } - bitmap DlDaysMaskMap : BITMAP8 { + bitmap DaysMaskMap : BITMAP8 { kSunday = 0x1; kMonday = 0x2; kTuesday = 0x4; @@ -2268,6 +2256,18 @@ client cluster DoorLock = 257 { kSaturday = 0x40; } + bitmap DlCredentialRuleMask : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + + bitmap DlCredentialRulesSupport : BITMAP8 { + kSingle = 0x1; + kDual = 0x2; + kTri = 0x4; + } + bitmap DlDefaultConfigurationRegister : BITMAP16 { kEnableLocalProgrammingEnabled = 0x1; kKeypadInterfaceDefaultAccessEnabled = 0x2; @@ -2372,56 +2372,56 @@ client cluster DoorLock = 257 { } bitmap DoorLockFeature : BITMAP32 { - kPINCredentials = 0x1; - kRFIDCredentials = 0x2; + kPinCredential = 0x1; + kRfidCredential = 0x2; kFingerCredentials = 0x4; kLogging = 0x8; - kWeekDaySchedules = 0x10; + kWeekDayAccessSchedules = 0x10; kDoorPositionSensor = 0x20; kFaceCredentials = 0x40; - kCredentialsOTA = 0x80; - kUsersManagement = 0x100; - kNotifications = 0x200; - kYearDaySchedules = 0x400; + kCredentialsOverTheAirAccess = 0x80; + kUser = 0x100; + kNotification = 0x200; + kYearDayAccessSchedules = 0x400; kHolidaySchedules = 0x800; } - struct DlCredential { - DlCredentialType credentialType = 0; + struct CredentialStruct { + CredentialTypeEnum credentialType = 0; int16u credentialIndex = 1; } critical event DoorLockAlarm = 0 { - DlAlarmCode alarmCode = 0; + AlarmCodeEnum alarmCode = 0; } critical event DoorStateChange = 1 { - DlDoorState doorState = 0; + DoorStateEnum doorState = 0; } critical event LockOperation = 2 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; nullable INT16U userIndex = 2; nullable fabric_idx fabricIndex = 3; nullable NODE_ID sourceNode = 4; - optional nullable DlCredential credentials[] = 5; + optional nullable CredentialStruct credentials[] = 5; } critical event LockOperationError = 3 { - DlLockOperationType lockOperationType = 0; - DlOperationSource operationSource = 1; - DlOperationError operationError = 2; + LockOperationTypeEnum lockOperationType = 0; + OperationSourceEnum operationSource = 1; + OperationErrorEnum operationError = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; - optional nullable DlCredential credentials[] = 6; + optional nullable CredentialStruct credentials[] = 6; } info event LockUserChange = 4 { - DlLockDataType lockDataType = 0; - DlDataOperationType dataOperationType = 1; - DlOperationSource operationSource = 2; + LockDataTypeEnum lockDataType = 0; + DataOperationTypeEnum dataOperationType = 1; + OperationSourceEnum operationSource = 2; nullable INT16U userIndex = 3; nullable fabric_idx fabricIndex = 4; nullable NODE_ID sourceNode = 5; @@ -2431,7 +2431,7 @@ client cluster DoorLock = 257 { readonly attribute nullable DlLockState lockState = 0; readonly attribute DlLockType lockType = 1; readonly attribute boolean actuatorEnabled = 2; - readonly attribute nullable DlDoorState doorState = 3; + readonly attribute nullable DoorStateEnum doorState = 3; readonly attribute int16u numberOfTotalUsersSupported = 17; readonly attribute int16u numberOfPINUsersSupported = 18; readonly attribute int16u numberOfRFIDUsersSupported = 19; @@ -2446,7 +2446,7 @@ client cluster DoorLock = 257 { attribute access(write: manage) char_string<3> language = 33; attribute access(write: manage) int32u autoRelockTime = 35; attribute access(write: manage) int8u soundVolume = 36; - attribute access(write: manage) DlOperatingMode operatingMode = 37; + attribute access(write: manage) OperatingModeEnum operatingMode = 37; readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38; attribute access(write: manage) boolean enableOneTouchLocking = 41; attribute access(write: manage) boolean enablePrivacyModeButton = 43; @@ -2460,22 +2460,22 @@ client cluster DoorLock = 257 { readonly attribute int16u clusterRevision = 65533; request struct LockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockDoorRequest { - optional OCTET_STRING pinCode = 0; + optional OCTET_STRING PINCode = 0; } request struct UnlockWithTimeoutRequest { INT16U timeout = 0; - optional OCTET_STRING pinCode = 1; + optional OCTET_STRING PINCode = 1; } request struct SetWeekDayScheduleRequest { INT8U weekDayIndex = 0; INT16U userIndex = 1; - DlDaysMaskMap daysMask = 2; + DaysMaskMap daysMask = 2; INT8U startHour = 3; INT8U startMinute = 4; INT8U endHour = 5; @@ -2513,7 +2513,7 @@ client cluster DoorLock = 257 { INT8U holidayIndex = 0; epoch_s localStartTime = 1; epoch_s localEndTime = 2; - DlOperatingMode operatingMode = 3; + OperatingModeEnum operatingMode = 3; } request struct GetHolidayScheduleRequest { @@ -2525,13 +2525,13 @@ client cluster DoorLock = 257 { } request struct SetUserRequest { - DlDataOperationType operationType = 0; + DataOperationTypeEnum 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; + nullable INT32U userUniqueID = 3; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; + nullable CredentialRuleEnum credentialRule = 6; } request struct GetUserRequest { @@ -2543,27 +2543,27 @@ client cluster DoorLock = 257 { } request struct SetCredentialRequest { - DlDataOperationType operationType = 0; - DlCredential credential = 1; + DataOperationTypeEnum operationType = 0; + CredentialStruct credential = 1; LONG_OCTET_STRING credentialData = 2; nullable INT16U userIndex = 3; - nullable DlUserStatus userStatus = 4; - nullable DlUserType userType = 5; + nullable UserStatusEnum userStatus = 4; + nullable UserTypeEnum userType = 5; } request struct GetCredentialStatusRequest { - DlCredential credential = 0; + CredentialStruct credential = 0; } request struct ClearCredentialRequest { - nullable DlCredential credential = 0; + nullable CredentialStruct credential = 0; } response struct GetWeekDayScheduleResponse = 12 { INT8U weekDayIndex = 0; INT16U userIndex = 1; DlStatus status = 2; - optional DlDaysMaskMap daysMask = 3; + optional DaysMaskMap daysMask = 3; optional INT8U startHour = 4; optional INT8U startMinute = 5; optional INT8U endHour = 6; @@ -2583,17 +2583,17 @@ client cluster DoorLock = 257 { DlStatus status = 1; optional epoch_s localStartTime = 2; optional epoch_s localEndTime = 3; - optional DlOperatingMode operatingMode = 4; + optional OperatingModeEnum operatingMode = 4; } response struct GetUserResponse = 28 { 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 INT32U userUniqueID = 2; + nullable UserStatusEnum userStatus = 3; + nullable UserTypeEnum userType = 4; + nullable CredentialRuleEnum credentialRule = 5; + nullable CredentialStruct credentials[] = 6; nullable fabric_idx creatorFabricIndex = 7; nullable fabric_idx lastModifiedFabricIndex = 8; nullable INT16U nextUserIndex = 9; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index f32c1c8935881f..15ddb88707a840 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -9607,7 +9607,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "DlDoorState", + "type": "DoorStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9927,7 +9927,7 @@ "code": 37, "mfgCode": null, "side": "server", - "type": "DlOperatingMode", + "type": "OperatingModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index 3c9086d31ef738..ab27364d930ee3 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -2368,23 +2368,24 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & newElement_2_credentialIndexClassName.c_str(), newElement_2_credentialIndexCtorSignature.c_str(), entry_2.credentialIndex, newElement_2_credentialIndex); - jclass dlCredentialStructClass_3; + jclass credentialStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_3); + env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct", + credentialStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential"); + ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct"); return nullptr; } - jmethodID dlCredentialStructCtor_3 = - env->GetMethodID(dlCredentialStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (dlCredentialStructCtor_3 == nullptr) + jmethodID credentialStructStructCtor_3 = + env->GetMethodID(credentialStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (credentialStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor"); return nullptr; } - newElement_2 = env->NewObject(dlCredentialStructClass_3, dlCredentialStructCtor_3, + newElement_2 = env->NewObject(credentialStructStructClass_3, credentialStructStructCtor_3, newElement_2_credentialType, newElement_2_credentialIndex); chip::JniReferences::GetInstance().AddToList(value_credentialsInsideOptional, newElement_2); } @@ -2519,23 +2520,24 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & newElement_2_credentialIndexClassName.c_str(), newElement_2_credentialIndexCtorSignature.c_str(), entry_2.credentialIndex, newElement_2_credentialIndex); - jclass dlCredentialStructClass_3; + jclass credentialStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_3); + env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct", + credentialStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential"); + ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct"); return nullptr; } - jmethodID dlCredentialStructCtor_3 = - env->GetMethodID(dlCredentialStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (dlCredentialStructCtor_3 == nullptr) + jmethodID credentialStructStructCtor_3 = + env->GetMethodID(credentialStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (credentialStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor"); return nullptr; } - newElement_2 = env->NewObject(dlCredentialStructClass_3, dlCredentialStructCtor_3, + newElement_2 = env->NewObject(credentialStructStructClass_3, credentialStructStructCtor_3, newElement_2_credentialType, newElement_2_credentialIndex); chip::JniReferences::GetInstance().AddToList(value_credentialsInsideOptional, newElement_2); } diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 0da0bfa0ab2f95..bd7e31c87047ac 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -2393,99 +2393,99 @@ void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject weekDayIndex; - std::string weekDayIndexClassName = "java/lang/Integer"; - std::string weekDayIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(weekDayIndexClassName.c_str(), weekDayIndexCtorSignature.c_str(), - dataResponse.weekDayIndex, weekDayIndex); - jobject userIndex; - std::string userIndexClassName = "java/lang/Integer"; - std::string userIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIndexClassName.c_str(), userIndexCtorSignature.c_str(), - dataResponse.userIndex, userIndex); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject daysMask; + jobject WeekDayIndex; + std::string WeekDayIndexClassName = "java/lang/Integer"; + std::string WeekDayIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(WeekDayIndexClassName.c_str(), WeekDayIndexCtorSignature.c_str(), + dataResponse.weekDayIndex, WeekDayIndex); + jobject UserIndex; + std::string UserIndexClassName = "java/lang/Integer"; + std::string UserIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(), + dataResponse.userIndex, UserIndex); + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject DaysMask; if (!dataResponse.daysMask.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, daysMask); + chip::JniReferences::GetInstance().CreateOptional(nullptr, DaysMask); } else { - jobject daysMaskInsideOptional; - std::string daysMaskInsideOptionalClassName = "java/lang/Integer"; - std::string daysMaskInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(daysMaskInsideOptionalClassName.c_str(), - daysMaskInsideOptionalCtorSignature.c_str(), - dataResponse.daysMask.Value().Raw(), daysMaskInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(daysMaskInsideOptional, daysMask); + jobject DaysMaskInsideOptional; + std::string DaysMaskInsideOptionalClassName = "java/lang/Integer"; + std::string DaysMaskInsideOptionalCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(DaysMaskInsideOptionalClassName.c_str(), + DaysMaskInsideOptionalCtorSignature.c_str(), + dataResponse.daysMask.Value().Raw(), DaysMaskInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(DaysMaskInsideOptional, DaysMask); } - jobject startHour; + jobject StartHour; if (!dataResponse.startHour.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, startHour); + chip::JniReferences::GetInstance().CreateOptional(nullptr, StartHour); } else { - jobject startHourInsideOptional; - std::string startHourInsideOptionalClassName = "java/lang/Integer"; - std::string startHourInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(startHourInsideOptionalClassName.c_str(), - startHourInsideOptionalCtorSignature.c_str(), - dataResponse.startHour.Value(), startHourInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(startHourInsideOptional, startHour); + jobject StartHourInsideOptional; + std::string StartHourInsideOptionalClassName = "java/lang/Integer"; + std::string StartHourInsideOptionalCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StartHourInsideOptionalClassName.c_str(), + StartHourInsideOptionalCtorSignature.c_str(), + dataResponse.startHour.Value(), StartHourInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(StartHourInsideOptional, StartHour); } - jobject startMinute; + jobject StartMinute; if (!dataResponse.startMinute.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, startMinute); + chip::JniReferences::GetInstance().CreateOptional(nullptr, StartMinute); } else { - jobject startMinuteInsideOptional; - std::string startMinuteInsideOptionalClassName = "java/lang/Integer"; - std::string startMinuteInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(startMinuteInsideOptionalClassName.c_str(), - startMinuteInsideOptionalCtorSignature.c_str(), - dataResponse.startMinute.Value(), startMinuteInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(startMinuteInsideOptional, startMinute); + jobject StartMinuteInsideOptional; + std::string StartMinuteInsideOptionalClassName = "java/lang/Integer"; + std::string StartMinuteInsideOptionalCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StartMinuteInsideOptionalClassName.c_str(), + StartMinuteInsideOptionalCtorSignature.c_str(), + dataResponse.startMinute.Value(), StartMinuteInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(StartMinuteInsideOptional, StartMinute); } - jobject endHour; + jobject EndHour; if (!dataResponse.endHour.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, endHour); + chip::JniReferences::GetInstance().CreateOptional(nullptr, EndHour); } else { - jobject endHourInsideOptional; - std::string endHourInsideOptionalClassName = "java/lang/Integer"; - std::string endHourInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(endHourInsideOptionalClassName.c_str(), - endHourInsideOptionalCtorSignature.c_str(), - dataResponse.endHour.Value(), endHourInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(endHourInsideOptional, endHour); + jobject EndHourInsideOptional; + std::string EndHourInsideOptionalClassName = "java/lang/Integer"; + std::string EndHourInsideOptionalCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(EndHourInsideOptionalClassName.c_str(), + EndHourInsideOptionalCtorSignature.c_str(), + dataResponse.endHour.Value(), EndHourInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(EndHourInsideOptional, EndHour); } - jobject endMinute; + jobject EndMinute; if (!dataResponse.endMinute.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, endMinute); + chip::JniReferences::GetInstance().CreateOptional(nullptr, EndMinute); } else { - jobject endMinuteInsideOptional; - std::string endMinuteInsideOptionalClassName = "java/lang/Integer"; - std::string endMinuteInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(endMinuteInsideOptionalClassName.c_str(), - endMinuteInsideOptionalCtorSignature.c_str(), - dataResponse.endMinute.Value(), endMinuteInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(endMinuteInsideOptional, endMinute); + jobject EndMinuteInsideOptional; + std::string EndMinuteInsideOptionalClassName = "java/lang/Integer"; + std::string EndMinuteInsideOptionalCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(EndMinuteInsideOptionalClassName.c_str(), + EndMinuteInsideOptionalCtorSignature.c_str(), + dataResponse.endMinute.Value(), EndMinuteInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(EndMinuteInsideOptional, EndMinute); } - env->CallVoidMethod(javaCallbackRef, javaMethod, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, - endMinute); + env->CallVoidMethod(javaCallbackRef, javaMethod, WeekDayIndex, UserIndex, Status, DaysMask, StartHour, StartMinute, EndHour, + EndMinute); } CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -2541,53 +2541,53 @@ void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn( "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject yearDayIndex; - std::string yearDayIndexClassName = "java/lang/Integer"; - std::string yearDayIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(yearDayIndexClassName.c_str(), yearDayIndexCtorSignature.c_str(), - dataResponse.yearDayIndex, yearDayIndex); - jobject userIndex; - std::string userIndexClassName = "java/lang/Integer"; - std::string userIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIndexClassName.c_str(), userIndexCtorSignature.c_str(), - dataResponse.userIndex, userIndex); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject localStartTime; + jobject YearDayIndex; + std::string YearDayIndexClassName = "java/lang/Integer"; + std::string YearDayIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(YearDayIndexClassName.c_str(), YearDayIndexCtorSignature.c_str(), + dataResponse.yearDayIndex, YearDayIndex); + jobject UserIndex; + std::string UserIndexClassName = "java/lang/Integer"; + std::string UserIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(), + dataResponse.userIndex, UserIndex); + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject LocalStartTime; if (!dataResponse.localStartTime.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime); + chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalStartTime); } else { - jobject localStartTimeInsideOptional; - std::string localStartTimeInsideOptionalClassName = "java/lang/Long"; - std::string localStartTimeInsideOptionalCtorSignature = "(J)V"; + jobject LocalStartTimeInsideOptional; + std::string LocalStartTimeInsideOptionalClassName = "java/lang/Long"; + std::string LocalStartTimeInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(), - dataResponse.localStartTime.Value(), localStartTimeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime); + LocalStartTimeInsideOptionalClassName.c_str(), LocalStartTimeInsideOptionalCtorSignature.c_str(), + dataResponse.localStartTime.Value(), LocalStartTimeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(LocalStartTimeInsideOptional, LocalStartTime); } - jobject localEndTime; + jobject LocalEndTime; if (!dataResponse.localEndTime.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime); + chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalEndTime); } else { - jobject localEndTimeInsideOptional; - std::string localEndTimeInsideOptionalClassName = "java/lang/Long"; - std::string localEndTimeInsideOptionalCtorSignature = "(J)V"; + jobject LocalEndTimeInsideOptional; + std::string LocalEndTimeInsideOptionalClassName = "java/lang/Long"; + std::string LocalEndTimeInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(), - dataResponse.localEndTime.Value(), localEndTimeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime); + LocalEndTimeInsideOptionalClassName.c_str(), LocalEndTimeInsideOptionalCtorSignature.c_str(), + dataResponse.localEndTime.Value(), LocalEndTimeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(LocalEndTimeInsideOptional, LocalEndTime); } - env->CallVoidMethod(javaCallbackRef, javaMethod, yearDayIndex, userIndex, status, localStartTime, localEndTime); + env->CallVoidMethod(javaCallbackRef, javaMethod, YearDayIndex, UserIndex, Status, LocalStartTime, LocalEndTime); } CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -2643,63 +2643,63 @@ void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn( "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject holidayIndex; - std::string holidayIndexClassName = "java/lang/Integer"; - std::string holidayIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(holidayIndexClassName.c_str(), holidayIndexCtorSignature.c_str(), - dataResponse.holidayIndex, holidayIndex); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject localStartTime; + jobject HolidayIndex; + std::string HolidayIndexClassName = "java/lang/Integer"; + std::string HolidayIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(HolidayIndexClassName.c_str(), HolidayIndexCtorSignature.c_str(), + dataResponse.holidayIndex, HolidayIndex); + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject LocalStartTime; if (!dataResponse.localStartTime.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime); + chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalStartTime); } else { - jobject localStartTimeInsideOptional; - std::string localStartTimeInsideOptionalClassName = "java/lang/Long"; - std::string localStartTimeInsideOptionalCtorSignature = "(J)V"; + jobject LocalStartTimeInsideOptional; + std::string LocalStartTimeInsideOptionalClassName = "java/lang/Long"; + std::string LocalStartTimeInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(), - dataResponse.localStartTime.Value(), localStartTimeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime); + LocalStartTimeInsideOptionalClassName.c_str(), LocalStartTimeInsideOptionalCtorSignature.c_str(), + dataResponse.localStartTime.Value(), LocalStartTimeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(LocalStartTimeInsideOptional, LocalStartTime); } - jobject localEndTime; + jobject LocalEndTime; if (!dataResponse.localEndTime.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime); + chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalEndTime); } else { - jobject localEndTimeInsideOptional; - std::string localEndTimeInsideOptionalClassName = "java/lang/Long"; - std::string localEndTimeInsideOptionalCtorSignature = "(J)V"; + jobject LocalEndTimeInsideOptional; + std::string LocalEndTimeInsideOptionalClassName = "java/lang/Long"; + std::string LocalEndTimeInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(), - dataResponse.localEndTime.Value(), localEndTimeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime); + LocalEndTimeInsideOptionalClassName.c_str(), LocalEndTimeInsideOptionalCtorSignature.c_str(), + dataResponse.localEndTime.Value(), LocalEndTimeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(LocalEndTimeInsideOptional, LocalEndTime); } - jobject operatingMode; + jobject OperatingMode; if (!dataResponse.operatingMode.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, operatingMode); + chip::JniReferences::GetInstance().CreateOptional(nullptr, OperatingMode); } else { - jobject operatingModeInsideOptional; - std::string operatingModeInsideOptionalClassName = "java/lang/Integer"; - std::string operatingModeInsideOptionalCtorSignature = "(I)V"; + jobject OperatingModeInsideOptional; + std::string OperatingModeInsideOptionalClassName = "java/lang/Integer"; + std::string OperatingModeInsideOptionalCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - operatingModeInsideOptionalClassName.c_str(), operatingModeInsideOptionalCtorSignature.c_str(), - static_cast(dataResponse.operatingMode.Value()), operatingModeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(operatingModeInsideOptional, operatingMode); + OperatingModeInsideOptionalClassName.c_str(), OperatingModeInsideOptionalCtorSignature.c_str(), + static_cast(dataResponse.operatingMode.Value()), OperatingModeInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(OperatingModeInsideOptional, OperatingMode); } - env->CallVoidMethod(javaCallbackRef, javaMethod, holidayIndex, status, localStartTime, localEndTime, operatingMode); + env->CallVoidMethod(javaCallbackRef, javaMethod, HolidayIndex, Status, LocalStartTime, LocalEndTime, OperatingMode); } CHIPDoorLockClusterGetUserResponseCallback::CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -2756,85 +2756,85 @@ void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject userIndex; - std::string userIndexClassName = "java/lang/Integer"; - std::string userIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIndexClassName.c_str(), userIndexCtorSignature.c_str(), - dataResponse.userIndex, userIndex); - jobject userName; + jobject UserIndex; + std::string UserIndexClassName = "java/lang/Integer"; + std::string UserIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(), + dataResponse.userIndex, UserIndex); + jobject UserName; if (dataResponse.userName.IsNull()) { - userName = nullptr; + UserName = nullptr; } else { - userName = + UserName = env->NewStringUTF(std::string(dataResponse.userName.Value().data(), dataResponse.userName.Value().size()).c_str()); } - jobject userUniqueId; - if (dataResponse.userUniqueId.IsNull()) + jobject UserUniqueID; + if (dataResponse.userUniqueID.IsNull()) { - userUniqueId = nullptr; + UserUniqueID = nullptr; } else { - std::string userUniqueIdClassName = "java/lang/Long"; - std::string userUniqueIdCtorSignature = "(J)V"; + std::string UserUniqueIDClassName = "java/lang/Long"; + std::string UserUniqueIDCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - userUniqueIdClassName.c_str(), userUniqueIdCtorSignature.c_str(), dataResponse.userUniqueId.Value(), userUniqueId); + UserUniqueIDClassName.c_str(), UserUniqueIDCtorSignature.c_str(), dataResponse.userUniqueID.Value(), UserUniqueID); } - jobject userStatus; + jobject UserStatus; if (dataResponse.userStatus.IsNull()) { - userStatus = nullptr; + UserStatus = nullptr; } else { - std::string userStatusClassName = "java/lang/Integer"; - std::string userStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userStatusClassName.c_str(), userStatusCtorSignature.c_str(), + std::string UserStatusClassName = "java/lang/Integer"; + std::string UserStatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserStatusClassName.c_str(), UserStatusCtorSignature.c_str(), static_cast(dataResponse.userStatus.Value()), - userStatus); + UserStatus); } - jobject userType; + jobject UserType; if (dataResponse.userType.IsNull()) { - userType = nullptr; + UserType = nullptr; } else { - std::string userTypeClassName = "java/lang/Integer"; - std::string userTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userTypeClassName.c_str(), userTypeCtorSignature.c_str(), + std::string UserTypeClassName = "java/lang/Integer"; + std::string UserTypeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserTypeClassName.c_str(), UserTypeCtorSignature.c_str(), static_cast(dataResponse.userType.Value()), - userType); + UserType); } - jobject credentialRule; + jobject CredentialRule; if (dataResponse.credentialRule.IsNull()) { - credentialRule = nullptr; + CredentialRule = nullptr; } else { - std::string credentialRuleClassName = "java/lang/Integer"; - std::string credentialRuleCtorSignature = "(I)V"; + std::string CredentialRuleClassName = "java/lang/Integer"; + std::string CredentialRuleCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - credentialRuleClassName.c_str(), credentialRuleCtorSignature.c_str(), - static_cast(dataResponse.credentialRule.Value()), credentialRule); + CredentialRuleClassName.c_str(), CredentialRuleCtorSignature.c_str(), + static_cast(dataResponse.credentialRule.Value()), CredentialRule); } - jobject credentials; + jobject Credentials; if (dataResponse.credentials.IsNull()) { - credentials = nullptr; + Credentials = nullptr; } else { - chip::JniReferences::GetInstance().CreateArrayList(credentials); + chip::JniReferences::GetInstance().CreateArrayList(Credentials); - auto iter_credentials_1 = dataResponse.credentials.Value().begin(); - while (iter_credentials_1.Next()) + auto iter_Credentials_1 = dataResponse.credentials.Value().begin(); + while (iter_Credentials_1.Next()) { - auto & entry_1 = iter_credentials_1.GetValue(); + auto & entry_1 = iter_Credentials_1.GetValue(); jobject newElement_1; jobject newElement_1_credentialType; std::string newElement_1_credentialTypeClassName = "java/lang/Integer"; @@ -2849,68 +2849,68 @@ void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn( newElement_1_credentialIndexCtorSignature.c_str(), entry_1.credentialIndex, newElement_1_credentialIndex); - jclass dlCredentialStructClass_2; + jclass credentialStructStructClass_2; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_2); + env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct", credentialStructStructClass_2); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential"); + ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct"); return; } - jmethodID dlCredentialStructCtor_2 = - env->GetMethodID(dlCredentialStructClass_2, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); - if (dlCredentialStructCtor_2 == nullptr) + jmethodID credentialStructStructCtor_2 = + env->GetMethodID(credentialStructStructClass_2, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (credentialStructStructCtor_2 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor"); return; } - newElement_1 = env->NewObject(dlCredentialStructClass_2, dlCredentialStructCtor_2, newElement_1_credentialType, + newElement_1 = env->NewObject(credentialStructStructClass_2, credentialStructStructCtor_2, newElement_1_credentialType, newElement_1_credentialIndex); - chip::JniReferences::GetInstance().AddToList(credentials, newElement_1); + chip::JniReferences::GetInstance().AddToList(Credentials, newElement_1); } } - jobject creatorFabricIndex; + jobject CreatorFabricIndex; if (dataResponse.creatorFabricIndex.IsNull()) { - creatorFabricIndex = nullptr; + CreatorFabricIndex = nullptr; } else { - std::string creatorFabricIndexClassName = "java/lang/Integer"; - std::string creatorFabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(creatorFabricIndexClassName.c_str(), - creatorFabricIndexCtorSignature.c_str(), - dataResponse.creatorFabricIndex.Value(), creatorFabricIndex); + std::string CreatorFabricIndexClassName = "java/lang/Integer"; + std::string CreatorFabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(CreatorFabricIndexClassName.c_str(), + CreatorFabricIndexCtorSignature.c_str(), + dataResponse.creatorFabricIndex.Value(), CreatorFabricIndex); } - jobject lastModifiedFabricIndex; + jobject LastModifiedFabricIndex; if (dataResponse.lastModifiedFabricIndex.IsNull()) { - lastModifiedFabricIndex = nullptr; + LastModifiedFabricIndex = nullptr; } else { - std::string lastModifiedFabricIndexClassName = "java/lang/Integer"; - std::string lastModifiedFabricIndexCtorSignature = "(I)V"; + std::string LastModifiedFabricIndexClassName = "java/lang/Integer"; + std::string LastModifiedFabricIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(), - dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex); + LastModifiedFabricIndexClassName.c_str(), LastModifiedFabricIndexCtorSignature.c_str(), + dataResponse.lastModifiedFabricIndex.Value(), LastModifiedFabricIndex); } - jobject nextUserIndex; + jobject NextUserIndex; if (dataResponse.nextUserIndex.IsNull()) { - nextUserIndex = nullptr; + NextUserIndex = nullptr; } else { - std::string nextUserIndexClassName = "java/lang/Integer"; - std::string nextUserIndexCtorSignature = "(I)V"; + std::string NextUserIndexClassName = "java/lang/Integer"; + std::string NextUserIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - nextUserIndexClassName.c_str(), nextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), nextUserIndex); + NextUserIndexClassName.c_str(), NextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), NextUserIndex); } - env->CallVoidMethod(javaCallbackRef, javaMethod, userIndex, userName, userUniqueId, userStatus, userType, credentialRule, - credentials, creatorFabricIndex, lastModifiedFabricIndex, nextUserIndex); + env->CallVoidMethod(javaCallbackRef, javaMethod, UserIndex, UserName, UserUniqueID, UserStatus, UserType, CredentialRule, + Credentials, CreatorFabricIndex, LastModifiedFabricIndex, NextUserIndex); } CHIPDoorLockClusterSetCredentialResponseCallback::CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -2964,38 +2964,38 @@ void CHIPDoorLockClusterSetCredentialResponseCallback::CallbackFn( "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject userIndex; + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject UserIndex; if (dataResponse.userIndex.IsNull()) { - userIndex = nullptr; + UserIndex = nullptr; } else { - std::string userIndexClassName = "java/lang/Integer"; - std::string userIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIndexClassName.c_str(), userIndexCtorSignature.c_str(), - dataResponse.userIndex.Value(), userIndex); + std::string UserIndexClassName = "java/lang/Integer"; + std::string UserIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(), + dataResponse.userIndex.Value(), UserIndex); } - jobject nextCredentialIndex; + jobject NextCredentialIndex; if (dataResponse.nextCredentialIndex.IsNull()) { - nextCredentialIndex = nullptr; + NextCredentialIndex = nullptr; } else { - std::string nextCredentialIndexClassName = "java/lang/Integer"; - std::string nextCredentialIndexCtorSignature = "(I)V"; + std::string NextCredentialIndexClassName = "java/lang/Integer"; + std::string NextCredentialIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(), - dataResponse.nextCredentialIndex.Value(), nextCredentialIndex); + NextCredentialIndexClassName.c_str(), NextCredentialIndexCtorSignature.c_str(), + dataResponse.nextCredentialIndex.Value(), NextCredentialIndex); } - env->CallVoidMethod(javaCallbackRef, javaMethod, status, userIndex, nextCredentialIndex); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, UserIndex, NextCredentialIndex); } CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCredentialStatusResponseCallback( jobject javaCallback) : @@ -3052,65 +3052,65 @@ void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn( "(Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject credentialExists; - std::string credentialExistsClassName = "java/lang/Boolean"; - std::string credentialExistsCtorSignature = "(Z)V"; + jobject CredentialExists; + std::string CredentialExistsClassName = "java/lang/Boolean"; + std::string CredentialExistsCtorSignature = "(Z)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - credentialExistsClassName.c_str(), credentialExistsCtorSignature.c_str(), dataResponse.credentialExists, credentialExists); - jobject userIndex; + CredentialExistsClassName.c_str(), CredentialExistsCtorSignature.c_str(), dataResponse.credentialExists, CredentialExists); + jobject UserIndex; if (dataResponse.userIndex.IsNull()) { - userIndex = nullptr; + UserIndex = nullptr; } else { - std::string userIndexClassName = "java/lang/Integer"; - std::string userIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIndexClassName.c_str(), userIndexCtorSignature.c_str(), - dataResponse.userIndex.Value(), userIndex); + std::string UserIndexClassName = "java/lang/Integer"; + std::string UserIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(), + dataResponse.userIndex.Value(), UserIndex); } - jobject creatorFabricIndex; + jobject CreatorFabricIndex; if (dataResponse.creatorFabricIndex.IsNull()) { - creatorFabricIndex = nullptr; + CreatorFabricIndex = nullptr; } else { - std::string creatorFabricIndexClassName = "java/lang/Integer"; - std::string creatorFabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(creatorFabricIndexClassName.c_str(), - creatorFabricIndexCtorSignature.c_str(), - dataResponse.creatorFabricIndex.Value(), creatorFabricIndex); + std::string CreatorFabricIndexClassName = "java/lang/Integer"; + std::string CreatorFabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(CreatorFabricIndexClassName.c_str(), + CreatorFabricIndexCtorSignature.c_str(), + dataResponse.creatorFabricIndex.Value(), CreatorFabricIndex); } - jobject lastModifiedFabricIndex; + jobject LastModifiedFabricIndex; if (dataResponse.lastModifiedFabricIndex.IsNull()) { - lastModifiedFabricIndex = nullptr; + LastModifiedFabricIndex = nullptr; } else { - std::string lastModifiedFabricIndexClassName = "java/lang/Integer"; - std::string lastModifiedFabricIndexCtorSignature = "(I)V"; + std::string LastModifiedFabricIndexClassName = "java/lang/Integer"; + std::string LastModifiedFabricIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(), - dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex); + LastModifiedFabricIndexClassName.c_str(), LastModifiedFabricIndexCtorSignature.c_str(), + dataResponse.lastModifiedFabricIndex.Value(), LastModifiedFabricIndex); } - jobject nextCredentialIndex; + jobject NextCredentialIndex; if (dataResponse.nextCredentialIndex.IsNull()) { - nextCredentialIndex = nullptr; + NextCredentialIndex = nullptr; } else { - std::string nextCredentialIndexClassName = "java/lang/Integer"; - std::string nextCredentialIndexCtorSignature = "(I)V"; + std::string NextCredentialIndexClassName = "java/lang/Integer"; + std::string NextCredentialIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(), - dataResponse.nextCredentialIndex.Value(), nextCredentialIndex); + NextCredentialIndexClassName.c_str(), NextCredentialIndexCtorSignature.c_str(), + dataResponse.nextCredentialIndex.Value(), NextCredentialIndex); } - env->CallVoidMethod(javaCallbackRef, javaMethod, credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, - nextCredentialIndex); + env->CallVoidMethod(javaCallbackRef, javaMethod, CredentialExists, UserIndex, CreatorFabricIndex, LastModifiedFabricIndex, + NextCredentialIndex); } CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index e46c90c7116afc..042235410a7f41 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -14968,7 +14968,7 @@ CHIPDoorLockDoorStateAttributeCallback::~CHIPDoorLockDoorStateAttributeCallback( } void CHIPDoorLockDoorStateAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::Nullable & value) + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index dbaa442c04721b..1e8a6c78c0767b 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -6162,7 +6162,7 @@ class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback & value); + const chip::app::DataModel::Nullable & value); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 03e29e55e417cb..685a5dd2ccda85 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -11391,21 +11391,21 @@ public DoorLockCluster(long devicePtr, int endpointId) { public native long initWithDevice(long devicePtr, int endpointId); public void lockDoor( - DefaultClusterCallback callback, Optional pinCode, int timedInvokeTimeoutMs) { - lockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs); + DefaultClusterCallback callback, Optional PINCode, int timedInvokeTimeoutMs) { + lockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs); } public void unlockDoor( - DefaultClusterCallback callback, Optional pinCode, int timedInvokeTimeoutMs) { - unlockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs); + DefaultClusterCallback callback, Optional PINCode, int timedInvokeTimeoutMs) { + unlockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs); } public void unlockWithTimeout( DefaultClusterCallback callback, Integer timeout, - Optional pinCode, + Optional PINCode, int timedInvokeTimeoutMs) { - unlockWithTimeout(chipClusterPtr, callback, timeout, pinCode, timedInvokeTimeoutMs); + unlockWithTimeout(chipClusterPtr, callback, timeout, PINCode, timedInvokeTimeoutMs); } public void setWeekDaySchedule( @@ -11591,7 +11591,7 @@ public void setUser( Integer operationType, Integer userIndex, @Nullable String userName, - @Nullable Long userUniqueId, + @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @@ -11602,7 +11602,7 @@ public void setUser( operationType, userIndex, userName, - userUniqueId, + userUniqueID, userStatus, userType, credentialRule, @@ -11626,7 +11626,7 @@ public void clearUser( public void setCredential( SetCredentialResponseCallback callback, Integer operationType, - ChipStructs.DoorLockClusterDlCredential credential, + ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @@ -11646,20 +11646,20 @@ public void setCredential( public void getCredentialStatus( GetCredentialStatusResponseCallback callback, - ChipStructs.DoorLockClusterDlCredential credential) { + ChipStructs.DoorLockClusterCredentialStruct credential) { getCredentialStatus(chipClusterPtr, callback, credential, null); } public void getCredentialStatus( GetCredentialStatusResponseCallback callback, - ChipStructs.DoorLockClusterDlCredential credential, + ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) { getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs); } public void clearCredential( DefaultClusterCallback callback, - @Nullable ChipStructs.DoorLockClusterDlCredential credential, + @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) { clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs); } @@ -11667,20 +11667,20 @@ public void clearCredential( private native void lockDoor( long chipClusterPtr, DefaultClusterCallback Callback, - Optional pinCode, + Optional PINCode, @Nullable Integer timedInvokeTimeoutMs); private native void unlockDoor( long chipClusterPtr, DefaultClusterCallback Callback, - Optional pinCode, + Optional PINCode, @Nullable Integer timedInvokeTimeoutMs); private native void unlockWithTimeout( long chipClusterPtr, DefaultClusterCallback Callback, Integer timeout, - Optional pinCode, + Optional PINCode, @Nullable Integer timedInvokeTimeoutMs); private native void setWeekDaySchedule( @@ -11759,7 +11759,7 @@ private native void setUser( Integer operationType, Integer userIndex, @Nullable String userName, - @Nullable Long userUniqueId, + @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, @@ -11781,7 +11781,7 @@ private native void setCredential( long chipClusterPtr, SetCredentialResponseCallback Callback, Integer operationType, - ChipStructs.DoorLockClusterDlCredential credential, + ChipStructs.DoorLockClusterCredentialStruct credential, byte[] credentialData, @Nullable Integer userIndex, @Nullable Integer userStatus, @@ -11791,13 +11791,13 @@ private native void setCredential( private native void getCredentialStatus( long chipClusterPtr, GetCredentialStatusResponseCallback Callback, - ChipStructs.DoorLockClusterDlCredential credential, + ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs); private native void clearCredential( long chipClusterPtr, DefaultClusterCallback Callback, - @Nullable ChipStructs.DoorLockClusterDlCredential credential, + @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs); public interface GetWeekDayScheduleResponseCallback { @@ -11840,11 +11840,11 @@ public interface GetUserResponseCallback { void onSuccess( Integer userIndex, @Nullable String userName, - @Nullable Long userUniqueId, + @Nullable Long userUniqueID, @Nullable Integer userStatus, @Nullable Integer userType, @Nullable Integer credentialRule, - @Nullable ArrayList credentials, + @Nullable ArrayList credentials, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextUserIndex); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java index 9db564c1e04f45..9f079111c14841 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java @@ -925,7 +925,7 @@ public static class DoorLockClusterLockOperationEvent { public @Nullable Integer userIndex; public @Nullable Integer fabricIndex; public @Nullable Long sourceNode; - public @Nullable Optional> credentials; + public @Nullable Optional> credentials; public DoorLockClusterLockOperationEvent( Integer lockOperationType, @@ -933,7 +933,7 @@ public DoorLockClusterLockOperationEvent( @Nullable Integer userIndex, @Nullable Integer fabricIndex, @Nullable Long sourceNode, - @Nullable Optional> credentials) { + @Nullable Optional> credentials) { this.lockOperationType = lockOperationType; this.operationSource = operationSource; this.userIndex = userIndex; @@ -976,7 +976,7 @@ public static class DoorLockClusterLockOperationErrorEvent { public @Nullable Integer userIndex; public @Nullable Integer fabricIndex; public @Nullable Long sourceNode; - public @Nullable Optional> credentials; + public @Nullable Optional> credentials; public DoorLockClusterLockOperationErrorEvent( Integer lockOperationType, @@ -985,7 +985,7 @@ public DoorLockClusterLockOperationErrorEvent( @Nullable Integer userIndex, @Nullable Integer fabricIndex, @Nullable Long sourceNode, - @Nullable Optional> credentials) { + @Nullable Optional> credentials) { this.lockOperationType = lockOperationType; this.operationSource = operationSource; this.operationError = operationError; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index b6fc1d33b30102..45db65c348cfbd 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1318,11 +1318,11 @@ public String toString() { } } - public static class DoorLockClusterDlCredential { + public static class DoorLockClusterCredentialStruct { public Integer credentialType; public Integer credentialIndex; - public DoorLockClusterDlCredential(Integer credentialType, Integer credentialIndex) { + public DoorLockClusterCredentialStruct(Integer credentialType, Integer credentialIndex) { this.credentialType = credentialType; this.credentialIndex = credentialIndex; } @@ -1330,7 +1330,7 @@ public DoorLockClusterDlCredential(Integer credentialType, Integer credentialInd @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("DoorLockClusterDlCredential {\n"); + output.append("DoorLockClusterCredentialStruct {\n"); output.append("\tcredentialType: "); output.append(credentialType); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 4a30a6afdeca7a..ac8f462acbeaff 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -4180,37 +4180,37 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer weekDayIndex, - Integer userIndex, - Integer status, - Optional daysMask, - Optional startHour, - Optional startMinute, - Optional endHour, - Optional endMinute) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo weekDayIndexResponseValue = - new CommandResponseInfo("weekDayIndex", "Integer"); - responseValues.put(weekDayIndexResponseValue, weekDayIndex); - CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer"); - responseValues.put(userIndexResponseValue, userIndex); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo daysMaskResponseValue = - new CommandResponseInfo("daysMask", "Optional"); - responseValues.put(daysMaskResponseValue, daysMask); - CommandResponseInfo startHourResponseValue = - new CommandResponseInfo("startHour", "Optional"); - responseValues.put(startHourResponseValue, startHour); - CommandResponseInfo startMinuteResponseValue = - new CommandResponseInfo("startMinute", "Optional"); - responseValues.put(startMinuteResponseValue, startMinute); - CommandResponseInfo endHourResponseValue = - new CommandResponseInfo("endHour", "Optional"); - responseValues.put(endHourResponseValue, endHour); - CommandResponseInfo endMinuteResponseValue = - new CommandResponseInfo("endMinute", "Optional"); - responseValues.put(endMinuteResponseValue, endMinute); + Integer WeekDayIndex, + Integer UserIndex, + Integer Status, + Optional DaysMask, + Optional StartHour, + Optional StartMinute, + Optional EndHour, + Optional EndMinute) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo WeekDayIndexResponseValue = + new CommandResponseInfo("WeekDayIndex", "Integer"); + responseValues.put(WeekDayIndexResponseValue, WeekDayIndex); + CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer"); + responseValues.put(UserIndexResponseValue, UserIndex); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo DaysMaskResponseValue = + new CommandResponseInfo("DaysMask", "Optional"); + responseValues.put(DaysMaskResponseValue, DaysMask); + CommandResponseInfo StartHourResponseValue = + new CommandResponseInfo("StartHour", "Optional"); + responseValues.put(StartHourResponseValue, StartHour); + CommandResponseInfo StartMinuteResponseValue = + new CommandResponseInfo("StartMinute", "Optional"); + responseValues.put(StartMinuteResponseValue, StartMinute); + CommandResponseInfo EndHourResponseValue = + new CommandResponseInfo("EndHour", "Optional"); + responseValues.put(EndHourResponseValue, EndHour); + CommandResponseInfo EndMinuteResponseValue = + new CommandResponseInfo("EndMinute", "Optional"); + responseValues.put(EndMinuteResponseValue, EndMinute); callback.onSuccess(responseValues); } @@ -4232,25 +4232,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer yearDayIndex, - Integer userIndex, - Integer status, - Optional localStartTime, - Optional localEndTime) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo yearDayIndexResponseValue = - new CommandResponseInfo("yearDayIndex", "Integer"); - responseValues.put(yearDayIndexResponseValue, yearDayIndex); - CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer"); - responseValues.put(userIndexResponseValue, userIndex); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo localStartTimeResponseValue = - new CommandResponseInfo("localStartTime", "Optional"); - responseValues.put(localStartTimeResponseValue, localStartTime); - CommandResponseInfo localEndTimeResponseValue = - new CommandResponseInfo("localEndTime", "Optional"); - responseValues.put(localEndTimeResponseValue, localEndTime); + Integer YearDayIndex, + Integer UserIndex, + Integer Status, + Optional LocalStartTime, + Optional LocalEndTime) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo YearDayIndexResponseValue = + new CommandResponseInfo("YearDayIndex", "Integer"); + responseValues.put(YearDayIndexResponseValue, YearDayIndex); + CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer"); + responseValues.put(UserIndexResponseValue, UserIndex); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo LocalStartTimeResponseValue = + new CommandResponseInfo("LocalStartTime", "Optional"); + responseValues.put(LocalStartTimeResponseValue, LocalStartTime); + CommandResponseInfo LocalEndTimeResponseValue = + new CommandResponseInfo("LocalEndTime", "Optional"); + responseValues.put(LocalEndTimeResponseValue, LocalEndTime); callback.onSuccess(responseValues); } @@ -4272,26 +4272,26 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer holidayIndex, - Integer status, - Optional localStartTime, - Optional localEndTime, - Optional operatingMode) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo holidayIndexResponseValue = - new CommandResponseInfo("holidayIndex", "Integer"); - responseValues.put(holidayIndexResponseValue, holidayIndex); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo localStartTimeResponseValue = - new CommandResponseInfo("localStartTime", "Optional"); - responseValues.put(localStartTimeResponseValue, localStartTime); - CommandResponseInfo localEndTimeResponseValue = - new CommandResponseInfo("localEndTime", "Optional"); - responseValues.put(localEndTimeResponseValue, localEndTime); - CommandResponseInfo operatingModeResponseValue = - new CommandResponseInfo("operatingMode", "Optional"); - responseValues.put(operatingModeResponseValue, operatingMode); + Integer HolidayIndex, + Integer Status, + Optional LocalStartTime, + Optional LocalEndTime, + Optional OperatingMode) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo HolidayIndexResponseValue = + new CommandResponseInfo("HolidayIndex", "Integer"); + responseValues.put(HolidayIndexResponseValue, HolidayIndex); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo LocalStartTimeResponseValue = + new CommandResponseInfo("LocalStartTime", "Optional"); + responseValues.put(LocalStartTimeResponseValue, LocalStartTime); + CommandResponseInfo LocalEndTimeResponseValue = + new CommandResponseInfo("LocalEndTime", "Optional"); + responseValues.put(LocalEndTimeResponseValue, LocalEndTime); + CommandResponseInfo OperatingModeResponseValue = + new CommandResponseInfo("OperatingMode", "Optional"); + responseValues.put(OperatingModeResponseValue, OperatingMode); callback.onSuccess(responseValues); } @@ -4312,43 +4312,43 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer userIndex, - @Nullable String userName, - @Nullable Long userUniqueId, - @Nullable Integer userStatus, - @Nullable Integer userType, - @Nullable Integer credentialRule, - @Nullable ArrayList credentials, - @Nullable Integer creatorFabricIndex, - @Nullable Integer lastModifiedFabricIndex, - @Nullable Integer nextUserIndex) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer"); - responseValues.put(userIndexResponseValue, userIndex); - CommandResponseInfo userNameResponseValue = new CommandResponseInfo("userName", "String"); - responseValues.put(userNameResponseValue, userName); - CommandResponseInfo userUniqueIdResponseValue = - new CommandResponseInfo("userUniqueId", "Long"); - responseValues.put(userUniqueIdResponseValue, userUniqueId); - CommandResponseInfo userStatusResponseValue = - new CommandResponseInfo("userStatus", "Integer"); - responseValues.put(userStatusResponseValue, userStatus); - CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "Integer"); - responseValues.put(userTypeResponseValue, userType); - CommandResponseInfo credentialRuleResponseValue = - new CommandResponseInfo("credentialRule", "Integer"); - responseValues.put(credentialRuleResponseValue, credentialRule); - // credentials: /* TYPE WARNING: array array defaults to */ uint8_t * + Integer UserIndex, + @Nullable String UserName, + @Nullable Long UserUniqueID, + @Nullable Integer UserStatus, + @Nullable Integer UserType, + @Nullable Integer CredentialRule, + @Nullable ArrayList Credentials, + @Nullable Integer CreatorFabricIndex, + @Nullable Integer LastModifiedFabricIndex, + @Nullable Integer NextUserIndex) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer"); + responseValues.put(UserIndexResponseValue, UserIndex); + CommandResponseInfo UserNameResponseValue = new CommandResponseInfo("UserName", "String"); + responseValues.put(UserNameResponseValue, UserName); + CommandResponseInfo UserUniqueIDResponseValue = + new CommandResponseInfo("UserUniqueID", "Long"); + responseValues.put(UserUniqueIDResponseValue, UserUniqueID); + CommandResponseInfo UserStatusResponseValue = + new CommandResponseInfo("UserStatus", "Integer"); + responseValues.put(UserStatusResponseValue, UserStatus); + CommandResponseInfo UserTypeResponseValue = new CommandResponseInfo("UserType", "Integer"); + responseValues.put(UserTypeResponseValue, UserType); + CommandResponseInfo CredentialRuleResponseValue = + new CommandResponseInfo("CredentialRule", "Integer"); + responseValues.put(CredentialRuleResponseValue, CredentialRule); + // Credentials: /* TYPE WARNING: array array defaults to */ uint8_t * // Conversion from this type to Java is not properly implemented yet - CommandResponseInfo creatorFabricIndexResponseValue = - new CommandResponseInfo("creatorFabricIndex", "Integer"); - responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex); - CommandResponseInfo lastModifiedFabricIndexResponseValue = - new CommandResponseInfo("lastModifiedFabricIndex", "Integer"); - responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex); - CommandResponseInfo nextUserIndexResponseValue = - new CommandResponseInfo("nextUserIndex", "Integer"); - responseValues.put(nextUserIndexResponseValue, nextUserIndex); + CommandResponseInfo CreatorFabricIndexResponseValue = + new CommandResponseInfo("CreatorFabricIndex", "Integer"); + responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex); + CommandResponseInfo LastModifiedFabricIndexResponseValue = + new CommandResponseInfo("LastModifiedFabricIndex", "Integer"); + responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex); + CommandResponseInfo NextUserIndexResponseValue = + new CommandResponseInfo("NextUserIndex", "Integer"); + responseValues.put(NextUserIndexResponseValue, NextUserIndex); callback.onSuccess(responseValues); } @@ -4370,15 +4370,15 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex) { + Integer Status, @Nullable Integer UserIndex, @Nullable Integer NextCredentialIndex) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer"); - responseValues.put(userIndexResponseValue, userIndex); - CommandResponseInfo nextCredentialIndexResponseValue = - new CommandResponseInfo("nextCredentialIndex", "Integer"); - responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer"); + responseValues.put(UserIndexResponseValue, UserIndex); + CommandResponseInfo NextCredentialIndexResponseValue = + new CommandResponseInfo("NextCredentialIndex", "Integer"); + responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex); callback.onSuccess(responseValues); } @@ -4400,26 +4400,26 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Boolean credentialExists, - @Nullable Integer userIndex, - @Nullable Integer creatorFabricIndex, - @Nullable Integer lastModifiedFabricIndex, - @Nullable Integer nextCredentialIndex) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo credentialExistsResponseValue = - new CommandResponseInfo("credentialExists", "Boolean"); - responseValues.put(credentialExistsResponseValue, credentialExists); - CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer"); - responseValues.put(userIndexResponseValue, userIndex); - CommandResponseInfo creatorFabricIndexResponseValue = - new CommandResponseInfo("creatorFabricIndex", "Integer"); - responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex); - CommandResponseInfo lastModifiedFabricIndexResponseValue = - new CommandResponseInfo("lastModifiedFabricIndex", "Integer"); - responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex); - CommandResponseInfo nextCredentialIndexResponseValue = - new CommandResponseInfo("nextCredentialIndex", "Integer"); - responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex); + Boolean CredentialExists, + @Nullable Integer UserIndex, + @Nullable Integer CreatorFabricIndex, + @Nullable Integer LastModifiedFabricIndex, + @Nullable Integer NextCredentialIndex) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo CredentialExistsResponseValue = + new CommandResponseInfo("CredentialExists", "Boolean"); + responseValues.put(CredentialExistsResponseValue, CredentialExists); + CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer"); + responseValues.put(UserIndexResponseValue, UserIndex); + CommandResponseInfo CreatorFabricIndexResponseValue = + new CommandResponseInfo("CreatorFabricIndex", "Integer"); + responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex); + CommandResponseInfo LastModifiedFabricIndexResponseValue = + new CommandResponseInfo("LastModifiedFabricIndex", "Integer"); + responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex); + CommandResponseInfo NextCredentialIndexResponseValue = + new CommandResponseInfo("NextCredentialIndex", "Integer"); + responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex); callback.onSuccess(responseValues); } @@ -9692,9 +9692,9 @@ public Map> getCommandMap() { Map doorLockClusterInteractionInfoMap = new LinkedHashMap<>(); Map doorLocklockDoorCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo = - new CommandParameterInfo("pinCode", Optional.class, byte[].class); - doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo); + CommandParameterInfo doorLocklockDoorPINCodeCommandParameterInfo = + new CommandParameterInfo("PINCode", Optional.class, byte[].class); + doorLocklockDoorCommandParams.put("PINCode", doorLocklockDoorPINCodeCommandParameterInfo); InteractionInfo doorLocklockDoorInteractionInfo = new InteractionInfo( @@ -9702,7 +9702,7 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .lockDoor( (DefaultClusterCallback) callback, - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -9710,9 +9710,9 @@ public Map> getCommandMap() { doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo); Map doorLockunlockDoorCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo = - new CommandParameterInfo("pinCode", Optional.class, byte[].class); - doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo); + CommandParameterInfo doorLockunlockDoorPINCodeCommandParameterInfo = + new CommandParameterInfo("PINCode", Optional.class, byte[].class); + doorLockunlockDoorCommandParams.put("PINCode", doorLockunlockDoorPINCodeCommandParameterInfo); InteractionInfo doorLockunlockDoorInteractionInfo = new InteractionInfo( @@ -9720,7 +9720,7 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .unlockDoor( (DefaultClusterCallback) callback, - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -9733,10 +9733,10 @@ public Map> getCommandMap() { doorLockunlockWithTimeoutCommandParams.put( "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo); - CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo = - new CommandParameterInfo("pinCode", Optional.class, byte[].class); + CommandParameterInfo doorLockunlockWithTimeoutPINCodeCommandParameterInfo = + new CommandParameterInfo("PINCode", Optional.class, byte[].class); doorLockunlockWithTimeoutCommandParams.put( - "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo); + "PINCode", doorLockunlockWithTimeoutPINCodeCommandParameterInfo); InteractionInfo doorLockunlockWithTimeoutInteractionInfo = new InteractionInfo( @@ -9745,7 +9745,7 @@ public Map> getCommandMap() { .unlockWithTimeout( (DefaultClusterCallback) callback, (Integer) commandArguments.get("timeout"), - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -10034,10 +10034,10 @@ public Map> getCommandMap() { new CommandParameterInfo("userName", String.class, String.class); doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo); - CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo = - new CommandParameterInfo("userUniqueId", Long.class, Long.class); + CommandParameterInfo doorLocksetUseruserUniqueIDCommandParameterInfo = + new CommandParameterInfo("userUniqueID", Long.class, Long.class); doorLocksetUserCommandParams.put( - "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo); + "userUniqueID", doorLocksetUseruserUniqueIDCommandParameterInfo); CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", Integer.class, Integer.class); @@ -10061,7 +10061,7 @@ public Map> getCommandMap() { (Integer) commandArguments.get("operationType"), (Integer) commandArguments.get("userIndex"), (String) commandArguments.get("userName"), - (Long) commandArguments.get("userUniqueId"), + (Long) commandArguments.get("userUniqueID"), (Integer) commandArguments.get("userStatus"), (Integer) commandArguments.get("userType"), (Integer) commandArguments.get("credentialRule"), @@ -10139,7 +10139,8 @@ public Map> getCommandMap() { .setCredential( (ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback, (Integer) commandArguments.get("operationType"), - (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"), + (ChipStructs.DoorLockClusterCredentialStruct) + commandArguments.get("credential"), (byte[]) commandArguments.get("credentialData"), (Integer) commandArguments.get("userIndex"), (Integer) commandArguments.get("userStatus"), @@ -10157,7 +10158,8 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .getCredentialStatus( (ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback, - (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential")); + (ChipStructs.DoorLockClusterCredentialStruct) + commandArguments.get("credential")); }, () -> new DelegatedGetCredentialStatusResponseCallback(), doorLockgetCredentialStatusCommandParams); @@ -10171,7 +10173,8 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .clearCredential( (DefaultClusterCallback) callback, - (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"), + (ChipStructs.DoorLockClusterCredentialStruct) + commandArguments.get("credential"), 10000); }, () -> new DelegatedDefaultClusterCallback(), diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 01388eb8a17d47..037d72ce1eb9de 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3543,14 +3543,14 @@ class ChipClusters: "commandId": 0x00000000, "commandName": "LockDoor", "args": { - "pinCode": "bytes", + "PINCode": "bytes", }, }, 0x00000001: { "commandId": 0x00000001, "commandName": "UnlockDoor", "args": { - "pinCode": "bytes", + "PINCode": "bytes", }, }, 0x00000003: { @@ -3558,7 +3558,7 @@ class ChipClusters: "commandName": "UnlockWithTimeout", "args": { "timeout": "int", - "pinCode": "bytes", + "PINCode": "bytes", }, }, 0x0000000B: { @@ -3647,7 +3647,7 @@ class ChipClusters: "operationType": "int", "userIndex": "int", "userName": "str", - "userUniqueId": "int", + "userUniqueID": "int", "userStatus": "int", "userType": "int", "credentialRule": "int", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 99e8a57d065274..12be11841c9b74 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -13299,7 +13299,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="lockState", Tag=0x00000000, Type=typing.Union[Nullable, DoorLock.Enums.DlLockState]), ClusterObjectFieldDescriptor(Label="lockType", Tag=0x00000001, Type=DoorLock.Enums.DlLockType), ClusterObjectFieldDescriptor(Label="actuatorEnabled", Tag=0x00000002, Type=bool), - ClusterObjectFieldDescriptor(Label="doorState", Tag=0x00000003, Type=typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]), + ClusterObjectFieldDescriptor(Label="doorState", Tag=0x00000003, Type=typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]), ClusterObjectFieldDescriptor(Label="doorOpenEvents", Tag=0x00000004, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="doorClosedEvents", Tag=0x00000005, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="openPeriod", Tag=0x00000006, Type=typing.Optional[uint]), @@ -13319,7 +13319,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="LEDSettings", Tag=0x00000022, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="autoRelockTime", Tag=0x00000023, Type=uint), ClusterObjectFieldDescriptor(Label="soundVolume", Tag=0x00000024, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="operatingMode", Tag=0x00000025, Type=DoorLock.Enums.DlOperatingMode), + ClusterObjectFieldDescriptor(Label="operatingMode", Tag=0x00000025, Type=DoorLock.Enums.OperatingModeEnum), ClusterObjectFieldDescriptor(Label="supportedOperatingModes", Tag=0x00000026, Type=uint), ClusterObjectFieldDescriptor(Label="defaultConfigurationRegister", Tag=0x00000027, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="enableLocalProgramming", Tag=0x00000028, Type=typing.Optional[bool]), @@ -13342,7 +13342,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: lockState: 'typing.Union[Nullable, DoorLock.Enums.DlLockState]' = None lockType: 'DoorLock.Enums.DlLockType' = None actuatorEnabled: 'bool' = None - doorState: 'typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]' = None + doorState: 'typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]' = None doorOpenEvents: 'typing.Optional[uint]' = None doorClosedEvents: 'typing.Optional[uint]' = None openPeriod: 'typing.Optional[uint]' = None @@ -13362,7 +13362,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: LEDSettings: 'typing.Optional[uint]' = None autoRelockTime: 'uint' = None soundVolume: 'typing.Optional[uint]' = None - operatingMode: 'DoorLock.Enums.DlOperatingMode' = None + operatingMode: 'DoorLock.Enums.OperatingModeEnum' = None supportedOperatingModes: 'uint' = None defaultConfigurationRegister: 'typing.Optional[uint]' = None enableLocalProgramming: 'typing.Optional[bool]' = None @@ -13382,7 +13382,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class DlAlarmCode(IntEnum): + class AlarmCodeEnum(IntEnum): kLockJammed = 0x00 kLockFactoryReset = 0x01 kLockRadioPowerCycled = 0x03 @@ -13392,12 +13392,12 @@ class DlAlarmCode(IntEnum): kDoorAjar = 0x07 kForcedUser = 0x08 - class DlCredentialRule(IntEnum): + class CredentialRuleEnum(IntEnum): kSingle = 0x00 - kDouble = 0x01 + kDual = 0x01 kTri = 0x02 - class DlCredentialType(IntEnum): + class CredentialTypeEnum(IntEnum): kProgrammingPIN = 0x00 kPin = 0x01 kRfid = 0x02 @@ -13405,36 +13405,11 @@ class DlCredentialType(IntEnum): kFingerVein = 0x04 kFace = 0x05 - class DlDataOperationType(IntEnum): + class DataOperationTypeEnum(IntEnum): kAdd = 0x00 kClear = 0x01 kModify = 0x02 - class DlDoorState(IntEnum): - kDoorOpen = 0x00 - kDoorClosed = 0x01 - kDoorJammed = 0x02 - kDoorForcedOpen = 0x03 - kDoorUnspecifiedError = 0x04 - kDoorAjar = 0x05 - - class DlLockDataType(IntEnum): - kUnspecified = 0x00 - kProgrammingCode = 0x01 - kUserIndex = 0x02 - kWeekDaySchedule = 0x03 - kYearDaySchedule = 0x04 - kHolidaySchedule = 0x05 - kPin = 0x06 - kRfid = 0x07 - kFingerprint = 0x08 - - class DlLockOperationType(IntEnum): - kLock = 0x00 - kUnlock = 0x01 - kNonAccessUserEvent = 0x02 - kForcedUserEvent = 0x03 - class DlLockState(IntEnum): kNotFullyLocked = 0x00 kLocked = 0x01 @@ -13453,32 +13428,6 @@ class DlLockType(IntEnum): kDeadLatch = 0x09 kDoorFurniture = 0x0A - class DlOperatingMode(IntEnum): - kNormal = 0x00 - kVacation = 0x01 - kPrivacy = 0x02 - kNoRemoteLockUnlock = 0x03 - kPassage = 0x04 - - class DlOperationError(IntEnum): - kUnspecified = 0x00 - kInvalidCredential = 0x01 - kDisabledUserDenied = 0x02 - kRestricted = 0x03 - kInsufficientBattery = 0x04 - - class DlOperationSource(IntEnum): - kUnspecified = 0x00 - kManual = 0x01 - kProprietaryRemote = 0x02 - kKeypad = 0x03 - kAuto = 0x04 - kButton = 0x05 - kSchedule = 0x06 - kRemote = 0x07 - kRfid = 0x08 - kBiometric = 0x09 - class DlStatus(IntEnum): kSuccess = 0x00 kFailure = 0x01 @@ -13488,23 +13437,6 @@ class DlStatus(IntEnum): kResourceExhausted = 0x89 kNotFound = 0x8B - class DlUserStatus(IntEnum): - kAvailable = 0x00 - kOccupiedEnabled = 0x01 - kOccupiedDisabled = 0x03 - - class DlUserType(IntEnum): - kUnrestrictedUser = 0x00 - kYearDayScheduleUser = 0x01 - kWeekDayScheduleUser = 0x02 - kProgrammingUser = 0x03 - kNonAccessUser = 0x04 - kForcedUser = 0x05 - kDisposableUser = 0x06 - kExpiringUser = 0x07 - kScheduleRestrictedUser = 0x08 - kRemoteOnlyUser = 0x09 - class DoorLockOperationEventCode(IntEnum): kUnknownOrMfgSpecific = 0x00 kLock = 0x01 @@ -13551,19 +13483,87 @@ class DoorLockUserType(IntEnum): kNonAccessUser = 0x04 kNotSupported = 0xFF + class DoorStateEnum(IntEnum): + kDoorOpen = 0x00 + kDoorClosed = 0x01 + kDoorJammed = 0x02 + kDoorForcedOpen = 0x03 + kDoorUnspecifiedError = 0x04 + kDoorAjar = 0x05 + + class LockDataTypeEnum(IntEnum): + kUnspecified = 0x00 + kProgrammingCode = 0x01 + kUserIndex = 0x02 + kWeekDaySchedule = 0x03 + kYearDaySchedule = 0x04 + kHolidaySchedule = 0x05 + kPin = 0x06 + kRfid = 0x07 + kFingerprint = 0x08 + + class LockOperationTypeEnum(IntEnum): + kLock = 0x00 + kUnlock = 0x01 + kNonAccessUserEvent = 0x02 + kForcedUserEvent = 0x03 + + class OperatingModeEnum(IntEnum): + kNormal = 0x00 + kVacation = 0x01 + kPrivacy = 0x02 + kNoRemoteLockUnlock = 0x03 + kPassage = 0x04 + + class OperationErrorEnum(IntEnum): + kUnspecified = 0x00 + kInvalidCredential = 0x01 + kDisabledUserDenied = 0x02 + kRestricted = 0x03 + kInsufficientBattery = 0x04 + + class OperationSourceEnum(IntEnum): + kUnspecified = 0x00 + kManual = 0x01 + kProprietaryRemote = 0x02 + kKeypad = 0x03 + kAuto = 0x04 + kButton = 0x05 + kSchedule = 0x06 + kRemote = 0x07 + kRfid = 0x08 + kBiometric = 0x09 + + class UserStatusEnum(IntEnum): + kAvailable = 0x00 + kOccupiedEnabled = 0x01 + kOccupiedDisabled = 0x03 + + class UserTypeEnum(IntEnum): + kUnrestrictedUser = 0x00 + kYearDayScheduleUser = 0x01 + kWeekDayScheduleUser = 0x02 + kProgrammingUser = 0x03 + kNonAccessUser = 0x04 + kForcedUser = 0x05 + kDisposableUser = 0x06 + kExpiringUser = 0x07 + kScheduleRestrictedUser = 0x08 + kRemoteOnlyUser = 0x09 + class Structs: @dataclass - class DlCredential(ClusterObject): + class CredentialStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="credentialType", Tag=0, Type=DoorLock.Enums.DlCredentialType), + ClusterObjectFieldDescriptor(Label="credentialType", Tag=0, Type=DoorLock.Enums.CredentialTypeEnum), ClusterObjectFieldDescriptor(Label="credentialIndex", Tag=1, Type=uint), ]) - credentialType: 'DoorLock.Enums.DlCredentialType' = 0 + credentialType: 'DoorLock.Enums.CredentialTypeEnum' = 0 credentialIndex: 'uint' = 0 @@ -13580,14 +13580,14 @@ class LockDoor(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="pinCode", Tag=0, Type=typing.Optional[bytes]), + ClusterObjectFieldDescriptor(Label="PINCode", Tag=0, Type=typing.Optional[bytes]), ]) @ChipUtility.classproperty def must_use_timed_invoke(cls) -> bool: return True - pinCode: 'typing.Optional[bytes]' = None + PINCode: 'typing.Optional[bytes]' = None @dataclass class UnlockDoor(ClusterCommand): @@ -13600,14 +13600,14 @@ class UnlockDoor(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="pinCode", Tag=0, Type=typing.Optional[bytes]), + ClusterObjectFieldDescriptor(Label="PINCode", Tag=0, Type=typing.Optional[bytes]), ]) @ChipUtility.classproperty def must_use_timed_invoke(cls) -> bool: return True - pinCode: 'typing.Optional[bytes]' = None + PINCode: 'typing.Optional[bytes]' = None @dataclass class UnlockWithTimeout(ClusterCommand): @@ -13621,7 +13621,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="timeout", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="pinCode", Tag=1, Type=typing.Optional[bytes]), + ClusterObjectFieldDescriptor(Label="PINCode", Tag=1, Type=typing.Optional[bytes]), ]) @ChipUtility.classproperty @@ -13629,7 +13629,7 @@ def must_use_timed_invoke(cls) -> bool: return True timeout: 'uint' = 0 - pinCode: 'typing.Optional[bytes]' = None + PINCode: 'typing.Optional[bytes]' = None @dataclass class SetWeekDaySchedule(ClusterCommand): @@ -13821,13 +13821,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="holidayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="localStartTime", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="localEndTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="operatingMode", Tag=3, Type=DoorLock.Enums.DlOperatingMode), + ClusterObjectFieldDescriptor(Label="operatingMode", Tag=3, Type=DoorLock.Enums.OperatingModeEnum), ]) holidayIndex: 'uint' = 0 localStartTime: 'uint' = 0 localEndTime: 'uint' = 0 - operatingMode: 'DoorLock.Enums.DlOperatingMode' = 0 + operatingMode: 'DoorLock.Enums.OperatingModeEnum' = 0 @dataclass class GetHolidaySchedule(ClusterCommand): @@ -13860,14 +13860,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="status", Tag=1, Type=DoorLock.Enums.DlStatus), ClusterObjectFieldDescriptor(Label="localStartTime", Tag=2, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="localEndTime", Tag=3, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="operatingMode", Tag=4, Type=typing.Optional[DoorLock.Enums.DlOperatingMode]), + ClusterObjectFieldDescriptor(Label="operatingMode", Tag=4, Type=typing.Optional[DoorLock.Enums.OperatingModeEnum]), ]) holidayIndex: 'uint' = 0 status: 'DoorLock.Enums.DlStatus' = 0 localStartTime: 'typing.Optional[uint]' = None localEndTime: 'typing.Optional[uint]' = None - operatingMode: 'typing.Optional[DoorLock.Enums.DlOperatingMode]' = None + operatingMode: 'typing.Optional[DoorLock.Enums.OperatingModeEnum]' = None @dataclass class ClearHolidaySchedule(ClusterCommand): @@ -13896,26 +13896,26 @@ class SetUser(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType), + ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DataOperationTypeEnum), ClusterObjectFieldDescriptor(Label="userIndex", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="userName", Tag=2, Type=typing.Union[Nullable, str]), - ClusterObjectFieldDescriptor(Label="userUniqueId", Tag=3, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]), - ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]), - ClusterObjectFieldDescriptor(Label="credentialRule", Tag=6, Type=typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]), + ClusterObjectFieldDescriptor(Label="userUniqueID", Tag=3, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]), + ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]), + ClusterObjectFieldDescriptor(Label="credentialRule", Tag=6, Type=typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]), ]) @ChipUtility.classproperty def must_use_timed_invoke(cls) -> bool: return True - operationType: 'DoorLock.Enums.DlDataOperationType' = 0 + operationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0 userIndex: 'uint' = 0 userName: 'typing.Union[Nullable, str]' = NullValue - userUniqueId: 'typing.Union[Nullable, uint]' = NullValue - userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue - userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue - credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = NullValue + userUniqueID: 'typing.Union[Nullable, uint]' = NullValue + userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue + userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue + credentialRule: 'typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]' = NullValue @dataclass class GetUser(ClusterCommand): @@ -13946,11 +13946,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="userIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="userName", Tag=1, Type=typing.Union[Nullable, str]), - ClusterObjectFieldDescriptor(Label="userUniqueId", Tag=2, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="userStatus", Tag=3, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]), - ClusterObjectFieldDescriptor(Label="userType", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]), - ClusterObjectFieldDescriptor(Label="credentialRule", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]), - ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[Nullable, typing.List[DoorLock.Structs.DlCredential]]), + ClusterObjectFieldDescriptor(Label="userUniqueID", Tag=2, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="userStatus", Tag=3, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]), + ClusterObjectFieldDescriptor(Label="userType", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]), + ClusterObjectFieldDescriptor(Label="credentialRule", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]), + ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[Nullable, typing.List[DoorLock.Structs.CredentialStruct]]), ClusterObjectFieldDescriptor(Label="creatorFabricIndex", Tag=7, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="lastModifiedFabricIndex", Tag=8, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="nextUserIndex", Tag=9, Type=typing.Union[Nullable, uint]), @@ -13958,11 +13958,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: userIndex: 'uint' = 0 userName: 'typing.Union[Nullable, str]' = NullValue - userUniqueId: 'typing.Union[Nullable, uint]' = NullValue - userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue - userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue - credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = NullValue - credentials: 'typing.Union[Nullable, typing.List[DoorLock.Structs.DlCredential]]' = NullValue + userUniqueID: 'typing.Union[Nullable, uint]' = NullValue + userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue + userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue + credentialRule: 'typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]' = NullValue + credentials: 'typing.Union[Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = NullValue creatorFabricIndex: 'typing.Union[Nullable, uint]' = NullValue lastModifiedFabricIndex: 'typing.Union[Nullable, uint]' = NullValue nextUserIndex: 'typing.Union[Nullable, uint]' = NullValue @@ -13998,24 +13998,24 @@ class SetCredential(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType), - ClusterObjectFieldDescriptor(Label="credential", Tag=1, Type=DoorLock.Structs.DlCredential), + ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DataOperationTypeEnum), + ClusterObjectFieldDescriptor(Label="credential", Tag=1, Type=DoorLock.Structs.CredentialStruct), ClusterObjectFieldDescriptor(Label="credentialData", Tag=2, Type=bytes), ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]), - ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]), + ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]), + ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]), ]) @ChipUtility.classproperty def must_use_timed_invoke(cls) -> bool: return True - operationType: 'DoorLock.Enums.DlDataOperationType' = 0 - credential: 'DoorLock.Structs.DlCredential' = field(default_factory=lambda: DoorLock.Structs.DlCredential()) + operationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0 + credential: 'DoorLock.Structs.CredentialStruct' = field(default_factory=lambda: DoorLock.Structs.CredentialStruct()) credentialData: 'bytes' = b"" userIndex: 'typing.Union[Nullable, uint]' = NullValue - userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue - userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue + userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue + userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue @dataclass class SetCredentialResponse(ClusterCommand): @@ -14048,10 +14048,10 @@ class GetCredentialStatus(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=DoorLock.Structs.DlCredential), + ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=DoorLock.Structs.CredentialStruct), ]) - credential: 'DoorLock.Structs.DlCredential' = field(default_factory=lambda: DoorLock.Structs.DlCredential()) + credential: 'DoorLock.Structs.CredentialStruct' = field(default_factory=lambda: DoorLock.Structs.CredentialStruct()) @dataclass class GetCredentialStatusResponse(ClusterCommand): @@ -14088,14 +14088,14 @@ class ClearCredential(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=typing.Union[Nullable, DoorLock.Structs.DlCredential]), + ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=typing.Union[Nullable, DoorLock.Structs.CredentialStruct]), ]) @ChipUtility.classproperty def must_use_timed_invoke(cls) -> bool: return True - credential: 'typing.Union[Nullable, DoorLock.Structs.DlCredential]' = NullValue + credential: 'typing.Union[Nullable, DoorLock.Structs.CredentialStruct]' = NullValue class Attributes: @@ -14159,9 +14159,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]) - value: 'typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]' = None + value: 'typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]' = None @dataclass class DoorOpenEvents(ClusterAttributeDescriptor): @@ -14479,9 +14479,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.DlOperatingMode) + return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.OperatingModeEnum) - value: 'DoorLock.Enums.DlOperatingMode' = 0 + value: 'DoorLock.Enums.OperatingModeEnum' = 0 @dataclass class SupportedOperatingModes(ClusterAttributeDescriptor): @@ -14771,10 +14771,10 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="alarmCode", Tag=0, Type=DoorLock.Enums.DlAlarmCode), + ClusterObjectFieldDescriptor(Label="alarmCode", Tag=0, Type=DoorLock.Enums.AlarmCodeEnum), ]) - alarmCode: 'DoorLock.Enums.DlAlarmCode' = 0 + alarmCode: 'DoorLock.Enums.AlarmCodeEnum' = 0 @dataclass class DoorStateChange(ClusterEvent): @@ -14790,10 +14790,10 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="doorState", Tag=0, Type=DoorLock.Enums.DlDoorState), + ClusterObjectFieldDescriptor(Label="doorState", Tag=0, Type=DoorLock.Enums.DoorStateEnum), ]) - doorState: 'DoorLock.Enums.DlDoorState' = 0 + doorState: 'DoorLock.Enums.DoorStateEnum' = 0 @dataclass class LockOperation(ClusterEvent): @@ -14809,20 +14809,20 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.DlLockOperationType), - ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.DlOperationSource), + ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.LockOperationTypeEnum), + ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.OperationSourceEnum), ClusterObjectFieldDescriptor(Label="userIndex", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=3, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="sourceNode", Tag=4, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="credentials", Tag=5, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]), + ClusterObjectFieldDescriptor(Label="credentials", Tag=5, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]), ]) - lockOperationType: 'DoorLock.Enums.DlLockOperationType' = 0 - operationSource: 'DoorLock.Enums.DlOperationSource' = 0 + lockOperationType: 'DoorLock.Enums.LockOperationTypeEnum' = 0 + operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0 userIndex: 'typing.Union[Nullable, uint]' = NullValue fabricIndex: 'typing.Union[Nullable, uint]' = NullValue sourceNode: 'typing.Union[Nullable, uint]' = NullValue - credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]' = None + credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = None @dataclass class LockOperationError(ClusterEvent): @@ -14838,22 +14838,22 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.DlLockOperationType), - ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.DlOperationSource), - ClusterObjectFieldDescriptor(Label="operationError", Tag=2, Type=DoorLock.Enums.DlOperationError), + ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.LockOperationTypeEnum), + ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.OperationSourceEnum), + ClusterObjectFieldDescriptor(Label="operationError", Tag=2, Type=DoorLock.Enums.OperationErrorEnum), ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=4, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="sourceNode", Tag=5, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]), + ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]), ]) - lockOperationType: 'DoorLock.Enums.DlLockOperationType' = 0 - operationSource: 'DoorLock.Enums.DlOperationSource' = 0 - operationError: 'DoorLock.Enums.DlOperationError' = 0 + lockOperationType: 'DoorLock.Enums.LockOperationTypeEnum' = 0 + operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0 + operationError: 'DoorLock.Enums.OperationErrorEnum' = 0 userIndex: 'typing.Union[Nullable, uint]' = NullValue fabricIndex: 'typing.Union[Nullable, uint]' = NullValue sourceNode: 'typing.Union[Nullable, uint]' = NullValue - credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]' = None + credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = None @dataclass class LockUserChange(ClusterEvent): @@ -14869,18 +14869,18 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="lockDataType", Tag=0, Type=DoorLock.Enums.DlLockDataType), - ClusterObjectFieldDescriptor(Label="dataOperationType", Tag=1, Type=DoorLock.Enums.DlDataOperationType), - ClusterObjectFieldDescriptor(Label="operationSource", Tag=2, Type=DoorLock.Enums.DlOperationSource), + ClusterObjectFieldDescriptor(Label="lockDataType", Tag=0, Type=DoorLock.Enums.LockDataTypeEnum), + ClusterObjectFieldDescriptor(Label="dataOperationType", Tag=1, Type=DoorLock.Enums.DataOperationTypeEnum), + ClusterObjectFieldDescriptor(Label="operationSource", Tag=2, Type=DoorLock.Enums.OperationSourceEnum), ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=4, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="sourceNode", Tag=5, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="dataIndex", Tag=6, Type=typing.Union[Nullable, uint]), ]) - lockDataType: 'DoorLock.Enums.DlLockDataType' = 0 - dataOperationType: 'DoorLock.Enums.DlDataOperationType' = 0 - operationSource: 'DoorLock.Enums.DlOperationSource' = 0 + lockDataType: 'DoorLock.Enums.LockDataTypeEnum' = 0 + dataOperationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0 + operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0 userIndex: 'typing.Union[Nullable, uint]' = NullValue fabricIndex: 'typing.Union[Nullable, uint]' = NullValue sourceNode: 'typing.Union[Nullable, uint]' = NullValue diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt index 9a7ccc35a06a17..5948a8664f2c73 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt @@ -102,10 +102,16 @@ typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumNam {{/inline}} {{> oldNameItemDecl oldItemName=(oldName ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}} {{/zcl_enum_items}} + {{!We had extra "Not Supported" values for DoorLockUserStatus/DoorLockUserType that we have to wedge in here manually for now.}} + {{#if (and (isStrEqual clusterName "DoorLock") + (or (isStrEqual enumName "UserTypeEnum") (isStrEqual enumName "UserStatusEnum")) + (not (wasRemoved clusterName enum=enumName enumValue="NotSupported")))}} + {{objCEnumName clusterName enumName}}{{objCEnumItemLabel "NotSupported"}} {{availability clusterName enum=enumName enumValue="NotSupported" deprecationMessage="This value is not part of the specification and will be removed"}} = 0xFF, + {{/if}} } {{/inline}} {{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true))}} -{{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true)}}; +{{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage="This enum is unused and will be removed"}}; {{/unless}} {{! Takes the name of the enum to use as enumName. }} {{#*inline "oldNameDecl"}} diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index cd894aa84592b2..325c4cb33f8730 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3135,6 +3135,11 @@ - DoorLockSetPinOrIdStatus - DoorLockUserStatus - DoorLockUserType + # UserTypeEnum and UserStatusEnum use the same generated name as + # DoorLockUserStatus and DoorLockUserType, so need to be + # considered as introduced at the same time. + - UserStatusEnum + - UserTypeEnum WindowCovering: - EndProductType - Type @@ -3701,6 +3706,22 @@ - MasterUser - NonAccessUser - NotSupported + # UserTypeEnum and UserStatusEnum use the same generated name as + # DoorLockUserStatus and DoorLockUserType, so need to be + # considered as introduced at the same time, with the enum value + # names that match DoorLockUserStatus and DoorLockUserType. + UserStatusEnum: + - Available + - OccupiedEnabled + - OccupiedDisabled + - NotSupported + UserTypeEnum: + - Unrestricted + - YearDayScheduleUser + - WeekDayScheduleUser + - MasterUser + - NonAccessUser + - NotSupported WindowCovering: EndProductType: - RollerShade @@ -4983,6 +5004,11 @@ - attestationSignature AddTrustedRootCertificate: - rootCACertificate + DoorLock: + SetUser: + - userUniqueID + GetUserResponse: + - userUniqueID structs: OTASoftwareUpdateRequestor: - ProviderLocation @@ -5009,6 +5035,8 @@ - SemanticTagStruct OperationalCredentials: - FabricDescriptorStruct + DoorLock: + - CredentialStruct struct fields: UnitTesting: SimpleStruct: @@ -5120,6 +5148,10 @@ - vendorId - fabricId - nodeId + DoorLock: + CredentialStruct: + - credentialType + - credentialIndex events: OTASoftwareUpdateRequestor: - StateTransition @@ -5217,6 +5249,17 @@ OperationalCredentials: - NodeOperationalCertStatusEnum - CertificateChainTypeEnum + DoorLock: + - AlarmCodeEnum + - CredentialRuleEnum + - CredentialTypeEnum + - DataOperationTypeEnum + - DoorStateEnum + - LockDataTypeEnum + - LockOperationTypeEnum + - OperationErrorEnum + - OperatingModeEnum + - OperationSourceEnum enum values: OTASoftwareUpdateProvider: OTAApplyUpdateAction: @@ -5345,6 +5388,84 @@ CertificateChainTypeEnum: - DACCertificate - PAICertificate + DoorLock: + AlarmCodeEnum: + - LockJammed + - LockFactoryReset + - LockRadioPowerCycled + - WrongCodeEntryLimit + - FrontEsceutcheonRemoved + - DoorForcedOpen + - DoorAjar + - ForcedUser + CredentialRuleEnum: + - Single + - Dual + - Tri + CredentialTypeEnum: + - ProgrammingPIN + - PIN + - RFID + - Fingerprint + - FingerVein + - Face + DataOperationTypeEnum: + - Add + - Clear + - Modify + DoorStateEnum: + - DoorOpen + - DoorClosed + - DoorJammed + - DoorForcedOpen + - DoorUnspecifiedError + - DoorAjar + LockDataTypeEnum: + - Unspecified + - ProgrammingCode + - UserIndex + - WeekDaySchedule + - YearDaySchedule + - HolidaySchedule + - PIN + - RFID + - Fingerprint + LockOperationTypeEnum: + - Lock + - Unlock + - NonAccessUserEvent + - ForcedUserEvent + OperationErrorEnum: + - Unspecified + - InvalidCredential + - DisabledUserDenied + - Restricted + - InsufficientBattery + OperatingModeEnum: + - Normal + - Vacation + - Privacy + - NoRemoteLockUnlock + - Passage + OperationSourceEnum: + - Unspecified + - Manual + - ProprietaryRemote + - Keypad + - Auto + - Button + - Schedule + - Remote + - RFID + - Biometric + UserTypeEnum: + - UnrestrictedUser + - ProgrammingUser + - ForcedUser + - DisposableUser + - ExpiringUser + - ScheduleRestrictedUser + - RemoteOnlyUser bitmaps: UnitTesting: - Bitmap8MaskMap @@ -5354,6 +5475,8 @@ - SimpleBitmap LevelControl: - LevelControlOptions + DoorLock: + - DaysMaskMap bitmap values: UnitTesting: Bitmap8MaskMap: @@ -5393,6 +5516,23 @@ PressureMeasurement: PressureFeature: - Extended + DoorLock: + DaysMaskMap: + - Sunday + - Monday + - Tuesday + - Wednesday + - Thursday + - Friday + - Saturday + DoorLockFeature: + - PINCredential + - RFIDCredential + - WeekDayAccessSchedules + - CredentialsOverTheAirAccess + - User + - Notification + - YearDayAccessSchedules deprecated: clusters: - OtaSoftwareUpdateProvider @@ -5448,6 +5588,11 @@ - signature AddTrustedRootCertificate: - rootCertificate + DoorLock: + SetUser: + - userUniqueId + GetUserResponse: + - userUniqueId structs: Descriptor: - DeviceType @@ -5466,6 +5611,8 @@ - SemanticTag OperationalCredentials: - FabricDescriptor + DoorLock: + - DlCredential struct fields: Descriptor: DeviceTypeStruct: @@ -5493,6 +5640,33 @@ - BootReasonType OperationalCredentials: - OperationalCertStatus + DoorLock: + - DlAlarmCode + - DlCredentialRule + - DlCredentialType + - DlDataOperationType + - DlDoorState + - DlLockDataType + - DlLockOperationType + - DlOperationError + - DlOperatingMode + - DlOperationSource + - DlUserStatus + - DlUserType + # The enums after this come from the silabs types.xml, not the + # door lock cluster XML + # + # DoorLockUserStatus is not marked deprecated here because the + # UserStatusEnum from the spec ends up with the same enum name + # (MTRDoorLockUserStatus) but is missing one of the values + # compared to DoorLockUserStatus. So we have to keep + # DoorLockUserStatus for now and just deprecate its one extra name. + - DoorLockUserStatus + - DoorLockUserType + - DoorLockDayOfWeek + - DoorLockSetPinOrIdStatus + - DoorLockOperationEventCode + - DoorLockProgrammingEventCode enum values: GeneralCommissioning: CommissioningError: @@ -5508,6 +5682,16 @@ - 80211n - 80211ac - 80211ax + DoorLock: + UserStatusEnum: + - NotSupported + UserTypeEnum: + - NotSupported + - Unrestricted + - MasterUser + bitmaps: + DoorLock: + - DlDaysMaskMap bitmap values: NetworkCommissioning: WiFiSecurity: @@ -5518,6 +5702,15 @@ PressureMeasurement: PressureFeature: - EXT + DoorLock: + DoorLockFeature: + - PINCredentials + - RFIDCredentials + - WeekDaySchedules + - CredentialsOTA + - UsersManagement + - Notifications + - YearDaySchedules apis: - Timed Invoke for server to client commands - Deprecated global attribute names @@ -5528,6 +5721,13 @@ commands: BasicInformation: - MfgSpecificPing + enums: + # DoorLockUserStatus (non-spec) and UserStatusEnum (from the spec) end + # up with the same enum name (MTRDoorLockUserStatus), so just remove + # the non-spec one. + DoorLock: + - DoorLockUserStatus + - DoorLockUserType enum values: EthernetNetworkDiagnostics: # Both the enum and the values got renamed, so don't output the @@ -5563,6 +5763,14 @@ - SUCCESS OperationalCertStatus: - OK + DoorLock: + # Both the enum and the values got renamed, so don't output the + # new values with the old enum name or the old values with the + # new enum name. + DlCredentialRule: + - Dual + CredentialRuleEnum: + - Double renames: clusters: UnitTesting: TestCluster @@ -5632,6 +5840,11 @@ attestationSignature: signature AddTrustedRootCertificate: rootCACertificate: rootCertificate + DoorLock: + SetUser: + userUniqueID: userUniqueId + GetUserResponse: + userUniqueID: userUniqueId structs: AccessControl: AccessControlEntryStruct: AccessControlEntry @@ -5644,6 +5857,8 @@ SemanticTagStruct: SemanticTag OperationalCredentials: FabricDescriptorStruct: FabricDescriptor + DoorLock: + CredentialStruct: DlCredential struct fields: Descriptor: DeviceTypeStruct: @@ -5671,6 +5886,19 @@ BootReasonEnum: BootReasonType OperationalCredentials: NodeOperationalCertStatusEnum: OperationalCertStatus + DoorLock: + AlarmCodeEnum: DlAlarmCode + CredentialRuleEnum: DlCredentialRule + CredentialTypeEnum: DlCredentialType + DataOperationTypeEnum: DlDataOperationType + DoorStateEnum: DlDoorState + LockDataTypeEnum: DlLockDataType + LockOperationTypeEnum: DlLockOperationType + OperationErrorEnum: DlOperationError + OperatingModeEnum: DlOperatingMode + OperationSourceEnum: DlOperationSource + UserStatusEnum: DlUserStatus + UserTypeEnum: DlUserType enum values: GeneralCommissioning: CommissioningError: @@ -5714,6 +5942,15 @@ OK: SUCCESS OperationalCertStatus: OK: SUCCESS + DoorLock: + CredentialRuleEnum: + Dual: Double + UserTypeEnum: + UnrestrictedUser: Unrestricted + ProgrammingUser: MasterUser + bitmaps: + DoorLock: + DaysMaskMap: DlDaysMaskMap bitmap values: NetworkCommissioning: WiFiSecurity: @@ -5724,3 +5961,12 @@ PressureMeasurement: PressureFeature: Extended: EXT + DoorLock: + DoorLockFeature: + PINCredential: PINCredentials + RFIDCredential: RFIDCredentials + WeekDayAccessSchedules: WeekDaySchedules + CredentialsOverTheAirAccess: CredentialsOTA + User: UsersManagement + Notification: Notifications + YearDayAccessSchedules: YearDaySchedules diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index baff7acd0e3c7b..25611a8a442aa9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17959,65 +17959,106 @@ typedef NS_OPTIONS(uint32_t, MTRModeSelectFeature) { MTRModeSelectFeatureDEPONOFF API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDoorLockAlarmCode) { + MTRDoorLockAlarmCodeLockJammed MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockAlarmCodeLockFactoryReset MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockAlarmCodeLockRadioPowerCycled MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockAlarmCodeWrongCodeEntryLimit MTR_NEWLY_AVAILABLE = 0x04, + MTRDoorLockAlarmCodeFrontEsceutcheonRemoved MTR_NEWLY_AVAILABLE = 0x05, + MTRDoorLockAlarmCodeDoorForcedOpen MTR_NEWLY_AVAILABLE = 0x06, + MTRDoorLockAlarmCodeDoorAjar MTR_NEWLY_AVAILABLE = 0x07, + MTRDoorLockAlarmCodeForcedUser MTR_NEWLY_AVAILABLE = 0x08, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRDoorLockDlAlarmCode) { - MTRDoorLockDlAlarmCodeLockJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlAlarmCodeLockFactoryReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlAlarmCodeLockRadioPowerCycled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlAlarmCodeWrongCodeEntryLimit API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlAlarmCodeFrontEsceutcheonRemoved API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockDlAlarmCodeDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRDoorLockDlAlarmCodeDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRDoorLockDlAlarmCodeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockDlAlarmCodeLockJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockJammed") + = 0x00, + MTRDoorLockDlAlarmCodeLockFactoryReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockFactoryReset") + = 0x01, + MTRDoorLockDlAlarmCodeLockRadioPowerCycled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockRadioPowerCycled") + = 0x03, + MTRDoorLockDlAlarmCodeWrongCodeEntryLimit API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeWrongCodeEntryLimit") + = 0x04, + MTRDoorLockDlAlarmCodeFrontEsceutcheonRemoved API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeFrontEsceutcheonRemoved") + = 0x05, + MTRDoorLockDlAlarmCodeDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeDoorForcedOpen") + = 0x06, + MTRDoorLockDlAlarmCodeDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeDoorAjar") + = 0x07, + MTRDoorLockDlAlarmCodeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeForcedUser") + = 0x08, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCode"); + +typedef NS_ENUM(uint8_t, MTRDoorLockCredentialRule) { + MTRDoorLockCredentialRuleSingle MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockCredentialRuleDual MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockCredentialRuleTri MTR_NEWLY_AVAILABLE = 0x02, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRDoorLockDlCredentialRule) { - MTRDoorLockDlCredentialRuleSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlCredentialRuleDouble API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlCredentialRuleTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockDlCredentialRuleSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRuleSingle") + = 0x00, + MTRDoorLockDlCredentialRuleTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRuleTri") + = 0x02, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRule"); + +typedef NS_ENUM(uint8_t, MTRDoorLockCredentialType) { + MTRDoorLockCredentialTypeProgrammingPIN MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockCredentialTypePIN MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockCredentialTypeRFID MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockCredentialTypeFingerprint MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockCredentialTypeFingerVein MTR_NEWLY_AVAILABLE = 0x04, + MTRDoorLockCredentialTypeFace MTR_NEWLY_AVAILABLE = 0x05, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRDoorLockDlCredentialType) { - MTRDoorLockDlCredentialTypeProgrammingPIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlCredentialTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlCredentialTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlCredentialTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlCredentialTypeFingerVein API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlCredentialTypeFace API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - -typedef NS_ENUM(uint8_t, MTRDoorLockDlDataOperationType) { - MTRDoorLockDlDataOperationTypeAdd API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlDataOperationTypeClear API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlDataOperationTypeModify API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - -typedef NS_ENUM(uint8_t, MTRDoorLockDlDoorState) { - MTRDoorLockDlDoorStateDoorOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlDoorStateDoorClosed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlDoorStateDoorJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlDoorStateDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlDoorStateDoorUnspecifiedError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlDoorStateDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockDlCredentialTypeProgrammingPIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeProgrammingPIN") + = 0x00, + MTRDoorLockDlCredentialTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypePIN") + = 0x01, + MTRDoorLockDlCredentialTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeRFID") + = 0x02, + MTRDoorLockDlCredentialTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFingerprint") + = 0x03, + MTRDoorLockDlCredentialTypeFingerVein API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFingerVein") + = 0x04, + MTRDoorLockDlCredentialTypeFace API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFace") + = 0x05, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialType"); -typedef NS_ENUM(uint8_t, MTRDoorLockDlLockDataType) { - MTRDoorLockDlLockDataTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlLockDataTypeProgrammingCode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlLockDataTypeUserIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlLockDataTypeWeekDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlLockDataTypeYearDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlLockDataTypeHolidaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockDlLockDataTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRDoorLockDlLockDataTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRDoorLockDlLockDataTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDoorLockDataOperationType) { + MTRDoorLockDataOperationTypeAdd MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockDataOperationTypeClear MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockDataOperationTypeModify MTR_NEWLY_AVAILABLE = 0x02, +} MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRDoorLockDlLockOperationType) { - MTRDoorLockDlLockOperationTypeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlLockOperationTypeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlLockOperationTypeNonAccessUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlLockOperationTypeForcedUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDoorLockDlDataOperationType) { + MTRDoorLockDlDataOperationTypeAdd API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeAdd") + = 0x00, + MTRDoorLockDlDataOperationTypeClear API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeClear") + = 0x01, + MTRDoorLockDlDataOperationTypeModify API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeModify") + = 0x02, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationType"); typedef NS_ENUM(uint8_t, MTRDoorLockDlLockState) { MTRDoorLockDlLockStateNotFullyLocked API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, @@ -18039,35 +18080,6 @@ typedef NS_ENUM(uint8_t, MTRDoorLockDlLockType) { MTRDoorLockDlLockTypeDoorFurniture API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -typedef NS_ENUM(uint8_t, MTRDoorLockDlOperatingMode) { - MTRDoorLockDlOperatingModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlOperatingModeVacation API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlOperatingModePrivacy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlOperatingModeNoRemoteLockUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlOperatingModePassage API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - -typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationError) { - MTRDoorLockDlOperationErrorUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlOperationErrorInvalidCredential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlOperationErrorDisabledUserDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlOperationErrorRestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlOperationErrorInsufficientBattery API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - -typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationSource) { - MTRDoorLockDlOperationSourceUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlOperationSourceManual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlOperationSourceProprietaryRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlOperationSourceKeypad API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlOperationSourceAuto API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlOperationSourceButton API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockDlOperationSourceSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRDoorLockDlOperationSourceRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRDoorLockDlOperationSourceRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, - MTRDoorLockDlOperationSourceBiometric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - typedef NS_ENUM(uint8_t, MTRDoorLockDlStatus) { MTRDoorLockDlStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRDoorLockDlStatusFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, @@ -18078,76 +18090,395 @@ typedef NS_ENUM(uint8_t, MTRDoorLockDlStatus) { MTRDoorLockDlStatusNotFound API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8B, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -typedef NS_ENUM(uint8_t, MTRDoorLockDlUserStatus) { - MTRDoorLockDlUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - -typedef NS_ENUM(uint8_t, MTRDoorLockDlUserType) { - MTRDoorLockDlUserTypeUnrestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockDlUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockDlUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockDlUserTypeProgrammingUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockDlUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockDlUserTypeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockDlUserTypeDisposableUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRDoorLockDlUserTypeExpiringUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRDoorLockDlUserTypeScheduleRestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, - MTRDoorLockDlUserTypeRemoteOnlyUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - typedef NS_ENUM(uint8_t, MTRDoorLockOperationEventCode) { - MTRDoorLockOperationEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockOperationEventCodeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockOperationEventCodeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockOperationEventCodeLockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockOperationEventCodeLockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockOperationEventCodeUnlockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockOperationEventCodeUnlockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, - MTRDoorLockOperationEventCodeOneTouchLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, - MTRDoorLockOperationEventCodeKeyLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08, - MTRDoorLockOperationEventCodeKeyUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09, - MTRDoorLockOperationEventCodeAutoLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A, - MTRDoorLockOperationEventCodeScheduleLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B, - MTRDoorLockOperationEventCodeScheduleUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0C, - MTRDoorLockOperationEventCodeManualLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0D, - MTRDoorLockOperationEventCodeManualUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0E, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockOperationEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnknownOrMfgSpecific") + = 0x00, + MTRDoorLockOperationEventCodeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLock") + = 0x01, + MTRDoorLockOperationEventCodeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlock") + = 0x02, + MTRDoorLockOperationEventCodeLockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLockInvalidPinOrId") + = 0x03, + MTRDoorLockOperationEventCodeLockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLockInvalidSchedule") + = 0x04, + MTRDoorLockOperationEventCodeUnlockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlockInvalidPinOrId") + = 0x05, + MTRDoorLockOperationEventCodeUnlockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlockInvalidSchedule") + = 0x06, + MTRDoorLockOperationEventCodeOneTouchLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeOneTouchLock") + = 0x07, + MTRDoorLockOperationEventCodeKeyLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeKeyLock") + = 0x08, + MTRDoorLockOperationEventCodeKeyUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeKeyUnlock") + = 0x09, + MTRDoorLockOperationEventCodeAutoLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeAutoLock") + = 0x0A, + MTRDoorLockOperationEventCodeScheduleLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeScheduleLock") + = 0x0B, + MTRDoorLockOperationEventCodeScheduleUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeScheduleUnlock") + = 0x0C, + MTRDoorLockOperationEventCodeManualLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeManualLock") + = 0x0D, + MTRDoorLockOperationEventCodeManualUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeManualUnlock") + = 0x0E, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed"); typedef NS_ENUM(uint8_t, MTRDoorLockProgrammingEventCode) { - MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockProgrammingEventCodeMasterCodeChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockProgrammingEventCodePinAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockProgrammingEventCodePinDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockProgrammingEventCodePinChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockProgrammingEventCodeIdAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05, - MTRDoorLockProgrammingEventCodeIdDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific") + = 0x00, + MTRDoorLockProgrammingEventCodeMasterCodeChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeMasterCodeChanged") + = 0x01, + MTRDoorLockProgrammingEventCodePinAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinAdded") + = 0x02, + MTRDoorLockProgrammingEventCodePinDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinDeleted") + = 0x03, + MTRDoorLockProgrammingEventCodePinChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinChanged") + = 0x04, + MTRDoorLockProgrammingEventCodeIdAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeIdAdded") + = 0x05, + MTRDoorLockProgrammingEventCodeIdDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeIdDeleted") + = 0x06, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed"); typedef NS_ENUM(uint8_t, MTRDoorLockSetPinOrIdStatus) { - MTRDoorLockSetPinOrIdStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRDoorLockSetPinOrIdStatusGeneralFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRDoorLockSetPinOrIdStatusMemoryFull API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockSetPinOrIdStatusDuplicateCodeError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockSetPinOrIdStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusSuccess") + = 0x00, + MTRDoorLockSetPinOrIdStatusGeneralFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusGeneralFailure") + = 0x01, + MTRDoorLockSetPinOrIdStatusMemoryFull API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusMemoryFull") + = 0x02, + MTRDoorLockSetPinOrIdStatusDuplicateCodeError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusDuplicateCodeError") + = 0x03, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed"); + +typedef NS_ENUM(uint8_t, MTRDoorLockDoorState) { + MTRDoorLockDoorStateDoorOpen MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockDoorStateDoorClosed MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockDoorStateDoorJammed MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockDoorStateDoorForcedOpen MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockDoorStateDoorUnspecifiedError MTR_NEWLY_AVAILABLE = 0x04, + MTRDoorLockDoorStateDoorAjar MTR_NEWLY_AVAILABLE = 0x05, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlDoorState) { + MTRDoorLockDlDoorStateDoorOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorOpen") + = 0x00, + MTRDoorLockDlDoorStateDoorClosed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorClosed") + = 0x01, + MTRDoorLockDlDoorStateDoorJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorJammed") + = 0x02, + MTRDoorLockDlDoorStateDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorForcedOpen") + = 0x03, + MTRDoorLockDlDoorStateDoorUnspecifiedError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorUnspecifiedError") + = 0x04, + MTRDoorLockDlDoorStateDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorAjar") + = 0x05, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorState"); + +typedef NS_ENUM(uint8_t, MTRDoorLockLockDataType) { + MTRDoorLockLockDataTypeUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockLockDataTypeProgrammingCode MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockLockDataTypeUserIndex MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockLockDataTypeWeekDaySchedule MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockLockDataTypeYearDaySchedule MTR_NEWLY_AVAILABLE = 0x04, + MTRDoorLockLockDataTypeHolidaySchedule MTR_NEWLY_AVAILABLE = 0x05, + MTRDoorLockLockDataTypePIN MTR_NEWLY_AVAILABLE = 0x06, + MTRDoorLockLockDataTypeRFID MTR_NEWLY_AVAILABLE = 0x07, + MTRDoorLockLockDataTypeFingerprint MTR_NEWLY_AVAILABLE = 0x08, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlLockDataType) { + MTRDoorLockDlLockDataTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeUnspecified") + = 0x00, + MTRDoorLockDlLockDataTypeProgrammingCode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeProgrammingCode") + = 0x01, + MTRDoorLockDlLockDataTypeUserIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeUserIndex") + = 0x02, + MTRDoorLockDlLockDataTypeWeekDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeWeekDaySchedule") + = 0x03, + MTRDoorLockDlLockDataTypeYearDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeYearDaySchedule") + = 0x04, + MTRDoorLockDlLockDataTypeHolidaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeHolidaySchedule") + = 0x05, + MTRDoorLockDlLockDataTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypePIN") + = 0x06, + MTRDoorLockDlLockDataTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeRFID") + = 0x07, + MTRDoorLockDlLockDataTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeFingerprint") + = 0x08, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataType"); + +typedef NS_ENUM(uint8_t, MTRDoorLockLockOperationType) { + MTRDoorLockLockOperationTypeLock MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockLockOperationTypeUnlock MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockLockOperationTypeNonAccessUserEvent MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockLockOperationTypeForcedUserEvent MTR_NEWLY_AVAILABLE = 0x03, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlLockOperationType) { + MTRDoorLockDlLockOperationTypeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeLock") + = 0x00, + MTRDoorLockDlLockOperationTypeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeUnlock") + = 0x01, + MTRDoorLockDlLockOperationTypeNonAccessUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeNonAccessUserEvent") + = 0x02, + MTRDoorLockDlLockOperationTypeForcedUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeForcedUserEvent") + = 0x03, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationType"); + +typedef NS_ENUM(uint8_t, MTRDoorLockOperatingMode) { + MTRDoorLockOperatingModeNormal MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockOperatingModeVacation MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockOperatingModePrivacy MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockOperatingModeNoRemoteLockUnlock MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockOperatingModePassage MTR_NEWLY_AVAILABLE = 0x04, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlOperatingMode) { + MTRDoorLockDlOperatingModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeNormal") + = 0x00, + MTRDoorLockDlOperatingModeVacation API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeVacation") + = 0x01, + MTRDoorLockDlOperatingModePrivacy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModePrivacy") + = 0x02, + MTRDoorLockDlOperatingModeNoRemoteLockUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeNoRemoteLockUnlock") + = 0x03, + MTRDoorLockDlOperatingModePassage API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModePassage") + = 0x04, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingMode"); + +typedef NS_ENUM(uint8_t, MTRDoorLockOperationError) { + MTRDoorLockOperationErrorUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockOperationErrorInvalidCredential MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockOperationErrorDisabledUserDenied MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockOperationErrorRestricted MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockOperationErrorInsufficientBattery MTR_NEWLY_AVAILABLE = 0x04, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationError) { + MTRDoorLockDlOperationErrorUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorUnspecified") + = 0x00, + MTRDoorLockDlOperationErrorInvalidCredential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorInvalidCredential") + = 0x01, + MTRDoorLockDlOperationErrorDisabledUserDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorDisabledUserDenied") + = 0x02, + MTRDoorLockDlOperationErrorRestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorRestricted") + = 0x03, + MTRDoorLockDlOperationErrorInsufficientBattery API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorInsufficientBattery") + = 0x04, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationError"); + +typedef NS_ENUM(uint8_t, MTRDoorLockOperationSource) { + MTRDoorLockOperationSourceUnspecified MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockOperationSourceManual MTR_NEWLY_AVAILABLE = 0x01, + MTRDoorLockOperationSourceProprietaryRemote MTR_NEWLY_AVAILABLE = 0x02, + MTRDoorLockOperationSourceKeypad MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockOperationSourceAuto MTR_NEWLY_AVAILABLE = 0x04, + MTRDoorLockOperationSourceButton MTR_NEWLY_AVAILABLE = 0x05, + MTRDoorLockOperationSourceSchedule MTR_NEWLY_AVAILABLE = 0x06, + MTRDoorLockOperationSourceRemote MTR_NEWLY_AVAILABLE = 0x07, + MTRDoorLockOperationSourceRFID MTR_NEWLY_AVAILABLE = 0x08, + MTRDoorLockOperationSourceBiometric MTR_NEWLY_AVAILABLE = 0x09, +} MTR_NEWLY_AVAILABLE; + +typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationSource) { + MTRDoorLockDlOperationSourceUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceUnspecified") + = 0x00, + MTRDoorLockDlOperationSourceManual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceManual") + = 0x01, + MTRDoorLockDlOperationSourceProprietaryRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceProprietaryRemote") + = 0x02, + MTRDoorLockDlOperationSourceKeypad API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceKeypad") + = 0x03, + MTRDoorLockDlOperationSourceAuto API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceAuto") + = 0x04, + MTRDoorLockDlOperationSourceButton API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceButton") + = 0x05, + MTRDoorLockDlOperationSourceSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceSchedule") + = 0x06, + MTRDoorLockDlOperationSourceRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceRemote") + = 0x07, + MTRDoorLockDlOperationSourceRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceRFID") + = 0x08, + MTRDoorLockDlOperationSourceBiometric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceBiometric") + = 0x09, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSource"); typedef NS_ENUM(uint8_t, MTRDoorLockUserStatus) { MTRDoorLockUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRDoorLockUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRDoorLockUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, - MTRDoorLockUserStatusNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFF, + MTRDoorLockUserStatusNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("This value is not part of the specification and will be removed") + = 0xFF, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDoorLockDlUserStatus) { + MTRDoorLockDlUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusAvailable") + = 0x00, + MTRDoorLockDlUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusOccupiedEnabled") + = 0x01, + MTRDoorLockDlUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusOccupiedDisabled") + = 0x03, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatus"); + typedef NS_ENUM(uint8_t, MTRDoorLockUserType) { - MTRDoorLockUserTypeUnrestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRDoorLockUserTypeUnrestrictedUser MTR_NEWLY_AVAILABLE = 0x00, + MTRDoorLockUserTypeUnrestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeUnrestrictedUser") + = 0x00, MTRDoorLockUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRDoorLockUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRDoorLockUserTypeMasterUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, + MTRDoorLockUserTypeProgrammingUser MTR_NEWLY_AVAILABLE = 0x03, + MTRDoorLockUserTypeMasterUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeProgrammingUser") + = 0x03, MTRDoorLockUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, - MTRDoorLockUserTypeNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFF, + MTRDoorLockUserTypeForcedUser MTR_NEWLY_AVAILABLE = 0x05, + MTRDoorLockUserTypeDisposableUser MTR_NEWLY_AVAILABLE = 0x06, + MTRDoorLockUserTypeExpiringUser MTR_NEWLY_AVAILABLE = 0x07, + MTRDoorLockUserTypeScheduleRestrictedUser MTR_NEWLY_AVAILABLE = 0x08, + MTRDoorLockUserTypeRemoteOnlyUser MTR_NEWLY_AVAILABLE = 0x09, + MTRDoorLockUserTypeNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("This value is not part of the specification and will be removed") + = 0xFF, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRDoorLockDlUserType) { + MTRDoorLockDlUserTypeUnrestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeUnrestrictedUser") + = 0x00, + MTRDoorLockDlUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeYearDayScheduleUser") + = 0x01, + MTRDoorLockDlUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeWeekDayScheduleUser") + = 0x02, + MTRDoorLockDlUserTypeProgrammingUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeProgrammingUser") + = 0x03, + MTRDoorLockDlUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeNonAccessUser") + = 0x04, + MTRDoorLockDlUserTypeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeForcedUser") + = 0x05, + MTRDoorLockDlUserTypeDisposableUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeDisposableUser") + = 0x06, + MTRDoorLockDlUserTypeExpiringUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeExpiringUser") + = 0x07, + MTRDoorLockDlUserTypeScheduleRestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeScheduleRestrictedUser") + = 0x08, + MTRDoorLockDlUserTypeRemoteOnlyUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeRemoteOnlyUser") + = 0x09, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserType"); + +typedef NS_OPTIONS(uint8_t, MTRDoorLockDaysMaskMap) { + MTRDoorLockDaysMaskMapSunday MTR_NEWLY_AVAILABLE = 0x1, + MTRDoorLockDaysMaskMapMonday MTR_NEWLY_AVAILABLE = 0x2, + MTRDoorLockDaysMaskMapTuesday MTR_NEWLY_AVAILABLE = 0x4, + MTRDoorLockDaysMaskMapWednesday MTR_NEWLY_AVAILABLE = 0x8, + MTRDoorLockDaysMaskMapThursday MTR_NEWLY_AVAILABLE = 0x10, + MTRDoorLockDaysMaskMapFriday MTR_NEWLY_AVAILABLE = 0x20, + MTRDoorLockDaysMaskMapSaturday MTR_NEWLY_AVAILABLE = 0x40, +} MTR_NEWLY_AVAILABLE; + +typedef NS_OPTIONS(uint8_t, MTRDoorLockDlDaysMaskMap) { + MTRDoorLockDlDaysMaskMapSunday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapSunday") + = 0x1, + MTRDoorLockDlDaysMaskMapMonday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapMonday") + = 0x2, + MTRDoorLockDlDaysMaskMapTuesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapTuesday") + = 0x4, + MTRDoorLockDlDaysMaskMapWednesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapWednesday") + = 0x8, + MTRDoorLockDlDaysMaskMapThursday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapThursday") + = 0x10, + MTRDoorLockDlDaysMaskMapFriday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapFriday") + = 0x20, + MTRDoorLockDlDaysMaskMapSaturday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapSaturday") + = 0x40, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMap"); + typedef NS_OPTIONS(uint8_t, MTRDoorLockDlCredentialRuleMask) { MTRDoorLockDlCredentialRuleMaskSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, MTRDoorLockDlCredentialRuleMaskDual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2, @@ -18160,16 +18491,6 @@ typedef NS_OPTIONS(uint8_t, MTRDoorLockDlCredentialRulesSupport) { MTRDoorLockDlCredentialRulesSupportTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -typedef NS_OPTIONS(uint8_t, MTRDoorLockDlDaysMaskMap) { - MTRDoorLockDlDaysMaskMapSunday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, - MTRDoorLockDlDaysMaskMapMonday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2, - MTRDoorLockDlDaysMaskMapTuesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, - MTRDoorLockDlDaysMaskMapWednesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8, - MTRDoorLockDlDaysMaskMapThursday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10, - MTRDoorLockDlDaysMaskMapFriday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20, - MTRDoorLockDlDaysMaskMapSaturday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - typedef NS_OPTIONS(uint16_t, MTRDoorLockDlDefaultConfigurationRegister) { MTRDoorLockDlDefaultConfigurationRegisterEnableLocalProgrammingEnabled API_AVAILABLE( ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @@ -18293,17 +18614,38 @@ typedef NS_OPTIONS(uint8_t, MTRDoorLockDayOfWeek) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRDoorLockFeature) { - MTRDoorLockFeaturePINCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, - MTRDoorLockFeatureRFIDCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2, + MTRDoorLockFeaturePINCredential MTR_NEWLY_AVAILABLE = 0x1, + MTRDoorLockFeaturePINCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeaturePINCredential") + = 0x1, + MTRDoorLockFeatureRFIDCredential MTR_NEWLY_AVAILABLE = 0x2, + MTRDoorLockFeatureRFIDCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureRFIDCredential") + = 0x2, MTRDoorLockFeatureFingerCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, MTRDoorLockFeatureLogging API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8, - MTRDoorLockFeatureWeekDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10, + MTRDoorLockFeatureWeekDayAccessSchedules MTR_NEWLY_AVAILABLE = 0x10, + MTRDoorLockFeatureWeekDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureWeekDayAccessSchedules") + = 0x10, MTRDoorLockFeatureDoorPositionSensor API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20, MTRDoorLockFeatureFaceCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40, - MTRDoorLockFeatureCredentialsOTA API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x80, - MTRDoorLockFeatureUsersManagement API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x100, - MTRDoorLockFeatureNotifications API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x200, - MTRDoorLockFeatureYearDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x400, + MTRDoorLockFeatureCredentialsOverTheAirAccess MTR_NEWLY_AVAILABLE = 0x80, + MTRDoorLockFeatureCredentialsOTA API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureCredentialsOverTheAirAccess") + = 0x80, + MTRDoorLockFeatureUser MTR_NEWLY_AVAILABLE = 0x100, + MTRDoorLockFeatureUsersManagement API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureUser") + = 0x100, + MTRDoorLockFeatureNotification MTR_NEWLY_AVAILABLE = 0x200, + MTRDoorLockFeatureNotifications API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureNotification") + = 0x200, + MTRDoorLockFeatureYearDayAccessSchedules MTR_NEWLY_AVAILABLE = 0x400, + MTRDoorLockFeatureYearDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureYearDayAccessSchedules") + = 0x400, MTRDoorLockFeatureHolidaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x800, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 03d3aa0ea49e55..20c4855392e385 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -45537,7 +45537,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params } if (params != nil) { if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } } @@ -45573,7 +45573,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par } if (params != nil) { if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } } @@ -45609,7 +45609,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * } request.timeout = params.timeout.unsignedShortValue; if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } @@ -45920,11 +45920,11 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completion:( auto & nonNullValue_0 = request.userName.SetNonNull(); nonNullValue_0 = [self asCharSpan:params.userName]; } - if (params.userUniqueId == nil) { - request.userUniqueId.SetNull(); + if (params.userUniqueID == nil) { + request.userUniqueID.SetNull(); } else { - auto & nonNullValue_0 = request.userUniqueId.SetNonNull(); - nonNullValue_0 = params.userUniqueId.unsignedIntValue; + auto & nonNullValue_0 = request.userUniqueID.SetNonNull(); + nonNullValue_0 = params.userUniqueID.unsignedIntValue; } if (params.userStatus == nil) { request.userStatus.SetNull(); @@ -46264,7 +46264,7 @@ - (void)readAttributeDoorStateWithCompletion:(void (^)(NSNumber * _Nullable valu { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo; - return MTRReadAttribute( + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -46273,7 +46273,7 @@ - (void)subscribeAttributeDoorStateWithParams:(MTRSubscribeParams * _Nonnull)par reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -46283,9 +46283,9 @@ + (void)readAttributeDoorStateWithClusterStateCache:(MTRClusterStateCacheContain queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableDoorLockClusterDlDoorStateAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableDoorLockClusterDoorStateEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo; @@ -47420,7 +47420,7 @@ - (void)readAttributeOperatingModeWithCompletion:(void (^)(NSNumber * _Nullable { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo; - return MTRReadAttribute( + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -47466,9 +47466,9 @@ - (void)subscribeAttributeOperatingModeWithParams:(MTRSubscribeParams * _Nonnull reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeOperatingModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -47476,9 +47476,9 @@ + (void)readAttributeOperatingModeWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(DoorLockClusterDlOperatingModeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(DoorLockClusterOperatingModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 07d3901a76550b..1c25c0ef1a88ec 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -354,51 +354,27 @@ typedef void (*GroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback) void *, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy); typedef void (*NullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlAlarmCodeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlAlarmCode); -typedef void (*NullableDoorLockClusterDlAlarmCodeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlCredentialRuleAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlCredentialRule); -typedef void (*NullableDoorLockClusterDlCredentialRuleAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlCredentialTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlCredentialType); -typedef void (*NullableDoorLockClusterDlCredentialTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlDataOperationTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlDataOperationType); -typedef void (*NullableDoorLockClusterDlDataOperationTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlDoorStateAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlDoorState); -typedef void (*NullableDoorLockClusterDlDoorStateAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlLockDataTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockDataType); -typedef void (*NullableDoorLockClusterDlLockDataTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlLockOperationTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockOperationType); -typedef void (*NullableDoorLockClusterDlLockOperationTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterAlarmCodeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::AlarmCodeEnum); +typedef void (*NullableDoorLockClusterAlarmCodeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterCredentialRuleEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::CredentialRuleEnum); +typedef void (*NullableDoorLockClusterCredentialRuleEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterCredentialTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::CredentialTypeEnum); +typedef void (*NullableDoorLockClusterCredentialTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterDataOperationTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::DataOperationTypeEnum); +typedef void (*NullableDoorLockClusterDataOperationTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*DoorLockClusterDlLockStateAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockState); typedef void (*NullableDoorLockClusterDlLockStateAttributeCallback)( void *, const chip::app::DataModel::Nullable &); typedef void (*DoorLockClusterDlLockTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockType); typedef void (*NullableDoorLockClusterDlLockTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlOperatingModeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperatingMode); -typedef void (*NullableDoorLockClusterDlOperatingModeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlOperationErrorAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperationError); -typedef void (*NullableDoorLockClusterDlOperationErrorAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlOperationSourceAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperationSource); -typedef void (*NullableDoorLockClusterDlOperationSourceAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); typedef void (*DoorLockClusterDlStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlStatus); typedef void (*NullableDoorLockClusterDlStatusAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlUserStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlUserStatus); -typedef void (*NullableDoorLockClusterDlUserStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDlUserTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlUserType); -typedef void (*NullableDoorLockClusterDlUserTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); typedef void (*DoorLockClusterDoorLockOperationEventCodeAttributeCallback)( void *, chip::app::Clusters::DoorLock::DoorLockOperationEventCode); typedef void (*NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback)( @@ -411,12 +387,30 @@ typedef void (*DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus); typedef void (*NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDoorLockUserStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockUserStatus); -typedef void (*NullableDoorLockClusterDoorLockUserStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*DoorLockClusterDoorLockUserTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockUserType); -typedef void (*NullableDoorLockClusterDoorLockUserTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterDoorStateEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorStateEnum); +typedef void (*NullableDoorLockClusterDoorStateEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterLockDataTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::LockDataTypeEnum); +typedef void (*NullableDoorLockClusterLockDataTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterLockOperationTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::LockOperationTypeEnum); +typedef void (*NullableDoorLockClusterLockOperationTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterOperatingModeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperatingModeEnum); +typedef void (*NullableDoorLockClusterOperatingModeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterOperationErrorEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperationErrorEnum); +typedef void (*NullableDoorLockClusterOperationErrorEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterOperationSourceEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperationSourceEnum); +typedef void (*NullableDoorLockClusterOperationSourceEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterUserStatusEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::UserStatusEnum); +typedef void (*NullableDoorLockClusterUserStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*DoorLockClusterUserTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::UserTypeEnum); +typedef void (*NullableDoorLockClusterUserTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*WindowCoveringClusterEndProductTypeAttributeCallback)(void *, chip::app::Clusters::WindowCovering::EndProductType); typedef void (*NullableWindowCoveringClusterEndProductTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -15794,464 +15788,268 @@ class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbac MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge : public MTRCallbackBridge +class MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlAlarmCode value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::AlarmCodeEnum value); }; -class MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge +class MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlCredentialRule value); -}; - -class MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge -{ -public: - MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge +class MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlCredentialType value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::CredentialRuleEnum value); }; -class MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge +class MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlDataOperationType value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::CredentialTypeEnum value); }; -class MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge +class MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlDoorStateAttributeCallbackBridge : public MTRCallbackBridge +class MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlDoorState value); -}; - -class MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlDoorStateAttributeCallbackBridge -{ -public: - MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlLockDataType value); -}; - -class MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge -{ -public: - MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnDone; + MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DataOperationTypeEnum value); }; -class MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge( + MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlLockOperationType value); -}; - -class MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} + MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; @@ -16385,733 +16183,802 @@ class MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterDlStatusAttributeCallbackBridge : public MTRCallbackBridge { public: - MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperatingMode value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value); }; -class MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge +class MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlStatusAttributeCallbackBridge { public: - MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge +class MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperationError value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value); }; -class MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge +class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge { public: - MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge +class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperationSource value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value); }; -class MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge +class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge { public: - MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge +class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlStatusAttributeCallbackBridge : public MTRCallbackBridge +class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value); }; -class MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlStatusAttributeCallbackBridge +class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge { public: - MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge +class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlUserStatusAttributeCallbackBridge : public MTRCallbackBridge +class MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlUserStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorStateEnum value); }; -class MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDlUserStatusAttributeCallbackBridge +class MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge +class MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDlUserTypeAttributeCallbackBridge : public MTRCallbackBridge +class MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlUserType value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::LockDataTypeEnum value); }; -class MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlUserTypeAttributeCallbackBridge +class MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::LockOperationTypeEnum value); }; -class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge +class MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge( + MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge +class MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperatingModeEnum value); }; -class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge +class MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge +class MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperationErrorEnum value); }; -class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge +class MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge( + MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(queue, handler, action), + mEstablishedHandler(establishedHandler) + {} + + void OnSubscriptionEstablished(); + using MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnDone; + +private: + MTRSubscriptionEstablishedHandler mEstablishedHandler; +}; + +class MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge + : public MTRCallbackBridge +{ +public: + MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; + + MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); +}; + +class MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge +{ +public: + MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperationSourceEnum value); +}; + +class MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge +{ +public: + MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(queue, handler, action), + mEstablishedHandler(establishedHandler) + {} + + void OnSubscriptionEstablished(); + using MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnDone; + +private: + MTRSubscriptionEstablishedHandler mEstablishedHandler; +}; + +class MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge + : public MTRCallbackBridge +{ +public: + MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; + + MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge +class MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockUserStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::UserStatusEnum value); }; -class MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge +class MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge +class MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge : public MTRCallbackBridge { public: - MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockUserType value); + static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::UserTypeEnum value); }; -class MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge - : public MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge +class MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge + : public MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge { public: - MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(queue, handler, action), + MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnDone; + using MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge - : public MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge +class MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge { public: - MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge( + MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnDone; + using MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 3bc9987924e74e..7166c12708cb8e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -12191,10 +12191,10 @@ } } { - if (data.userUniqueId.IsNull()) { - response.userUniqueId = nil; + if (data.userUniqueID.IsNull()) { + response.userUniqueID = nil; } else { - response.userUniqueId = [NSNumber numberWithUnsignedInt:data.userUniqueId.Value()]; + response.userUniqueID = [NSNumber numberWithUnsignedInt:data.userUniqueID.Value()]; } } { @@ -12227,8 +12227,8 @@ auto iter_1 = data.credentials.Value().begin(); while (iter_1.Next()) { auto & entry_1 = iter_1.GetValue(); - MTRDoorLockClusterDlCredential * newElement_1; - newElement_1 = [MTRDoorLockClusterDlCredential new]; + MTRDoorLockClusterCredentialStruct * newElement_1; + newElement_1 = [MTRDoorLockClusterCredentialStruct new]; newElement_1.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.credentialType)]; newElement_1.credentialIndex = [NSNumber numberWithUnsignedShort:entry_1.credentialIndex]; [array_1 addObject:newElement_1]; @@ -16063,15 +16063,15 @@ } } -void MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlAlarmCode value) +void MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::AlarmCodeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16086,8 +16086,8 @@ } } -void MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16098,7 +16098,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16113,15 +16113,15 @@ } } -void MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlCredentialRule value) +void MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::CredentialRuleEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16136,8 +16136,8 @@ } } -void MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16148,7 +16148,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16163,15 +16163,15 @@ } } -void MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlCredentialType value) +void MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::CredentialTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16186,8 +16186,8 @@ } } -void MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16198,7 +16198,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16213,15 +16213,15 @@ } } -void MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlDataOperationType value) +void MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DataOperationTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16236,8 +16236,8 @@ } } -void MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16248,7 +16248,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16263,115 +16263,15 @@ } } -void MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlDoorState value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlLockDataType value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlLockOperationType value) +void MTRDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DlLockState value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16386,8 +16286,8 @@ } } -void MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16398,7 +16298,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16413,15 +16313,15 @@ } } -void MTRDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlLockState value) +void MTRDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DlLockType value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16436,8 +16336,8 @@ } } -void MTRNullableDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16448,7 +16348,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16463,15 +16363,14 @@ } } -void MTRDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlLockType value) +void MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16486,8 +16385,8 @@ } } -void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16498,7 +16397,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16513,15 +16412,15 @@ } } -void MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlOperatingMode value) +void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16536,8 +16435,8 @@ } } -void MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16548,7 +16447,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16563,15 +16462,15 @@ } } -void MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlOperationError value) +void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16586,8 +16485,8 @@ } } -void MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16598,7 +16497,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16613,15 +16512,15 @@ } } -void MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlOperationSource value) +void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16636,8 +16535,8 @@ } } -void MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16648,7 +16547,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16663,14 +16562,15 @@ } } -void MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value) +void MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::DoorStateEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16685,8 +16585,8 @@ } } -void MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16697,7 +16597,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16712,15 +16612,15 @@ } } -void MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlUserStatus value) +void MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::LockDataTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16735,8 +16635,8 @@ } } -void MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16747,7 +16647,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16762,15 +16662,15 @@ } } -void MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DlUserType value) +void MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::LockOperationTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16785,8 +16685,8 @@ } } -void MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16797,7 +16697,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16812,15 +16712,15 @@ } } -void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value) +void MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::OperatingModeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16835,8 +16735,8 @@ } } -void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16847,7 +16747,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16862,15 +16762,15 @@ } } -void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value) +void MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::OperationErrorEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16885,8 +16785,8 @@ } } -void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16897,7 +16797,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16912,15 +16812,15 @@ } } -void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value) +void MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::OperationSourceEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16935,8 +16835,8 @@ } } -void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16947,7 +16847,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16962,15 +16862,15 @@ } } -void MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DoorLockUserStatus value) +void MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::UserStatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16985,8 +16885,8 @@ } } -void MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -16997,7 +16897,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -17012,15 +16912,15 @@ } } -void MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::DoorLock::DoorLockUserType value) +void MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::DoorLock::UserTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -17035,8 +16935,8 @@ } } -void MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -17047,7 +16947,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index b86061ab336f4b..8391f8b391bfe6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -11787,7 +11787,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params } if (params != nil) { if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } } @@ -11852,7 +11852,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par } if (params != nil) { if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } } @@ -11917,7 +11917,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * } request.timeout = params.timeout.unsignedShortValue; if (params.pinCode != nil) { - auto & definedValue_0 = request.pinCode.Emplace(); + auto & definedValue_0 = request.PINCode.Emplace(); definedValue_0 = [self asByteSpan:params.pinCode]; } @@ -12525,11 +12525,11 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params auto & nonNullValue_0 = request.userName.SetNonNull(); nonNullValue_0 = [self asCharSpan:params.userName]; } - if (params.userUniqueId == nil) { - request.userUniqueId.SetNull(); + if (params.userUniqueID == nil) { + request.userUniqueID.SetNull(); } else { - auto & nonNullValue_0 = request.userUniqueId.SetNonNull(); - nonNullValue_0 = params.userUniqueId.unsignedIntValue; + auto & nonNullValue_0 = request.userUniqueID.SetNonNull(); + nonNullValue_0 = params.userUniqueID.unsignedIntValue; } if (params.userStatus == nil) { request.userStatus.SetNull(); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index b53ea6f2041389..e4ba36f787ae1e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -3165,7 +3165,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSString * _Nullable userName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nullable userUniqueID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable userStatus API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -3189,6 +3189,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; @end +@interface MTRDoorLockClusterSetUserParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use userUniqueID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRDoorLockClusterGetUserParams : NSObject @@ -3217,7 +3223,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSString * _Nullable userName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nullable userUniqueID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable userStatus API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -3251,6 +3257,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRDoorLockClusterGetUserResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use userUniqueID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRDoorLockClusterClearUserParams : NSObject @@ -3278,7 +3290,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull operationType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @property (nonatomic, copy) - MTRDoorLockClusterDlCredential * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockClusterCredentialStruct * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @property (nonatomic, copy) NSData * _Nonnull credentialData API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -3335,7 +3347,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRDoorLockClusterGetCredentialStatusParams : NSObject @property (nonatomic, copy) - MTRDoorLockClusterDlCredential * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockClusterCredentialStruct * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -3389,7 +3401,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRDoorLockClusterClearCredentialParams : NSObject @property (nonatomic, copy) - MTRDoorLockClusterDlCredential * _Nullable credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRDoorLockClusterCredentialStruct * _Nullable credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** * Controls whether the command is a timed command (using Timed Invoke). * diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index d27471742050cb..2ecde9a646fc07 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -4433,7 +4433,7 @@ - (instancetype)init _userName = nil; - _userUniqueId = nil; + _userUniqueID = nil; _userStatus = nil; @@ -4452,7 +4452,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; other.operationType = self.operationType; other.userIndex = self.userIndex; other.userName = self.userName; - other.userUniqueId = self.userUniqueId; + other.userUniqueID = self.userUniqueID; other.userStatus = self.userStatus; other.userType = self.userType; other.credentialRule = self.credentialRule; @@ -4465,12 +4465,25 @@ - (NSString *)description { NSString * descriptionString = [NSString stringWithFormat: - @"<%@: operationType:%@; userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; >", - NSStringFromClass([self class]), _operationType, _userIndex, _userName, _userUniqueId, _userStatus, _userType, + @"<%@: operationType:%@; userIndex:%@; userName:%@; userUniqueID:%@; userStatus:%@; userType:%@; credentialRule:%@; >", + NSStringFromClass([self class]), _operationType, _userIndex, _userName, _userUniqueID, _userStatus, _userType, _credentialRule]; return descriptionString; } +@end + +@implementation MTRDoorLockClusterSetUserParams (Deprecated) + +- (void)setUserUniqueId:(NSNumber * _Nullable)userUniqueId +{ + self.userUniqueID = userUniqueId; +} + +- (NSNumber * _Nullable)userUniqueId +{ + return self.userUniqueID; +} @end @implementation MTRDoorLockClusterGetUserParams - (instancetype)init @@ -4509,7 +4522,7 @@ - (instancetype)init _userName = nil; - _userUniqueId = nil; + _userUniqueID = nil; _userStatus = nil; @@ -4535,7 +4548,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; other.userIndex = self.userIndex; other.userName = self.userName; - other.userUniqueId = self.userUniqueId; + other.userUniqueID = self.userUniqueID; other.userStatus = self.userStatus; other.userType = self.userType; other.credentialRule = self.credentialRule; @@ -4551,13 +4564,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = [NSString - stringWithFormat:@"<%@: userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; " + stringWithFormat:@"<%@: userIndex:%@; userName:%@; userUniqueID:%@; userStatus:%@; userType:%@; credentialRule:%@; " @"credentials:%@; creatorFabricIndex:%@; lastModifiedFabricIndex:%@; nextUserIndex:%@; >", - NSStringFromClass([self class]), _userIndex, _userName, _userUniqueId, _userStatus, _userType, _credentialRule, + NSStringFromClass([self class]), _userIndex, _userName, _userUniqueID, _userStatus, _userType, _credentialRule, _credentials, _creatorFabricIndex, _lastModifiedFabricIndex, _nextUserIndex]; return descriptionString; } +@end + +@implementation MTRDoorLockClusterGetUserResponseParams (Deprecated) + +- (void)setUserUniqueId:(NSNumber * _Nullable)userUniqueId +{ + self.userUniqueID = userUniqueId; +} + +- (NSNumber * _Nullable)userUniqueId +{ + return self.userUniqueID; +} @end @implementation MTRDoorLockClusterClearUserParams - (instancetype)init @@ -4594,7 +4620,7 @@ - (instancetype)init _operationType = @(0); - _credential = [MTRDoorLockClusterDlCredential new]; + _credential = [MTRDoorLockClusterCredentialStruct new]; _credentialData = [NSData data]; @@ -4673,7 +4699,7 @@ - (instancetype)init { if (self = [super init]) { - _credential = [MTRDoorLockClusterDlCredential new]; + _credential = [MTRDoorLockClusterCredentialStruct new]; _timedInvokeTimeoutMs = nil; } return self; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 301203c3f7bced..d36a169791c077 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -1602,8 +1602,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead auto iter_2 = cppValue.credentials.Value().Value().begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRDoorLockClusterDlCredential * newElement_2; - newElement_2 = [MTRDoorLockClusterDlCredential new]; + MTRDoorLockClusterCredentialStruct * newElement_2; + newElement_2 = [MTRDoorLockClusterCredentialStruct new]; newElement_2.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)]; newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex]; @@ -1688,8 +1688,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead auto iter_2 = cppValue.credentials.Value().Value().begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRDoorLockClusterDlCredential * newElement_2; - newElement_2 = [MTRDoorLockClusterDlCredential new]; + MTRDoorLockClusterCredentialStruct * newElement_2; + newElement_2 = [MTRDoorLockClusterCredentialStruct new]; newElement_2.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)]; newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 1ba36af8708fd5..1f90dbbb216142 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -645,10 +645,15 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSArray * _Nonnull semanticTags API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRDoorLockClusterCredentialStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull credentialType MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull credentialIndex MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRDoorLockClusterDlCredential : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull credentialType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull credentialIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRDoorLockClusterCredentialStruct") +@interface MTRDoorLockClusterDlCredential : MTRDoorLockClusterCredentialStruct @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 4c2b13924e43b8..1d00021a616711 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -2579,7 +2579,7 @@ - (NSString *)description @end -@implementation MTRDoorLockClusterDlCredential +@implementation MTRDoorLockClusterCredentialStruct - (instancetype)init { if (self = [super init]) { @@ -2593,7 +2593,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRDoorLockClusterDlCredential alloc] init]; + auto other = [[MTRDoorLockClusterCredentialStruct alloc] init]; other.credentialType = self.credentialType; other.credentialIndex = self.credentialIndex; @@ -2610,6 +2610,9 @@ - (NSString *)description @end +@implementation MTRDoorLockClusterDlCredential : MTRDoorLockClusterCredentialStruct +@end + @implementation MTRDoorLockClusterDoorLockAlarmEvent - (instancetype)init { diff --git a/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py b/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py index cadd7eab4b116d..2895deebb532ff 100644 --- a/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py +++ b/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py @@ -113,7 +113,7 @@ def test_lock_ctrl(device, controller): assert err == 0 assert res.userIndex == LOCK_CTRL_TEST_USER_INDEX assert res.userName == LOCK_CTRL_TEST_USER_NAME - assert res.userUniqueId == LOCK_CTRL_TEST_USER_INDEX + assert res.userUniqueID == LOCK_CTRL_TEST_USER_INDEX assert res.userStatus == DoorLock.Enums.DlUserStatus.kOccupiedEnabled assert res.userType == DoorLock.Enums.DlUserType.kUnrestrictedUser assert res.credentialRule == DoorLock.Enums.DlCredentialRule.kSingle diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index 7beca18ed91d05..5bc0a86b450639 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -37,9 +37,9 @@ typedef struct _ApplicationBasicApplication chip::CharSpan applicationId; } ApplicationBasicApplication; -// Struct for DlCredential -typedef struct _DlCredential +// Struct for CredentialStruct +typedef struct _CredentialStruct { uint8_t CredentialType; uint16_t CredentialIndex; -} DlCredential; +} CredentialStruct; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index a858d1fb086271..f5db0cc7616674 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -11640,9 +11640,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) namespace DoorState { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); @@ -11657,9 +11657,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -11672,7 +11672,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlDo EmberAfStatus SetNull(chip::EndpointId endpoint) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); @@ -11680,7 +11680,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) } EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value) + const chip::app::DataModel::Nullable & value) { if (value.IsNull()) { @@ -12282,9 +12282,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) namespace OperatingMode { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); @@ -12296,9 +12296,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOp *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 52f778ba68551e..a495ef2f9b0ef5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -2034,11 +2034,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value); namespace DoorState { EmberAfStatus Get(chip::EndpointId endpoint, - DataModel::Nullable & value); // DlDoorState -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlDoorState value); + DataModel::Nullable & value); // DoorStateEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); } // namespace DoorState namespace DoorOpenEvents { @@ -2138,8 +2138,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace SoundVolume namespace OperatingMode { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode * value); // DlOperatingMode -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode value); +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum * value); // OperatingModeEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value); } // namespace OperatingMode namespace SupportedOperatingModes { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index f1c14e78474450..268c988101ca59 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8246,9 +8246,9 @@ bool emberAfDoorLockClusterGetWeekDayScheduleCallback( * @brief Door Lock Cluster GetWeekDayScheduleResponse Command callback (from server) */ bool emberAfDoorLockClusterGetWeekDayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t weekDayIndex, uint16_t userIndex, uint8_t status, - uint8_t daysMask, uint8_t startHour, uint8_t startMinute, - uint8_t endHour, uint8_t endMinute); + uint8_t WeekDayIndex, uint16_t UserIndex, uint8_t Status, + uint8_t DaysMask, uint8_t StartHour, uint8_t StartMinute, + uint8_t EndHour, uint8_t EndMinute); /** * @brief Door Lock Cluster ClearWeekDaySchedule Command callback (from client) */ @@ -8271,8 +8271,8 @@ bool emberAfDoorLockClusterGetYearDayScheduleCallback( * @brief Door Lock Cluster GetYearDayScheduleResponse Command callback (from server) */ bool emberAfDoorLockClusterGetYearDayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t yearDayIndex, uint16_t userIndex, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime); + uint8_t YearDayIndex, uint16_t UserIndex, uint8_t Status, + uint32_t LocalStartTime, uint32_t LocalEndTime); /** * @brief Door Lock Cluster ClearYearDaySchedule Command callback (from client) */ @@ -8295,8 +8295,8 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback( * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback (from server) */ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t holidayIndex, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingMode); + uint8_t HolidayIndex, uint8_t Status, uint32_t LocalStartTime, + uint32_t LocalEndTime, uint8_t OperatingMode); /** * @brief Door Lock Cluster ClearHolidaySchedule Command callback (from client) */ @@ -8319,11 +8319,11 @@ bool emberAfDoorLockClusterGetUserCallback(chip::app::CommandHandler * commandOb * @brief Door Lock Cluster GetUserResponse Command callback (from server) */ bool emberAfDoorLockClusterGetUserResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t userIndex, chip::CharSpan userName, uint32_t userUniqueId, - uint8_t userStatus, uint8_t userType, uint8_t credentialRule, - /* TYPE WARNING: array array defaults to */ uint8_t * credentials, - chip::FabricIndex creatorFabricIndex, chip::FabricIndex lastModifiedFabricIndex, - uint16_t nextUserIndex); + uint16_t UserIndex, chip::CharSpan UserName, uint32_t UserUniqueID, + uint8_t UserStatus, uint8_t UserType, uint8_t CredentialRule, + /* TYPE WARNING: array array defaults to */ uint8_t * Credentials, + chip::FabricIndex CreatorFabricIndex, chip::FabricIndex LastModifiedFabricIndex, + uint16_t NextUserIndex); /** * @brief Door Lock Cluster ClearUser Command callback (from client) */ @@ -8340,7 +8340,7 @@ bool emberAfDoorLockClusterSetCredentialCallback( * @brief Door Lock Cluster SetCredentialResponse Command callback (from server) */ bool emberAfDoorLockClusterSetCredentialResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, uint16_t userIndex, uint16_t nextCredentialIndex); + uint8_t Status, uint16_t UserIndex, uint16_t NextCredentialIndex); /** * @brief Door Lock Cluster GetCredentialStatus Command callback (from client) */ @@ -8351,10 +8351,10 @@ bool emberAfDoorLockClusterGetCredentialStatusCallback( * @brief Door Lock Cluster GetCredentialStatusResponse Command callback (from server) */ bool emberAfDoorLockClusterGetCredentialStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - bool credentialExists, uint16_t userIndex, - chip::FabricIndex creatorFabricIndex, - chip::FabricIndex lastModifiedFabricIndex, - uint16_t nextCredentialIndex); + bool CredentialExists, uint16_t UserIndex, + chip::FabricIndex CreatorFabricIndex, + chip::FabricIndex LastModifiedFabricIndex, + uint16_t NextCredentialIndex); /** * @brief Door Lock Cluster ClearCredential Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 211443a6f114c6..e5cdd39354d065 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -1097,9 +1097,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::Gro } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlAlarmCode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::AlarmCodeEnum val) { - using EnumType = DoorLock::DlAlarmCode; + using EnumType = DoorLock::AlarmCodeEnum; switch (val) { case EnumType::kLockJammed: @@ -1115,22 +1115,22 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlAlarmCode v return static_cast(2); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialRule val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::CredentialRuleEnum val) { - using EnumType = DoorLock::DlCredentialRule; + using EnumType = DoorLock::CredentialRuleEnum; switch (val) { case EnumType::kSingle: - case EnumType::kDouble: + case EnumType::kDual: case EnumType::kTri: return val; default: return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::CredentialTypeEnum val) { - using EnumType = DoorLock::DlCredentialType; + using EnumType = DoorLock::CredentialTypeEnum; switch (val) { case EnumType::kProgrammingPIN: @@ -1144,9 +1144,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialT return static_cast(6); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDataOperationType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DataOperationTypeEnum val) { - using EnumType = DoorLock::DlDataOperationType; + using EnumType = DoorLock::DataOperationTypeEnum; switch (val) { case EnumType::kAdd: @@ -1157,55 +1157,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDataOperati return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDoorState val) -{ - using EnumType = DoorLock::DlDoorState; - switch (val) - { - case EnumType::kDoorOpen: - case EnumType::kDoorClosed: - case EnumType::kDoorJammed: - case EnumType::kDoorForcedOpen: - case EnumType::kDoorUnspecifiedError: - case EnumType::kDoorAjar: - return val; - default: - return static_cast(6); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockDataType val) -{ - using EnumType = DoorLock::DlLockDataType; - switch (val) - { - case EnumType::kUnspecified: - case EnumType::kProgrammingCode: - case EnumType::kUserIndex: - case EnumType::kWeekDaySchedule: - case EnumType::kYearDaySchedule: - case EnumType::kHolidaySchedule: - case EnumType::kPin: - case EnumType::kRfid: - case EnumType::kFingerprint: - return val; - default: - return static_cast(9); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockOperationType val) -{ - using EnumType = DoorLock::DlLockOperationType; - switch (val) - { - case EnumType::kLock: - case EnumType::kUnlock: - case EnumType::kNonAccessUserEvent: - case EnumType::kForcedUserEvent: - return val; - default: - return static_cast(4); - } -} static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockState val) { using EnumType = DoorLock::DlLockState; @@ -1240,56 +1191,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockType va return static_cast(11); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperatingMode val) -{ - using EnumType = DoorLock::DlOperatingMode; - switch (val) - { - case EnumType::kNormal: - case EnumType::kVacation: - case EnumType::kPrivacy: - case EnumType::kNoRemoteLockUnlock: - case EnumType::kPassage: - return val; - default: - return static_cast(5); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperationError val) -{ - using EnumType = DoorLock::DlOperationError; - switch (val) - { - case EnumType::kUnspecified: - case EnumType::kInvalidCredential: - case EnumType::kDisabledUserDenied: - case EnumType::kRestricted: - case EnumType::kInsufficientBattery: - return val; - default: - return static_cast(5); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperationSource val) -{ - using EnumType = DoorLock::DlOperationSource; - switch (val) - { - case EnumType::kUnspecified: - case EnumType::kManual: - case EnumType::kProprietaryRemote: - case EnumType::kKeypad: - case EnumType::kAuto: - case EnumType::kButton: - case EnumType::kSchedule: - case EnumType::kRemote: - case EnumType::kRfid: - case EnumType::kBiometric: - return val; - default: - return static_cast(10); - } -} static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlStatus val) { using EnumType = DoorLock::DlStatus; @@ -1307,39 +1208,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlStatus val) return static_cast(4); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlUserStatus val) -{ - using EnumType = DoorLock::DlUserStatus; - switch (val) - { - case EnumType::kAvailable: - case EnumType::kOccupiedEnabled: - case EnumType::kOccupiedDisabled: - return val; - default: - return static_cast(2); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlUserType val) -{ - using EnumType = DoorLock::DlUserType; - switch (val) - { - case EnumType::kUnrestrictedUser: - case EnumType::kYearDayScheduleUser: - case EnumType::kWeekDayScheduleUser: - case EnumType::kProgrammingUser: - case EnumType::kNonAccessUser: - case EnumType::kForcedUser: - case EnumType::kDisposableUser: - case EnumType::kExpiringUser: - case EnumType::kScheduleRestrictedUser: - case EnumType::kRemoteOnlyUser: - return val; - default: - return static_cast(10); - } -} static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorLockOperationEventCode val) { using EnumType = DoorLock::DoorLockOperationEventCode; @@ -1426,6 +1294,138 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorLockUserT return static_cast(5); } } +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorStateEnum val) +{ + using EnumType = DoorLock::DoorStateEnum; + switch (val) + { + case EnumType::kDoorOpen: + case EnumType::kDoorClosed: + case EnumType::kDoorJammed: + case EnumType::kDoorForcedOpen: + case EnumType::kDoorUnspecifiedError: + case EnumType::kDoorAjar: + return val; + default: + return static_cast(6); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::LockDataTypeEnum val) +{ + using EnumType = DoorLock::LockDataTypeEnum; + switch (val) + { + case EnumType::kUnspecified: + case EnumType::kProgrammingCode: + case EnumType::kUserIndex: + case EnumType::kWeekDaySchedule: + case EnumType::kYearDaySchedule: + case EnumType::kHolidaySchedule: + case EnumType::kPin: + case EnumType::kRfid: + case EnumType::kFingerprint: + return val; + default: + return static_cast(9); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::LockOperationTypeEnum val) +{ + using EnumType = DoorLock::LockOperationTypeEnum; + switch (val) + { + case EnumType::kLock: + case EnumType::kUnlock: + case EnumType::kNonAccessUserEvent: + case EnumType::kForcedUserEvent: + return val; + default: + return static_cast(4); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperatingModeEnum val) +{ + using EnumType = DoorLock::OperatingModeEnum; + switch (val) + { + case EnumType::kNormal: + case EnumType::kVacation: + case EnumType::kPrivacy: + case EnumType::kNoRemoteLockUnlock: + case EnumType::kPassage: + return val; + default: + return static_cast(5); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperationErrorEnum val) +{ + using EnumType = DoorLock::OperationErrorEnum; + switch (val) + { + case EnumType::kUnspecified: + case EnumType::kInvalidCredential: + case EnumType::kDisabledUserDenied: + case EnumType::kRestricted: + case EnumType::kInsufficientBattery: + return val; + default: + return static_cast(5); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperationSourceEnum val) +{ + using EnumType = DoorLock::OperationSourceEnum; + switch (val) + { + case EnumType::kUnspecified: + case EnumType::kManual: + case EnumType::kProprietaryRemote: + case EnumType::kKeypad: + case EnumType::kAuto: + case EnumType::kButton: + case EnumType::kSchedule: + case EnumType::kRemote: + case EnumType::kRfid: + case EnumType::kBiometric: + return val; + default: + return static_cast(10); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::UserStatusEnum val) +{ + using EnumType = DoorLock::UserStatusEnum; + switch (val) + { + case EnumType::kAvailable: + case EnumType::kOccupiedEnabled: + case EnumType::kOccupiedDisabled: + return val; + default: + return static_cast(2); + } +} +static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::UserTypeEnum val) +{ + using EnumType = DoorLock::UserTypeEnum; + switch (val) + { + case EnumType::kUnrestrictedUser: + case EnumType::kYearDayScheduleUser: + case EnumType::kWeekDayScheduleUser: + case EnumType::kProgrammingUser: + case EnumType::kNonAccessUser: + case EnumType::kForcedUser: + case EnumType::kDisposableUser: + case EnumType::kExpiringUser: + case EnumType::kScheduleRestrictedUser: + case EnumType::kRemoteOnlyUser: + return val; + default: + return static_cast(10); + } +} static auto __attribute__((unused)) EnsureKnownEnumValue(WindowCovering::EndProductType val) { 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 b03629533322dd..20b0596d737ed5 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 @@ -1032,8 +1032,8 @@ enum class ModeSelectFeature : uint32_t namespace DoorLock { -// Enum for DlAlarmCode -enum class DlAlarmCode : uint8_t +// Enum for AlarmCodeEnum +enum class AlarmCodeEnum : uint8_t { kLockJammed = 0x00, kLockFactoryReset = 0x01, @@ -1046,17 +1046,17 @@ enum class DlAlarmCode : uint8_t kUnknownEnumValue = 2, }; -// Enum for DlCredentialRule -enum class DlCredentialRule : uint8_t +// Enum for CredentialRuleEnum +enum class CredentialRuleEnum : uint8_t { kSingle = 0x00, - kDouble = 0x01, + kDual = 0x01, kTri = 0x02, kUnknownEnumValue = 3, }; -// Enum for DlCredentialType -enum class DlCredentialType : uint8_t +// Enum for CredentialTypeEnum +enum class CredentialTypeEnum : uint8_t { kProgrammingPIN = 0x00, kPin = 0x01, @@ -1067,8 +1067,8 @@ enum class DlCredentialType : uint8_t kUnknownEnumValue = 6, }; -// Enum for DlDataOperationType -enum class DlDataOperationType : uint8_t +// Enum for DataOperationTypeEnum +enum class DataOperationTypeEnum : uint8_t { kAdd = 0x00, kClear = 0x01, @@ -1076,43 +1076,6 @@ enum class DlDataOperationType : uint8_t kUnknownEnumValue = 3, }; -// Enum for DlDoorState -enum class DlDoorState : uint8_t -{ - kDoorOpen = 0x00, - kDoorClosed = 0x01, - kDoorJammed = 0x02, - kDoorForcedOpen = 0x03, - kDoorUnspecifiedError = 0x04, - kDoorAjar = 0x05, - kUnknownEnumValue = 6, -}; - -// Enum for DlLockDataType -enum class DlLockDataType : uint8_t -{ - kUnspecified = 0x00, - kProgrammingCode = 0x01, - kUserIndex = 0x02, - kWeekDaySchedule = 0x03, - kYearDaySchedule = 0x04, - kHolidaySchedule = 0x05, - kPin = 0x06, - kRfid = 0x07, - kFingerprint = 0x08, - kUnknownEnumValue = 9, -}; - -// Enum for DlLockOperationType -enum class DlLockOperationType : uint8_t -{ - kLock = 0x00, - kUnlock = 0x01, - kNonAccessUserEvent = 0x02, - kForcedUserEvent = 0x03, - kUnknownEnumValue = 4, -}; - // Enum for DlLockState enum class DlLockState : uint8_t { @@ -1139,44 +1102,6 @@ enum class DlLockType : uint8_t kUnknownEnumValue = 11, }; -// Enum for DlOperatingMode -enum class DlOperatingMode : uint8_t -{ - kNormal = 0x00, - kVacation = 0x01, - kPrivacy = 0x02, - kNoRemoteLockUnlock = 0x03, - kPassage = 0x04, - kUnknownEnumValue = 5, -}; - -// Enum for DlOperationError -enum class DlOperationError : uint8_t -{ - kUnspecified = 0x00, - kInvalidCredential = 0x01, - kDisabledUserDenied = 0x02, - kRestricted = 0x03, - kInsufficientBattery = 0x04, - kUnknownEnumValue = 5, -}; - -// Enum for DlOperationSource -enum class DlOperationSource : uint8_t -{ - kUnspecified = 0x00, - kManual = 0x01, - kProprietaryRemote = 0x02, - kKeypad = 0x03, - kAuto = 0x04, - kButton = 0x05, - kSchedule = 0x06, - kRemote = 0x07, - kRfid = 0x08, - kBiometric = 0x09, - kUnknownEnumValue = 10, -}; - // Enum for DlStatus enum class DlStatus : uint8_t { @@ -1190,31 +1115,6 @@ enum class DlStatus : uint8_t kUnknownEnumValue = 4, }; -// Enum for DlUserStatus -enum class DlUserStatus : uint8_t -{ - kAvailable = 0x00, - kOccupiedEnabled = 0x01, - kOccupiedDisabled = 0x03, - kUnknownEnumValue = 2, -}; - -// Enum for DlUserType -enum class DlUserType : uint8_t -{ - kUnrestrictedUser = 0x00, - kYearDayScheduleUser = 0x01, - kWeekDayScheduleUser = 0x02, - kProgrammingUser = 0x03, - kNonAccessUser = 0x04, - kForcedUser = 0x05, - kDisposableUser = 0x06, - kExpiringUser = 0x07, - kScheduleRestrictedUser = 0x08, - kRemoteOnlyUser = 0x09, - kUnknownEnumValue = 10, -}; - // Enum for DoorLockOperationEventCode enum class DoorLockOperationEventCode : uint8_t { @@ -1281,24 +1181,108 @@ enum class DoorLockUserType : uint8_t kUnknownEnumValue = 5, }; -// Bitmap for DlCredentialRuleMask -enum class DlCredentialRuleMask : uint8_t +// Enum for DoorStateEnum +enum class DoorStateEnum : uint8_t { - kSingle = 0x1, - kDual = 0x2, - kTri = 0x4, + kDoorOpen = 0x00, + kDoorClosed = 0x01, + kDoorJammed = 0x02, + kDoorForcedOpen = 0x03, + kDoorUnspecifiedError = 0x04, + kDoorAjar = 0x05, + kUnknownEnumValue = 6, }; -// Bitmap for DlCredentialRulesSupport -enum class DlCredentialRulesSupport : uint8_t +// Enum for LockDataTypeEnum +enum class LockDataTypeEnum : uint8_t { - kSingle = 0x1, - kDual = 0x2, - kTri = 0x4, + kUnspecified = 0x00, + kProgrammingCode = 0x01, + kUserIndex = 0x02, + kWeekDaySchedule = 0x03, + kYearDaySchedule = 0x04, + kHolidaySchedule = 0x05, + kPin = 0x06, + kRfid = 0x07, + kFingerprint = 0x08, + kUnknownEnumValue = 9, +}; + +// Enum for LockOperationTypeEnum +enum class LockOperationTypeEnum : uint8_t +{ + kLock = 0x00, + kUnlock = 0x01, + kNonAccessUserEvent = 0x02, + kForcedUserEvent = 0x03, + kUnknownEnumValue = 4, +}; + +// Enum for OperatingModeEnum +enum class OperatingModeEnum : uint8_t +{ + kNormal = 0x00, + kVacation = 0x01, + kPrivacy = 0x02, + kNoRemoteLockUnlock = 0x03, + kPassage = 0x04, + kUnknownEnumValue = 5, +}; + +// Enum for OperationErrorEnum +enum class OperationErrorEnum : uint8_t +{ + kUnspecified = 0x00, + kInvalidCredential = 0x01, + kDisabledUserDenied = 0x02, + kRestricted = 0x03, + kInsufficientBattery = 0x04, + kUnknownEnumValue = 5, +}; + +// Enum for OperationSourceEnum +enum class OperationSourceEnum : uint8_t +{ + kUnspecified = 0x00, + kManual = 0x01, + kProprietaryRemote = 0x02, + kKeypad = 0x03, + kAuto = 0x04, + kButton = 0x05, + kSchedule = 0x06, + kRemote = 0x07, + kRfid = 0x08, + kBiometric = 0x09, + kUnknownEnumValue = 10, +}; + +// Enum for UserStatusEnum +enum class UserStatusEnum : uint8_t +{ + kAvailable = 0x00, + kOccupiedEnabled = 0x01, + kOccupiedDisabled = 0x03, + kUnknownEnumValue = 2, }; -// Bitmap for DlDaysMaskMap -enum class DlDaysMaskMap : uint8_t +// Enum for UserTypeEnum +enum class UserTypeEnum : uint8_t +{ + kUnrestrictedUser = 0x00, + kYearDayScheduleUser = 0x01, + kWeekDayScheduleUser = 0x02, + kProgrammingUser = 0x03, + kNonAccessUser = 0x04, + kForcedUser = 0x05, + kDisposableUser = 0x06, + kExpiringUser = 0x07, + kScheduleRestrictedUser = 0x08, + kRemoteOnlyUser = 0x09, + kUnknownEnumValue = 10, +}; + +// Bitmap for DaysMaskMap +enum class DaysMaskMap : uint8_t { kSunday = 0x1, kMonday = 0x2, @@ -1309,6 +1293,22 @@ enum class DlDaysMaskMap : uint8_t kSaturday = 0x40, }; +// Bitmap for DlCredentialRuleMask +enum class DlCredentialRuleMask : uint8_t +{ + kSingle = 0x1, + kDual = 0x2, + kTri = 0x4, +}; + +// Bitmap for DlCredentialRulesSupport +enum class DlCredentialRulesSupport : uint8_t +{ + kSingle = 0x1, + kDual = 0x2, + kTri = 0x4, +}; + // Bitmap for DlDefaultConfigurationRegister enum class DlDefaultConfigurationRegister : uint16_t { @@ -1437,18 +1437,18 @@ enum class DoorLockDayOfWeek : uint8_t // Bitmap for DoorLockFeature enum class DoorLockFeature : uint32_t { - kPINCredentials = 0x1, - kRFIDCredentials = 0x2, - kFingerCredentials = 0x4, - kLogging = 0x8, - kWeekDaySchedules = 0x10, - kDoorPositionSensor = 0x20, - kFaceCredentials = 0x40, - kCredentialsOTA = 0x80, - kUsersManagement = 0x100, - kNotifications = 0x200, - kYearDaySchedules = 0x400, - kHolidaySchedules = 0x800, + kPinCredential = 0x1, + kRfidCredential = 0x2, + kFingerCredentials = 0x4, + kLogging = 0x8, + kWeekDayAccessSchedules = 0x10, + kDoorPositionSensor = 0x20, + kFaceCredentials = 0x40, + kCredentialsOverTheAirAccess = 0x80, + kUser = 0x100, + kNotification = 0x200, + kYearDayAccessSchedules = 0x400, + kHolidaySchedules = 0x800, }; } // namespace DoorLock diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index bab9ed25be187a..eaffc82c98ccd6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -10440,7 +10440,7 @@ namespace Events {} // namespace Events } // namespace ModeSelect namespace DoorLock { namespace Structs { -namespace DlCredential { +namespace CredentialStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -10483,7 +10483,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace DlCredential +} // namespace CredentialStruct } // namespace Structs namespace Commands { @@ -10492,7 +10492,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10511,8 +10511,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kPinCode): - ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); + case to_underlying(Fields::kPINCode): + ReturnErrorOnFailure(DataModel::Decode(reader, PINCode)); break; default: break; @@ -10529,7 +10529,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10548,8 +10548,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kPinCode): - ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); + case to_underlying(Fields::kPINCode): + ReturnErrorOnFailure(DataModel::Decode(reader, PINCode)); break; default: break; @@ -10567,7 +10567,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeout)), timeout)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10589,8 +10589,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kTimeout): ReturnErrorOnFailure(DataModel::Decode(reader, timeout)); break; - case to_underlying(Fields::kPinCode): - ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); + case to_underlying(Fields::kPINCode): + ReturnErrorOnFailure(DataModel::Decode(reader, PINCode)); break; default: break; @@ -11178,7 +11178,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueID)), userUniqueID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule)); @@ -11209,8 +11209,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kUserName): ReturnErrorOnFailure(DataModel::Decode(reader, userName)); break; - case to_underlying(Fields::kUserUniqueId): - ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId)); + case to_underlying(Fields::kUserUniqueID): + ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueID)); break; case to_underlying(Fields::kUserStatus): ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); @@ -11275,7 +11275,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueID)), userUniqueID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule)); @@ -11309,8 +11309,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kUserName): ReturnErrorOnFailure(DataModel::Decode(reader, userName)); break; - case to_underlying(Fields::kUserUniqueId): - ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId)); + case to_underlying(Fields::kUserUniqueID): + ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueID)); break; case to_underlying(Fields::kUserStatus): ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 963f08345e82e3..3c5f9449e97014 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -13022,7 +13022,7 @@ struct TypeInfo } // namespace ModeSelect namespace DoorLock { namespace Structs { -namespace DlCredential { +namespace CredentialStruct { enum class Fields { kCredentialType = 0, @@ -13032,8 +13032,8 @@ enum class Fields struct Type { public: - DlCredentialType credentialType = static_cast(0); - uint16_t credentialIndex = static_cast(0); + CredentialTypeEnum credentialType = static_cast(0); + uint16_t credentialIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -13044,7 +13044,7 @@ struct Type using DecodableType = Type; -} // namespace DlCredential +} // namespace CredentialStruct } // namespace Structs namespace Commands { @@ -13176,7 +13176,7 @@ namespace Commands { namespace LockDoor { enum class Fields { - kPinCode = 0, + kPINCode = 0, }; struct Type @@ -13186,7 +13186,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Optional pinCode; + Optional PINCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13201,14 +13201,14 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Optional pinCode; + Optional PINCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace LockDoor namespace UnlockDoor { enum class Fields { - kPinCode = 0, + kPINCode = 0, }; struct Type @@ -13218,7 +13218,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Optional pinCode; + Optional PINCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13233,7 +13233,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Optional pinCode; + Optional PINCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace UnlockDoor @@ -13241,7 +13241,7 @@ namespace UnlockWithTimeout { enum class Fields { kTimeout = 0, - kPinCode = 1, + kPINCode = 1, }; struct Type @@ -13252,7 +13252,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t timeout = static_cast(0); - Optional pinCode; + Optional PINCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13268,7 +13268,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t timeout = static_cast(0); - Optional pinCode; + Optional PINCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace UnlockWithTimeout @@ -13291,13 +13291,13 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t weekDayIndex = static_cast(0); - uint16_t userIndex = static_cast(0); - chip::BitMask daysMask = static_cast>(0); - uint8_t startHour = static_cast(0); - uint8_t startMinute = static_cast(0); - uint8_t endHour = static_cast(0); - uint8_t endMinute = static_cast(0); + uint8_t weekDayIndex = static_cast(0); + uint16_t userIndex = static_cast(0); + chip::BitMask daysMask = static_cast>(0); + uint8_t startHour = static_cast(0); + uint8_t startMinute = static_cast(0); + uint8_t endHour = static_cast(0); + uint8_t endMinute = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13312,13 +13312,13 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t weekDayIndex = static_cast(0); - uint16_t userIndex = static_cast(0); - chip::BitMask daysMask = static_cast>(0); - uint8_t startHour = static_cast(0); - uint8_t startMinute = static_cast(0); - uint8_t endHour = static_cast(0); - uint8_t endMinute = static_cast(0); + uint8_t weekDayIndex = static_cast(0); + uint16_t userIndex = static_cast(0); + chip::BitMask daysMask = static_cast>(0); + uint8_t startHour = static_cast(0); + uint8_t startMinute = static_cast(0); + uint8_t endHour = static_cast(0); + uint8_t endMinute = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetWeekDaySchedule @@ -13380,7 +13380,7 @@ struct Type uint8_t weekDayIndex = static_cast(0); uint16_t userIndex = static_cast(0); DlStatus status = static_cast(0); - Optional> daysMask; + Optional> daysMask; Optional startHour; Optional startMinute; Optional endHour; @@ -13402,7 +13402,7 @@ struct DecodableType uint8_t weekDayIndex = static_cast(0); uint16_t userIndex = static_cast(0); DlStatus status = static_cast(0); - Optional> daysMask; + Optional> daysMask; Optional startHour; Optional startMinute; Optional endHour; @@ -13616,10 +13616,10 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t holidayIndex = static_cast(0); - uint32_t localStartTime = static_cast(0); - uint32_t localEndTime = static_cast(0); - DlOperatingMode operatingMode = static_cast(0); + uint8_t holidayIndex = static_cast(0); + uint32_t localStartTime = static_cast(0); + uint32_t localEndTime = static_cast(0); + OperatingModeEnum operatingMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13634,10 +13634,10 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t holidayIndex = static_cast(0); - uint32_t localStartTime = static_cast(0); - uint32_t localEndTime = static_cast(0); - DlOperatingMode operatingMode = static_cast(0); + uint8_t holidayIndex = static_cast(0); + uint32_t localStartTime = static_cast(0); + uint32_t localEndTime = static_cast(0); + OperatingModeEnum operatingMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetHolidaySchedule @@ -13694,7 +13694,7 @@ struct Type DlStatus status = static_cast(0); Optional localStartTime; Optional localEndTime; - Optional operatingMode; + Optional operatingMode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13713,7 +13713,7 @@ struct DecodableType DlStatus status = static_cast(0); Optional localStartTime; Optional localEndTime; - Optional operatingMode; + Optional operatingMode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetHolidayScheduleResponse @@ -13755,7 +13755,7 @@ enum class Fields kOperationType = 0, kUserIndex = 1, kUserName = 2, - kUserUniqueId = 3, + kUserUniqueID = 3, kUserStatus = 4, kUserType = 5, kCredentialRule = 6, @@ -13768,13 +13768,13 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlDataOperationType operationType = static_cast(0); - uint16_t userIndex = static_cast(0); + DataOperationTypeEnum operationType = static_cast(0); + uint16_t userIndex = static_cast(0); DataModel::Nullable userName; - DataModel::Nullable userUniqueId; - DataModel::Nullable userStatus; - DataModel::Nullable userType; - DataModel::Nullable credentialRule; + DataModel::Nullable userUniqueID; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13789,13 +13789,13 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlDataOperationType operationType = static_cast(0); - uint16_t userIndex = static_cast(0); + DataOperationTypeEnum operationType = static_cast(0); + uint16_t userIndex = static_cast(0); DataModel::Nullable userName; - DataModel::Nullable userUniqueId; - DataModel::Nullable userStatus; - DataModel::Nullable userType; - DataModel::Nullable credentialRule; + DataModel::Nullable userUniqueID; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetUser @@ -13836,7 +13836,7 @@ enum class Fields { kUserIndex = 0, kUserName = 1, - kUserUniqueId = 2, + kUserUniqueID = 2, kUserStatus = 3, kUserType = 4, kCredentialRule = 5, @@ -13855,11 +13855,11 @@ struct Type uint16_t userIndex = static_cast(0); DataModel::Nullable userName; - DataModel::Nullable userUniqueId; - DataModel::Nullable userStatus; - DataModel::Nullable userType; - DataModel::Nullable credentialRule; - DataModel::Nullable> credentials; + DataModel::Nullable userUniqueID; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; + DataModel::Nullable> credentials; DataModel::Nullable creatorFabricIndex; DataModel::Nullable lastModifiedFabricIndex; DataModel::Nullable nextUserIndex; @@ -13879,11 +13879,11 @@ struct DecodableType uint16_t userIndex = static_cast(0); DataModel::Nullable userName; - DataModel::Nullable userUniqueId; - DataModel::Nullable userStatus; - DataModel::Nullable userType; - DataModel::Nullable credentialRule; - DataModel::Nullable> credentials; + DataModel::Nullable userUniqueID; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; + DataModel::Nullable> credentials; DataModel::Nullable creatorFabricIndex; DataModel::Nullable lastModifiedFabricIndex; DataModel::Nullable nextUserIndex; @@ -13940,12 +13940,12 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlDataOperationType operationType = static_cast(0); - Structs::DlCredential::Type credential; + DataOperationTypeEnum operationType = static_cast(0); + Structs::CredentialStruct::Type credential; chip::ByteSpan credentialData; DataModel::Nullable userIndex; - DataModel::Nullable userStatus; - DataModel::Nullable userType; + DataModel::Nullable userStatus; + DataModel::Nullable userType; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -13960,12 +13960,12 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlDataOperationType operationType = static_cast(0); - Structs::DlCredential::DecodableType credential; + DataOperationTypeEnum operationType = static_cast(0); + Structs::CredentialStruct::DecodableType credential; chip::ByteSpan credentialData; DataModel::Nullable userIndex; - DataModel::Nullable userStatus; - DataModel::Nullable userType; + DataModel::Nullable userStatus; + DataModel::Nullable userType; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetCredential @@ -14020,7 +14020,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Structs::DlCredential::Type credential; + Structs::CredentialStruct::Type credential; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14035,7 +14035,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - Structs::DlCredential::DecodableType credential; + Structs::CredentialStruct::DecodableType credential; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetCredentialStatus @@ -14096,7 +14096,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DataModel::Nullable credential; + DataModel::Nullable credential; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14111,7 +14111,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DataModel::Nullable credential; + DataModel::Nullable credential; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ClearCredential @@ -14158,9 +14158,9 @@ struct TypeInfo namespace DoorState { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::DoorState::Id; } @@ -14399,9 +14399,9 @@ struct TypeInfo namespace OperatingMode { struct TypeInfo { - using Type = chip::app::Clusters::DoorLock::DlOperatingMode; - using DecodableType = chip::app::Clusters::DoorLock::DlOperatingMode; - using DecodableArgType = chip::app::Clusters::DoorLock::DlOperatingMode; + using Type = chip::app::Clusters::DoorLock::OperatingModeEnum; + using DecodableType = chip::app::Clusters::DoorLock::OperatingModeEnum; + using DecodableArgType = chip::app::Clusters::DoorLock::OperatingModeEnum; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OperatingMode::Id; } @@ -14620,7 +14620,7 @@ struct TypeInfo Attributes::AutoRelockTime::TypeInfo::DecodableType autoRelockTime = static_cast(0); Attributes::SoundVolume::TypeInfo::DecodableType soundVolume = static_cast(0); Attributes::OperatingMode::TypeInfo::DecodableType operatingMode = - static_cast(0); + static_cast(0); Attributes::SupportedOperatingModes::TypeInfo::DecodableType supportedOperatingModes = static_cast>(0); Attributes::DefaultConfigurationRegister::TypeInfo::DecodableType defaultConfigurationRegister = @@ -14661,7 +14661,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr bool kIsFabricScoped = false; - DlAlarmCode alarmCode = static_cast(0); + AlarmCodeEnum alarmCode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -14673,7 +14673,7 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::DoorLockAlarm::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlAlarmCode alarmCode = static_cast(0); + AlarmCodeEnum alarmCode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -14694,7 +14694,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr bool kIsFabricScoped = false; - DlDoorState doorState = static_cast(0); + DoorStateEnum doorState = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -14706,7 +14706,7 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::DoorStateChange::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlDoorState doorState = static_cast(0); + DoorStateEnum doorState = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -14732,12 +14732,12 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr bool kIsFabricScoped = false; - DlLockOperationType lockOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); + LockOperationTypeEnum lockOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; - Optional>> credentials; + Optional>> credentials; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -14749,12 +14749,12 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::LockOperation::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlLockOperationType lockOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); + LockOperationTypeEnum lockOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; - Optional>> credentials; + Optional>> credentials; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -14781,13 +14781,13 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr bool kIsFabricScoped = false; - DlLockOperationType lockOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); - DlOperationError operationError = static_cast(0); + LockOperationTypeEnum lockOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); + OperationErrorEnum operationError = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; - Optional>> credentials; + Optional>> credentials; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -14799,13 +14799,13 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::LockOperationError::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlLockOperationType lockOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); - DlOperationError operationError = static_cast(0); + LockOperationTypeEnum lockOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); + OperationErrorEnum operationError = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; - Optional>> credentials; + Optional>> credentials; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -14832,9 +14832,9 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr bool kIsFabricScoped = false; - DlLockDataType lockDataType = static_cast(0); - DlDataOperationType dataOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); + LockDataTypeEnum lockDataType = static_cast(0); + DataOperationTypeEnum dataOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; @@ -14850,9 +14850,9 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::LockUserChange::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DlLockDataType lockDataType = static_cast(0); - DlDataOperationType dataOperationType = static_cast(0); - DlOperationSource operationSource = static_cast(0); + LockDataTypeEnum lockDataType = static_cast(0); + DataOperationTypeEnum dataOperationType = static_cast(0); + OperationSourceEnum operationSource = static_cast(0); DataModel::Nullable userIndex; DataModel::Nullable fabricIndex; DataModel::Nullable sourceNode; 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 55e14edff1108d..7f838a500049fe 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -476,6 +476,20 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_DAY_OF_WEEK_SATURDAY_OFFSET (6) #define EMBER_AF_DAY_OF_WEEK_AWAY_OR_VACATION (128) #define EMBER_AF_DAY_OF_WEEK_AWAY_OR_VACATION_OFFSET (7) +#define EMBER_AF_DAYS_MASK_MAP_SUNDAY (1) +#define EMBER_AF_DAYS_MASK_MAP_SUNDAY_OFFSET (0) +#define EMBER_AF_DAYS_MASK_MAP_MONDAY (2) +#define EMBER_AF_DAYS_MASK_MAP_MONDAY_OFFSET (1) +#define EMBER_AF_DAYS_MASK_MAP_TUESDAY (4) +#define EMBER_AF_DAYS_MASK_MAP_TUESDAY_OFFSET (2) +#define EMBER_AF_DAYS_MASK_MAP_WEDNESDAY (8) +#define EMBER_AF_DAYS_MASK_MAP_WEDNESDAY_OFFSET (3) +#define EMBER_AF_DAYS_MASK_MAP_THURSDAY (16) +#define EMBER_AF_DAYS_MASK_MAP_THURSDAY_OFFSET (4) +#define EMBER_AF_DAYS_MASK_MAP_FRIDAY (32) +#define EMBER_AF_DAYS_MASK_MAP_FRIDAY_OFFSET (5) +#define EMBER_AF_DAYS_MASK_MAP_SATURDAY (64) +#define EMBER_AF_DAYS_MASK_MAP_SATURDAY_OFFSET (6) #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW (1) #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW_OFFSET (0) #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH (2) @@ -492,20 +506,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_DUAL_OFFSET (1) #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_TRI (4) #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_TRI_OFFSET (2) -#define EMBER_AF_DL_DAYS_MASK_MAP_SUNDAY (1) -#define EMBER_AF_DL_DAYS_MASK_MAP_SUNDAY_OFFSET (0) -#define EMBER_AF_DL_DAYS_MASK_MAP_MONDAY (2) -#define EMBER_AF_DL_DAYS_MASK_MAP_MONDAY_OFFSET (1) -#define EMBER_AF_DL_DAYS_MASK_MAP_TUESDAY (4) -#define EMBER_AF_DL_DAYS_MASK_MAP_TUESDAY_OFFSET (2) -#define EMBER_AF_DL_DAYS_MASK_MAP_WEDNESDAY (8) -#define EMBER_AF_DL_DAYS_MASK_MAP_WEDNESDAY_OFFSET (3) -#define EMBER_AF_DL_DAYS_MASK_MAP_THURSDAY (16) -#define EMBER_AF_DL_DAYS_MASK_MAP_THURSDAY_OFFSET (4) -#define EMBER_AF_DL_DAYS_MASK_MAP_FRIDAY (32) -#define EMBER_AF_DL_DAYS_MASK_MAP_FRIDAY_OFFSET (5) -#define EMBER_AF_DL_DAYS_MASK_MAP_SATURDAY (64) -#define EMBER_AF_DL_DAYS_MASK_MAP_SATURDAY_OFFSET (6) #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_ENABLE_LOCAL_PROGRAMMING_ENABLED (1) #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_ENABLE_LOCAL_PROGRAMMING_ENABLED_OFFSET (0) #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_KEYPAD_INTERFACE_DEFAULT_ACCESS_ENABLED (2) @@ -646,28 +646,28 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_FRIDAY_OFFSET (5) #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SATURDAY (64) #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SATURDAY_OFFSET (6) -#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIALS (1) -#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIALS_OFFSET (0) -#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIALS (2) -#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIALS_OFFSET (1) +#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIAL (1) +#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIAL_OFFSET (0) +#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIAL (2) +#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIAL_OFFSET (1) #define EMBER_AF_DOOR_LOCK_FEATURE_FINGER_CREDENTIALS (4) #define EMBER_AF_DOOR_LOCK_FEATURE_FINGER_CREDENTIALS_OFFSET (2) #define EMBER_AF_DOOR_LOCK_FEATURE_LOGGING (8) #define EMBER_AF_DOOR_LOCK_FEATURE_LOGGING_OFFSET (3) -#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_SCHEDULES (16) -#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_SCHEDULES_OFFSET (4) +#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_ACCESS_SCHEDULES (16) +#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_ACCESS_SCHEDULES_OFFSET (4) #define EMBER_AF_DOOR_LOCK_FEATURE_DOOR_POSITION_SENSOR (32) #define EMBER_AF_DOOR_LOCK_FEATURE_DOOR_POSITION_SENSOR_OFFSET (5) #define EMBER_AF_DOOR_LOCK_FEATURE_FACE_CREDENTIALS (64) #define EMBER_AF_DOOR_LOCK_FEATURE_FACE_CREDENTIALS_OFFSET (6) -#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OTA (128) -#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OTA_OFFSET (7) -#define EMBER_AF_DOOR_LOCK_FEATURE_USERS_MANAGEMENT (256) -#define EMBER_AF_DOOR_LOCK_FEATURE_USERS_MANAGEMENT_OFFSET (8) -#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATIONS (512) -#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATIONS_OFFSET (9) -#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_SCHEDULES (1024) -#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_SCHEDULES_OFFSET (10) +#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OVER_THE_AIR_ACCESS (128) +#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OVER_THE_AIR_ACCESS_OFFSET (7) +#define EMBER_AF_DOOR_LOCK_FEATURE_USER (256) +#define EMBER_AF_DOOR_LOCK_FEATURE_USER_OFFSET (8) +#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATION (512) +#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATION_OFFSET (9) +#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_ACCESS_SCHEDULES (1024) +#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_ACCESS_SCHEDULES_OFFSET (10) #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES (2048) #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES_OFFSET (11) #define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_RIGHT_OF_THE_DECIMAL_POINT (7) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index e5577dfb66dae9..714a7f24e1a55c 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3800,7 +3800,7 @@ class DoorLockLockDoor : public ClusterCommand public: DoorLockLockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("lock-door", credsIssuerConfig) { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -3830,7 +3830,7 @@ class DoorLockUnlockDoor : public ClusterCommand public: DoorLockUnlockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unlock-door", credsIssuerConfig) { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -3862,7 +3862,7 @@ class DoorLockUnlockWithTimeout : public ClusterCommand ClusterCommand("unlock-with-timeout", credsIssuerConfig) { AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout); - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -4190,7 +4190,7 @@ class DoorLockSetUser : public ClusterCommand AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType); AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); AddArgument("UserName", &mRequest.userName); - AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId); + AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID); AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus); AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType); AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule); @@ -4309,7 +4309,7 @@ class DoorLockSetCredential : public ClusterCommand private: chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -4341,7 +4341,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand private: chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -4373,7 +4373,7 @@ class DoorLockClearCredential : public ClusterCommand private: chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest; - TypedComplexArgument> + TypedComplexArgument> mComplex_Credential; }; @@ -10755,7 +10755,7 @@ void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * cre make_unique>(Id, "auto-relock-time", 0, UINT32_MAX, Attributes::AutoRelockTime::Id, credsIssuerConfig), // make_unique>(Id, "sound-volume", 0, UINT8_MAX, Attributes::SoundVolume::Id, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "operating-mode", 0, UINT8_MAX, Attributes::OperatingMode::Id, credsIssuerConfig), // make_unique>(Id, "enable-local-programming", 0, 1, Attributes::EnableLocalProgramming::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index c19ad8821dab8c..ae169a0046aa34 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -497,6 +497,32 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Struc { ComplexArgumentParser::Finalize(request.parameterList); } +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("CredentialStruct.credentialType", "credentialType", + value.isMember("credentialType"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("CredentialStruct.credentialIndex", "credentialIndex", + value.isMember("credentialIndex"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialType"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialType, value["credentialType"])); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialIndex, value["credentialIndex"])); + + return CHIP_NO_ERROR; +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request) +{ + ComplexArgumentParser::Finalize(request.credentialType); + ComplexArgumentParser::Finalize(request.credentialIndex); +} CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request, Json::Value & value) @@ -552,31 +578,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Struc ComplexArgumentParser::Finalize(request.height); ComplexArgumentParser::Finalize(request.metric); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request, - Json::Value & value) -{ - VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DlCredential.credentialType", "credentialType", - value.isMember("credentialType"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DlCredential.credentialIndex", "credentialIndex", - value.isMember("credentialIndex"))); - - char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialType"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialType, value["credentialType"])); - - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialIndex, value["credentialIndex"])); - - return CHIP_NO_ERROR; -} - -void ComplexArgumentParser::Finalize(chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request) -{ - ComplexArgumentParser::Finalize(request.credentialType); - ComplexArgumentParser::Finalize(request.credentialIndex); -} CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request, Json::Value & value) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 7339dc6d9a5a30..483493b009426a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -85,6 +85,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher Json::Value & value); static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request); +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request, Json::Value & value); @@ -93,10 +97,6 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher Json::Value & value); static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request, - Json::Value & value); - -static void Finalize(chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index e277b165bcc221..11de491ab85d35 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -493,22 +493,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value) + const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("DeviceType", indent + 1, value.deviceType); + CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceType'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'"); return err; } } { - CHIP_ERROR err = LogValue("Revision", indent + 1, value.revision); + CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Revision'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'"); return err; } } @@ -517,30 +517,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value) + const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("Width", indent + 1, value.width); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'"); - return err; - } - } - { - CHIP_ERROR err = LogValue("Height", indent + 1, value.height); + CHIP_ERROR err = LogValue("DeviceType", indent + 1, value.deviceType); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceType'"); return err; } } { - CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric); + CHIP_ERROR err = LogValue("Revision", indent + 1, value.revision); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Revision'"); return err; } } @@ -549,22 +541,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType); + CHIP_ERROR err = LogValue("Width", indent + 1, value.width); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'"); return err; } } { - CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex); + CHIP_ERROR err = LogValue("Height", indent + 1, value.height); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'"); return err; } } @@ -3995,7 +3995,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex)); ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName)); - ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueId", indent + 1, value.userUniqueId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueID", indent + 1, value.userUniqueID)); ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus)); ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType)); ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule)); @@ -6754,7 +6754,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("ActuatorEnabled", 1, value); } case DoorLock::Attributes::DoorState::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("DoorState", 1, value); } @@ -6854,7 +6854,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("SoundVolume", 1, value); } case DoorLock::Attributes::OperatingMode::Id: { - chip::app::Clusters::DoorLock::DlOperatingMode value; + chip::app::Clusters::DoorLock::OperatingModeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OperatingMode", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 82643f35a3a980..dee95473a7f8aa 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -51,12 +51,12 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value); -static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 5d0afb4a7d50c8..aa73655fe4afbc 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -73724,7 +73724,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -73760,7 +73760,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73789,7 +73789,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73815,8 +73815,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73842,8 +73842,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73869,8 +73869,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73896,8 +73896,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73923,8 +73923,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user", 9))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 466460832UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 466460832UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73950,8 +73950,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user2", 10))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 12648430UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 12648430UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -73976,7 +73976,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -73996,7 +73996,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74017,8 +74017,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user3", 10))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 47802UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 47802UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74044,7 +74044,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("last_user", 9))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74075,7 +74075,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74097,7 +74097,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74129,7 +74129,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74146,7 +74146,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74243,7 +74243,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74364,7 +74364,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74577,7 +74577,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74625,7 +74625,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74681,7 +74681,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74733,7 +74733,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74805,7 +74805,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -74834,7 +74834,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74926,7 +74926,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74943,7 +74943,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74960,7 +74960,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -74977,7 +74977,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 4U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -75016,7 +75016,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -75091,7 +75091,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); + VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID)); VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValueNull("userType", value.userType)); VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); @@ -75250,10 +75250,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(5, "Create new user with default parameters"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75276,10 +75276,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(7, "Set user at the occupied index fails with appropriate response"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75292,11 +75292,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(8, "Modify userName for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("new_usergarbage: not in length on purpose", 8); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75319,11 +75319,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(10, "Modify userUniqueId for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 305441741UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 305441741UL; value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75346,12 +75346,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(12, "Modify userStatus for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(3); + value.userStatus.Value() = static_cast(3); value.userType.SetNull(); value.credentialRule.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, @@ -75373,13 +75373,13 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(14, "Modify userType for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNonNull(); - value.userType.Value() = static_cast(6); + value.userType.Value() = static_cast(6); value.credentialRule.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -75400,14 +75400,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(16, "Modify credentialRule for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(2); + value.credentialRule.Value() = static_cast(2); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -75427,18 +75427,18 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(18, "Modify all fields for existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("test_usergarbage: not in length on purpose", 9); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 466460832UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 466460832UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(1); + value.credentialRule.Value() = static_cast(1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -75458,18 +75458,18 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(20, "Add another user with non-default fields"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 2U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("test_user2garbage: not in length on purpose", 10); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 12648430UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 12648430UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(1); + value.userType.Value() = static_cast(1); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(2); + value.credentialRule.Value() = static_cast(2); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -75489,14 +75489,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(22, "Try to add a user with userStatus 0"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 3U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("test_user3garbage: not in length on purpose", 10); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 47802UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 47802UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(0); + value.userStatus.Value() = static_cast(0); value.userType.SetNull(); value.credentialRule.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, @@ -75518,14 +75518,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(24, "Try to add a user with userStatus 2"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 3U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("test_user3garbage: not in length on purpose", 10); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 47802UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 47802UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(2); + value.userStatus.Value() = static_cast(2); value.userType.SetNull(); value.credentialRule.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, @@ -75547,14 +75547,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(26, "Try to add a user with userStatus 3"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 3U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("test_user3garbage: not in length on purpose", 10); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 47802UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 47802UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(3); + value.userStatus.Value() = static_cast(3); value.userType.SetNull(); value.credentialRule.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, @@ -75576,11 +75576,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(28, "Create user in the last slot"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = NumberOfTotalUsersSupported; value.userName.SetNonNull(); value.userName.Value() = chip::Span("last_usergarbage: not in length on purpose", 9); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75603,10 +75603,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(30, "User creation in the 0 slot fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 0U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75619,10 +75619,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(31, "User creation in the out-of-bounds slot fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = static_cast(NumberOfTotalUsersSupported + 1); value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75655,10 +75655,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(34, "Create new user in the cleared slot"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -75737,7 +75737,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75750,7 +75750,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75763,7 +75763,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = static_cast(NumberOfPINUsersSupported + 1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75775,15 +75775,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(45, "Verify that a user with UserStatus = 0 cannot be added via SetCredential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); value.userIndex.SetNull(); value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(0); + value.userStatus.Value() = static_cast(0); value.userType.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, chip::Optional(10000), chip::NullOptional @@ -75794,15 +75794,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(46, "Verify that a user with UserStatus = 2 cannot be added via SetCredential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); value.userIndex.SetNull(); value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(2); + value.userStatus.Value() = static_cast(2); value.userType.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, chip::Optional(10000), chip::NullOptional @@ -75813,9 +75813,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(47, "Create new PIN credential and user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); @@ -75842,7 +75842,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75854,9 +75854,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(50, "Create new PIN credential and user with index 0 fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 0U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -75872,9 +75872,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(51, "Create new PIN credential and user with out-of-bounds index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = static_cast(NumberOfPINUsersSupported + 1); value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -75896,7 +75896,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75909,7 +75909,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = static_cast(NumberOfRFIDUsersSupported + 1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75922,7 +75922,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75934,9 +75934,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(56, "Create new RFID credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; value.credentialData = @@ -75965,7 +75965,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -75977,9 +75977,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(59, "Create new RFID credential and user with index 0 fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 0U; value.credentialData = @@ -75996,9 +75996,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(60, "Create new RFID credential and user with out-of-bounds index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = static_cast(NumberOfRFIDUsersSupported + 1); value.credentialData = @@ -76015,9 +76015,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(61, "Create new credential and try to add it to 0 user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6); @@ -76034,9 +76034,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(62, "Create new credential and try to add it to out-of-bounds user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6); @@ -76053,9 +76053,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(63, "Create new PIN with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("12345garbage: not in length on purpose"), 5); @@ -76072,9 +76072,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(64, "Create new PIN with too long data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456789garbage: not in length on purpose"), 9); @@ -76091,9 +76091,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(65, "Create new RFID with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_datagarbage: not in length on purpose"), 9); @@ -76110,9 +76110,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(66, "Create new PIN with Programming user type fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76120,7 +76120,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand value.userIndex.Value() = 0U; value.userStatus.SetNull(); value.userType.SetNonNull(); - value.userType.Value() = static_cast(3); + value.userType.Value() = static_cast(3); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, chip::Optional(10000), chip::NullOptional @@ -76130,9 +76130,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(67, "Create new RFID with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan( @@ -76150,9 +76150,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(68, "Create new PIN credential with data the would cause duplicate"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 4U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); @@ -76168,9 +76168,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(69, "Create new RFID credential with data the would cause duplicate"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 4U; value.credentialData = @@ -76187,9 +76187,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(70, "Modify credentialData of existing PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76206,9 +76206,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(71, "Verify that credential was changed by creating new credential with old data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); @@ -76224,9 +76224,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(72, "Verify that credential was changed by creating new credential with new data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 4U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76242,9 +76242,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(73, "Create new RFID credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 4U; value.credentialData = @@ -76272,9 +76272,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(75, "Create new RFID credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 5U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("789012garbage: not in length on purpose"), 6); @@ -76303,7 +76303,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76316,7 +76316,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76340,7 +76340,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 3U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76353,7 +76353,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76375,9 +76375,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(83, "Create new RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 1U; value.credentialData = @@ -76396,7 +76396,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(2); + value.credential.Value().credentialType = static_cast(2); value.credential.Value().credentialIndex = 65534U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76409,7 +76409,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76422,7 +76422,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76435,7 +76435,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 4U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76467,9 +76467,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(90, "Create new PIN credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76485,9 +76485,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(91, "Create new RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; value.credentialData = @@ -76504,9 +76504,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(92, "Create another RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 6U; value.credentialData = @@ -76534,7 +76534,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76547,7 +76547,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(2); + value.credential.credentialType = static_cast(2); value.credential.credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76560,7 +76560,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 6U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76612,9 +76612,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(101, "Create new Programming PIN credential with invalid index"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(0); + value.credential.credentialType = static_cast(0); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76630,9 +76630,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(102, "Create new Programming PIN credential with valid index"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(0); + value.credential.credentialType = static_cast(0); value.credential.credentialIndex = 0U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -76659,7 +76659,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(0); + value.credential.credentialType = static_cast(0); value.credential.credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76671,9 +76671,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(105, "Modify the Programming PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(2); + value.operationType = static_cast(2); - value.credential.credentialType = static_cast(0); + value.credential.credentialType = static_cast(0); value.credential.credentialIndex = 0U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); @@ -76691,7 +76691,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(0); + value.credential.Value().credentialType = static_cast(0); value.credential.Value().credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76705,7 +76705,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(0); + value.credential.Value().credentialType = static_cast(0); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76719,7 +76719,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76733,7 +76733,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = static_cast(NumberOfPINUsersSupported + 1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76747,7 +76747,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(2); + value.credential.Value().credentialType = static_cast(2); value.credential.Value().credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76761,7 +76761,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(2); + value.credential.Value().credentialType = static_cast(2); value.credential.Value().credentialIndex = static_cast(NumberOfRFIDUsersSupported + 1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -76794,7 +76794,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(0); + value.credential.credentialType = static_cast(0); value.credential.credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -76806,9 +76806,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(115, "Create new PIN credential and user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); @@ -76824,9 +76824,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(116, "Create second PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000001garbage: not in length on purpose"), 6); @@ -76843,9 +76843,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(117, "Create third PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000002garbage: not in length on purpose"), 6); @@ -76862,9 +76862,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(118, "Create fourth PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 4U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000003garbage: not in length on purpose"), 6); @@ -76881,9 +76881,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(119, "Create fifth PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 5U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000004garbage: not in length on purpose"), 6); @@ -76900,9 +76900,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand LogStep(120, "Try to create sixth PIN credential and make sure it fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 6U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000005garbage: not in length on purpose"), 6); @@ -77239,9 +77239,9 @@ class DL_LockUnlockSuite : public TestCommand LogStep(5, "Create new PIN credential and lock/unlock user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -77265,8 +77265,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(7, "Try to unlock the door with invalid PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77281,8 +77281,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(9, "Try to unlock the door with valid PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77297,8 +77297,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(11, "Try to lock the door with invalid PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77313,8 +77313,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(13, "Try to lock the door with valid PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77328,8 +77328,8 @@ class DL_LockUnlockSuite : public TestCommand case 15: { LogStep(15, "Set OperatingMode to NoRemoteLockUnlock"); ListFreer listFreer; - chip::app::Clusters::DoorLock::DlOperatingMode value; - value = static_cast(3); + chip::app::Clusters::DoorLock::OperatingModeEnum value; + value = static_cast(3); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::OperatingMode::Id, value, chip::NullOptional, chip::NullOptional); } @@ -77345,8 +77345,8 @@ class DL_LockUnlockSuite : public TestCommand case 17: { LogStep(17, "Set OperatingMode to Normal"); ListFreer listFreer; - chip::app::Clusters::DoorLock::DlOperatingMode value; - value = static_cast(0); + chip::app::Clusters::DoorLock::OperatingModeEnum value; + value = static_cast(0); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::OperatingMode::Id, value, chip::NullOptional, chip::NullOptional); } @@ -77367,8 +77367,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(20, "Try to unlock the door with invalid PIN for the first time"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77378,8 +77378,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(21, "Try to unlock the door with invalid PIN for the second time"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77389,8 +77389,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(22, "Try to unlock the door with invalid PIN for the third time"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77400,8 +77400,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(23, "Try to unlock the door with valid PIN and make sure it fails due to lockout"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77418,8 +77418,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(25, "Try to unlock the door with valid PIN and make sure it succeeds"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77434,8 +77434,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(27, "Lock the door back prior to next tests"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77445,15 +77445,15 @@ class DL_LockUnlockSuite : public TestCommand LogStep(28, "Create a disabled user and credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); value.userIndex.SetNull(); value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(3); + value.userStatus.Value() = static_cast(3); value.userType.SetNull(); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, chip::Optional(10000), chip::NullOptional @@ -77464,8 +77464,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(29, "Try to unlock the door with disabled user PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77480,8 +77480,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(31, "Unlock the door with enabled user PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77496,8 +77496,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(33, "Try to lock the door with disabled user PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -77512,8 +77512,8 @@ class DL_LockUnlockSuite : public TestCommand LogStep(35, "Lock the door with enabled user PIN"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(10000), chip::NullOptional @@ -78664,9 +78664,9 @@ class DL_SchedulesSuite : public TestCommand LogStep(1, "Create new PIN credential and schedule user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -78704,7 +78704,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 0U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78720,7 +78720,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = static_cast(NumberOfWeekDaySchedulesSupportedPerUser + 1); value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78736,7 +78736,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 0U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78752,7 +78752,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = static_cast(NumberOfTotalUsersSupported + 1); - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78768,7 +78768,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 2U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78784,7 +78784,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(0U); + value.daysMask = static_cast>(0U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78800,7 +78800,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(3U); + value.daysMask = static_cast>(3U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78816,7 +78816,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(73U); + value.daysMask = static_cast>(73U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78832,7 +78832,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 24U; value.startMinute = 16U; value.endHour = 18U; @@ -78848,7 +78848,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 60U; value.endHour = 18U; @@ -78864,7 +78864,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 24U; @@ -78880,7 +78880,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -78896,7 +78896,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 19U; value.startMinute = 16U; value.endHour = 18U; @@ -78912,7 +78912,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 50U; value.endHour = 15U; @@ -79139,7 +79139,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = 0U; value.localStartTime = 12345UL; value.localEndTime = 12345689UL; - value.operatingMode = static_cast(0); + value.operatingMode = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79152,7 +79152,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = static_cast(NumberOfHolidaySchedulesSupported + 1); value.localStartTime = 12345UL; value.localEndTime = 12345689UL; - value.operatingMode = static_cast(0); + value.operatingMode = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79165,7 +79165,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = 1U; value.localStartTime = 12345689UL; value.localEndTime = 12345688UL; - value.operatingMode = static_cast(0); + value.operatingMode = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79178,7 +79178,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = 1U; value.localStartTime = 12345UL; value.localEndTime = 12345689UL; - value.operatingMode = static_cast(5); + value.operatingMode = static_cast(5); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79221,7 +79221,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = 1U; value.localStartTime = 12345UL; value.localEndTime = 12345689UL; - value.operatingMode = static_cast(0); + value.operatingMode = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79243,7 +79243,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 15U; value.startMinute = 16U; value.endHour = 18U; @@ -79520,7 +79520,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 2U; value.userIndex = 1U; - value.daysMask = static_cast>(2U); + value.daysMask = static_cast>(2U); value.startHour = 0U; value.startMinute = 0U; value.endHour = 23U; @@ -79572,7 +79572,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = 2U; value.localStartTime = 123456UL; value.localEndTime = 1234567UL; - value.operatingMode = static_cast(1); + value.operatingMode = static_cast(1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79680,7 +79680,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(2U); + value.daysMask = static_cast>(2U); value.startHour = 0U; value.startMinute = 0U; value.endHour = 23U; @@ -79760,10 +79760,10 @@ class DL_SchedulesSuite : public TestCommand LogStep(93, "Create new user without credential so we can add more schedules to it"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 2U; value.userName.SetNull(); - value.userUniqueId.SetNull(); + value.userUniqueID.SetNull(); value.userStatus.SetNull(); value.userType.SetNull(); value.credentialRule.SetNull(); @@ -79778,7 +79778,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 0U; value.startMinute = 0U; value.endHour = 23U; @@ -79829,7 +79829,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 4U; value.userIndex = 2U; - value.daysMask = static_cast>(64U); + value.daysMask = static_cast>(64U); value.startHour = 23U; value.startMinute = 0U; value.endHour = 23U; @@ -79955,7 +79955,7 @@ class DL_SchedulesSuite : public TestCommand value.holidayIndex = NumberOfHolidaySchedulesSupported; value.localStartTime = 1UL; value.localEndTime = 100UL; - value.operatingMode = static_cast(4); + value.operatingMode = static_cast(4); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -79975,9 +79975,9 @@ class DL_SchedulesSuite : public TestCommand LogStep(111, "Create new PIN credential and schedule user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -79995,7 +79995,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(1U); + value.daysMask = static_cast>(1U); value.startHour = 0U; value.startMinute = 0U; value.endHour = 23U; @@ -80956,8 +80956,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -81117,18 +81117,18 @@ class Test_TC_DRLK_2_2Suite : public TestCommand LogStep(1, "Create new user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(1000), chip::NullOptional @@ -81148,9 +81148,9 @@ class Test_TC_DRLK_2_2Suite : public TestCommand LogStep(3, "Create new PIN credential and lock/unlock user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -81168,7 +81168,7 @@ class Test_TC_DRLK_2_2Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -81219,8 +81219,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81259,8 +81259,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81271,8 +81271,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("645321garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("645321garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81397,7 +81397,7 @@ class Test_TC_DRLK_2_2Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -81466,8 +81466,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -81660,18 +81660,18 @@ class Test_TC_DRLK_2_3Suite : public TestCommand LogStep(1, "Create new user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(1000), chip::NullOptional @@ -81691,9 +81691,9 @@ class Test_TC_DRLK_2_3Suite : public TestCommand LogStep(3, "Create new PIN credential and lock/unlock user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -81711,7 +81711,7 @@ class Test_TC_DRLK_2_3Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -81762,8 +81762,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81802,8 +81802,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81814,8 +81814,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81880,8 +81880,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81892,8 +81892,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81904,8 +81904,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81916,8 +81916,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -81934,8 +81934,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, chip::Optional(1000), chip::NullOptional @@ -82028,7 +82028,7 @@ class Test_TC_DRLK_2_3Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -82100,8 +82100,8 @@ class Test_TC_DRLK_2_4Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -82202,18 +82202,18 @@ class Test_TC_DRLK_2_4Suite : public TestCommand LogStep(1, "Create new user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(1000), chip::NullOptional @@ -82233,9 +82233,9 @@ class Test_TC_DRLK_2_4Suite : public TestCommand LogStep(3, "Create new PIN credential and lock/unlock user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -82253,7 +82253,7 @@ class Test_TC_DRLK_2_4Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -82285,8 +82285,8 @@ class Test_TC_DRLK_2_4Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type value; value.timeout = 60U; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.PINCode.Emplace(); + value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockWithTimeout::Id, value, chip::Optional(1000), chip::NullOptional @@ -82323,7 +82323,7 @@ class Test_TC_DRLK_2_4Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -82398,8 +82398,8 @@ class Test_TC_DRLK_2_5Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -82528,18 +82528,18 @@ class Test_TC_DRLK_2_5Suite : public TestCommand LogStep(1, "Create new user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -82574,7 +82574,7 @@ class Test_TC_DRLK_2_5Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 1U; value.userIndex = 1U; - value.daysMask = static_cast>(2U); + value.daysMask = static_cast>(2U); value.startHour = 15U; value.startMinute = 45U; value.endHour = 16U; @@ -82604,7 +82604,7 @@ class Test_TC_DRLK_2_5Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value; value.weekDayIndex = 0U; value.userIndex = 1U; - value.daysMask = static_cast>(7U); + value.daysMask = static_cast>(7U); value.startHour = 15U; value.startMinute = 45U; value.endHour = 16U; @@ -82827,7 +82827,7 @@ class Test_TC_DRLK_2_6Suite : public TestCommand value.holidayIndex = 1U; value.localStartTime = 20UL; value.localEndTime = 30UL; - value.operatingMode = static_cast(0); + value.operatingMode = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -82853,7 +82853,7 @@ class Test_TC_DRLK_2_6Suite : public TestCommand value.holidayIndex = 1U; value.localStartTime = 20UL; value.localEndTime = 30UL; - value.operatingMode = static_cast(5); + value.operatingMode = static_cast(5); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value, chip::NullOptional @@ -82983,8 +82983,8 @@ class Test_TC_DRLK_2_7Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -83147,18 +83147,18 @@ class Test_TC_DRLK_2_7Suite : public TestCommand LogStep(1, "Create new user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -83244,18 +83244,18 @@ class Test_TC_DRLK_2_7Suite : public TestCommand LogStep(9, "Create a user with userIndex as 5"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 5U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -83426,8 +83426,8 @@ class Test_TC_DRLK_2_9Suite : public TestCommand VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL)); + VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID)); + VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL)); VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("userType", value.userType)); @@ -83609,18 +83609,18 @@ class Test_TC_DRLK_2_9Suite : public TestCommand LogStep(1, "Create new user with default parameters"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 1U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -83648,9 +83648,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -83670,7 +83670,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -83684,17 +83684,17 @@ class Test_TC_DRLK_2_9Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("4321garbage: not in length on purpose"), 4); value.userIndex.SetNull(); value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(5); + value.userStatus.Value() = static_cast(5); value.userType.SetNonNull(); - value.userType.Value() = static_cast(10); + value.userType.Value() = static_cast(10); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, chip::Optional(10000), chip::NullOptional @@ -83706,9 +83706,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -83766,7 +83766,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -83781,7 +83781,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -83794,18 +83794,18 @@ class Test_TC_DRLK_2_9Suite : public TestCommand VerifyOrDo(!ShouldSkip("DRLK.S.F08 && DRLK.S.C1a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetUser::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); value.userIndex = 2U; value.userName.SetNonNull(); value.userName.Value() = chip::Span("xxxgarbage: not in length on purpose", 3); - value.userUniqueId.SetNonNull(); - value.userUniqueId.Value() = 6452UL; + value.userUniqueID.SetNonNull(); + value.userUniqueID.Value() = 6452UL; value.userStatus.SetNonNull(); - value.userStatus.Value() = static_cast(1); + value.userStatus.Value() = static_cast(1); value.userType.SetNonNull(); - value.userType.Value() = static_cast(0); + value.userType.Value() = static_cast(0); value.credentialRule.SetNonNull(); - value.credentialRule.Value() = static_cast(0); + value.credentialRule.Value() = static_cast(0); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value, chip::Optional(10000), chip::NullOptional @@ -83817,9 +83817,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); + value.operationType = static_cast(0); - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); @@ -83839,7 +83839,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialType = static_cast(1); value.credential.Value().credentialIndex = 65534U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, @@ -83854,7 +83854,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 65534U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -83869,7 +83869,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; - value.credential.credentialType = static_cast(1); + value.credential.credentialType = static_cast(1); value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, @@ -83884,7 +83884,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); - value.credential.Value().credentialType = static_cast(8); + value.credential.Value().credentialType = static_cast(8); value.credential.Value().credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 8ab732426f50ee..37cf951894619a 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -37833,7 +37833,7 @@ class DoorLockLockDoor : public ClusterCommand { DoorLockLockDoor() : ClusterCommand("lock-door") { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -37846,8 +37846,8 @@ class DoorLockLockDoor : public ClusterCommand { __auto_type * params = [[MTRDoorLockClusterLockDoorParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - if (mRequest.pinCode.HasValue()) { - params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()]; + if (mRequest.PINCode.HasValue()) { + params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()]; } else { params.pinCode = nil; } @@ -37881,7 +37881,7 @@ class DoorLockUnlockDoor : public ClusterCommand { DoorLockUnlockDoor() : ClusterCommand("unlock-door") { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -37894,8 +37894,8 @@ class DoorLockUnlockDoor : public ClusterCommand { __auto_type * params = [[MTRDoorLockClusterUnlockDoorParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - if (mRequest.pinCode.HasValue()) { - params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()]; + if (mRequest.PINCode.HasValue()) { + params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()]; } else { params.pinCode = nil; } @@ -37930,7 +37930,7 @@ class DoorLockUnlockWithTimeout : public ClusterCommand { : ClusterCommand("unlock-with-timeout") { AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout); - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -37944,8 +37944,8 @@ class DoorLockUnlockWithTimeout : public ClusterCommand { params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.timeout = [NSNumber numberWithUnsignedShort:mRequest.timeout]; - if (mRequest.pinCode.HasValue()) { - params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()]; + if (mRequest.PINCode.HasValue()) { + params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()]; } else { params.pinCode = nil; } @@ -38416,7 +38416,7 @@ class DoorLockSetUser : public ClusterCommand { AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType); AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); AddArgument("UserName", &mRequest.userName); - AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId); + AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID); AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus); AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType); AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule); @@ -38441,10 +38441,10 @@ class DoorLockSetUser : public ClusterCommand { length:mRequest.userName.Value().size() encoding:NSUTF8StringEncoding]; } - if (mRequest.userUniqueId.IsNull()) { - params.userUniqueId = nil; + if (mRequest.userUniqueID.IsNull()) { + params.userUniqueID = nil; } else { - params.userUniqueId = [NSNumber numberWithUnsignedInt:mRequest.userUniqueId.Value()]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:mRequest.userUniqueID.Value()]; } if (mRequest.userStatus.IsNull()) { params.userStatus = nil; @@ -38600,7 +38600,7 @@ class DoorLockSetCredential : public ClusterCommand { params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)]; - params.credential = [MTRDoorLockClusterDlCredential new]; + params.credential = [MTRDoorLockClusterCredentialStruct new]; params.credential.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)]; params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex]; @@ -38642,7 +38642,7 @@ class DoorLockSetCredential : public ClusterCommand { private: chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -38667,7 +38667,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand { __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.credential = [MTRDoorLockClusterDlCredential new]; + params.credential = [MTRDoorLockClusterCredentialStruct new]; params.credential.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)]; params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex]; @@ -38693,7 +38693,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand { private: chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -38721,7 +38721,7 @@ class DoorLockClearCredential : public ClusterCommand { if (mRequest.credential.IsNull()) { params.credential = nil; } else { - params.credential = [MTRDoorLockClusterDlCredential new]; + params.credential = [MTRDoorLockClusterCredentialStruct new]; params.credential.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.Value().credentialType)]; params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.Value().credentialIndex]; @@ -38746,7 +38746,7 @@ class DoorLockClearCredential : public ClusterCommand { private: chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest; - TypedComplexArgument> + TypedComplexArgument> mComplex_Credential; }; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 29e91879267357..e95a4c214ff41e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -110484,52 +110484,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -110626,7 +110626,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -110660,58 +110660,58 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -110732,7 +110732,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -110762,7 +110762,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"new_user"; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -110796,58 +110796,58 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -110868,7 +110868,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = [NSNumber numberWithUnsignedInt:305441741UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:305441741UL]; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -110902,59 +110902,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -110975,7 +110975,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = [NSNumber numberWithUnsignedChar:3U]; params.userType = nil; params.credentialRule = nil; @@ -111009,59 +111009,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111082,7 +111082,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = [NSNumber numberWithUnsignedChar:6U]; params.credentialRule = nil; @@ -111116,59 +111116,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 6U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 6U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111189,7 +111189,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = [NSNumber numberWithUnsignedChar:2U]; @@ -111223,59 +111223,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 6U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 6U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 2U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111296,7 +111296,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:2U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"test_user"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:466460832UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:466460832UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:1U]; @@ -111330,59 +111330,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 466460832UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 466460832UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 1U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111403,7 +111403,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:2U]; params.userName = @"test_user2"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:12648430UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:12648430UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:1U]; params.credentialRule = [NSNumber numberWithUnsignedChar:2U]; @@ -111437,59 +111437,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user2")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user2")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 12648430UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 12648430UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 1U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 2U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111510,7 +111510,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:3U]; params.userName = @"test_user3"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL]; params.userStatus = [NSNumber numberWithUnsignedChar:0U]; params.userType = nil; params.credentialRule = nil; @@ -111546,52 +111546,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111612,7 +111612,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:3U]; params.userName = @"test_user3"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL]; params.userStatus = [NSNumber numberWithUnsignedChar:2U]; params.userType = nil; params.credentialRule = nil; @@ -111648,52 +111648,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111714,7 +111714,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:3U]; params.userName = @"test_user3"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL]; params.userStatus = [NSNumber numberWithUnsignedChar:3U]; params.userType = nil; params.credentialRule = nil; @@ -111748,59 +111748,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user3")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user3")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 47802UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 47802UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111821,7 +111821,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NumberOfTotalUsersSupported copy]; params.userName = @"last_user"; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -111855,58 +111855,58 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"last_user")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"last_user")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -111927,7 +111927,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -111957,7 +111957,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -112015,53 +112015,53 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue)); - VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue)); + VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U)); } NextTest(); @@ -112082,7 +112082,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -112116,59 +112116,59 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue)); - VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue)); + VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U)); } NextTest(); @@ -112267,52 +112267,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -112339,52 +112339,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -112430,9 +112430,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -112443,27 +112443,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -112481,9 +112481,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -112494,27 +112494,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -112532,9 +112532,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; [cluster @@ -112547,27 +112547,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -112586,9 +112586,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -112603,18 +112603,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -112633,9 +112633,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -112650,18 +112650,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -112680,9 +112680,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -112697,19 +112697,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -112736,63 +112736,63 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U)); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(1))); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -112810,9 +112810,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -112823,30 +112823,30 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -112865,9 +112865,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -112882,18 +112882,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -112912,9 +112912,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; @@ -112930,17 +112930,17 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -112986,9 +112986,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -113001,22 +113001,22 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } NextTest(); @@ -113034,9 +113034,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; [cluster @@ -113049,27 +113049,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -113087,9 +113087,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -113100,27 +113100,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -113139,9 +113139,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -113156,18 +113156,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113194,67 +113194,67 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(2))); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(2))); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U)); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -113272,9 +113272,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -113285,30 +113285,30 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -113327,9 +113327,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19]; params.userIndex = nil; @@ -113344,18 +113344,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113374,9 +113374,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19]; @@ -113392,17 +113392,17 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -113421,9 +113421,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113438,18 +113438,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113468,9 +113468,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; @@ -113485,18 +113485,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113515,9 +113515,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"12345" length:5]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113532,18 +113532,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113562,9 +113562,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"123456789" length:9]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113579,18 +113579,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113609,9 +113609,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data" length:9]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113626,18 +113626,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113656,9 +113656,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113673,18 +113673,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113703,9 +113703,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"very_long_rfid_data_to_test_boundaries" length:38]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113720,18 +113720,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113750,9 +113750,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -113767,18 +113767,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 2U)); + VerifyOrReturn(CheckValue("Status", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -113797,9 +113797,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16]; params.userIndex = nil; @@ -113814,18 +113814,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 2U)); + VerifyOrReturn(CheckValue("Status", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -113844,9 +113844,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:2U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -113861,18 +113861,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113891,9 +113891,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -113908,19 +113908,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -113939,9 +113939,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -113956,18 +113956,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 2U)); + VerifyOrReturn(CheckValue("Status", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -113986,9 +113986,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_7890" length:14]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -114003,18 +114003,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -114041,72 +114041,72 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(3))); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(3))); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U)); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue)); - VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue)); + VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U)); } NextTest(); @@ -114125,9 +114125,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U]; params.credentialData = [[NSData alloc] initWithBytes:"789012" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -114142,18 +114142,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 6U)); } NextTest(); @@ -114180,76 +114180,76 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(4))); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U)); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(4))); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U)); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[3]).credentialType, 1U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[3]).credentialIndex, 5U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialIndex, 5U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue)); - VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue)); + VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U)); } NextTest(); @@ -114267,9 +114267,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -114292,9 +114292,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114305,28 +114305,28 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -114353,72 +114353,72 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(3))); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 2U)); - VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 2U)); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(3))); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 4U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 2U)); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 4U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 5U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 1U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 5U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue)); - VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue)); + VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U)); } NextTest(); @@ -114436,9 +114436,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -114461,9 +114461,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114474,28 +114474,28 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -114522,52 +114522,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -114586,9 +114586,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_12345" length:15]; params.userIndex = nil; @@ -114603,19 +114603,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114633,9 +114633,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -114658,9 +114658,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114671,28 +114671,28 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -114710,9 +114710,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114723,28 +114723,28 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -114762,9 +114762,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114775,28 +114775,28 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -114824,63 +114824,63 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(1))); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(1))); VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 5U)); + "CredentialIndex", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 5U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -114907,52 +114907,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -114971,9 +114971,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -114988,19 +114988,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -115019,9 +115019,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_1234" length:14]; params.userIndex = nil; @@ -115036,19 +115036,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -115067,9 +115067,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_9876" length:14]; params.userIndex = nil; @@ -115084,19 +115084,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 4U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 7U)); } NextTest(); @@ -115136,9 +115136,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -115149,27 +115149,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115187,9 +115187,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -115200,27 +115200,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115238,9 +115238,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -115251,27 +115251,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115298,52 +115298,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -115370,52 +115370,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -115442,52 +115442,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -115514,52 +115514,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 4U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -115578,9 +115578,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -115595,17 +115595,17 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115624,9 +115624,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -115641,18 +115641,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115679,63 +115679,63 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNonNull("credentials", actualValue)); - VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue( - "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 0U)); + VerifyOrReturn(CheckValueNonNull("Credentials", actualValue)); + VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast(1))); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 0U)); + "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 0U)); + VerifyOrReturn(CheckValue("CredentialIndex", + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 0U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -115753,9 +115753,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -115766,30 +115766,30 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115808,9 +115808,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:2U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6]; params.userIndex = nil; @@ -115825,17 +115825,17 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115853,9 +115853,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -115881,9 +115881,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -115909,9 +115909,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -115937,9 +115937,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; [cluster clearCredentialWithParams:params @@ -115966,9 +115966,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -115994,9 +115994,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; [cluster clearCredentialWithParams:params @@ -116054,52 +116054,52 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNull("userName", actualValue)); + VerifyOrReturn(CheckValueNull("UserName", actualValue)); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNull("userUniqueId", actualValue)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNull("userStatus", actualValue)); + VerifyOrReturn(CheckValueNull("UserStatus", actualValue)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNull("userType", actualValue)); + VerifyOrReturn(CheckValueNull("UserType", actualValue)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNull("credentialRule", actualValue)); + VerifyOrReturn(CheckValueNull("CredentialRule", actualValue)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -116117,9 +116117,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -116130,27 +116130,27 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -116169,9 +116169,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -116186,19 +116186,19 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -116217,9 +116217,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"000001" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -116234,18 +116234,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -116264,9 +116264,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"000002" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -116281,18 +116281,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -116311,9 +116311,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; params.credentialData = [[NSData alloc] initWithBytes:"000003" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -116328,18 +116328,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); } NextTest(); @@ -116358,9 +116358,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U]; params.credentialData = [[NSData alloc] initWithBytes:"000004" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -116375,18 +116375,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 6U)); } NextTest(); @@ -116405,9 +116405,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U]; params.credentialData = [[NSData alloc] initWithBytes:"000005" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -116422,18 +116422,18 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 137U)); + VerifyOrReturn(CheckValue("Status", actualValue, 137U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 7U)); } NextTest(); @@ -116919,9 +116919,9 @@ class DL_LockUnlock : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -116936,19 +116936,19 @@ class DL_LockUnlock : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -117479,9 +117479,9 @@ class DL_LockUnlock : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6]; params.userIndex = nil; @@ -117496,19 +117496,19 @@ class DL_LockUnlock : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -118725,9 +118725,9 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -118742,19 +118742,19 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -119334,17 +119334,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -119373,17 +119373,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119412,18 +119412,18 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, [NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119452,17 +119452,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 0U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119491,18 +119491,18 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; VerifyOrReturn(CheckValue( - "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); + "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119531,17 +119531,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -119738,17 +119738,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -119777,17 +119777,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119816,18 +119816,18 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, [NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119856,17 +119856,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 0U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119895,18 +119895,18 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; VerifyOrReturn(CheckValue( - "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); + "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -119935,17 +119935,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -120085,12 +120085,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -120118,12 +120118,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 0U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -120151,13 +120151,13 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, [NumberOfHolidaySchedulesSupported unsignedCharValue] + 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -120210,27 +120210,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -120287,42 +120287,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 15U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 15U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 16U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 18U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 18U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U)); } NextTest(); @@ -120376,27 +120376,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } NextTest(); @@ -120560,42 +120560,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 15U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 15U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 16U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 18U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 18U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U)); } NextTest(); @@ -120624,27 +120624,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } NextTest(); @@ -120672,27 +120672,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -120856,42 +120856,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 15U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 15U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 16U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 18U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 18U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U)); } NextTest(); @@ -120920,27 +120920,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } NextTest(); @@ -120968,27 +120968,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -121069,42 +121069,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 15U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 15U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 16U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 18U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 18U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U)); } NextTest(); @@ -121133,27 +121133,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } NextTest(); @@ -121181,27 +121181,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -121258,42 +121258,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 2U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 0U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -121347,27 +121347,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL)); } NextTest(); @@ -121420,27 +121420,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U)); } NextTest(); @@ -121492,17 +121492,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -121554,17 +121554,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -121593,27 +121593,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } NextTest(); @@ -121642,27 +121642,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL)); } NextTest(); @@ -121690,27 +121690,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -121738,27 +121738,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U)); } NextTest(); @@ -121838,17 +121838,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -121900,17 +121900,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -121939,42 +121939,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 2U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 0U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -122018,7 +122018,7 @@ class DL_Schedules : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:2U]; params.userName = nil; - params.userUniqueId = nil; + params.userUniqueID = nil; params.userStatus = nil; params.userType = nil; params.credentialRule = nil; @@ -122082,42 +122082,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 0U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -122171,27 +122171,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 4U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL)); } NextTest(); @@ -122248,42 +122248,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 4U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 64U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 64U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 23U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -122337,27 +122337,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 55555UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 55555UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 7777777UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 7777777UL)); } NextTest(); @@ -122408,17 +122408,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -122447,17 +122447,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 4U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -122486,17 +122486,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 4U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -122525,17 +122525,17 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 1U)); + VerifyOrReturn(CheckValue("Status", actualValue, 1U)); } NextTest(); @@ -122563,27 +122563,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -122611,27 +122611,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U)); } NextTest(); @@ -122685,27 +122685,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 4U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); } NextTest(); @@ -122724,9 +122724,9 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -122741,19 +122741,19 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -122856,27 +122856,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -122904,12 +122904,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -122938,27 +122938,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); } { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 4U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); } NextTest(); @@ -122987,42 +122987,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 0U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -123051,27 +123051,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL)); } NextTest(); @@ -123121,12 +123121,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -123154,12 +123154,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -123188,12 +123188,12 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -123222,42 +123222,42 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 1U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 0U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 0U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U)); } { id actualValue = values.endHour; - VerifyOrReturn(CheckValue("endHour", actualValue, 23U)); + VerifyOrReturn(CheckValue("EndHour", actualValue, 23U)); } { id actualValue = values.endMinute; - VerifyOrReturn(CheckValue("endMinute", actualValue, 59U)); + VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U)); } NextTest(); @@ -123286,27 +123286,27 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL)); } NextTest(); @@ -125226,7 +125226,7 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -125260,59 +125260,59 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -125331,9 +125331,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -125348,18 +125348,18 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -125377,9 +125377,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -125390,30 +125390,30 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -125901,9 +125901,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -126403,7 +126403,7 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -126437,59 +126437,59 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -126508,9 +126508,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -126525,18 +126525,18 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -126554,9 +126554,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -126567,30 +126567,30 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -127328,9 +127328,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -127549,7 +127549,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -127583,59 +127583,59 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -127654,9 +127654,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -127671,18 +127671,18 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -127700,9 +127700,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -127713,30 +127713,30 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, true)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, true)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -127884,9 +127884,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -128113,7 +128113,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -128147,59 +128147,59 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -128312,32 +128312,32 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.daysMask; - VerifyOrReturn(CheckValue("daysMask", actualValue, 2U)); + VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U)); } { id actualValue = values.startHour; - VerifyOrReturn(CheckValue("startHour", actualValue, 15U)); + VerifyOrReturn(CheckValue("StartHour", actualValue, 15U)); } { id actualValue = values.startMinute; - VerifyOrReturn(CheckValue("startMinute", actualValue, 45U)); + VerifyOrReturn(CheckValue("StartMinute", actualValue, 45U)); } VerifyOrReturn(CheckConstraintHasValue("endHour", values.endHour, true)); @@ -128411,17 +128411,17 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false)); @@ -128493,17 +128493,17 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { id actualValue = values.weekDayIndex; - VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false)); @@ -128813,22 +128813,22 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 20UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 20UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 30UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 30UL)); } if (values.localEndTime != nil) { @@ -128839,7 +128839,7 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -128895,12 +128895,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 15U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 15U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } NextTest(); @@ -128928,12 +128928,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 10U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 10U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -128983,12 +128983,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } NextTest(); @@ -129294,7 +129294,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -129328,59 +129328,59 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -129489,27 +129489,27 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 960UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 960UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 1980UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1980UL)); } if (values.localEndTime != nil) { @@ -129572,17 +129572,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 15U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 15U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false)); @@ -129611,7 +129611,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:5U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -129648,17 +129648,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; VerifyOrReturn( - CheckValue("yearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUser)); + CheckValue("YearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUser)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 5U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 5U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false)); @@ -129718,17 +129718,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 139U)); + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); } VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false)); @@ -129790,27 +129790,27 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("localStartTime", actualValue, 1080UL)); + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1080UL)); } { id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("localEndTime", actualValue, 2100UL)); + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 2100UL)); } if (values.localEndTime != nil) { @@ -130212,7 +130212,7 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -130246,59 +130246,59 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.userName; - VerifyOrReturn(CheckValueNonNull("userName", actualValue)); - VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx")); + VerifyOrReturn(CheckValueNonNull("UserName", actualValue)); + VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx")); } { - id actualValue = values.userUniqueId; - VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue)); - VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL)); + id actualValue = values.userUniqueID; + VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue)); + VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL)); } { id actualValue = values.userStatus; - VerifyOrReturn(CheckValueNonNull("userStatus", actualValue)); - VerifyOrReturn(CheckValue("userStatus", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue)); + VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U)); } { id actualValue = values.userType; - VerifyOrReturn(CheckValueNonNull("userType", actualValue)); - VerifyOrReturn(CheckValue("userType", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("UserType", actualValue)); + VerifyOrReturn(CheckValue("UserType", actualValue, 0U)); } { id actualValue = values.credentialRule; - VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue)); - VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U)); + VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue)); + VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U)); } { id actualValue = values.credentials; - VerifyOrReturn(CheckValueNull("credentials", actualValue)); + VerifyOrReturn(CheckValueNull("Credentials", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextUserIndex; - VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue)); } NextTest(); @@ -130343,9 +130343,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -130360,18 +130360,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -130389,9 +130389,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -130403,25 +130403,25 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("credentialExists", "boolean", "boolean")); { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); - VerifyOrReturn(CheckValue("userIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue)); - VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U)); + VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -130440,9 +130440,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"4321" length:4]; params.userIndex = nil; @@ -130457,18 +130457,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 133U)); + VerifyOrReturn(CheckValue("Status", actualValue, 133U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -130487,9 +130487,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -130504,18 +130504,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 2U)); + VerifyOrReturn(CheckValue("Status", actualValue, 2U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -130566,9 +130566,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -130591,9 +130591,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -130604,27 +130604,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -130645,7 +130645,7 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.userIndex = [NSNumber numberWithUnsignedShort:2U]; params.userName = @"xxx"; - params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL]; + params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL]; params.userStatus = [NSNumber numberWithUnsignedChar:1U]; params.userType = [NSNumber numberWithUnsignedChar:0U]; params.credentialRule = [NSNumber numberWithUnsignedChar:0U]; @@ -130671,9 +130671,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:2U]; @@ -130688,18 +130688,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U)); + VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -130717,9 +130717,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -130742,9 +130742,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -130755,27 +130755,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -130793,9 +130793,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -130806,27 +130806,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { id actualValue = values.credentialExists; - VerifyOrReturn(CheckValue("credentialExists", actualValue, false)); + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); } { id actualValue = values.userIndex; - VerifyOrReturn(CheckValueNull("userIndex", actualValue)); + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); } { id actualValue = values.creatorFabricIndex; - VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); } { id actualValue = values.lastModifiedFabricIndex; - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue)); + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); } { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -130844,9 +130844,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; - params.credential = [[MTRDoorLockClusterDlCredential alloc] init]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:8U]; - ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:8U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) {