From 9cf6a8c28923f5e03c9211dbbf88a48b897fd463 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 10 Jan 2023 15:41:00 -0500 Subject: [PATCH] Regenerate generated code. --- .../all-clusters-app.matter | 266 +- .../all-clusters-minimal-app.matter | 228 +- .../rootnode_doorlock_aNKYAreMXE.matter | 224 +- examples/lock-app/lock-common/lock-app.matter | 272 +- .../data_model/controller-clusters.matter | 272 +- .../CHIPEventTLVValueDecoder.cpp | 34 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 490 +-- .../java/zap-generated/CHIPReadCallbacks.cpp | 2 +- .../java/zap-generated/CHIPReadCallbacks.h | 2 +- .../chip/devicecontroller/ChipClusters.java | 42 +- .../devicecontroller/ChipEventStructs.java | 8 +- .../chip/devicecontroller/ChipStructs.java | 6 +- .../devicecontroller/ClusterInfoMapping.java | 309 +- .../python/chip/clusters/CHIPClusters.py | 8 +- .../python/chip/clusters/Objects.py | 300 +- .../CHIP/zap-generated/MTRBaseClusters.h | 678 +++- .../CHIP/zap-generated/MTRBaseClusters.mm | 34 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 1243 +++---- .../CHIP/zap-generated/MTRCallbackBridge.mm | 324 +- .../CHIP/zap-generated/MTRClusters.mm | 14 +- .../zap-generated/MTRCommandPayloadsObjc.h | 22 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 46 +- .../zap-generated/MTREventTLVValueDecoder.mm | 8 +- .../CHIP/zap-generated/MTRStructsObjc.h | 11 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 7 +- .../all-clusters-app/zap-generated/access.h | 66 +- .../zap-generated/endpoint_config.h | 38 +- .../zap-generated/endpoint_config.h | 4 +- .../app-common/zap-generated/af-structs.h | 6 +- .../zap-generated/attributes/Accessors.cpp | 20 +- .../zap-generated/attributes/Accessors.h | 10 +- .../app-common/zap-generated/callback.h | 82 +- .../zap-generated/cluster-enums-check.h | 282 +- .../app-common/zap-generated/cluster-enums.h | 266 +- .../zap-generated/cluster-objects.cpp | 34 +- .../zap-generated/cluster-objects.h | 212 +- .../app-common/zap-generated/enums.h | 56 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/cluster/Commands.h | 16 +- .../cluster/ComplexArgumentParser.cpp | 51 +- .../cluster/ComplexArgumentParser.h | 8 +- .../cluster/logging/DataModelLogger.cpp | 64 +- .../cluster/logging/DataModelLogger.h | 4 +- .../chip-tool/zap-generated/test/Commands.h | 750 ++-- .../zap-generated/cluster/Commands.h | 38 +- .../zap-generated/test/Commands.h | 3108 ++++++++--------- zzz_generated/lock-app/zap-generated/access.h | 90 +- .../lock-app/zap-generated/endpoint_config.h | 48 +- 48 files changed, 5134 insertions(+), 4973 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 453c4a425aaca8..02314037dc8f3a 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 @@ -1808,7 +1808,7 @@ server cluster ModeSelect = 80 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1819,13 +1819,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; @@ -1834,40 +1834,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; @@ -1888,35 +1860,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; @@ -1927,25 +1870,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; @@ -1997,19 +1921,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; @@ -2019,6 +2007,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; @@ -2123,56 +2123,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; @@ -2182,7 +2182,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; @@ -2201,7 +2201,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; @@ -2214,22 +2214,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; @@ -2259,13 +2259,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 { @@ -2277,30 +2277,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-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 41265fd93aa923..3c8a88455b72e7 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 @@ -1650,7 +1650,7 @@ server cluster ModeSelect = 80 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1661,13 +1661,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; @@ -1676,40 +1676,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; @@ -1730,35 +1702,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; @@ -1769,25 +1712,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; @@ -1839,19 +1763,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; @@ -1861,6 +1849,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; @@ -1965,56 +1965,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; @@ -2025,17 +2025,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/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index ce5e5271e3d548..6c473001bf28ff 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1023,7 +1023,7 @@ server cluster FixedLabel = 64 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1034,13 +1034,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; @@ -1049,40 +1049,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; @@ -1103,35 +1075,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; @@ -1142,25 +1085,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; @@ -1212,19 +1136,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; @@ -1234,6 +1222,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; @@ -1338,51 +1338,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; @@ -1396,7 +1396,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; @@ -1409,11 +1409,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/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 4813d33f6da103..8e4cc21859700b 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1308,7 +1308,7 @@ server cluster UserLabel = 65 { } server cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -1319,13 +1319,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; @@ -1334,40 +1334,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; @@ -1388,35 +1360,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; @@ -1427,25 +1370,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; @@ -1497,19 +1421,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; @@ -1519,6 +1507,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; @@ -1623,56 +1623,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; @@ -1682,7 +1682,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; @@ -1698,7 +1698,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; @@ -1709,22 +1709,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; @@ -1762,7 +1762,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 { @@ -1774,13 +1774,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 { @@ -1792,27 +1792,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; @@ -1832,17 +1832,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/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a4e66e691a0455..946511c6514039 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2052,7 +2052,7 @@ client cluster ModeSelect = 80 { } client cluster DoorLock = 257 { - enum DlAlarmCode : ENUM8 { + enum AlarmCodeEnum : ENUM8 { kLockJammed = 0; kLockFactoryReset = 1; kLockRadioPowerCycled = 3; @@ -2063,13 +2063,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; @@ -2078,40 +2078,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; @@ -2132,35 +2104,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; @@ -2171,25 +2114,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; @@ -2241,19 +2165,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; @@ -2263,6 +2251,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; @@ -2367,56 +2367,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; @@ -2426,7 +2426,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; @@ -2441,7 +2441,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; @@ -2455,22 +2455,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; @@ -2508,7 +2508,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 { @@ -2520,13 +2520,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 { @@ -2538,27 +2538,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; @@ -2578,17 +2578,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/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index 8b08310c1c819f..31ba7e38e62ba0 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -2365,23 +2365,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); } @@ -2516,23 +2517,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 a055b67cc3fa57..f263a60a8596b8 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 576fb43c870dde..ed6544fbb74768 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -14965,7 +14965,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 1b9e29c1571b20..26f72cd75ad3fc 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -6161,7 +6161,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 4ae3c8e5af58d2..f53fd2c0ab86eb 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -11389,21 +11389,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( @@ -11589,7 +11589,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, @@ -11600,7 +11600,7 @@ public void setUser( operationType, userIndex, userName, - userUniqueId, + userUniqueID, userStatus, userType, credentialRule, @@ -11624,7 +11624,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, @@ -11644,20 +11644,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); } @@ -11665,20 +11665,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( @@ -11757,7 +11757,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, @@ -11779,7 +11779,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, @@ -11789,13 +11789,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 { @@ -11838,11 +11838,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 2040b030738a89..7b9a16dc3b15c2 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 87079f933b5ee2..c3de005c07a75a 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 2a4857ae12fa87..32f981c3000cbe 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -4175,37 +4175,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); } @@ -4227,25 +4227,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); } @@ -4267,26 +4267,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); } @@ -4307,43 +4307,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); } @@ -4365,15 +4365,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); } @@ -4395,26 +4395,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); } @@ -9683,9 +9683,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( @@ -9693,7 +9693,7 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .lockDoor( (DefaultClusterCallback) callback, - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -9701,9 +9701,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( @@ -9711,7 +9711,7 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .unlockDoor( (DefaultClusterCallback) callback, - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -9724,10 +9724,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( @@ -9736,7 +9736,7 @@ public Map> getCommandMap() { .unlockWithTimeout( (DefaultClusterCallback) callback, (Integer) commandArguments.get("timeout"), - (Optional) commandArguments.get("pinCode"), + (Optional) commandArguments.get("PINCode"), 10000); }, () -> new DelegatedDefaultClusterCallback(), @@ -10025,10 +10025,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); @@ -10052,7 +10052,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"), @@ -10130,7 +10130,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"), @@ -10148,7 +10149,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); @@ -10162,7 +10164,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 38ad1730b57cc8..e2663d68c8473f 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 92cab8362db39a..765e82d64abb89 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -13295,7 +13295,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]), @@ -13315,7 +13315,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]), @@ -13338,7 +13338,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 @@ -13358,7 +13358,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 @@ -13378,7 +13378,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class DlAlarmCode(IntEnum): + class AlarmCodeEnum(IntEnum): kLockJammed = 0x00 kLockFactoryReset = 0x01 kLockRadioPowerCycled = 0x03 @@ -13388,12 +13388,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 @@ -13401,36 +13401,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 @@ -13449,32 +13424,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 @@ -13484,23 +13433,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 @@ -13547,19 +13479,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 @@ -13576,14 +13576,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): @@ -13596,14 +13596,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): @@ -13617,7 +13617,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 @@ -13625,7 +13625,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): @@ -13817,13 +13817,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): @@ -13856,14 +13856,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): @@ -13892,26 +13892,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): @@ -13942,11 +13942,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]), @@ -13954,11 +13954,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 @@ -13994,24 +13994,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): @@ -14044,10 +14044,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): @@ -14084,14 +14084,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: @@ -14155,9 +14155,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): @@ -14475,9 +14475,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): @@ -14767,10 +14767,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): @@ -14786,10 +14786,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): @@ -14805,20 +14805,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): @@ -14834,22 +14834,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): @@ -14865,18 +14865,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/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 6122c5cfbb9052..68d92312244829 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -6862,35 +6862,35 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; /** - * Command LockDoor + * Command Lock Door * * This command causes the lock device to lock the door. */ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command UnlockDoor + * Command Unlock Door * * This command causes the lock device to unlock the door. */ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command UnlockWithTimeout + * Command Unlock with Timeout * * This command causes the lock device to unlock the door with a timeout parameter. */ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command SetWeekDaySchedule + * Command Set Week Day Schedule * * Set a weekly repeating schedule for a specified user. */ - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command GetWeekDaySchedule + * Command Get Week Day Schedule * * Retrieve the specific weekly schedule for the specific user. */ @@ -6898,21 +6898,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command ClearWeekDaySchedule + * Command Clear Week Day Schedule * * Clear the specific weekly schedule or all weekly schedules for the specific user. */ - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command SetYearDaySchedule + * Command Set Year Day Schedule * * Set a time-specific schedule ID for a specified user. */ - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command GetYearDaySchedule + * Command Get Year Day Schedule * * Returns the year day schedule data for the specified schedule and user indexes. */ @@ -6920,21 +6920,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command ClearYearDaySchedule + * Command Clear Year Day Schedule * * Clears the specific year day schedule or all year day schedules for the specific user. */ - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command SetHolidaySchedule + * Command Set Holiday Schedule * * Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode. */ - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command GetHolidaySchedule + * Command Get Holiday Schedule * * Get the holiday schedule for the specified index. */ @@ -6942,20 +6942,20 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command ClearHolidaySchedule + * Command Clear Holiday Schedule * * Clears the holiday schedule or all holiday schedules. */ - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidayScheduleParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command SetUser + * Command Set User * * Set User into the lock. */ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command GetUser + * Command Get User * * Retrieve User. */ @@ -6963,14 +6963,14 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command ClearUser + * Command Clear User * * Clears a User or all Users. */ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** - * Command SetCredential + * Command Set Credential * * Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser. */ @@ -6978,7 +6978,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command GetCredentialStatus + * Command Get Credential Status * * Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index. */ @@ -6986,7 +6986,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** - * Command ClearCredential + * Command Clear Credential * * Clear one, one type, or all credentials except ProgrammingPIN credential. */ @@ -17923,65 +17923,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, @@ -18003,35 +18044,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, @@ -18042,76 +18054,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, @@ -18124,16 +18455,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)) @@ -18257,17 +18578,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 c8b4e71e2127da..fe987053620d90 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -45530,7 +45530,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]; } } @@ -45566,7 +45566,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]; } } @@ -45602,7 +45602,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]; } @@ -45913,11 +45913,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(); @@ -46257,7 +46257,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()); } @@ -46266,7 +46266,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()); } @@ -46276,9 +46276,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; @@ -47413,7 +47413,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()); } @@ -47459,9 +47459,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 @@ -47469,9 +47469,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 c3d79ef81d5c97..58205638725d51 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -350,51 +350,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)( @@ -407,12 +383,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 &); @@ -15705,464 +15699,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; @@ -16296,733 +16094,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 af6b57bc696872..212e5a6906dbeb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -12190,10 +12190,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()]; } } { @@ -12226,8 +12226,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]; @@ -16010,15 +16010,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; @@ -16033,8 +16033,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()) { @@ -16045,7 +16045,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16060,15 +16060,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; @@ -16083,8 +16083,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()) { @@ -16095,7 +16095,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16110,15 +16110,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; @@ -16133,8 +16133,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()) { @@ -16145,7 +16145,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16160,15 +16160,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; @@ -16183,8 +16183,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()) { @@ -16195,7 +16195,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16210,115 +16210,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; @@ -16333,8 +16233,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()) { @@ -16345,7 +16245,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16360,15 +16260,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; @@ -16383,8 +16283,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()) { @@ -16395,7 +16295,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16410,15 +16310,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; @@ -16433,8 +16332,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()) { @@ -16445,7 +16344,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16460,15 +16359,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; @@ -16483,8 +16382,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()) { @@ -16495,7 +16394,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16510,15 +16409,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; @@ -16533,8 +16432,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()) { @@ -16545,7 +16444,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16560,15 +16459,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; @@ -16583,8 +16482,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()) { @@ -16595,7 +16494,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16610,14 +16509,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; @@ -16632,8 +16532,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()) { @@ -16644,7 +16544,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16659,15 +16559,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; @@ -16682,8 +16582,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()) { @@ -16694,7 +16594,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16709,15 +16609,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; @@ -16732,8 +16632,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()) { @@ -16744,7 +16644,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16759,15 +16659,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; @@ -16782,8 +16682,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()) { @@ -16794,7 +16694,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16809,15 +16709,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; @@ -16832,8 +16732,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()) { @@ -16844,7 +16744,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16859,15 +16759,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; @@ -16882,8 +16782,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()) { @@ -16894,7 +16794,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16909,15 +16809,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; @@ -16932,8 +16832,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()) { @@ -16944,7 +16844,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -16959,15 +16859,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; @@ -16982,8 +16882,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()) { @@ -16994,7 +16894,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 60a943cc11bcaf..3c92a915340299 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -11775,7 +11775,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]; } } @@ -11840,7 +11840,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]; } } @@ -11905,7 +11905,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]; } @@ -12513,11 +12513,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 f2714a5618ee5f..88c5d1fcf8ae68 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -3153,7 +3153,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)); @@ -3177,6 +3177,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 @@ -3205,7 +3211,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)); @@ -3239,6 +3245,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 @@ -3266,7 +3278,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)); @@ -3323,7 +3335,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). * @@ -3377,7 +3389,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 a002bf55dd823c..60825891c989ea 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -4407,7 +4407,7 @@ - (instancetype)init _userName = nil; - _userUniqueId = nil; + _userUniqueID = nil; _userStatus = nil; @@ -4426,7 +4426,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; @@ -4439,12 +4439,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 @@ -4483,7 +4496,7 @@ - (instancetype)init _userName = nil; - _userUniqueId = nil; + _userUniqueID = nil; _userStatus = nil; @@ -4509,7 +4522,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; @@ -4525,13 +4538,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 @@ -4568,7 +4594,7 @@ - (instancetype)init _operationType = @(0); - _credential = [MTRDoorLockClusterDlCredential new]; + _credential = [MTRDoorLockClusterCredentialStruct new]; _credentialData = [NSData data]; @@ -4647,7 +4673,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 a2fa781704a557..bcfc6213386993 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 f25c0a264de5de..8c5db6312663cc 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -622,10 +622,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 03e854a2c5bfb3..3e233bf5a898a6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -2534,7 +2534,7 @@ - (NSString *)description @end -@implementation MTRDoorLockClusterDlCredential +@implementation MTRDoorLockClusterCredentialStruct - (instancetype)init { if (self = [super init]) { @@ -2548,7 +2548,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; @@ -2565,6 +2565,9 @@ - (NSString *)description @end +@implementation MTRDoorLockClusterDlCredential : MTRDoorLockClusterCredentialStruct +@end + @implementation MTRDoorLockClusterDoorLockAlarmEvent - (instancetype)init { diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index 5bd2477bd02e1f..3889c46c03ea4d 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -419,17 +419,17 @@ 63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ 4166, /* Cluster: Client Monitoring, Command: RegisterClientMonitoring, Privilege: manage */ \ 4166, /* Cluster: Client Monitoring, Command: UnregisterClientMonitoring, Privilege: manage */ \ 4294048774, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ @@ -473,17 +473,17 @@ 1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - 14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - 15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 11, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + 12, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + 13, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + 14, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + 15, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + 26, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + 27, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + 29, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + 34, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + 36, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + 38, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ 0, /* Cluster: Client Monitoring, Command: RegisterClientMonitoring, Privilege: manage */ \ 1, /* Cluster: Client Monitoring, Command: UnregisterClientMonitoring, Privilege: manage */ \ 0, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ @@ -527,17 +527,17 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: Client Monitoring, Command: RegisterClientMonitoring, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Client Monitoring, Command: UnregisterClientMonitoring, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \ diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index ba12b1aeadd456..4add3e9b33e135 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1742,27 +1742,27 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ /* AcceptedCommandList (index=130) */ \ - 0x00000000 /* LockDoor */, \ - 0x00000001 /* UnlockDoor */, \ - 0x00000003 /* UnlockWithTimeout */, \ - 0x0000000B /* SetWeekDaySchedule */, \ - 0x0000000C /* GetWeekDaySchedule */, \ - 0x0000000D /* ClearWeekDaySchedule */, \ - 0x0000000E /* SetYearDaySchedule */, \ - 0x0000000F /* GetYearDaySchedule */, \ - 0x0000001A /* SetUser */, \ - 0x0000001B /* GetUser */, \ - 0x0000001D /* ClearUser */, \ - 0x00000022 /* SetCredential */, \ - 0x00000024 /* GetCredentialStatus */, \ - 0x00000026 /* ClearCredential */, \ + 0x00000000 /* Lock Door */, \ + 0x00000001 /* Unlock Door */, \ + 0x00000003 /* Unlock with Timeout */, \ + 0x0000000B /* Set Week Day Schedule */, \ + 0x0000000C /* Get Week Day Schedule */, \ + 0x0000000D /* Clear Week Day Schedule */, \ + 0x0000000E /* Set Year Day Schedule */, \ + 0x0000000F /* Get Year Day Schedule */, \ + 0x0000001A /* Set User */, \ + 0x0000001B /* Get User */, \ + 0x0000001D /* Clear User */, \ + 0x00000022 /* Set Credential */, \ + 0x00000024 /* Get Credential Status */, \ + 0x00000026 /* Clear Credential */, \ chip::kInvalidCommandId /* end of list */, \ /* GeneratedCommandList (index=145)*/ \ - 0x0000000C /* GetWeekDayScheduleResponse */, \ - 0x0000000F /* GetYearDayScheduleResponse */, \ - 0x0000001C /* GetUserResponse */, \ - 0x00000023 /* SetCredentialResponse */, \ - 0x00000025 /* GetCredentialStatusResponse */, \ + 0x0000000C /* Get Week Day Schedule Response */, \ + 0x0000000F /* Get Year Day Schedule Response */, \ + 0x0000001C /* Get User Response */, \ + 0x00000023 /* Set Credential Response */, \ + 0x00000025 /* Get Credential Status Response */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ /* AcceptedCommandList (index=151) */ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 66af010c2ff80a..8ca3f938d21e60 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -1237,8 +1237,8 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ /* AcceptedCommandList (index=112) */ \ - 0x00000000 /* LockDoor */, \ - 0x00000001 /* UnlockDoor */, \ + 0x00000000 /* Lock Door */, \ + 0x00000001 /* Unlock Door */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ /* AcceptedCommandList (index=115) */ \ 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 b14c05369fffce..81f8ed531413c0 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 @@ -11606,9 +11606,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)); @@ -11623,9 +11623,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -11638,7 +11638,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); @@ -11646,7 +11646,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()) { @@ -12248,9 +12248,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)); @@ -12262,9 +12262,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 2303534ce5f682..a02e4e4ca6d766 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 d646734249827d..8eec566912cfd5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8211,150 +8211,150 @@ bool emberAfModeSelectClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ModeSelect::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief Door Lock Cluster LockDoor Command callback (from client) + * @brief Door Lock Cluster Lock Door Command callback (from client) */ bool emberAfDoorLockClusterLockDoorCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::LockDoor::DecodableType & commandData); /** - * @brief Door Lock Cluster UnlockDoor Command callback (from client) + * @brief Door Lock Cluster Unlock Door Command callback (from client) */ bool emberAfDoorLockClusterUnlockDoorCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::UnlockDoor::DecodableType & commandData); /** - * @brief Door Lock Cluster UnlockWithTimeout Command callback (from client) + * @brief Door Lock Cluster Unlock with Timeout Command callback (from client) */ bool emberAfDoorLockClusterUnlockWithTimeoutCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::DecodableType & commandData); /** - * @brief Door Lock Cluster SetWeekDaySchedule Command callback (from client) + * @brief Door Lock Cluster Set Week Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterSetWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetWeekDaySchedule Command callback (from client) + * @brief Door Lock Cluster Get Week Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterGetWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetWeekDayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster Get Week Day Schedule Response 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) + * @brief Door Lock Cluster Clear Week Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterClearWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster SetYearDaySchedule Command callback (from client) + * @brief Door Lock Cluster Set Year Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterSetYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetYearDaySchedule Command callback (from client) + * @brief Door Lock Cluster Get Year Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterGetYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetYearDayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster Get Year Day Schedule Response 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) + * @brief Door Lock Cluster Clear Year Day Schedule Command callback (from client) */ bool emberAfDoorLockClusterClearYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster SetHolidaySchedule Command callback (from client) + * @brief Door Lock Cluster Set Holiday Schedule Command callback (from client) */ bool emberAfDoorLockClusterSetHolidayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetHolidaySchedule Command callback (from client) + * @brief Door Lock Cluster Get Holiday Schedule Command callback (from client) */ bool emberAfDoorLockClusterGetHolidayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster Get Holiday Schedule Response 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) + * @brief Door Lock Cluster Clear Holiday Schedule Command callback (from client) */ bool emberAfDoorLockClusterClearHolidayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster SetUser Command callback (from client) + * @brief Door Lock Cluster Set User Command callback (from client) */ bool emberAfDoorLockClusterSetUserCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetUser::DecodableType & commandData); /** - * @brief Door Lock Cluster GetUser Command callback (from client) + * @brief Door Lock Cluster Get User Command callback (from client) */ bool emberAfDoorLockClusterGetUserCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::GetUser::DecodableType & commandData); /** - * @brief Door Lock Cluster GetUserResponse Command callback (from server) + * @brief Door Lock Cluster Get User Response 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) + * @brief Door Lock Cluster Clear User Command callback (from client) */ bool emberAfDoorLockClusterClearUserCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::ClearUser::DecodableType & commandData); /** - * @brief Door Lock Cluster SetCredential Command callback (from client) + * @brief Door Lock Cluster Set Credential Command callback (from client) */ bool emberAfDoorLockClusterSetCredentialCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetCredential::DecodableType & commandData); /** - * @brief Door Lock Cluster SetCredentialResponse Command callback (from server) + * @brief Door Lock Cluster Set Credential Response 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) + * @brief Door Lock Cluster Get Credential Status Command callback (from client) */ bool emberAfDoorLockClusterGetCredentialStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::DecodableType & commandData); /** - * @brief Door Lock Cluster GetCredentialStatusResponse Command callback (from server) + * @brief Door Lock Cluster Get Credential Status Response 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) + * @brief Door Lock Cluster Clear Credential Command callback (from client) */ bool emberAfDoorLockClusterClearCredentialCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, 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 495610c7455834..2372ec2c14ae24 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 @@ -1085,9 +1085,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: @@ -1103,22 +1103,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: @@ -1132,9 +1132,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: @@ -1145,55 +1145,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; @@ -1228,56 +1179,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; @@ -1295,39 +1196,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; @@ -1414,6 +1282,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 be72b6ae08bd53..7ba71659f4a1f8 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 @@ -1039,8 +1039,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, @@ -1053,17 +1053,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, @@ -1074,8 +1074,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, @@ -1083,43 +1083,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 { @@ -1146,44 +1109,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 { @@ -1197,31 +1122,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 { @@ -1288,24 +1188,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, @@ -1316,6 +1300,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 { @@ -1444,18 +1444,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 50f984dc7acf6a..3bbe70f2128c07 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 @@ -10489,7 +10489,7 @@ 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; @@ -10532,7 +10532,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace DlCredential +} // namespace CredentialStruct } // namespace Structs namespace Commands { @@ -10541,7 +10541,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; } @@ -10560,8 +10560,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; @@ -10578,7 +10578,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; } @@ -10597,8 +10597,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; @@ -10616,7 +10616,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; } @@ -10638,8 +10638,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; @@ -11227,7 +11227,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)); @@ -11258,8 +11258,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)); @@ -11324,7 +11324,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)); @@ -11358,8 +11358,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 62a0fb93405645..d9b63140b75379 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 @@ -13021,7 +13021,7 @@ struct TypeInfo } // namespace ModeSelect namespace DoorLock { namespace Structs { -namespace DlCredential { +namespace CredentialStruct { enum class Fields { kCredentialType = 0, @@ -13031,8 +13031,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); @@ -13043,7 +13043,7 @@ struct Type using DecodableType = Type; -} // namespace DlCredential +} // namespace CredentialStruct } // namespace Structs namespace Commands { @@ -13175,7 +13175,7 @@ namespace Commands { namespace LockDoor { enum class Fields { - kPinCode = 0, + kPINCode = 0, }; struct Type @@ -13185,7 +13185,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; @@ -13200,14 +13200,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 @@ -13217,7 +13217,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; @@ -13232,7 +13232,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 @@ -13240,7 +13240,7 @@ namespace UnlockWithTimeout { enum class Fields { kTimeout = 0, - kPinCode = 1, + kPINCode = 1, }; struct Type @@ -13251,7 +13251,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; @@ -13267,7 +13267,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 @@ -13290,13 +13290,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; @@ -13311,13 +13311,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 @@ -13379,7 +13379,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; @@ -13401,7 +13401,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; @@ -13615,10 +13615,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; @@ -13633,10 +13633,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 @@ -13693,7 +13693,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; @@ -13712,7 +13712,7 @@ struct DecodableType DlStatus status = static_cast(0); Optional localStartTime; Optional localEndTime; - Optional operatingMode; + Optional operatingMode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetHolidayScheduleResponse @@ -13754,7 +13754,7 @@ enum class Fields kOperationType = 0, kUserIndex = 1, kUserName = 2, - kUserUniqueId = 3, + kUserUniqueID = 3, kUserStatus = 4, kUserType = 5, kCredentialRule = 6, @@ -13767,13 +13767,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; @@ -13788,13 +13788,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 @@ -13835,7 +13835,7 @@ enum class Fields { kUserIndex = 0, kUserName = 1, - kUserUniqueId = 2, + kUserUniqueID = 2, kUserStatus = 3, kUserType = 4, kCredentialRule = 5, @@ -13854,11 +13854,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; @@ -13878,11 +13878,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; @@ -13939,12 +13939,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; @@ -13959,12 +13959,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 @@ -14019,7 +14019,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; @@ -14034,7 +14034,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 @@ -14095,7 +14095,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; @@ -14110,7 +14110,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 @@ -14157,9 +14157,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; } @@ -14398,9 +14398,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; } @@ -14619,7 +14619,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 = @@ -14660,7 +14660,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; }; @@ -14672,7 +14672,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); }; @@ -14693,7 +14693,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; }; @@ -14705,7 +14705,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); }; @@ -14731,12 +14731,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; }; @@ -14748,12 +14748,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); }; @@ -14780,13 +14780,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; }; @@ -14798,13 +14798,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); }; @@ -14831,9 +14831,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; @@ -14849,9 +14849,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 fe568a150e46ce..e8fc04f15ada4e 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/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h index 2e7c64f49d2747..b75112f439d164 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/endpoint_config.h @@ -455,8 +455,8 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ /* AcceptedCommandList (index=81) */ \ - 0x00000000 /* LockDoor */, \ - 0x00000001 /* UnlockDoor */, \ + 0x00000000 /* Lock Door */, \ + 0x00000001 /* Unlock Door */, \ chip::kInvalidCommandId /* end of list */, \ } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index fe85a94a241f75..05fd3b7645eee1 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 28a59a03b7366d..559b25a99ada24 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 94cd1b782b1ba7..d103c03297053e 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 1545849d5e6b5b..88602b0235b50f 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); } @@ -10383,32 +10383,32 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa case DoorLock::Commands::GetWeekDayScheduleResponse::Id: { DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("GetWeekDayScheduleResponse", 1, value); + return DataModelLogger::LogValue("Get Week Day Schedule Response", 1, value); } case DoorLock::Commands::GetYearDayScheduleResponse::Id: { DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("GetYearDayScheduleResponse", 1, value); + return DataModelLogger::LogValue("Get Year Day Schedule Response", 1, value); } case DoorLock::Commands::GetHolidayScheduleResponse::Id: { DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("GetHolidayScheduleResponse", 1, value); + return DataModelLogger::LogValue("Get Holiday Schedule Response", 1, value); } case DoorLock::Commands::GetUserResponse::Id: { DoorLock::Commands::GetUserResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("GetUserResponse", 1, value); + return DataModelLogger::LogValue("Get User Response", 1, value); } case DoorLock::Commands::SetCredentialResponse::Id: { DoorLock::Commands::SetCredentialResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("SetCredentialResponse", 1, value); + return DataModelLogger::LogValue("Set Credential Response", 1, value); } case DoorLock::Commands::GetCredentialStatusResponse::Id: { DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("GetCredentialStatusResponse", 1, value); + return DataModelLogger::LogValue("Get Credential Status Response", 1, value); } } break; 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 077dece4c4c9c2..a20e7e8022e7b9 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 5733c20be38e39..e095d2d886b040 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -70730,7 +70730,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)); @@ -70766,7 +70766,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)); @@ -70795,7 +70795,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)); @@ -70821,8 +70821,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)); @@ -70848,8 +70848,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)); @@ -70875,8 +70875,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)); @@ -70902,8 +70902,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)); @@ -70929,8 +70929,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)); @@ -70956,8 +70956,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)); @@ -70982,7 +70982,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)); @@ -71002,7 +71002,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)); @@ -71023,8 +71023,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)); @@ -71050,7 +71050,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)); @@ -71081,7 +71081,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)); @@ -71103,7 +71103,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)); @@ -71135,7 +71135,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)); @@ -71152,7 +71152,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)); @@ -71249,7 +71249,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)); @@ -71370,7 +71370,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)); @@ -71583,7 +71583,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)); @@ -71631,7 +71631,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)); @@ -71687,7 +71687,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)); @@ -71739,7 +71739,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)); @@ -71811,7 +71811,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)); @@ -71840,7 +71840,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)); @@ -71932,7 +71932,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)); @@ -71949,7 +71949,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)); @@ -71966,7 +71966,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)); @@ -71983,7 +71983,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)); @@ -72022,7 +72022,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)); @@ -72097,7 +72097,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)); @@ -72250,10 +72250,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(); @@ -72276,10 +72276,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(); @@ -72292,11 +72292,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(); @@ -72319,11 +72319,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(); @@ -72346,12 +72346,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, @@ -72373,13 +72373,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 @@ -72400,14 +72400,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 @@ -72427,18 +72427,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 @@ -72458,18 +72458,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 @@ -72489,14 +72489,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, @@ -72518,14 +72518,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, @@ -72547,14 +72547,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, @@ -72576,11 +72576,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(); @@ -72603,10 +72603,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(); @@ -72619,10 +72619,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(); @@ -72655,10 +72655,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(); @@ -72737,7 +72737,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, @@ -72750,7 +72750,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, @@ -72763,7 +72763,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, @@ -72775,15 +72775,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 @@ -72794,15 +72794,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 @@ -72813,9 +72813,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); @@ -72842,7 +72842,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, @@ -72854,9 +72854,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); @@ -72872,9 +72872,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); @@ -72896,7 +72896,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, @@ -72909,7 +72909,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, @@ -72922,7 +72922,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, @@ -72934,9 +72934,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 = @@ -72965,7 +72965,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, @@ -72977,9 +72977,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 = @@ -72996,9 +72996,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 = @@ -73015,9 +73015,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); @@ -73034,9 +73034,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); @@ -73053,9 +73053,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); @@ -73072,9 +73072,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); @@ -73091,9 +73091,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); @@ -73110,9 +73110,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); @@ -73120,7 +73120,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 @@ -73130,9 +73130,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( @@ -73150,9 +73150,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); @@ -73168,9 +73168,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 = @@ -73187,9 +73187,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); @@ -73206,9 +73206,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); @@ -73224,9 +73224,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); @@ -73242,9 +73242,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 = @@ -73272,9 +73272,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); @@ -73303,7 +73303,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, @@ -73316,7 +73316,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, @@ -73340,7 +73340,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, @@ -73353,7 +73353,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, @@ -73375,9 +73375,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 = @@ -73396,7 +73396,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, @@ -73409,7 +73409,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, @@ -73422,7 +73422,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, @@ -73435,7 +73435,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, @@ -73467,9 +73467,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); @@ -73485,9 +73485,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 = @@ -73504,9 +73504,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 = @@ -73534,7 +73534,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, @@ -73547,7 +73547,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, @@ -73560,7 +73560,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, @@ -73612,9 +73612,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); @@ -73630,9 +73630,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); @@ -73659,7 +73659,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, @@ -73671,9 +73671,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); @@ -73691,7 +73691,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, @@ -73705,7 +73705,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, @@ -73719,7 +73719,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, @@ -73733,7 +73733,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, @@ -73747,7 +73747,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, @@ -73761,7 +73761,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, @@ -73794,7 +73794,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, @@ -73806,9 +73806,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); @@ -73824,9 +73824,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); @@ -73843,9 +73843,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); @@ -73862,9 +73862,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); @@ -73881,9 +73881,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); @@ -73900,9 +73900,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); @@ -74225,9 +74225,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); @@ -74251,8 +74251,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 @@ -74267,8 +74267,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 @@ -74283,8 +74283,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 @@ -74299,8 +74299,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 @@ -74314,8 +74314,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); } @@ -74331,8 +74331,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); } @@ -74353,8 +74353,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 @@ -74364,8 +74364,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 @@ -74375,8 +74375,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 @@ -74386,8 +74386,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 @@ -74404,8 +74404,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 @@ -74420,8 +74420,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 @@ -74431,15 +74431,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 @@ -74450,8 +74450,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 @@ -74466,8 +74466,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 @@ -74482,8 +74482,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 @@ -74498,8 +74498,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 @@ -75636,9 +75636,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); @@ -75676,7 +75676,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; @@ -75692,7 +75692,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; @@ -75708,7 +75708,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; @@ -75724,7 +75724,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; @@ -75740,7 +75740,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; @@ -75756,7 +75756,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; @@ -75772,7 +75772,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; @@ -75788,7 +75788,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; @@ -75804,7 +75804,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; @@ -75820,7 +75820,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; @@ -75836,7 +75836,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; @@ -75852,7 +75852,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; @@ -75868,7 +75868,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; @@ -75884,7 +75884,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; @@ -76111,7 +76111,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 @@ -76124,7 +76124,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 @@ -76137,7 +76137,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 @@ -76150,7 +76150,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 @@ -76193,7 +76193,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 @@ -76215,7 +76215,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; @@ -76492,7 +76492,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; @@ -76544,7 +76544,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 @@ -76652,7 +76652,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; @@ -76732,10 +76732,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(); @@ -76750,7 +76750,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; @@ -76801,7 +76801,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; @@ -76927,7 +76927,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 @@ -76947,9 +76947,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); @@ -76967,7 +76967,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; @@ -77906,8 +77906,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)); @@ -78061,18 +78061,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 @@ -78092,9 +78092,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); @@ -78112,7 +78112,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, @@ -78163,8 +78163,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 @@ -78203,8 +78203,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 @@ -78215,8 +78215,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 @@ -78341,7 +78341,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, @@ -78402,8 +78402,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)); @@ -78590,18 +78590,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 @@ -78621,9 +78621,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); @@ -78641,7 +78641,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, @@ -78692,8 +78692,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 @@ -78732,8 +78732,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 @@ -78744,8 +78744,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 @@ -78810,8 +78810,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 @@ -78822,8 +78822,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 @@ -78834,8 +78834,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 @@ -78846,8 +78846,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 @@ -78864,8 +78864,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 @@ -78958,7 +78958,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, @@ -79022,8 +79022,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)); @@ -79118,18 +79118,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 @@ -79149,9 +79149,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); @@ -79169,7 +79169,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, @@ -79201,8 +79201,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 @@ -79239,7 +79239,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, @@ -79306,8 +79306,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)); @@ -79430,18 +79430,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 @@ -79476,7 +79476,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; @@ -79506,7 +79506,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; @@ -79715,7 +79715,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 @@ -79741,7 +79741,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 @@ -79863,8 +79863,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)); @@ -80021,18 +80021,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 @@ -80118,18 +80118,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 @@ -80292,8 +80292,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)); @@ -80469,18 +80469,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 @@ -80508,9 +80508,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); @@ -80530,7 +80530,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, @@ -80544,17 +80544,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 @@ -80566,9 +80566,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); @@ -80626,7 +80626,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, @@ -80641,7 +80641,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, @@ -80654,18 +80654,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 @@ -80677,9 +80677,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); @@ -80699,7 +80699,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, @@ -80714,7 +80714,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, @@ -80729,7 +80729,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, @@ -80744,7 +80744,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 a48c4bdcd29c85..08a4e5b31f1310 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -37832,7 +37832,7 @@ class DoorLockLockDoor : public ClusterCommand { DoorLockLockDoor() : ClusterCommand("lock-door") { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -37845,8 +37845,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; } @@ -37880,7 +37880,7 @@ class DoorLockUnlockDoor : public ClusterCommand { DoorLockUnlockDoor() : ClusterCommand("unlock-door") { - AddArgument("PinCode", &mRequest.pinCode); + AddArgument("PINCode", &mRequest.PINCode); ClusterCommand::AddArguments(); } @@ -37893,8 +37893,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; } @@ -37929,7 +37929,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(); } @@ -37943,8 +37943,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; } @@ -38415,7 +38415,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); @@ -38440,10 +38440,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; @@ -38599,7 +38599,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]; @@ -38641,7 +38641,7 @@ class DoorLockSetCredential : public ClusterCommand { private: chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -38666,7 +38666,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]; @@ -38692,7 +38692,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand { private: chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest; - TypedComplexArgument mComplex_Credential; + TypedComplexArgument mComplex_Credential; }; /* @@ -38720,7 +38720,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]; @@ -38745,7 +38745,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 26e2f7857d773a..b8bd60a509283b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -107097,52 +107097,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(); @@ -107235,7 +107235,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; @@ -107268,58 +107268,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(); @@ -107339,7 +107339,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; @@ -107368,7 +107368,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; @@ -107401,58 +107401,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(); @@ -107472,7 +107472,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; @@ -107505,59 +107505,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(); @@ -107577,7 +107577,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; @@ -107610,59 +107610,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(); @@ -107682,7 +107682,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; @@ -107715,59 +107715,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(); @@ -107787,7 +107787,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]; @@ -107820,59 +107820,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(); @@ -107892,7 +107892,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]; @@ -107925,59 +107925,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(); @@ -107997,7 +107997,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]; @@ -108030,59 +108030,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(); @@ -108102,7 +108102,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; @@ -108137,52 +108137,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(); @@ -108202,7 +108202,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; @@ -108237,52 +108237,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(); @@ -108302,7 +108302,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; @@ -108335,59 +108335,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(); @@ -108407,7 +108407,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; @@ -108440,58 +108440,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(); @@ -108511,7 +108511,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; @@ -108540,7 +108540,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; @@ -108596,53 +108596,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(); @@ -108662,7 +108662,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; @@ -108695,59 +108695,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(); @@ -108842,52 +108842,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(); @@ -108913,52 +108913,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(); @@ -109002,9 +109002,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, @@ -109015,27 +109015,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(); @@ -109052,9 +109052,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, @@ -109065,27 +109065,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(); @@ -109102,9 +109102,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 @@ -109117,27 +109117,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(); @@ -109155,9 +109155,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; @@ -109172,18 +109172,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(); @@ -109201,9 +109201,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; @@ -109218,18 +109218,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(); @@ -109247,9 +109247,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; @@ -109264,19 +109264,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(); @@ -109302,63 +109302,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(); @@ -109375,9 +109375,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, @@ -109388,30 +109388,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(); @@ -109429,9 +109429,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; @@ -109446,18 +109446,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(); @@ -109475,9 +109475,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]; @@ -109493,17 +109493,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(); @@ -109547,9 +109547,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, @@ -109562,22 +109562,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(); @@ -109594,9 +109594,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 @@ -109609,27 +109609,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(); @@ -109646,9 +109646,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, @@ -109659,27 +109659,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(); @@ -109697,9 +109697,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]; @@ -109714,18 +109714,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(); @@ -109751,67 +109751,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(); @@ -109828,9 +109828,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, @@ -109841,30 +109841,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(); @@ -109882,9 +109882,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; @@ -109899,18 +109899,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(); @@ -109928,9 +109928,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]; @@ -109946,17 +109946,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(); @@ -109974,9 +109974,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]; @@ -109991,18 +109991,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(); @@ -110020,9 +110020,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]; @@ -110037,18 +110037,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(); @@ -110066,9 +110066,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]; @@ -110083,18 +110083,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(); @@ -110112,9 +110112,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]; @@ -110129,18 +110129,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(); @@ -110158,9 +110158,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]; @@ -110175,18 +110175,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(); @@ -110204,9 +110204,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]; @@ -110221,18 +110221,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(); @@ -110250,9 +110250,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]; @@ -110267,18 +110267,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(); @@ -110296,9 +110296,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; @@ -110313,18 +110313,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(); @@ -110342,9 +110342,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; @@ -110359,18 +110359,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(); @@ -110388,9 +110388,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]; @@ -110405,18 +110405,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(); @@ -110434,9 +110434,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; @@ -110451,19 +110451,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(); @@ -110481,9 +110481,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; @@ -110498,18 +110498,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(); @@ -110527,9 +110527,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]; @@ -110544,18 +110544,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(); @@ -110581,72 +110581,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(); @@ -110664,9 +110664,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]; @@ -110681,18 +110681,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(); @@ -110718,76 +110718,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(); @@ -110804,9 +110804,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) { @@ -110828,9 +110828,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, @@ -110841,28 +110841,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(); @@ -110888,72 +110888,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(); @@ -110970,9 +110970,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) { @@ -110994,9 +110994,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, @@ -111007,28 +111007,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(); @@ -111054,52 +111054,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(); @@ -111117,9 +111117,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; @@ -111134,19 +111134,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(); @@ -111163,9 +111163,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) { @@ -111187,9 +111187,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, @@ -111200,28 +111200,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(); @@ -111238,9 +111238,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, @@ -111251,28 +111251,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(); @@ -111289,9 +111289,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, @@ -111302,28 +111302,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(); @@ -111350,63 +111350,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(); @@ -111432,52 +111432,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(); @@ -111495,9 +111495,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; @@ -111512,19 +111512,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(); @@ -111542,9 +111542,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; @@ -111559,19 +111559,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(); @@ -111589,9 +111589,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; @@ -111606,19 +111606,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(); @@ -111656,9 +111656,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, @@ -111669,27 +111669,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(); @@ -111706,9 +111706,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, @@ -111719,27 +111719,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(); @@ -111756,9 +111756,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, @@ -111769,27 +111769,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(); @@ -111815,52 +111815,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(); @@ -111886,52 +111886,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(); @@ -111957,52 +111957,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(); @@ -112028,52 +112028,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(); @@ -112091,9 +112091,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; @@ -112108,17 +112108,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(); @@ -112136,9 +112136,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; @@ -112153,18 +112153,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(); @@ -112190,63 +112190,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(); @@ -112263,9 +112263,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, @@ -112276,30 +112276,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(); @@ -112317,9 +112317,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; @@ -112334,17 +112334,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(); @@ -112361,9 +112361,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) { @@ -112388,9 +112388,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) { @@ -112415,9 +112415,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) { @@ -112442,9 +112442,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 @@ -112470,9 +112470,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) { @@ -112497,9 +112497,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 @@ -112555,52 +112555,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(); @@ -112617,9 +112617,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, @@ -112630,27 +112630,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(); @@ -112668,9 +112668,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; @@ -112685,19 +112685,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(); @@ -112715,9 +112715,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]; @@ -112732,18 +112732,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(); @@ -112761,9 +112761,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]; @@ -112778,18 +112778,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(); @@ -112807,9 +112807,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]; @@ -112824,18 +112824,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(); @@ -112853,9 +112853,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]; @@ -112870,18 +112870,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(); @@ -112899,9 +112899,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]; @@ -112916,18 +112916,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(); @@ -113400,9 +113400,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; @@ -113417,19 +113417,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(); @@ -113938,9 +113938,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; @@ -113955,19 +113955,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(); @@ -115167,9 +115167,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; @@ -115184,19 +115184,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(); @@ -115757,17 +115757,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(); @@ -115795,17 +115795,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(); @@ -115833,18 +115833,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(); @@ -115872,17 +115872,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(); @@ -115910,18 +115910,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(); @@ -115949,17 +115949,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(); @@ -116149,17 +116149,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(); @@ -116187,17 +116187,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(); @@ -116225,18 +116225,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(); @@ -116264,17 +116264,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(); @@ -116302,18 +116302,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(); @@ -116341,17 +116341,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(); @@ -116486,12 +116486,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(); @@ -116518,12 +116518,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(); @@ -116550,13 +116550,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(); @@ -116607,27 +116607,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(); @@ -116682,42 +116682,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(); @@ -116769,27 +116769,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(); @@ -116947,42 +116947,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(); @@ -117010,27 +117010,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(); @@ -117057,27 +117057,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(); @@ -117235,42 +117235,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(); @@ -117298,27 +117298,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(); @@ -117345,27 +117345,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(); @@ -117443,42 +117443,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(); @@ -117506,27 +117506,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(); @@ -117553,27 +117553,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(); @@ -117628,42 +117628,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(); @@ -117715,27 +117715,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(); @@ -117786,27 +117786,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(); @@ -117856,17 +117856,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(); @@ -117916,17 +117916,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(); @@ -117954,27 +117954,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(); @@ -118002,27 +118002,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(); @@ -118049,27 +118049,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(); @@ -118096,27 +118096,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(); @@ -118193,17 +118193,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(); @@ -118253,17 +118253,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(); @@ -118291,42 +118291,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(); @@ -118368,7 +118368,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; @@ -118430,42 +118430,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(); @@ -118517,27 +118517,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(); @@ -118592,42 +118592,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(); @@ -118679,27 +118679,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(); @@ -118748,17 +118748,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(); @@ -118786,17 +118786,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(); @@ -118824,17 +118824,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(); @@ -118862,17 +118862,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(); @@ -118899,27 +118899,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(); @@ -118946,27 +118946,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(); @@ -119018,27 +119018,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(); @@ -119056,9 +119056,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; @@ -119073,19 +119073,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(); @@ -119184,27 +119184,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(); @@ -119231,12 +119231,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(); @@ -119264,27 +119264,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(); @@ -119312,42 +119312,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(); @@ -119375,27 +119375,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(); @@ -119443,12 +119443,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(); @@ -119475,12 +119475,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(); @@ -119508,12 +119508,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(); @@ -119541,42 +119541,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(); @@ -119604,27 +119604,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(); @@ -121486,7 +121486,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]; @@ -121519,59 +121519,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(); @@ -121589,9 +121589,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]; @@ -121606,18 +121606,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(); @@ -121634,9 +121634,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, @@ -121647,30 +121647,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(); @@ -122139,9 +122139,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) { @@ -122633,7 +122633,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]; @@ -122666,59 +122666,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(); @@ -122736,9 +122736,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]; @@ -122753,18 +122753,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(); @@ -122781,9 +122781,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, @@ -122794,30 +122794,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(); @@ -123526,9 +123526,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) { @@ -123739,7 +123739,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]; @@ -123772,59 +123772,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(); @@ -123842,9 +123842,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]; @@ -123859,18 +123859,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(); @@ -123887,9 +123887,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, @@ -123900,30 +123900,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(); @@ -124065,9 +124065,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) { @@ -124286,7 +124286,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]; @@ -124319,59 +124319,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(); @@ -124480,32 +124480,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)); @@ -124577,17 +124577,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)); @@ -124657,17 +124657,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)); @@ -124966,22 +124966,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) { @@ -124992,7 +124992,7 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U)); + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U)); } NextTest(); @@ -125046,12 +125046,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(); @@ -125078,12 +125078,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(); @@ -125131,12 +125131,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(); @@ -125433,7 +125433,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]; @@ -125466,59 +125466,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(); @@ -125623,27 +125623,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) { @@ -125704,17 +125704,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)); @@ -125742,7 +125742,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]; @@ -125778,17 +125778,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)); @@ -125846,17 +125846,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)); @@ -125916,27 +125916,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) { @@ -126327,7 +126327,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]; @@ -126360,59 +126360,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(); @@ -126455,9 +126455,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]; @@ -126472,18 +126472,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(); @@ -126500,9 +126500,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, @@ -126514,25 +126514,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(); @@ -126550,9 +126550,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; @@ -126567,18 +126567,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(); @@ -126596,9 +126596,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; @@ -126613,18 +126613,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(); @@ -126674,9 +126674,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) { @@ -126698,9 +126698,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, @@ -126711,27 +126711,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(); @@ -126751,7 +126751,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]; @@ -126776,9 +126776,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]; @@ -126793,18 +126793,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(); @@ -126821,9 +126821,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) { @@ -126845,9 +126845,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, @@ -126858,27 +126858,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(); @@ -126895,9 +126895,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, @@ -126908,27 +126908,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(); @@ -126945,9 +126945,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) { diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h index 7ef4f38c1a3889..dcfeac5ffd03c6 100644 --- a/zzz_generated/lock-app/zap-generated/access.h +++ b/zzz_generated/lock-app/zap-generated/access.h @@ -224,21 +224,21 @@ 63, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - 257, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Year Day Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Holiday Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Holiday Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Holiday Schedule, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ } // Parallel array data (cluster, *command*, privilege) for invoke command @@ -269,21 +269,21 @@ 1, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 3, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ 4, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - 11, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - 12, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - 13, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - 14, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - 15, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - 16, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - 17, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \ - 18, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \ - 19, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \ - 26, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - 27, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - 29, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - 34, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - 36, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - 38, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + 11, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + 12, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + 13, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + 14, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + 15, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + 16, /* Cluster: Door Lock, Command: Clear Year Day Schedule, Privilege: administer */ \ + 17, /* Cluster: Door Lock, Command: Set Holiday Schedule, Privilege: administer */ \ + 18, /* Cluster: Door Lock, Command: Get Holiday Schedule, Privilege: administer */ \ + 19, /* Cluster: Door Lock, Command: Clear Holiday Schedule, Privilege: administer */ \ + 26, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + 27, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + 29, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + 34, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + 36, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + 38, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ } // Parallel array data (cluster, command, *privilege*) for invoke command @@ -314,21 +314,21 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearWeekDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearYearDaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetHolidaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetHolidaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearHolidaySchedule, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearUser, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Week Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Year Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Year Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Year Day Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Holiday Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Holiday Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Holiday Schedule, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear User, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Set Credential, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Get Credential Status, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: Clear Credential, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index 5cc86b8fc11292..2a267740a49769 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -690,32 +690,32 @@ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ /* AcceptedCommandList (index=67) */ \ - 0x00000000 /* LockDoor */, \ - 0x00000001 /* UnlockDoor */, \ - 0x00000003 /* UnlockWithTimeout */, \ - 0x0000000B /* SetWeekDaySchedule */, \ - 0x0000000C /* GetWeekDaySchedule */, \ - 0x0000000D /* ClearWeekDaySchedule */, \ - 0x0000000E /* SetYearDaySchedule */, \ - 0x0000000F /* GetYearDaySchedule */, \ - 0x00000010 /* ClearYearDaySchedule */, \ - 0x00000011 /* SetHolidaySchedule */, \ - 0x00000012 /* GetHolidaySchedule */, \ - 0x00000013 /* ClearHolidaySchedule */, \ - 0x0000001A /* SetUser */, \ - 0x0000001B /* GetUser */, \ - 0x0000001D /* ClearUser */, \ - 0x00000022 /* SetCredential */, \ - 0x00000024 /* GetCredentialStatus */, \ - 0x00000026 /* ClearCredential */, \ + 0x00000000 /* Lock Door */, \ + 0x00000001 /* Unlock Door */, \ + 0x00000003 /* Unlock with Timeout */, \ + 0x0000000B /* Set Week Day Schedule */, \ + 0x0000000C /* Get Week Day Schedule */, \ + 0x0000000D /* Clear Week Day Schedule */, \ + 0x0000000E /* Set Year Day Schedule */, \ + 0x0000000F /* Get Year Day Schedule */, \ + 0x00000010 /* Clear Year Day Schedule */, \ + 0x00000011 /* Set Holiday Schedule */, \ + 0x00000012 /* Get Holiday Schedule */, \ + 0x00000013 /* Clear Holiday Schedule */, \ + 0x0000001A /* Set User */, \ + 0x0000001B /* Get User */, \ + 0x0000001D /* Clear User */, \ + 0x00000022 /* Set Credential */, \ + 0x00000024 /* Get Credential Status */, \ + 0x00000026 /* Clear Credential */, \ chip::kInvalidCommandId /* end of list */, \ /* GeneratedCommandList (index=86)*/ \ - 0x0000000C /* GetWeekDayScheduleResponse */, \ - 0x0000000F /* GetYearDayScheduleResponse */, \ - 0x00000012 /* GetHolidayScheduleResponse */, \ - 0x0000001C /* GetUserResponse */, \ - 0x00000023 /* SetCredentialResponse */, \ - 0x00000025 /* GetCredentialStatusResponse */, \ + 0x0000000C /* Get Week Day Schedule Response */, \ + 0x0000000F /* Get Year Day Schedule Response */, \ + 0x00000012 /* Get Holiday Schedule Response */, \ + 0x0000001C /* Get User Response */, \ + 0x00000023 /* Set Credential Response */, \ + 0x00000025 /* Get Credential Status Response */, \ chip::kInvalidCommandId /* end of list */, \ }