diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index ac50e4399eb3c9..65df1f07560b01 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -4053,7 +4053,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -4061,7 +4061,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -4069,7 +4069,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -4077,7 +4077,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -4085,7 +4085,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -4093,7 +4093,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -4101,7 +4101,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -4109,7 +4109,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -4117,7 +4117,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -4125,7 +4125,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -4173,7 +4173,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -4181,7 +4181,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -4189,7 +4189,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -4197,7 +4197,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -4230,27 +4230,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -4265,7 +4248,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -4280,7 +4263,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -4295,7 +4278,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -4310,7 +4293,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -4325,7 +4308,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -4340,7 +4323,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -4355,7 +4338,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -4370,7 +4353,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -4385,7 +4368,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -4400,7 +4383,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -4415,7 +4398,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -4430,7 +4413,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -4445,7 +4428,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -4460,7 +4443,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -4475,7 +4458,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -4490,7 +4473,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -4505,7 +4488,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -4520,7 +4503,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -4535,22 +4518,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -4565,7 +4533,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -4580,7 +4548,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -4595,7 +4563,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -4610,7 +4578,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -4625,7 +4593,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -4640,7 +4608,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -4655,7 +4623,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", @@ -9856,7 +9824,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -9864,7 +9832,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -9872,7 +9840,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -9880,7 +9848,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -9888,7 +9856,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -9896,7 +9864,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -9904,7 +9872,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -9912,7 +9880,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -9920,7 +9888,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -9928,7 +9896,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -9976,7 +9944,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -9984,7 +9952,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -9992,7 +9960,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -10000,7 +9968,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -10035,25 +10003,41 @@ "enabled": 1, "commands": [ { - "name": "LockDoorResponse", - "code": 0, + "name": "GetLogRecordResponse", + "code": 4, "mfgCode": null, "source": "server", - "incoming": 1, + "incoming": 0, "outgoing": 1 }, { - "name": "UnlockDoorResponse", - "code": 1, + "name": "GetPINCodeResponse", + "code": 6, "mfgCode": null, "source": "server", - "incoming": 1, + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetWeekDayScheduleResponse", + "code": 12, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetYearDayScheduleResponse", + "code": 15, + "mfgCode": null, + "source": "server", + "incoming": 0, "outgoing": 1 } ], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -10068,7 +10052,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -10083,7 +10067,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -10098,7 +10082,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -10113,7 +10097,22 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "NumberOfLogRecordsSupported", + "code": 16, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -10128,7 +10127,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -10143,7 +10142,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -10158,11 +10157,11 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", - "included": 0, + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -10173,7 +10172,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -10188,11 +10187,11 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", - "included": 0, + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -10203,7 +10202,22 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "SupportedOperatingModes", + "code": 38, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0xFFF6", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -10218,7 +10232,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -10233,7 +10247,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -10248,7 +10262,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -10263,7 +10277,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -10278,7 +10292,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -10293,7 +10307,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -10308,7 +10322,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -10323,7 +10337,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -10338,22 +10352,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -10368,7 +10367,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -10383,7 +10382,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -10398,7 +10397,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -10413,7 +10412,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -10428,7 +10427,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -10443,7 +10442,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -10458,7 +10457,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", @@ -18175,7 +18174,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -18183,7 +18182,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -18191,7 +18190,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -18199,7 +18198,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -18207,7 +18206,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -18215,7 +18214,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -18223,7 +18222,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -18231,7 +18230,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -18239,7 +18238,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -18247,7 +18246,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -18295,7 +18294,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -18303,7 +18302,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -18311,7 +18310,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -18319,7 +18318,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -18352,27 +18351,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -18387,7 +18369,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -18402,7 +18384,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -18417,7 +18399,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -18432,7 +18414,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -18447,7 +18429,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -18462,7 +18444,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -18477,7 +18459,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -18492,7 +18474,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -18507,7 +18489,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -18522,7 +18504,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -18537,7 +18519,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -18552,7 +18534,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -18567,7 +18549,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -18582,7 +18564,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -18597,7 +18579,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -18612,7 +18594,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -18627,7 +18609,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -18642,7 +18624,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -18657,22 +18639,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -18687,7 +18654,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -18702,7 +18669,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -18717,7 +18684,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -18732,7 +18699,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -18747,7 +18714,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -18762,7 +18729,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -18777,7 +18744,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 8edf5ad6216887..019815cdf0affb 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -32,7 +32,7 @@ "endpointTypes": [ { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -1764,7 +1764,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -1772,7 +1772,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -1780,7 +1780,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -1788,7 +1788,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -1796,7 +1796,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -1804,7 +1804,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -1812,7 +1812,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -1820,7 +1820,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -1828,7 +1828,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -1836,7 +1836,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -1884,7 +1884,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -1892,7 +1892,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -1900,7 +1900,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -1908,7 +1908,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -1941,27 +1941,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -1976,7 +1959,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -1991,7 +1974,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -2006,7 +1989,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -2021,7 +2004,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -2036,7 +2019,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -2051,7 +2034,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -2066,7 +2049,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -2081,7 +2064,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -2096,7 +2079,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -2111,7 +2094,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -2126,7 +2109,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -2141,7 +2124,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -2156,7 +2139,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -2171,7 +2154,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -2186,7 +2169,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -2201,7 +2184,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -2216,7 +2199,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -2231,7 +2214,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -2246,22 +2229,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -2276,7 +2244,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -2291,7 +2259,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -2306,7 +2274,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -2321,7 +2289,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -2336,7 +2304,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -2351,7 +2319,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -2366,7 +2334,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index 83ebacd2582cc9..00defa501db607 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -32,7 +32,7 @@ "endpointTypes": [ { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -1803,7 +1803,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -1811,7 +1811,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -1819,7 +1819,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -1827,7 +1827,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -1835,7 +1835,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -1843,7 +1843,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -1851,7 +1851,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -1859,7 +1859,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -1867,7 +1867,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -1875,7 +1875,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -1923,7 +1923,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -1931,7 +1931,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -1939,7 +1939,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -1947,7 +1947,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -1980,27 +1980,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -2015,7 +1998,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -2030,7 +2013,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -2045,7 +2028,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -2060,7 +2043,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -2075,7 +2058,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -2090,7 +2073,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -2105,7 +2088,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -2120,7 +2103,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -2135,7 +2118,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -2150,7 +2133,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -2165,7 +2148,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -2180,7 +2163,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -2195,7 +2178,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -2210,7 +2193,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -2225,7 +2208,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -2240,7 +2223,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -2255,7 +2238,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -2270,7 +2253,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -2285,22 +2268,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -2315,7 +2283,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -2330,7 +2298,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -2345,7 +2313,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -2360,7 +2328,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -2375,7 +2343,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -2390,7 +2358,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -2405,7 +2373,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index d66334b0f88290..9f88525e508d41 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -32,7 +32,7 @@ "endpointTypes": [ { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -3920,7 +3920,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -3928,7 +3928,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -3936,7 +3936,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -3944,7 +3944,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -3952,7 +3952,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -3960,7 +3960,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -3968,7 +3968,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -3976,7 +3976,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -3984,7 +3984,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -3992,7 +3992,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -4040,7 +4040,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -4048,7 +4048,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -4056,7 +4056,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -4064,7 +4064,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -4097,27 +4097,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -4132,7 +4115,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -4147,7 +4130,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -4162,7 +4145,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -4177,7 +4160,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -4192,7 +4175,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -4207,7 +4190,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -4222,7 +4205,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -4237,7 +4220,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -4252,7 +4235,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -4267,7 +4250,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -4282,7 +4265,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -4297,7 +4280,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -4312,7 +4295,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -4327,7 +4310,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -4342,7 +4325,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -4357,7 +4340,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -4372,7 +4355,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -4387,7 +4370,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -4402,22 +4385,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -4432,7 +4400,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -4447,7 +4415,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -4462,7 +4430,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -4477,7 +4445,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -4492,7 +4460,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -4507,7 +4475,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -4522,7 +4490,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", @@ -8892,7 +8860,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -8900,7 +8868,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -8908,7 +8876,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -8916,7 +8884,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -8924,7 +8892,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -8932,7 +8900,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -8940,7 +8908,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -8948,7 +8916,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -8956,7 +8924,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -8964,7 +8932,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -9012,7 +8980,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -9020,7 +8988,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -9028,7 +8996,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -9036,7 +9004,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -9069,27 +9037,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -9104,7 +9055,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -9119,7 +9070,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -9134,7 +9085,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -9149,7 +9100,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -9164,7 +9115,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -9179,7 +9130,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -9194,7 +9145,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -9209,7 +9160,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -9224,7 +9175,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -9239,7 +9190,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -9254,7 +9205,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -9269,7 +9220,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -9284,7 +9235,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -9299,7 +9250,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -9314,7 +9265,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -9329,7 +9280,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -9344,7 +9295,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -9359,7 +9310,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -9374,22 +9325,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -9404,7 +9340,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -9419,7 +9355,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -9434,7 +9370,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -9449,7 +9385,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -9464,7 +9400,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -9479,7 +9415,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -9494,7 +9430,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 903f68acd89691..42135d5af396fd 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -32,7 +32,7 @@ "endpointTypes": [ { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -3905,7 +3905,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -3913,7 +3913,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -3921,7 +3921,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -3929,7 +3929,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -3937,7 +3937,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -3945,7 +3945,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -3953,7 +3953,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -3961,7 +3961,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -3969,7 +3969,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -3977,7 +3977,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -4025,7 +4025,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -4033,7 +4033,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -4041,7 +4041,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -4049,7 +4049,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -4082,27 +4082,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -4117,7 +4100,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -4132,7 +4115,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -4147,7 +4130,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -4162,7 +4145,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -4177,7 +4160,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -4192,7 +4175,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -4207,7 +4190,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -4222,7 +4205,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -4237,7 +4220,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -4252,7 +4235,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -4267,7 +4250,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -4282,7 +4265,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -4297,7 +4280,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -4312,7 +4295,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -4327,7 +4310,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -4342,7 +4325,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -4357,7 +4340,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -4372,7 +4355,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -4387,22 +4370,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -4417,7 +4385,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -4432,7 +4400,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -4447,7 +4415,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -4462,7 +4430,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -4477,7 +4445,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -4492,7 +4460,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -4507,7 +4475,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 27c34e80eb100e..65badb44e5e6aa 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -32,7 +32,7 @@ "endpointTypes": [ { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -3920,7 +3920,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -3928,7 +3928,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -3936,7 +3936,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -3944,7 +3944,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -3952,7 +3952,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -3960,7 +3960,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -3968,7 +3968,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -3976,7 +3976,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -3984,7 +3984,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -3992,7 +3992,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -4040,7 +4040,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -4048,7 +4048,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -4056,7 +4056,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -4064,7 +4064,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -4097,27 +4097,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -4132,7 +4115,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -4147,7 +4130,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -4162,7 +4145,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -4177,7 +4160,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -4192,7 +4175,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -4207,7 +4190,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -4222,7 +4205,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -4237,7 +4220,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -4252,7 +4235,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -4267,7 +4250,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -4282,7 +4265,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -4297,7 +4280,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -4312,7 +4295,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -4327,7 +4310,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -4342,7 +4325,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -4357,7 +4340,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -4372,7 +4355,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -4387,7 +4370,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -4402,22 +4385,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -4432,7 +4400,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -4447,7 +4415,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -4462,7 +4430,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -4477,7 +4445,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -4492,7 +4460,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -4507,7 +4475,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -4522,7 +4490,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", @@ -6500,7 +6468,7 @@ }, { "name": "Anonymous Endpoint Type", - "deviceTypeName": "CHIP-All-Clusters-Server", + "deviceTypeName": "MA-all-clusters-app", "deviceTypeCode": 0, "deviceTypeProfileId": 259, "clusters": [ @@ -8892,7 +8860,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -8900,7 +8868,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -8908,7 +8876,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -8916,7 +8884,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -8924,7 +8892,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -8932,7 +8900,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -8940,7 +8908,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -8948,7 +8916,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -8956,7 +8924,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -8964,7 +8932,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -9012,7 +8980,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -9020,7 +8988,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -9028,7 +8996,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -9036,7 +9004,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -9071,25 +9039,65 @@ "enabled": 1, "commands": [ { - "name": "LockDoorResponse", - "code": 0, + "name": "GetLogRecordResponse", + "code": 4, "mfgCode": null, "source": "server", - "incoming": 1, + "incoming": 0, "outgoing": 1 }, { - "name": "UnlockDoorResponse", - "code": 1, + "name": "GetPINCodeResponse", + "code": 6, "mfgCode": null, "source": "server", - "incoming": 1, + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetWeekDayScheduleResponse", + "code": 12, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetYearDayScheduleResponse", + "code": 15, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetHolidayScheduleResponse", + "code": 18, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetUserTypeResponse", + "code": 21, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "GetRFIDCodeResponse", + "code": 23, + "mfgCode": null, + "source": "server", + "incoming": 0, "outgoing": 1 } ], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -9104,7 +9112,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -9119,7 +9127,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -9134,7 +9142,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -9149,7 +9157,22 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "NumberOfLogRecordsSupported", + "code": 16, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -9164,7 +9187,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -9179,7 +9202,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -9194,7 +9217,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -9209,7 +9232,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -9224,7 +9247,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -9239,7 +9262,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -9254,7 +9277,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -9269,7 +9292,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -9284,7 +9307,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -9299,7 +9322,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -9314,7 +9337,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -9329,7 +9352,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -9344,7 +9367,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -9359,7 +9382,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -9374,22 +9397,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -9404,7 +9412,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -9419,7 +9427,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -9434,7 +9442,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -9449,7 +9457,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -9464,7 +9472,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -9479,7 +9487,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -9494,7 +9502,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", @@ -14837,7 +14845,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -14845,7 +14853,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -14853,7 +14861,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -14861,7 +14869,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -14869,7 +14877,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -14877,7 +14885,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -14885,7 +14893,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -14893,7 +14901,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -14901,7 +14909,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -14909,7 +14917,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -14957,7 +14965,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -14965,7 +14973,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -14973,7 +14981,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -14981,7 +14989,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -15014,27 +15022,10 @@ "define": "DOOR_LOCK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -15049,7 +15040,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -15064,7 +15055,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -15079,7 +15070,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -15094,7 +15085,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -15109,7 +15100,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -15124,7 +15115,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -15139,7 +15130,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -15154,7 +15145,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -15169,7 +15160,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -15184,7 +15175,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -15199,7 +15190,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -15214,7 +15205,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -15229,7 +15220,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -15244,7 +15235,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -15259,7 +15250,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -15274,7 +15265,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -15289,7 +15280,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -15304,7 +15295,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -15319,22 +15310,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -15349,7 +15325,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -15364,7 +15340,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -15379,7 +15355,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -15394,7 +15370,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -15409,7 +15385,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -15424,7 +15400,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -15439,7 +15415,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp index f691c91c3fb6b4..fea472f8c5cb67 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp @@ -121,19 +121,19 @@ void emAfPluginDoorLockServerInitSchedule(void) #endif } -bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterSetWeekDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::SetWeekdaySchedule::DecodableType & commandData) + const Commands::SetWeekDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.weekDayIndex; + auto & userId = commandData.userIndex; auto & daysMask = commandData.daysMask; auto & startHour = commandData.startHour; auto & startMinute = commandData.startMinute; auto & stopHour = commandData.endHour; auto & stopMinute = commandData.endMinute; - uint8_t status = 0x00; + EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; uint8_t userPin = 0x00; uint16_t rfProgrammingEventMask = 0xffff; // event sent by default CHIP_ERROR err = CHIP_NO_ERROR; @@ -141,7 +141,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * comm EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) || !emAfPluginDoorLockServerCheckForSufficientSpace(userId, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE)) { - status = 0x01; + status = EMBER_ZCL_STATUS_FAILURE; } if (!status) { @@ -157,18 +157,10 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * comm printWeekdayScheduleTable(); } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::SetWeekdayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } + VerifyOrExit(EMBER_ZCL_STATUS_SUCCESS == emberAfSendImmediateDefaultResponse(status), err = CHIP_ERROR_INCORRECT_STATE); // get bitmask so we can check if we should send event notification - Attributes::RfProgrammingEventMask::Get(DOOR_LOCK_SERVER_ENDPOINT, &rfProgrammingEventMask); + Attributes::RemoteProgrammingEventMask::Get(DOOR_LOCK_SERVER_ENDPOINT, &rfProgrammingEventMask); if (rfProgrammingEventMask & EMBER_BIT(0)) { @@ -185,12 +177,12 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * comm return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterGetWeekDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::GetWeekdaySchedule::DecodableType & commandData) + const Commands::GetWeekDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.weekDayIndex; + auto & userId = commandData.userIndex; EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD @@ -206,7 +198,7 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(app::CommandHandler * comm { app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::GetWeekdayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; + Commands::GetWeekDayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); @@ -228,55 +220,42 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(app::CommandHandler * comm return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterClearWeekDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearWeekdaySchedule::DecodableType & commandData) + const Commands::ClearWeekDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.weekDayIndex; + auto & userId = commandData.userIndex; EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD : EMBER_ZCL_STATUS_SUCCESS); - CHIP_ERROR err = CHIP_NO_ERROR; if (zclStatus == EMBER_ZCL_STATUS_SUCCESS) { weekdayScheduleTable[scheduleId].inUse = false; emAfPluginDoorLockServerSetPinUserType(userId, EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED); } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::ClearWeekdayScheduleResponse::Id, - (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), zclStatus)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(zclStatus)) { ChipLogError(Zcl, "Failed to encode response command."); } return true; } -bool emberAfDoorLockClusterSetYeardayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterSetYearDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::SetYeardaySchedule::DecodableType & commandData) + const Commands::SetYearDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.yearDayIndex; + auto & userId = commandData.userIndex; auto & localStartTime = commandData.localStartTime; auto & localEndTime = commandData.localEndTime; - uint8_t status; - CHIP_ERROR err = CHIP_NO_ERROR; + EmberAfStatus status; if (scheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) { - status = 0x01; // failure (per 7.3.2.17.15) + status = EMBER_ZCL_STATUS_FAILURE; // failure (per 7.3.2.17.15) } else { @@ -284,32 +263,22 @@ bool emberAfDoorLockClusterSetYeardayScheduleCallback(app::CommandHandler * comm yeardayScheduleTable[scheduleId].localStartTime = localStartTime; yeardayScheduleTable[scheduleId].localEndTime = localEndTime; yeardayScheduleTable[scheduleId].inUse = true; - status = 0x00; // success (per 7.3.2.17.15) + status = EMBER_ZCL_STATUS_SUCCESS; // success (per 7.3.2.17.15) } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::SetYeardayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } return true; } -bool emberAfDoorLockClusterGetYeardayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterGetYearDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::GetYeardaySchedule::DecodableType & commandData) + const Commands::GetYearDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.yearDayIndex; + auto & userId = commandData.userIndex; EmberAfPluginDoorLockServerYeardayScheduleEntry * entry = &yeardayScheduleTable[0]; EmberAfStatus zclStatus; @@ -334,7 +303,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleCallback(app::CommandHandler * comm { app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::GetYeardayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; + Commands::GetYearDayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); @@ -353,38 +322,26 @@ bool emberAfDoorLockClusterGetYeardayScheduleCallback(app::CommandHandler * comm return true; } -bool emberAfDoorLockClusterClearYeardayScheduleCallback(app::CommandHandler * commandObj, +bool emberAfDoorLockClusterClearYearDayScheduleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearYeardaySchedule::DecodableType & commandData) + const Commands::ClearYearDaySchedule::DecodableType & commandData) { - auto & scheduleId = commandData.scheduleId; - auto & userId = commandData.userId; + auto & scheduleId = commandData.yearDayIndex; + auto & userId = commandData.userIndex; - uint8_t status; - CHIP_ERROR err = CHIP_NO_ERROR; + EmberAfStatus status; if (scheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) { - status = 0x01; // failure (per 7.3.2.17.17) + status = EMBER_ZCL_STATUS_FAILURE; // failure (per 7.3.2.17.17) } else { yeardayScheduleTable[scheduleId].inUse = false; emAfPluginDoorLockServerSetPinUserType(userId, EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED); - status = 0x00; // success (per 7.3.2.17.17) + status = EMBER_ZCL_STATUS_SUCCESS; // success (per 7.3.2.17.17) } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::ClearYeardayScheduleResponse::Id, - (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } @@ -395,16 +352,15 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(app::CommandHandler * comm const app::ConcreteCommandPath & commandPath, const Commands::SetHolidaySchedule::DecodableType & commandData) { - auto & holidayScheduleId = commandData.scheduleId; + auto & holidayScheduleId = commandData.holidayIndex; auto & localStartTime = commandData.localStartTime; auto & localEndTime = commandData.localEndTime; - auto & operatingModeDuringHoliday = commandData.operatingModeDuringHoliday; + auto & operatingModeDuringHoliday = commandData.operatingMode; - uint8_t status; - CHIP_ERROR err = CHIP_NO_ERROR; + EmberAfStatus status; if (holidayScheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_HOLIDAY_SCHEDULE_TABLE_SIZE) { - status = 0x01; // failure (per 7.3.2.17.18) + status = EMBER_ZCL_STATUS_FAILURE; // failure (per 7.3.2.17.18) } else { @@ -414,20 +370,10 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(app::CommandHandler * comm holidayScheduleTable[holidayScheduleId].operatingModeDuringHoliday = static_cast(operatingModeDuringHoliday); holidayScheduleTable[holidayScheduleId].inUse = true; - status = 0x00; // success (per 7.3.2.17.18) + status = EMBER_ZCL_STATUS_SUCCESS; // success (per 7.3.2.17.18) } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::SetHolidayScheduleResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } @@ -438,7 +384,7 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(app::CommandHandler * comm const app::ConcreteCommandPath & commandPath, const Commands::GetHolidaySchedule::DecodableType & commandData) { - auto & holidayScheduleId = commandData.scheduleId; + auto & holidayScheduleId = commandData.holidayIndex; EmberAfPluginDoorLockServerHolidayScheduleEntry * entry = &holidayScheduleTable[0]; EmberAfStatus zclStatus; @@ -485,32 +431,20 @@ bool emberAfDoorLockClusterClearHolidayScheduleCallback(app::CommandHandler * co const app::ConcreteCommandPath & commandPath, const Commands::ClearHolidaySchedule::DecodableType & commandData) { - auto & holidayScheduleId = commandData.scheduleId; + auto & holidayScheduleId = commandData.holidayIndex; - uint8_t status; - CHIP_ERROR err = CHIP_NO_ERROR; + EmberAfStatus status; if (holidayScheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) { - status = 0x01; // failure (per 7.3.2.17.20) + status = EMBER_ZCL_STATUS_FAILURE; // failure (per 7.3.2.17.20) } else { holidayScheduleTable[holidayScheduleId].inUse = false; - status = 0x00; // success (per 7.3.2.17.20) + status = EMBER_ZCL_STATUS_SUCCESS; // success (per 7.3.2.17.20) } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, - Commands::ClearHolidayScheduleResponse::Id, - (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp index 4cbfa249048be7..ea5a8cfe6c7080 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp @@ -162,8 +162,8 @@ static void printUserTables(void) } // Returns status byte for use in SetPinResponse and SetRfidResponse commands. -static uint8_t setUser(uint16_t userId, uint8_t userStatus, uint8_t userType, const ByteSpan & code, - EmberAfPluginDoorLockServerUser * userTable, uint8_t userTableSize) +static EmberAfStatus setUser(uint16_t userId, DlUserStatus userStatus, DlUserType userType, const ByteSpan & code, + EmberAfPluginDoorLockServerUser * userTable, uint8_t userTableSize) { bool success = false; // "code" (i.e. PIN/RFID) is stored in table entry in ZCL format (1-byte @@ -194,7 +194,7 @@ static uint8_t setUser(uint16_t userId, uint8_t userStatus, uint8_t userType, co success = true; } - return (success ? 0x00 : 0x01); // See 7.3.2.17.6 and 7.3.2.17.23). + return (success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); // See 7.3.2.17.6 and 7.3.2.17.23). } // Returns true for success, false for failure. @@ -211,7 +211,7 @@ static bool getUser(uint16_t userId, EmberAfPluginDoorLockServerUser * userTable } // Returns status byte for use in ClearPin and ClearRfid response commands. -static uint8_t clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUser * userTable, uint8_t userTableSize) +static EmberAfStatus clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUser * userTable, uint8_t userTableSize) { bool success = false; if (userId < userTableSize) @@ -222,7 +222,7 @@ static uint8_t clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUs sizeof(userTable[userId].code)); success = true; } - return (success ? 0x00 : 0x01); // See 7.3.2.17.8 and 7.3.2.17.25). + return (success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); // See 7.3.2.17.8 and 7.3.2.17.25). } bool emberAfDoorLockClusterGetUserTypeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, @@ -260,23 +260,12 @@ bool emberAfDoorLockClusterSetUserTypeCallback(app::CommandHandler * commandObj, auto & userId = commandData.userId; auto & userType = commandData.userType; - CHIP_ERROR err = CHIP_NO_ERROR; // TODO: Need to validate userType. https://github.com/project-chip/connectedhomeip/issues/3580 - uint8_t status = (emAfPluginDoorLockServerSetPinUserType(userId, static_cast(userType)) - ? 0x00 // success (per 7.3.2.17.21) - : 0x01); // failure (per 7.3.2.17.21) + EmberAfStatus status = (emAfPluginDoorLockServerSetPinUserType(userId, static_cast(userType)) + ? EMBER_ZCL_STATUS_SUCCESS // success (per 7.3.2.17.21) + : EMBER_ZCL_STATUS_FAILURE); // failure (per 7.3.2.17.21) - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } @@ -299,8 +288,8 @@ bool emAfPluginDoorLockServerSetPinUserType(uint16_t userId, EmberAfDoorLockUser // ------------------------------------------------------------------------------ // PIN handling -bool emberAfDoorLockClusterSetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::SetPin::DecodableType & commandData) +bool emberAfDoorLockClusterSetPINCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::SetPINCode::DecodableType & commandData) { auto & userId = commandData.userId; auto & userStatus = commandData.userStatus; @@ -309,21 +298,14 @@ bool emberAfDoorLockClusterSetPinCallback(app::CommandHandler * commandObj, cons CHIP_ERROR err = CHIP_NO_ERROR; // send response - uint8_t status = setUser(userId, userStatus, userType, pin, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); + EmberAfStatus status = + setUser(userId, userStatus, userType, pin, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); uint16_t rfProgrammingEventMask = 0xffff; // send event by default - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_SET_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } + VerifyOrExit(EMBER_ZCL_STATUS_SUCCESS == emberAfSendImmediateDefaultResponse(status), err = CHIP_ERROR_INCORRECT_STATE); // get bitmask so we can check if we should send event notification - emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_RF_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID, + emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ::Id, Attributes::RemoteProgrammingEventMask::Id, (uint8_t *) &rfProgrammingEventMask, sizeof(rfProgrammingEventMask)); if ((rfProgrammingEventMask & EMBER_BIT(2)) && !status && !pin.empty()) { @@ -357,8 +339,8 @@ static bool getSendPinOverTheAir(void) return sendPinOverTheAir; } -bool emberAfDoorLockClusterGetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::GetPin::DecodableType & commandData) +bool emberAfDoorLockClusterGetPINCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::GetPINCode::DecodableType & commandData) { auto & userId = commandData.userId; @@ -368,8 +350,8 @@ bool emberAfDoorLockClusterGetPinCallback(app::CommandHandler * commandObj, cons if (getUser(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE, &user)) { { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_GET_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; + app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ::Id, Commands::GetPINCodeResponse::Id, + (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); @@ -404,28 +386,20 @@ bool emberAfDoorLockClusterGetPinCallback(app::CommandHandler * commandObj, cons return true; } -bool emberAfDoorLockClusterClearPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearPin::DecodableType & commandData) +bool emberAfDoorLockClusterClearPINCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::ClearPINCode::DecodableType & commandData) { - auto & userId = commandData.userId; + auto & userId = commandData.pinSlotIndex; - CHIP_ERROR err = CHIP_NO_ERROR; - uint8_t status = clearUserPinOrRfid(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); + CHIP_ERROR err = CHIP_NO_ERROR; + EmberAfStatus status = clearUserPinOrRfid(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); // get bitmask so we can check if we should send event notification uint16_t rfProgrammingEventMask = 0xffff; // event sent by default uint8_t userPin = 0x00; // Zero length Zigbee string - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } + VerifyOrExit(EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status), err = CHIP_ERROR_INCORRECT_STATE); - emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_RF_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID, + emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ::Id, Attributes::RemoteProgrammingEventMask::Id, (uint8_t *) &rfProgrammingEventMask, sizeof(rfProgrammingEventMask)); if ((rfProgrammingEventMask & EMBER_BIT(2)) && !status) { @@ -449,28 +423,17 @@ bool emberAfDoorLockClusterClearPinCallback(app::CommandHandler * commandObj, co return true; } -bool emberAfDoorLockClusterClearAllPinsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearAllPins::DecodableType & commandData) +bool emberAfDoorLockClusterClearAllPINCodesCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::ClearAllPINCodes::DecodableType & commandData) { uint8_t i; - CHIP_ERROR err = CHIP_NO_ERROR; for (i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE; i++) { clearUserPinOrRfid(i, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); } // 7.3.2.17.9 says that "0x00" indicates success. - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), static_cast(0))); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS)) { ChipLogError(Zcl, "Failed to encode response command."); } @@ -480,37 +443,26 @@ bool emberAfDoorLockClusterClearAllPinsCallback(app::CommandHandler * commandObj // ------------------------------------------------------------------------------ // RFID handling -bool emberAfDoorLockClusterSetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::SetRfid::DecodableType & commandData) +bool emberAfDoorLockClusterSetRFIDCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::SetRFIDCode::DecodableType & commandData) { auto & userId = commandData.userId; auto & userStatus = commandData.userStatus; auto & userType = commandData.userType; - auto & rfid = commandData.id; + auto & rfid = commandData.rfidCode; - CHIP_ERROR err = CHIP_NO_ERROR; - uint8_t status = + EmberAfStatus status = setUser(userId, userStatus, userType, rfid, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_SET_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } return true; } -bool emberAfDoorLockClusterGetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::GetRfid::DecodableType & commandData) +bool emberAfDoorLockClusterGetRFIDCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::GetRFIDCode::DecodableType & commandData) { auto & userId = commandData.userId; @@ -521,7 +473,7 @@ bool emberAfDoorLockClusterGetRfidCallback(app::CommandHandler * commandObj, con { { app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_GET_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; + Commands::GetRFIDCodeResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); @@ -549,52 +501,31 @@ bool emberAfDoorLockClusterGetRfidCallback(app::CommandHandler * commandObj, con return true; } -bool emberAfDoorLockClusterClearRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearRfid::DecodableType & commandData) +bool emberAfDoorLockClusterClearRFIDCodeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::ClearRFIDCode::DecodableType & commandData) { - auto & userId = commandData.userId; + auto & userId = commandData.rfidSlotIndex; - CHIP_ERROR err = CHIP_NO_ERROR; - uint8_t status = clearUserPinOrRfid(userId, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); + EmberAfStatus status = clearUserPinOrRfid(userId, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + // 7.3.2.17.9 says that "0x00" indicates success. + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } return true; } -bool emberAfDoorLockClusterClearAllRfidsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ClearAllRfids::DecodableType & commandData) +bool emberAfDoorLockClusterClearAllRFIDCodesCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::ClearAllRFIDCodes::DecodableType & commandData) { - CHIP_ERROR err = CHIP_NO_ERROR; for (uint8_t i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE; i++) { clearUserPinOrRfid(i, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); } // 7.3.2.17.26 says that "0x00" indicates success. - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), static_cast(0))); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS)) { ChipLogError(Zcl, "Failed to encode response command."); } @@ -632,7 +563,7 @@ static bool verifyPin(const ByteSpan & pin, uint8_t * userId) status = emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_REQUIRE_PIN_FOR_RF_OPERATION_ATTRIBUTE_ID, (uint8_t *) &pinRequired, sizeof(pinRequired)); + Attributes::RequirePINforRemoteOperation::Id, (uint8_t *) &pinRequired, sizeof(pinRequired)); if (EMBER_ZCL_STATUS_SUCCESS != status || !pinRequired) { return true; @@ -658,7 +589,10 @@ static bool verifyPin(const ByteSpan & pin, uint8_t * userId) bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::LockDoor::DecodableType & commandData) { - auto & PIN = commandData.pin; + // NOTE: PIN code is optional for Lock commands in the Matter spec (5.2.4.1). + // Don't care that it is optional for now, this should be properly addressed in the upcoming door lock + // cluster implementation. For now we assume that the PIN code is always present. + auto & PIN = commandData.pinCode.Value(); uint8_t userId = 0; bool pinVerified = verifyPin(PIN, &userId); @@ -677,23 +611,18 @@ bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, co if (doorLocked) { - emberAfWriteServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_LOCK_STATE_ATTRIBUTE_ID, + emberAfWriteServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, Attributes::LockState::Id, &lockStateLocked, ZCL_INT8U_ATTRIBUTE_TYPE); } // send response { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), doorLocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE)); - SuccessOrExit(err = commandObj->FinishCommand()); + auto status = doorLocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; + VerifyOrExit(EMBER_ZCL_STATUS_SUCCESS == emberAfSendImmediateDefaultResponse(status), err = CHIP_ERROR_INCORRECT_STATE); } // check if we should send event notification - emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_RF_OPERATION_EVENT_MASK_ATTRIBUTE_ID, + emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, Attributes::RemoteOperationEventMask::Id, (uint8_t *) &rfOperationEventMask, sizeof(rfOperationEventMask)); // Possibly send operation event @@ -702,7 +631,7 @@ bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, co if (rfOperationEventMask & EMBER_BIT(1) && !PIN.empty()) { emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuvSwS", 0x01, 0x03, userId, PIN.data(), + Commands::OperatingEventNotification::Id, "uuvSwS", 0x01, 0x03, userId, PIN.data(), static_cast(PIN.size()), 0X00, PIN.data(), static_cast(PIN.size())); } } @@ -711,7 +640,7 @@ bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, co if (rfOperationEventMask & EMBER_BIT(3) && !PIN.empty()) { emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuvSwS", 0x01, 0x03, userId, PIN.data(), + Commands::OperatingEventNotification::Id, "uuvSwS", 0x01, 0x03, userId, PIN.data(), static_cast(PIN.size()), 0x00, PIN.data(), static_cast(PIN.size())); } } @@ -727,7 +656,10 @@ bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, co bool emberAfDoorLockClusterUnlockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::UnlockDoor::DecodableType & commandData) { - auto & pin = commandData.pin; + // NOTE: PIN code is optional for Unlock command in the Matter spec (5.2.4.2). + // Don't care that it is optional for now, this should be properly addressed in the upcoming door lock + // cluster implementation. For now we assume that the PIN code is always present. + auto & pin = commandData.pinCode.Value(); uint8_t userId = 0; bool pinVerified = verifyPin(pin, &userId); @@ -745,29 +677,24 @@ bool emberAfDoorLockClusterUnlockDoorCallback(app::CommandHandler * commandObj, } if (doorUnlocked) { - emberAfWriteServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_LOCK_STATE_ATTRIBUTE_ID, + emberAfWriteServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, Attributes::LockState::Id, &lockStateUnlocked, ZCL_INT8U_ATTRIBUTE_TYPE); } { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), doorUnlocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE)); - SuccessOrExit(err = commandObj->FinishCommand()); + auto status = doorUnlocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; + VerifyOrExit(EMBER_ZCL_STATUS_SUCCESS == emberAfSendImmediateDefaultResponse(status), err = CHIP_ERROR_INCORRECT_STATE); } // get bitmask so we can check if we should send event notification - emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, ZCL_RF_OPERATION_EVENT_MASK_ATTRIBUTE_ID, + emberAfReadServerAttribute(DOOR_LOCK_SERVER_ENDPOINT, ZCL_DOOR_LOCK_CLUSTER_ID, Attributes::RemoteOperationEventMask::Id, (uint8_t *) &rfOperationEventMask, sizeof(rfOperationEventMask)); // send operation event if (doorUnlocked && (rfOperationEventMask & EMBER_BIT(2)) && !pin.empty()) { emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuvSwS", EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF, + Commands::OperatingEventNotification::Id, "uuvSwS", EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF, EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK, userId, pin.data(), static_cast(pin.size()), 0 /*emberAfGetCurrentTime() #2507 */, pin.data(), static_cast(pin.size())); @@ -920,13 +847,14 @@ void MatterDoorLockClusterServerAttributeChangedCallback(const app::ConcreteAttr bool emberAfDoorLockClusterUnlockWithTimeoutCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::UnlockWithTimeout::DecodableType & commandData) { - auto & timeoutS = commandData.timeoutInSeconds; - auto & pin = commandData.pin; + // NOTE: PIN code is optional for Lock With Timeout commands in the Matter spec (5.2.4.3). + // Don't care that it is optional for now, this should be properly addressed in the upcoming door lock + // cluster implementation. For now we assume that the PIN code is always present. + auto & timeoutS = commandData.timeout; + auto & pin = commandData.pinCode.Value(); uint8_t userId; - uint8_t status; - CHIP_ERROR err = CHIP_NO_ERROR; - + EmberAfStatus status; if (verifyPin(pin, &userId)) { uint8_t lockState = EMBER_ZCL_DOOR_LOCK_STATE_LOCKED; @@ -938,25 +866,14 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(app::CommandHandler * comma } scheduleAutoRelock(timeoutS); - status = 0x00; // success (per 7.3.2.17.4) + status = EMBER_ZCL_STATUS_SUCCESS; // success (per 7.3.2.17.4) } else { - status = 0x01; // failure (per 7.3.2.17.4) + status = EMBER_ZCL_STATUS_FAILURE; // failure (per 7.3.2.17.4) } - { - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_DOOR_LOCK_CLUSTER_ID, - ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID, - (app::CommandPathFlags::kEndpointIdValid) }; - TLV::TLVWriter * writer = nullptr; - SuccessOrExit(err = commandObj->PrepareCommand(cmdParams)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status)); - SuccessOrExit(err = commandObj->FinishCommand()); - } -exit: - if (err != CHIP_NO_ERROR) + if (EMBER_ZCL_STATUS_SUCCESS != emberAfSendImmediateDefaultResponse(status)) { ChipLogError(Zcl, "Failed to encode response command."); } diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml new file mode 100644 index 00000000000000..2e989e13e2d77e --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -0,0 +1,957 @@ + + + + + + + Closures + Door Lock + 0x0101 + DOOR_LOCK_CLUSTER + An interface to a generic way to secure a door + + + + + + + + + + + + + + true + true + + + + + + true + false + false + false + false + true + false + false + true + false + + + + + + LockState + LockType + ActuatorEnabled + + DoorState + + + DoorOpenEvents + + + + + + DoorClosedEvents + + + + + + OpenPeriod + + + + + NumberOfLogRecordsSupported + + NumberOfTotalUsersSupported + + NumberOfPINUsersSupported + + NumberOfRFIDUsersSupported + + NumberOfWeekDaySchedulesSupportedPerUser + + NumberOfYearDaySchedulesSupportedPerUser + + NumberOfHolidaySchedulesSupported + + MaxPINCodeLength + + MinPINCodeLength + + MaxRFIDCodeLength + + MinRFIDCodeLength + + CredentialRulesSupport + + + EnableLogging + + + + + Language + + + + + LEDSettings + + + + + AutoRelockTime + + + + + SoundVolume + + + + + OperatingMode + + + + SupportedOperatingModes + DefaultConfigurationRegister + + EnableLocalProgramming + + + + + EnableOneTouchLocking + + + + + EnableInsideStatusLED + + + + + EnablePrivacyModeButton + + + + + LocalProgrammingFeatures + + + + + + WrongCodeEntryLimit + + + + + + UserCodeTemporaryDisableTime + + + + + + SendPINOverTheAir + + + + + + RequirePINforRemoteOperation + + + + + + + ExpiringUserTimeout + + + + + AlarmMask + + + + + + KeypadOperationEventMask + + + + + + RemoteOperationEventMask + + + + + + ManualOperationEventMask + + + + + + RFIDOperationEventMask + + + + + + KeypadProgrammingEventMask + + + + + + RemoteProgrammingEventMask + + + + + + RFIDProgrammingEventMask + + + + + + + + This command causes the lock device to lock the door. + + + + + This command causes the lock device to unlock the door. + + + + + + This command causes the lock device to unlock the door with a timeout parameter. + + + + + + + Request a log record. + + + + + + Returns the specified log record. + + + + + + + + + + + + Set a PIN Code into the lock. + + + + + + + + + Retrieve a PIN Code. + + + + + + Returns the PIN for the specified user ID. + + + + + + + + + Clear a PIN code or all PIN codes. + + + + + + Clear out all PINs on the lock. + + + + + Set the status of a user ID. + + + + + + + Get the status of a user. + + + + + + Returns the user status for the specified user ID. + + + + + + + Set a weekly repeating schedule for a specified user. + + + + + + + + + + + + Retrieve the specific weekly schedule for the specific user. + + + + + + + Returns the weekly repeating schedule data for the specified schedule index. + + + + + + + + + + + + + Clear the specific weekly schedule or all weekly schedules for the specific user. + + + + + + + Set a time-specific schedule ID for a specified user. + + + + + + + + + Returns the year day schedule data for the specified schedule and user indexes. + + + + + + + Returns the year day schedule data for the specified schedule and user indexes. + + + + + + + + + + Clears the specific year day schedule or all year day schedules for the specific user. + + + + + + + Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode. + + + + + + + + + Get the holiday schedule for the specified index. + + + + + + Returns the Holiday Schedule Entry for the specified Holiday ID. + + + + + + + + + + Clears the holiday schedule or all holiday schedules. + + + + + + Set the user type for a specified user. + + + + + + + Retrieve the user type for a specific user. + + + + + + Returns the user type for the specified user ID. + + + + + + + Set an ID for RFID access into the lock. + + + + + + + + + Retrieve an RFID code. + + + + + + Returns the RFID code for the specified user ID. + + + + + + + + + Clear an RFID code or all RFID codes. + + + + + + Clear out all RFIDs on the lock. + + + + + Set User into the lock. + + + + + + + + + + + + Retrieve User. + + + + + + Returns the User for the specified UserIndex. + + + + + + + + + + + + + + + Clears a User or all Users. + + + + + + The door lock server sends out operation event notification when the event is triggered by the various event sources. + + + + + + + + + + The door lock server sends out a programming event notification whenever a programming event takes place on the door lock. + + + + + + + + + + + + Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser. + + + + + + + + + + Returns the status for setting the specified credential. + + + + + + + + Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index. + + + + + + Returns the status for the specified credential. + + + + + + + + Clear one, one type, or all credentials except ProgrammingPIN credential. + + + + + + + + The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock. + + + + + The door lock server sends out a DoorStateChange event when the door lock door state changes. + + + + The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources. + + + + + + + + + + The door lock server sends out a LockOperationError event when a lock operation fails for various reasons. + + + + + + + + + + + The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml index ddb249bb1a0cb6..8ac2736b9c3233 100644 --- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml +++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml @@ -2149,28 +2149,34 @@ limitations under the License. LockDoor UnlockDoor - Toggle UnlockWithTimeout GetLogRecord - SetPin - GetPin - ClearPin - ClearAllPins - SetWeekdaySchedule - GetWeekdaySchedule - ClearWeekdaySchedule + GetLogRecordResponse + SetPINCode + GetPINCode + GetPINCodeResponse + ClearPINCode + ClearAllPINCodes + SetWeekDaySchedule + GetWeekDaySchedule + GetWeekDayScheduleResponse + ClearWeekDaySchedule SetYearDaySchedule GetYearDaySchedule + GetYearDayScheduleResponse ClearYearDaySchedule SetHolidaySchedule GetHolidaySchedule + GetHolidayScheduleResponse ClearHolidaySchedule SetUserType GetUserType - SetRfid - GetRfid - ClearRfid - ClearAllRfids + GetUserTypeResponse + SetRFIDCode + GetRFIDCode + GetRFIDCodeResponse + ClearRFIDCode + ClearAllRFIDCodes GROUP_NAME_SUPPORT diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml index 96f836b1534510..3a47091f9d00e8 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -1223,447 +1223,6 @@ limitations under the License. - - Door Lock - Closures - Provides an interface into a generic way to secure a door. - 0x0101 - DOOR_LOCK_CLUSTER - true - true - - lock state - lock type - actuator enabled - door state - door open events - door closed events - open period - num lock records supported - num total users supported - num PIN users supported - num RFID users supported - num weekday schedules supported per user - num yearday schedules supported per user - num holiday schedules supported per user - max pin length - min pin length - max rfid code length - min rfid code length - enable logging - language - led settings - auto relock time - sound volume - operating mode - supported operating modes - default configuration register - enable local programming - enable one touch locking - enable inside status led - enable privacy mode button - wrong code entry limit - user code temporary disable time - send pin over the air - require pin for rf operation - zigbee security level - alarm mask - keypad operation event mask - RF operation event mask - manual operation event mask - rfid operation event mask - keypad programming event mask - rf programming event mask - rfid programming event mask - - - Locks the door - - - - - - Unlocks the door - - - - - - Toggles the door lock from its current state to the opposite state locked or unlocked. - - - - - - Unlock the door with a timeout. When the timeout expires, the door will automatically re-lock. - - - - - - - Retrieve a log record at a specified index. - - - - - - Set the PIN for a specified user id. - - - - - - - - - Retrieve PIN information for a user with a specific user ID. - - - - - - Clear the PIN for a user with a specific user ID - - - - - - Clear all PIN codes on the lock for all users. - - - - - Set the status value for a specified user ID. - - - - - - - Retrieve the status byte for a specific user. - - - - - - Set the schedule of days during the week that the associated user based on the user ID will have access to the lock and will be able to operate it. - - - - - - - - - - - - Retrieve a weekday schedule for doorlock user activation for a specific schedule id and user id. - - - - - - - Clear a weekday schedule for doorlock user activation for a specific schedule id and user id. - - - - - - - Set a door lock user id activation schedule according to a specific absolute local start and end time - - - - - - - - - Retrieve a yearday schedule for a specific scheduleId and userId - - - - - - - Clear a yearday schedule for a specific scheduleId and userId - - - - - - - Set the holiday schedule for a specific user - - - - - - - - - Retrieve a holiday schedule for a specific scheduleId - - - - - - Clear a holiday schedule for a specific scheduleId - - - - - - Set the type value for a user based on user ID. - - - - - - - Retrieve the type for a specific user based on the user ID. - - - - - - Set the PIN for a specified user id. - - - - - - - - - Retrieve RFID ID information for a user with a specific user ID. - - - - - - Clear the RFID ID for a user with a specific user ID - - - - - - Clear all RFID ID codes on the lock for all users. - - - - - Indicates lock success or failure - - - - - - Indicates unlock success or failure - - - - - - Response provided to the toggle command, indicates whether the toggle was successful or not. - - - - - - Response provided to unlock with specific timeout. This command indicates whether the unlock command was successful or not. - - - - - - Returns the specific log record requested. - - - - - - - - - - - - Indicates whether the setting of the PIN was successful or not. - - - - - - Returns the PIN requested according to the user ID passed. - - - - - - - - - Returns success or failure depending on whether the PIN was cleared or not. - - - - - - Returns success or failure depending on whether the PINs were cleared or not. - - - - - - Returns success or failure depending on whether the user status was set or not. - - - - - - Returns the user status. - - - - - - - Returns the status of setting the weekday schedule - - - - - - Returns the weekday schedule requested. - - - - - - - - - - - - - Returns the status of clearing the weekday schedule - - - - - - Returns success or failure depending on whether the yearday schedule was set or not. - - - - - - Returns the yearday schedule requested - - - - - - - - - - Returns success or failure depending on whether the yearday schedule was removed or not. - - - - - - Returns success or failure depending on whether the holiday schedule was set or not. - - - - - - Returns the holiday schedule requested - - - - - - - - - - Returns success or failure depending on whether the holiday schedule was removed or not. - - - - - - returns success or failure depending on whether the user type was set or not. - - - - - - Returns the user type for the user ID requested. - - - - - - - Indicates whether the setting of the RFID ID was successful or not. - - - - - - Returns the RFID ID requested according to the user ID passed. - - - - - - - - - Returns success or failure depending on whether the RFID ID was cleared or not. - - - - - - Returns success or failure depending on whether the RFID IDs were cleared or not. - - - - - - Indicates that an operation event has taken place. Includes the associated event information. - - - - - - - - - - - Indicates that a programming event has taken place. Includes the associated programming event information. - - - - - - - - - - - Barrier Control Closures diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 5a7b1dd3954107..2f67b24b5124b0 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -20,6 +20,7 @@ "content-launch-cluster.xml", "descriptor-cluster.xml", "diagnostic-logs-cluster.xml", + "door-lock-cluster.xml", "ethernet-network-diagnostics-cluster.xml", "fixed-label-cluster.xml", "flow-measurement-cluster.xml", diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index d79aa562b94028..b6b1149c19bb2b 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -5936,7 +5936,7 @@ "outgoing": 1 }, { - "name": "SetPin", + "name": "SetPINCode", "code": 5, "mfgCode": null, "source": "client", @@ -5944,7 +5944,7 @@ "outgoing": 1 }, { - "name": "GetPin", + "name": "GetPINCode", "code": 6, "mfgCode": null, "source": "client", @@ -5952,7 +5952,7 @@ "outgoing": 1 }, { - "name": "ClearPin", + "name": "ClearPINCode", "code": 7, "mfgCode": null, "source": "client", @@ -5960,7 +5960,7 @@ "outgoing": 1 }, { - "name": "ClearAllPins", + "name": "ClearAllPINCodes", "code": 8, "mfgCode": null, "source": "client", @@ -5968,7 +5968,7 @@ "outgoing": 1 }, { - "name": "SetWeekdaySchedule", + "name": "SetWeekDaySchedule", "code": 11, "mfgCode": null, "source": "client", @@ -5976,7 +5976,7 @@ "outgoing": 1 }, { - "name": "GetWeekdaySchedule", + "name": "GetWeekDaySchedule", "code": 12, "mfgCode": null, "source": "client", @@ -5984,7 +5984,7 @@ "outgoing": 1 }, { - "name": "ClearWeekdaySchedule", + "name": "ClearWeekDaySchedule", "code": 13, "mfgCode": null, "source": "client", @@ -5992,7 +5992,7 @@ "outgoing": 1 }, { - "name": "SetYeardaySchedule", + "name": "SetYearDaySchedule", "code": 14, "mfgCode": null, "source": "client", @@ -6000,7 +6000,7 @@ "outgoing": 1 }, { - "name": "GetYeardaySchedule", + "name": "GetYearDaySchedule", "code": 15, "mfgCode": null, "source": "client", @@ -6008,7 +6008,7 @@ "outgoing": 1 }, { - "name": "ClearYeardaySchedule", + "name": "ClearYearDaySchedule", "code": 16, "mfgCode": null, "source": "client", @@ -6056,7 +6056,7 @@ "outgoing": 1 }, { - "name": "SetRfid", + "name": "SetRFIDCode", "code": 22, "mfgCode": null, "source": "client", @@ -6064,7 +6064,7 @@ "outgoing": 1 }, { - "name": "GetRfid", + "name": "GetRFIDCode", "code": 23, "mfgCode": null, "source": "client", @@ -6072,7 +6072,7 @@ "outgoing": 1 }, { - "name": "ClearRfid", + "name": "ClearRFIDCode", "code": 24, "mfgCode": null, "source": "client", @@ -6080,7 +6080,7 @@ "outgoing": 1 }, { - "name": "ClearAllRfids", + "name": "ClearAllRFIDCodes", "code": 25, "mfgCode": null, "source": "client", @@ -6114,30 +6114,6 @@ "side": "server", "enabled": 0, "commands": [ - { - "name": "LockDoorResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockDoorResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "UnlockWithTimeoutResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, { "name": "GetLogRecordResponse", "code": 4, @@ -6147,45 +6123,13 @@ "outgoing": 1 }, { - "name": "SetPinResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetPinResponse", + "name": "GetPINCodeResponse", "code": 6, "mfgCode": null, "source": "server", "incoming": 1, "outgoing": 1 }, - { - "name": "ClearPinResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ClearAllPinsResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetUserStatusResponse", - "code": 9, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 0 - }, { "name": "GetUserStatusResponse", "code": 10, @@ -6195,15 +6139,7 @@ "outgoing": 0 }, { - "name": "SetWeekdayScheduleResponse", - "code": 11, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetWeekdayScheduleResponse", + "name": "GetWeekDayScheduleResponse", "code": 12, "mfgCode": null, "source": "server", @@ -6211,45 +6147,13 @@ "outgoing": 1 }, { - "name": "ClearWeekdayScheduleResponse", - "code": 13, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetYeardayScheduleResponse", - "code": 14, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetYeardayScheduleResponse", + "name": "GetYearDayScheduleResponse", "code": 15, "mfgCode": null, "source": "server", "incoming": 1, "outgoing": 1 }, - { - "name": "ClearYeardayScheduleResponse", - "code": 16, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetHolidayScheduleResponse", - "code": 17, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, { "name": "GetHolidayScheduleResponse", "code": 18, @@ -6258,22 +6162,6 @@ "incoming": 1, "outgoing": 1 }, - { - "name": "ClearHolidayScheduleResponse", - "code": 19, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SetUserTypeResponse", - "code": 20, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, { "name": "GetUserTypeResponse", "code": 21, @@ -6283,41 +6171,17 @@ "outgoing": 1 }, { - "name": "SetRfidResponse", - "code": 22, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "GetRfidResponse", + "name": "GetRFIDCodeResponse", "code": 23, "mfgCode": null, "source": "server", "incoming": 1, "outgoing": 1 - }, - { - "name": "ClearRfidResponse", - "code": 24, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "ClearAllRfidsResponse", - "code": 25, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ { - "name": "lock state", + "name": "LockState", "code": 0, "mfgCode": null, "side": "server", @@ -6332,7 +6196,7 @@ "reportableChange": 0 }, { - "name": "lock type", + "name": "LockType", "code": 1, "mfgCode": null, "side": "server", @@ -6347,7 +6211,7 @@ "reportableChange": 0 }, { - "name": "actuator enabled", + "name": "ActuatorEnabled", "code": 2, "mfgCode": null, "side": "server", @@ -6362,7 +6226,7 @@ "reportableChange": 0 }, { - "name": "door state", + "name": "DoorState", "code": 3, "mfgCode": null, "side": "server", @@ -6377,7 +6241,7 @@ "reportableChange": 0 }, { - "name": "enable logging", + "name": "EnableLogging", "code": 32, "mfgCode": null, "side": "server", @@ -6392,7 +6256,7 @@ "reportableChange": 0 }, { - "name": "language", + "name": "Language", "code": 33, "mfgCode": null, "side": "server", @@ -6407,7 +6271,7 @@ "reportableChange": 0 }, { - "name": "led settings", + "name": "LEDSettings", "code": 34, "mfgCode": null, "side": "server", @@ -6422,7 +6286,7 @@ "reportableChange": 0 }, { - "name": "auto relock time", + "name": "AutoRelockTime", "code": 35, "mfgCode": null, "side": "server", @@ -6437,7 +6301,7 @@ "reportableChange": 0 }, { - "name": "sound volume", + "name": "SoundVolume", "code": 36, "mfgCode": null, "side": "server", @@ -6452,7 +6316,7 @@ "reportableChange": 0 }, { - "name": "operating mode", + "name": "OperatingMode", "code": 37, "mfgCode": null, "side": "server", @@ -6467,7 +6331,7 @@ "reportableChange": 0 }, { - "name": "default configuration register", + "name": "DefaultConfigurationRegister", "code": 39, "mfgCode": null, "side": "server", @@ -6482,7 +6346,7 @@ "reportableChange": 0 }, { - "name": "enable local programming", + "name": "EnableLocalProgramming", "code": 40, "mfgCode": null, "side": "server", @@ -6497,7 +6361,7 @@ "reportableChange": 0 }, { - "name": "enable one touch locking", + "name": "EnableOneTouchLocking", "code": 41, "mfgCode": null, "side": "server", @@ -6512,7 +6376,7 @@ "reportableChange": 0 }, { - "name": "enable inside status led", + "name": "EnableInsideStatusLED", "code": 42, "mfgCode": null, "side": "server", @@ -6527,7 +6391,7 @@ "reportableChange": 0 }, { - "name": "enable privacy mode button", + "name": "EnablePrivacyModeButton", "code": 43, "mfgCode": null, "side": "server", @@ -6542,7 +6406,7 @@ "reportableChange": 0 }, { - "name": "wrong code entry limit", + "name": "WrongCodeEntryLimit", "code": 48, "mfgCode": null, "side": "server", @@ -6557,7 +6421,7 @@ "reportableChange": 0 }, { - "name": "user code temporary disable time", + "name": "UserCodeTemporaryDisableTime", "code": 49, "mfgCode": null, "side": "server", @@ -6572,7 +6436,7 @@ "reportableChange": 0 }, { - "name": "send pin over the air", + "name": "SendPINOverTheAir", "code": 50, "mfgCode": null, "side": "server", @@ -6587,7 +6451,7 @@ "reportableChange": 0 }, { - "name": "require pin for rf operation", + "name": "RequirePINforRemoteOperation", "code": 51, "mfgCode": null, "side": "server", @@ -6602,22 +6466,7 @@ "reportableChange": 0 }, { - "name": "zigbee security level", - "code": 52, - "mfgCode": null, - "side": "server", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "alarm mask", + "name": "AlarmMask", "code": 64, "mfgCode": null, "side": "server", @@ -6632,7 +6481,7 @@ "reportableChange": 0 }, { - "name": "keypad operation event mask", + "name": "KeypadOperationEventMask", "code": 65, "mfgCode": null, "side": "server", @@ -6647,7 +6496,7 @@ "reportableChange": 0 }, { - "name": "RF operation event mask", + "name": "RemoteOperationEventMask", "code": 66, "mfgCode": null, "side": "server", @@ -6662,7 +6511,7 @@ "reportableChange": 0 }, { - "name": "manual operation event mask", + "name": "ManualOperationEventMask", "code": 67, "mfgCode": null, "side": "server", @@ -6677,7 +6526,7 @@ "reportableChange": 0 }, { - "name": "rfid operation event mask", + "name": "RFIDOperationEventMask", "code": 68, "mfgCode": null, "side": "server", @@ -6692,7 +6541,7 @@ "reportableChange": 0 }, { - "name": "keypad programming event mask", + "name": "KeypadProgrammingEventMask", "code": 69, "mfgCode": null, "side": "server", @@ -6707,7 +6556,7 @@ "reportableChange": 0 }, { - "name": "rf programming event mask", + "name": "RemoteProgrammingEventMask", "code": 70, "mfgCode": null, "side": "server", @@ -6722,7 +6571,7 @@ "reportableChange": 0 }, { - "name": "rfid programming event mask", + "name": "RFIDProgrammingEventMask", "code": 71, "mfgCode": null, "side": "server", diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt index 3d8e8908566c5f..565bba2f243b44 100644 --- a/src/controller/java/templates/ClusterInfo-java.zapt +++ b/src/controller/java/templates/ClusterInfo-java.zapt @@ -9,6 +9,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import androidx.annotation.Nullable; import chip.clusterinfo.ClusterInfo; import chip.clusterinfo.InteractionInfo; import chip.clusterinfo.CommandParameterInfo; diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index c665335cddbc4b..40dbc7f5b9d083 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -307,52 +307,20 @@ typedef void (*CHIPDescriptorClusterClusterRevisionAttributeCallbackType)( typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)( void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearAllPinsResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearAllRfidsResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearHolidayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetLogRecordResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetPINCodeResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetRFIDCodeResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetUserTypeResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterLockDoorResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetHolidayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetUserTypeResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterUnlockDoorResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &); typedef void (*CHIPDoorLockClusterLockStateAttributeCallbackType)( void *, chip::app::Clusters::DoorLock::Attributes::LockState::TypeInfo::DecodableArgType); diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp index 04008fe91673d2..ea3e97921619a3 100644 --- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp @@ -9415,17 +9415,16 @@ JNI_METHOD(jlong, DoorLockCluster, initWithDevice)(JNIEnv * env, jobject self, j return reinterpret_cast(cppCluster); } -JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, DoorLockCluster, clearAllPINCodes)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearAllPins::Type request; + chip::app::Clusters::DoorLock::Commands::ClearAllPINCodes::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9440,8 +9439,7 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9452,17 +9450,16 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, DoorLockCluster, clearAllRFIDCodes)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearAllRfids::Type request; + chip::app::Clusters::DoorLock::Commands::ClearAllRFIDCodes::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9477,8 +9474,7 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9490,7 +9486,7 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo onFailure.release(); } JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject holidayIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -9498,13 +9494,11 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule) chip::app::Clusters::DoorLock::Commands::ClearHolidaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); + request.holidayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(holidayIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9519,8 +9513,7 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9531,19 +9524,20 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) +JNI_METHOD(void, DoorLockCluster, clearPINCode) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject pinSlotIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearPin::Type request; + chip::app::Clusters::DoorLock::Commands::ClearPINCode::Type request; - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.pinSlotIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(pinSlotIndex)); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9558,7 +9552,7 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9569,19 +9563,20 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) +JNI_METHOD(void, DoorLockCluster, clearRFIDCode) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject rfidSlotIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearRfid::Type request; + chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::Type request; - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.rfidSlotIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(rfidSlotIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9596,8 +9591,7 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9608,23 +9602,21 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId) +JNI_METHOD(void, DoorLockCluster, clearWeekDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject weekDayIndex, jobject userIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearWeekdaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.weekDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(weekDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9639,8 +9631,7 @@ JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9651,23 +9642,21 @@ JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId) +JNI_METHOD(void, DoorLockCluster, clearYearDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject yearDayIndex, jobject userIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::ClearYeardaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.yearDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(yearDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9682,8 +9671,7 @@ JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9695,7 +9683,7 @@ JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule) onFailure.release(); } JNI_METHOD(void, DoorLockCluster, getHolidaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject holidayIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -9703,8 +9691,8 @@ JNI_METHOD(void, DoorLockCluster, getHolidaySchedule) chip::app::Clusters::DoorLock::Commands::GetHolidaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); + request.holidayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(holidayIndex)); std::unique_ptr @@ -9775,19 +9763,19 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) +JNI_METHOD(void, DoorLockCluster, getPINCode)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::GetPin::Type request; + chip::app::Clusters::DoorLock::Commands::GetPINCode::Type request; request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9802,7 +9790,8 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9813,19 +9802,19 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) +JNI_METHOD(void, DoorLockCluster, getRFIDCode)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::GetRfid::Type request; + chip::app::Clusters::DoorLock::Commands::GetRFIDCode::Type request; request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9840,7 +9829,8 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9890,23 +9880,23 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId) +JNI_METHOD(void, DoorLockCluster, getWeekDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject weekDayIndex, jobject userIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::GetWeekdaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.weekDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(weekDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9922,7 +9912,7 @@ JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9933,23 +9923,23 @@ JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, getYeardaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId) +JNI_METHOD(void, DoorLockCluster, getYearDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject yearDayIndex, jobject userIndex) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::GetYeardaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.yearDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(yearDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -9965,7 +9955,7 @@ JNI_METHOD(void, DoorLockCluster, getYeardaySchedule) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -9976,7 +9966,7 @@ JNI_METHOD(void, DoorLockCluster, getYeardaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray pin) +JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject pinCode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -9984,11 +9974,11 @@ JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong cl chip::app::Clusters::DoorLock::Commands::LockDoor::Type request; - request.pin = chip::JniByteArray(env, static_cast(pin)).byteSpan(); + chip::JniReferences::GetInstance().GetOptionalValue(pinCode, pinCode); + request.pinCode = chip::Optional(chip::JniByteArray(env, static_cast(pinCode)).byteSpan()); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10003,7 +9993,7 @@ JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong cl AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10015,8 +10005,8 @@ JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong cl onFailure.release(); } JNI_METHOD(void, DoorLockCluster, setHolidaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject localStartTime, jobject localEndTime, - jobject operatingModeDuringHoliday) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject holidayIndex, jobject localStartTime, jobject localEndTime, + jobject operatingMode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -10024,19 +10014,17 @@ JNI_METHOD(void, DoorLockCluster, setHolidaySchedule) chip::app::Clusters::DoorLock::Commands::SetHolidaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); + request.holidayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(holidayIndex)); request.localStartTime = static_cast(chip::JniReferences::GetInstance().LongToPrimitive(localStartTime)); request.localEndTime = static_cast(chip::JniReferences::GetInstance().LongToPrimitive(localEndTime)); - request.operatingModeDuringHoliday = static_cast( - chip::JniReferences::GetInstance().IntegerToPrimitive(operatingModeDuringHoliday)); + request.operatingMode = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(operatingMode)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10051,8 +10039,7 @@ JNI_METHOD(void, DoorLockCluster, setHolidaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10063,7 +10050,7 @@ JNI_METHOD(void, DoorLockCluster, setHolidaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, setPin) +JNI_METHOD(void, DoorLockCluster, setPINCode) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId, jobject userStatus, jobject userType, jbyteArray pin) { @@ -10071,7 +10058,7 @@ JNI_METHOD(void, DoorLockCluster, setPin) CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::SetPin::Type request; + chip::app::Clusters::DoorLock::Commands::SetPINCode::Type request; request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); request.userStatus = @@ -10079,9 +10066,8 @@ JNI_METHOD(void, DoorLockCluster, setPin) request.userType = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userType)); request.pin = chip::JniByteArray(env, static_cast(pin)).byteSpan(); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10096,7 +10082,7 @@ JNI_METHOD(void, DoorLockCluster, setPin) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10107,25 +10093,24 @@ JNI_METHOD(void, DoorLockCluster, setPin) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, setRfid) +JNI_METHOD(void, DoorLockCluster, setRFIDCode) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject userId, jobject userStatus, jobject userType, - jbyteArray id) + jbyteArray rfidCode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::SetRfid::Type request; + chip::app::Clusters::DoorLock::Commands::SetRFIDCode::Type request; request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); request.userStatus = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userStatus)); request.userType = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userType)); - request.id = chip::JniByteArray(env, static_cast(id)).byteSpan(); + request.rfidCode = chip::JniByteArray(env, static_cast(rfidCode)).byteSpan(); - std::unique_ptr onSuccess( - Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10140,7 +10125,7 @@ JNI_METHOD(void, DoorLockCluster, setRfid) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10163,9 +10148,8 @@ JNI_METHOD(void, DoorLockCluster, setUserType) request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); request.userType = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userType)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10180,8 +10164,7 @@ JNI_METHOD(void, DoorLockCluster, setUserType) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10192,19 +10175,19 @@ JNI_METHOD(void, DoorLockCluster, setUserType) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId, jobject daysMask, +JNI_METHOD(void, DoorLockCluster, setWeekDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject weekDayIndex, jobject userIndex, jobject daysMask, jobject startHour, jobject startMinute, jobject endHour, jobject endMinute) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::SetWeekdaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.weekDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(weekDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); request.daysMask = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(daysMask)); request.startHour = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(startHour)); request.startMinute = @@ -10212,10 +10195,8 @@ JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule) request.endHour = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(endHour)); request.endMinute = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(endMinute)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10230,8 +10211,7 @@ JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10242,28 +10222,26 @@ JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, setYeardaySchedule) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject scheduleId, jobject userId, jobject localStartTime, +JNI_METHOD(void, DoorLockCluster, setYearDaySchedule) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject yearDayIndex, jobject userIndex, jobject localStartTime, jobject localEndTime) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; DoorLockCluster * cppCluster; - chip::app::Clusters::DoorLock::Commands::SetYeardaySchedule::Type request; + chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type request; - request.scheduleId = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(scheduleId)); - request.userId = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userId)); + request.yearDayIndex = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(yearDayIndex)); + request.userIndex = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(userIndex)); request.localStartTime = static_cast(chip::JniReferences::GetInstance().LongToPrimitive(localStartTime)); request.localEndTime = static_cast(chip::JniReferences::GetInstance().LongToPrimitive(localEndTime)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10278,8 +10256,7 @@ JNI_METHOD(void, DoorLockCluster, setYeardaySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10290,7 +10267,7 @@ JNI_METHOD(void, DoorLockCluster, setYeardaySchedule) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray pin) +JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject pinCode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -10298,11 +10275,11 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type request; - request.pin = chip::JniByteArray(env, static_cast(pin)).byteSpan(); + chip::JniReferences::GetInstance().GetOptionalValue(pinCode, pinCode); + request.pinCode = chip::Optional(chip::JniByteArray(env, static_cast(pinCode)).byteSpan()); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10317,8 +10294,7 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10330,7 +10306,7 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong onFailure.release(); } JNI_METHOD(void, DoorLockCluster, unlockWithTimeout) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject timeoutInSeconds, jbyteArray pin) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject timeout, jobject pinCode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -10338,14 +10314,12 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout) chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type request; - request.timeoutInSeconds = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(timeoutInSeconds)); - request.pin = chip::JniByteArray(env, static_cast(pin)).byteSpan(); + request.timeout = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(timeout)); + chip::JniReferences::GetInstance().GetOptionalValue(pinCode, pinCode); + request.pinCode = chip::Optional(chip::JniByteArray(env, static_cast(pinCode)).byteSpan()); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -10360,8 +10334,7 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10372,114 +10345,6 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) -{ - chip::DeviceLayer::StackLock lock; - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); - VerifyOrReturn(onSuccess.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); - - std::unique_ptr onFailure( - Platform::New(callback), Platform::Delete); - VerifyOrReturn(onFailure.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - err = cppCluster->SubscribeAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), static_cast(minInterval), - static_cast(maxInterval)); - VerifyOrReturn(err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error subscribing to attribute", err)); - - onSuccess.release(); - onFailure.release(); -} - -JNI_METHOD(void, DoorLockCluster, reportLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) -{ - chip::DeviceLayer::StackLock lock; - std::unique_ptr onReport( - Platform::New(callback, true), Platform::Delete); - VerifyOrReturn(onReport.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - err = cppCluster->ReportAttributeLockState(onReport->Cancel()); - VerifyOrReturn(err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error registering for attribute reporting", err)); - - onReport.release(); -} -JNI_METHOD(void, DoorLockCluster, subscribeLockTypeAttribute) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) -{ - chip::DeviceLayer::StackLock lock; - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); - VerifyOrReturn(onSuccess.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); - - std::unique_ptr onFailure( - Platform::New(callback), Platform::Delete); - VerifyOrReturn(onFailure.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - err = cppCluster->SubscribeAttributeLockType(onSuccess->Cancel(), onFailure->Cancel(), static_cast(minInterval), - static_cast(maxInterval)); - VerifyOrReturn(err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error subscribing to attribute", err)); - - onSuccess.release(); - onFailure.release(); -} - -JNI_METHOD(void, DoorLockCluster, reportLockTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) -{ - chip::DeviceLayer::StackLock lock; - std::unique_ptr onReport( - Platform::New(callback, true), Platform::Delete); - VerifyOrReturn(onReport.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - err = cppCluster->ReportAttributeLockType(onReport->Cancel()); - VerifyOrReturn(err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error registering for attribute reporting", err)); - - onReport.release(); -} JNI_METHOD(void, DoorLockCluster, subscribeActuatorEnabledAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) { diff --git a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp index dc960cb471d637..f5415b29ebd1ae 100644 --- a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp @@ -4544,74 +4544,6 @@ JNI_METHOD(void, DescriptorCluster, readClusterRevisionAttribute)(JNIEnv * env, onFailure.release(); } -JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) -{ - chip::DeviceLayer::StackLock lock; - using TypeInfo = chip::app::Clusters::DoorLock::Attributes::LockState::TypeInfo; - std::unique_ptr onSuccess( - chip::Platform::New(callback, false), chip::Platform::Delete); - VerifyOrReturn(onSuccess.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); - - std::unique_ptr onFailure( - chip::Platform::New(callback), chip::Platform::Delete); - VerifyOrReturn(onFailure.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - chip::Controller::DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); - auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); - err = cppCluster->ReadAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall); - VerifyOrReturn( - err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error reading attribute", err)); - - onSuccess.release(); - onFailure.release(); -} - -JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) -{ - chip::DeviceLayer::StackLock lock; - using TypeInfo = chip::app::Clusters::DoorLock::Attributes::LockType::TypeInfo; - std::unique_ptr onSuccess( - chip::Platform::New(callback, false), chip::Platform::Delete); - VerifyOrReturn(onSuccess.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); - - std::unique_ptr onFailure( - chip::Platform::New(callback), chip::Platform::Delete); - VerifyOrReturn(onFailure.get() != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - - CHIP_ERROR err = CHIP_NO_ERROR; - chip::Controller::DoorLockCluster * cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); - - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); - auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); - err = cppCluster->ReadAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall); - VerifyOrReturn( - err == CHIP_NO_ERROR, - chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error reading attribute", err)); - - onSuccess.release(); - onFailure.release(); -} - JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; @@ -6716,10 +6648,8 @@ JNI_METHOD(void, IlluminanceMeasurementCluster, readLightSensorTypeAttribute) { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::IlluminanceMeasurement::Attributes::LightSensorType::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -7132,9 +7062,8 @@ JNI_METHOD(void, LevelControlCluster, readOnLevelAttribute)(JNIEnv * env, jobjec { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::LevelControl::Attributes::OnLevel::TypeInfo; - std::unique_ptr onSuccess( - chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -7240,9 +7169,8 @@ JNI_METHOD(void, LevelControlCluster, readDefaultMoveRateAttribute)(JNIEnv * env { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::LevelControl::Attributes::DefaultMoveRate::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -13071,9 +12999,8 @@ JNI_METHOD(void, TestClusterCluster, readNullableBitmap8Attribute)(JNIEnv * env, { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableBitmap8::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -13211,9 +13138,8 @@ JNI_METHOD(void, TestClusterCluster, readNullableInt8uAttribute)(JNIEnv * env, j { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableInt8u::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -13771,9 +13697,8 @@ JNI_METHOD(void, TestClusterCluster, readNullableEnum8Attribute)(JNIEnv * env, j { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableEnum8::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); @@ -13990,10 +13915,8 @@ JNI_METHOD(void, TestClusterCluster, readNullableRangeRestrictedInt8uAttribute) { chip::DeviceLayer::StackLock lock; using TypeInfo = chip::app::Clusters::TestCluster::Attributes::NullableRangeRestrictedInt8u::TypeInfo; - std::unique_ptr - onSuccess(chip::Platform::New(callback, false), - chip::Platform::Delete); + std::unique_ptr onSuccess( + chip::Platform::New(callback, false), chip::Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index dac582580e1311..abe9359c778993 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -368,8 +368,8 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, status, content, timeStamp, timeSinceBoot); } -CHIPDoorLockClusterClearAllPinsResponseCallback::CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -385,7 +385,7 @@ CHIPDoorLockClusterClearAllPinsResponseCallback::CHIPDoorLockClusterClearAllPins } } -CHIPDoorLockClusterClearAllPinsResponseCallback::~CHIPDoorLockClusterClearAllPinsResponseCallback() +CHIPDoorLockClusterGetHolidayScheduleResponseCallback::~CHIPDoorLockClusterGetHolidayScheduleResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -396,8 +396,8 @@ CHIPDoorLockClusterClearAllPinsResponseCallback::~CHIPDoorLockClusterClearAllPin env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearAllPinsResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -407,29 +407,56 @@ void CHIPDoorLockClusterClearAllPinsResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod( + env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)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(), - dataResponse.status, status); + chip::JniReferences::GetInstance().CreateBoxedObject( + statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); + jobject localStartTime; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string localStartTimeClassName = "java/lang/Long"; + std::string localStartTimeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + localStartTimeClassName.c_str(), localStartTimeCtorSignature.c_str(), dataResponse.localStartTime, localStartTime); + jobject localEndTime; + + std::string localEndTimeClassName = "java/lang/Long"; + std::string localEndTimeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(localEndTimeClassName.c_str(), localEndTimeCtorSignature.c_str(), + dataResponse.localEndTime, localEndTime); + jobject operatingMode; + + std::string operatingModeClassName = "java/lang/Integer"; + std::string operatingModeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + operatingModeClassName.c_str(), operatingModeCtorSignature.c_str(), dataResponse.operatingMode, operatingMode); + + env->CallVoidMethod(javaCallbackRef, javaMethod, holidayIndex, status, localStartTime, localEndTime, operatingMode); } -CHIPDoorLockClusterClearAllRfidsResponseCallback::CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetLogRecordResponseCallback::CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -445,7 +472,7 @@ CHIPDoorLockClusterClearAllRfidsResponseCallback::CHIPDoorLockClusterClearAllRfi } } -CHIPDoorLockClusterClearAllRfidsResponseCallback::~CHIPDoorLockClusterClearAllRfidsResponseCallback() +CHIPDoorLockClusterGetLogRecordResponseCallback::~CHIPDoorLockClusterGetLogRecordResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -456,8 +483,8 @@ CHIPDoorLockClusterClearAllRfidsResponseCallback::~CHIPDoorLockClusterClearAllRf env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearAllRfidsResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetLogRecordResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -467,30 +494,67 @@ void CHIPDoorLockClusterClearAllRfidsResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod( + env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", + &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; + jobject logEntryId; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); + std::string logEntryIdClassName = "java/lang/Integer"; + std::string logEntryIdCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(logEntryIdClassName.c_str(), logEntryIdCtorSignature.c_str(), + dataResponse.logEntryId, logEntryId); + jobject timestamp; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string timestampClassName = "java/lang/Long"; + std::string timestampCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(timestampClassName.c_str(), timestampCtorSignature.c_str(), + dataResponse.timestamp, timestamp); + jobject eventType; + + std::string eventTypeClassName = "java/lang/Integer"; + std::string eventTypeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(eventTypeClassName.c_str(), eventTypeCtorSignature.c_str(), + dataResponse.eventType, eventType); + jobject source; + + std::string sourceClassName = "java/lang/Integer"; + std::string sourceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(sourceClassName.c_str(), sourceCtorSignature.c_str(), + dataResponse.source, source); + jobject eventIdOrAlarmCode; + + std::string eventIdOrAlarmCodeClassName = "java/lang/Integer"; + std::string eventIdOrAlarmCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(eventIdOrAlarmCodeClassName.c_str(), + eventIdOrAlarmCodeCtorSignature.c_str(), + dataResponse.eventIdOrAlarmCode, eventIdOrAlarmCode); + jobject userId; + + std::string userIdClassName = "java/lang/Integer"; + std::string userIdCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), + dataResponse.userId, userId); + jobject pin; + + chip::ByteArray pinByteArray(env, dataResponse.pin); + pin = pinByteArray.jniValue(); + + env->CallVoidMethod(javaCallbackRef, javaMethod, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin); } -CHIPDoorLockClusterClearHolidayScheduleResponseCallback::CHIPDoorLockClusterClearHolidayScheduleResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetPINCodeResponseCallback::CHIPDoorLockClusterGetPINCodeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -506,7 +570,7 @@ CHIPDoorLockClusterClearHolidayScheduleResponseCallback::CHIPDoorLockClusterClea } } -CHIPDoorLockClusterClearHolidayScheduleResponseCallback::~CHIPDoorLockClusterClearHolidayScheduleResponseCallback() +CHIPDoorLockClusterGetPINCodeResponseCallback::~CHIPDoorLockClusterGetPINCodeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -517,8 +581,8 @@ CHIPDoorLockClusterClearHolidayScheduleResponseCallback::~CHIPDoorLockClusterCle env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearHolidayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetPINCodeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -528,30 +592,46 @@ void CHIPDoorLockClusterClearHolidayScheduleResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; + jobject userId; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); + std::string userIdClassName = "java/lang/Integer"; + std::string userIdCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), + dataResponse.userId, userId); + jobject userStatus; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string userStatusClassName = "java/lang/Integer"; + std::string userStatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + userStatusClassName.c_str(), userStatusCtorSignature.c_str(), dataResponse.userStatus.Value(), userStatus); + jobject userType; + + std::string userTypeClassName = "java/lang/Integer"; + std::string userTypeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType.Value(), userType); + jobject pin; + + chip::ByteArray pinByteArray(env, dataResponse.pin.Value()); + pin = pinByteArray.jniValue(); + + env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userStatus, userType, pin); } -CHIPDoorLockClusterClearPinResponseCallback::CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetRFIDCodeResponseCallback::CHIPDoorLockClusterGetRFIDCodeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -567,7 +647,7 @@ CHIPDoorLockClusterClearPinResponseCallback::CHIPDoorLockClusterClearPinResponse } } -CHIPDoorLockClusterClearPinResponseCallback::~CHIPDoorLockClusterClearPinResponseCallback() +CHIPDoorLockClusterGetRFIDCodeResponseCallback::~CHIPDoorLockClusterGetRFIDCodeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -578,8 +658,8 @@ CHIPDoorLockClusterClearPinResponseCallback::~CHIPDoorLockClusterClearPinRespons env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearPinResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetRFIDCodeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -589,29 +669,46 @@ void CHIPDoorLockClusterClearPinResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; + jobject userId; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); + std::string userIdClassName = "java/lang/Integer"; + std::string userIdCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), + dataResponse.userId, userId); + jobject userStatus; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string userStatusClassName = "java/lang/Integer"; + std::string userStatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + userStatusClassName.c_str(), userStatusCtorSignature.c_str(), dataResponse.userStatus.Value(), userStatus); + jobject userType; + + std::string userTypeClassName = "java/lang/Integer"; + std::string userTypeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType.Value(), userType); + jobject rfidCode; + + chip::ByteArray rfidCodeByteArray(env, dataResponse.rfidCode.Value()); + rfidCode = rfidCodeByteArray.jniValue(); + + env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userStatus, userType, rfidCode); } -CHIPDoorLockClusterClearRfidResponseCallback::CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetUserTypeResponseCallback::CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -627,7 +724,7 @@ CHIPDoorLockClusterClearRfidResponseCallback::CHIPDoorLockClusterClearRfidRespon } } -CHIPDoorLockClusterClearRfidResponseCallback::~CHIPDoorLockClusterClearRfidResponseCallback() +CHIPDoorLockClusterGetUserTypeResponseCallback::~CHIPDoorLockClusterGetUserTypeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -638,8 +735,8 @@ CHIPDoorLockClusterClearRfidResponseCallback::~CHIPDoorLockClusterClearRfidRespo env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearRfidResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetUserTypeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -649,30 +746,36 @@ void CHIPDoorLockClusterClearRfidResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V", + &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; + jobject userId; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); + std::string userIdClassName = "java/lang/Integer"; + std::string userIdCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), + dataResponse.userId, userId); + jobject userType; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string userTypeClassName = "java/lang/Integer"; + std::string userTypeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType, userType); + + env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userType); } -CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::CHIPDoorLockClusterClearWeekdayScheduleResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -688,7 +791,7 @@ CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::CHIPDoorLockClusterClea } } -CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback() +CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -699,8 +802,8 @@ CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::~CHIPDoorLockClusterCle env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -710,31 +813,77 @@ void CHIPDoorLockClusterClearWeekdayScheduleResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod( + env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;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 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(), - dataResponse.status, status); + chip::JniReferences::GetInstance().CreateBoxedObject( + statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); + jobject daysMask; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + std::string daysMaskClassName = "java/lang/Integer"; + std::string daysMaskCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject>( + daysMaskClassName.c_str(), daysMaskCtorSignature.c_str(), dataResponse.daysMask, daysMask); + jobject startHour; + + std::string startHourClassName = "java/lang/Integer"; + std::string startHourCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(startHourClassName.c_str(), startHourCtorSignature.c_str(), + dataResponse.startHour, startHour); + jobject startMinute; + + std::string startMinuteClassName = "java/lang/Integer"; + std::string startMinuteCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(startMinuteClassName.c_str(), startMinuteCtorSignature.c_str(), + dataResponse.startMinute, startMinute); + jobject endHour; + + std::string endHourClassName = "java/lang/Integer"; + std::string endHourCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(endHourClassName.c_str(), endHourCtorSignature.c_str(), + dataResponse.endHour, endHour); + jobject endMinute; + + std::string endMinuteClassName = "java/lang/Integer"; + std::string endMinuteCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(endMinuteClassName.c_str(), endMinuteCtorSignature.c_str(), + dataResponse.endMinute, endMinute); + + env->CallVoidMethod(javaCallbackRef, javaMethod, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, + endMinute); } -CHIPDoorLockClusterClearYeardayScheduleResponseCallback::CHIPDoorLockClusterClearYeardayScheduleResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -750,7 +899,7 @@ CHIPDoorLockClusterClearYeardayScheduleResponseCallback::CHIPDoorLockClusterClea } } -CHIPDoorLockClusterClearYeardayScheduleResponseCallback::~CHIPDoorLockClusterClearYeardayScheduleResponseCallback() +CHIPDoorLockClusterGetYearDayScheduleResponseCallback::~CHIPDoorLockClusterGetYearDayScheduleResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -761,8 +910,8 @@ CHIPDoorLockClusterClearYeardayScheduleResponseCallback::~CHIPDoorLockClusterCle env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDoorLockClusterClearYeardayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & dataResponse) +void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -772,1173 +921,53 @@ void CHIPDoorLockClusterClearYeardayScheduleResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; // Java callback is allowed to be null, exit early if this is the case. VerifyOrReturn(javaCallbackRef != nullptr); - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + err = JniReferences::GetInstance().FindMethod( + env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)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(), - dataResponse.status, status); + chip::JniReferences::GetInstance().CreateBoxedObject( + statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); + jobject localStartTime; - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } + std::string localStartTimeClassName = "java/lang/Long"; + std::string localStartTimeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + localStartTimeClassName.c_str(), localStartTimeCtorSignature.c_str(), dataResponse.localStartTime, localStartTime); + jobject localEndTime; - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} + std::string localEndTimeClassName = "java/lang/Long"; + std::string localEndTimeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(localEndTimeClassName.c_str(), localEndTimeCtorSignature.c_str(), + dataResponse.localEndTime, localEndTime); -CHIPDoorLockClusterGetHolidayScheduleResponseCallback::~CHIPDoorLockClusterGetHolidayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod( - env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject scheduleId; - - std::string scheduleIdClassName = "java/lang/Integer"; - std::string scheduleIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(scheduleIdClassName.c_str(), scheduleIdCtorSignature.c_str(), - dataResponse.scheduleId, scheduleId); - jobject status; - - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); - jobject localStartTime; - - std::string localStartTimeClassName = "java/lang/Long"; - std::string localStartTimeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - localStartTimeClassName.c_str(), localStartTimeCtorSignature.c_str(), dataResponse.localStartTime, localStartTime); - jobject localEndTime; - - std::string localEndTimeClassName = "java/lang/Long"; - std::string localEndTimeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(localEndTimeClassName.c_str(), localEndTimeCtorSignature.c_str(), - dataResponse.localEndTime, localEndTime); - jobject operatingModeDuringHoliday; - - std::string operatingModeDuringHolidayClassName = "java/lang/Integer"; - std::string operatingModeDuringHolidayCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - operatingModeDuringHolidayClassName.c_str(), operatingModeDuringHolidayCtorSignature.c_str(), - dataResponse.operatingModeDuringHoliday, operatingModeDuringHoliday); - - env->CallVoidMethod(javaCallbackRef, javaMethod, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday); -} -CHIPDoorLockClusterGetLogRecordResponseCallback::CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetLogRecordResponseCallback::~CHIPDoorLockClusterGetLogRecordResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetLogRecordResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod( - env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", - &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject logEntryId; - - std::string logEntryIdClassName = "java/lang/Integer"; - std::string logEntryIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(logEntryIdClassName.c_str(), logEntryIdCtorSignature.c_str(), - dataResponse.logEntryId, logEntryId); - jobject timestamp; - - std::string timestampClassName = "java/lang/Long"; - std::string timestampCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(timestampClassName.c_str(), timestampCtorSignature.c_str(), - dataResponse.timestamp, timestamp); - jobject eventType; - - std::string eventTypeClassName = "java/lang/Integer"; - std::string eventTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(eventTypeClassName.c_str(), eventTypeCtorSignature.c_str(), - dataResponse.eventType, eventType); - jobject source; - - std::string sourceClassName = "java/lang/Integer"; - std::string sourceCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(sourceClassName.c_str(), sourceCtorSignature.c_str(), - dataResponse.source, source); - jobject eventIdOrAlarmCode; - - std::string eventIdOrAlarmCodeClassName = "java/lang/Integer"; - std::string eventIdOrAlarmCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(eventIdOrAlarmCodeClassName.c_str(), - eventIdOrAlarmCodeCtorSignature.c_str(), - dataResponse.eventIdOrAlarmCode, eventIdOrAlarmCode); - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject pin; - - chip::ByteArray pinByteArray(env, dataResponse.pin); - pin = pinByteArray.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin); -} -CHIPDoorLockClusterGetPinResponseCallback::CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetPinResponseCallback::~CHIPDoorLockClusterGetPinResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetPinResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject userStatus; - - std::string userStatusClassName = "java/lang/Integer"; - std::string userStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - userStatusClassName.c_str(), userStatusCtorSignature.c_str(), dataResponse.userStatus, userStatus); - jobject userType; - - std::string userTypeClassName = "java/lang/Integer"; - std::string userTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType, userType); - jobject pin; - - chip::ByteArray pinByteArray(env, dataResponse.pin); - pin = pinByteArray.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userStatus, userType, pin); -} -CHIPDoorLockClusterGetRfidResponseCallback::CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetRfidResponseCallback::~CHIPDoorLockClusterGetRfidResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetRfidResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;[B)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject userStatus; - - std::string userStatusClassName = "java/lang/Integer"; - std::string userStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - userStatusClassName.c_str(), userStatusCtorSignature.c_str(), dataResponse.userStatus, userStatus); - jobject userType; - - std::string userTypeClassName = "java/lang/Integer"; - std::string userTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType, userType); - jobject rfid; - - chip::ByteArray rfidByteArray(env, dataResponse.rfid); - rfid = rfidByteArray.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userStatus, userType, rfid); -} -CHIPDoorLockClusterGetUserTypeResponseCallback::CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetUserTypeResponseCallback::~CHIPDoorLockClusterGetUserTypeResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetUserTypeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/Integer;)V", - &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject userType; - - std::string userTypeClassName = "java/lang/Integer"; - std::string userTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - userTypeClassName.c_str(), userTypeCtorSignature.c_str(), dataResponse.userType, userType); - - env->CallVoidMethod(javaCallbackRef, javaMethod, userId, userType); -} -CHIPDoorLockClusterGetWeekdayScheduleResponseCallback::CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetWeekdayScheduleResponseCallback::~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetWeekdayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod( - env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;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 scheduleId; - - std::string scheduleIdClassName = "java/lang/Integer"; - std::string scheduleIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(scheduleIdClassName.c_str(), scheduleIdCtorSignature.c_str(), - dataResponse.scheduleId, scheduleId); - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject status; - - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); - jobject daysMask; - - std::string daysMaskClassName = "java/lang/Integer"; - std::string daysMaskCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(daysMaskClassName.c_str(), daysMaskCtorSignature.c_str(), - dataResponse.daysMask, daysMask); - jobject startHour; - - std::string startHourClassName = "java/lang/Integer"; - std::string startHourCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(startHourClassName.c_str(), startHourCtorSignature.c_str(), - dataResponse.startHour, startHour); - jobject startMinute; - - std::string startMinuteClassName = "java/lang/Integer"; - std::string startMinuteCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(startMinuteClassName.c_str(), startMinuteCtorSignature.c_str(), - dataResponse.startMinute, startMinute); - jobject endHour; - - std::string endHourClassName = "java/lang/Integer"; - std::string endHourCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(endHourClassName.c_str(), endHourCtorSignature.c_str(), - dataResponse.endHour, endHour); - jobject endMinute; - - std::string endMinuteClassName = "java/lang/Integer"; - std::string endMinuteCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(endMinuteClassName.c_str(), endMinuteCtorSignature.c_str(), - dataResponse.endMinute, endMinute); - - env->CallVoidMethod(javaCallbackRef, javaMethod, scheduleId, userId, status, daysMask, startHour, startMinute, endHour, - endMinute); -} -CHIPDoorLockClusterGetYeardayScheduleResponseCallback::CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterGetYeardayScheduleResponseCallback::~CHIPDoorLockClusterGetYeardayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterGetYeardayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod( - env, javaCallbackRef, "onSuccess", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject scheduleId; - - std::string scheduleIdClassName = "java/lang/Integer"; - std::string scheduleIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(scheduleIdClassName.c_str(), scheduleIdCtorSignature.c_str(), - dataResponse.scheduleId, scheduleId); - jobject userId; - - std::string userIdClassName = "java/lang/Integer"; - std::string userIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(userIdClassName.c_str(), userIdCtorSignature.c_str(), - dataResponse.userId, userId); - jobject status; - - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - dataResponse.status, status); - jobject localStartTime; - - std::string localStartTimeClassName = "java/lang/Long"; - std::string localStartTimeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - localStartTimeClassName.c_str(), localStartTimeCtorSignature.c_str(), dataResponse.localStartTime, localStartTime); - jobject localEndTime; - - std::string localEndTimeClassName = "java/lang/Long"; - std::string localEndTimeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(localEndTimeClassName.c_str(), localEndTimeCtorSignature.c_str(), - dataResponse.localEndTime, localEndTime); - - env->CallVoidMethod(javaCallbackRef, javaMethod, scheduleId, userId, status, localStartTime, localEndTime); -} -CHIPDoorLockClusterLockDoorResponseCallback::CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterLockDoorResponseCallback::~CHIPDoorLockClusterLockDoorResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterLockDoorResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetHolidayScheduleResponseCallback::CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetHolidayScheduleResponseCallback::~CHIPDoorLockClusterSetHolidayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetHolidayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetPinResponseCallback::CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetPinResponseCallback::~CHIPDoorLockClusterSetPinResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetPinResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetRfidResponseCallback::CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetRfidResponseCallback::~CHIPDoorLockClusterSetRfidResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetRfidResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr cppCallback( - reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetUserTypeResponseCallback::CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetUserTypeResponseCallback::~CHIPDoorLockClusterSetUserTypeResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetUserTypeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetWeekdayScheduleResponseCallback::CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetWeekdayScheduleResponseCallback::~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetWeekdayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterSetYeardayScheduleResponseCallback::CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterSetYeardayScheduleResponseCallback::~CHIPDoorLockClusterSetYeardayScheduleResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterSetYeardayScheduleResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterUnlockDoorResponseCallback::CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterUnlockDoorResponseCallback::~CHIPDoorLockClusterUnlockDoorResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterUnlockDoorResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); -} -CHIPDoorLockClusterUnlockWithTimeoutResponseCallback::CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPDoorLockClusterUnlockWithTimeoutResponseCallback::~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPDoorLockClusterUnlockWithTimeoutResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(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(), - dataResponse.status, status); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status); + env->CallVoidMethod(javaCallbackRef, javaMethod, yearDayIndex, userIndex, status, localStartTime, localEndTime); } CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissioningClusterArmFailSafeResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index d0cce3e299fa72..dad692ac7b8583 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -99,107 +99,6 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback jobject javaCallbackRef; }; -class CHIPDoorLockClusterClearAllPinsResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearAllPinsResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearAllRfidsResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearAllRfidsResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearHolidayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearHolidayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearHolidayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearPinResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearPinResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearRfidResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearRfidResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterClearYeardayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterClearYeardayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterClearYeardayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - class CHIPDoorLockClusterGetHolidayScheduleResponseCallback : public Callback::Callback { @@ -230,27 +129,28 @@ class CHIPDoorLockClusterGetLogRecordResponseCallback jobject javaCallbackRef; }; -class CHIPDoorLockClusterGetPinResponseCallback : public Callback::Callback +class CHIPDoorLockClusterGetPINCodeResponseCallback : public Callback::Callback { public: - CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback); + CHIPDoorLockClusterGetPINCodeResponseCallback(jobject javaCallback); - ~CHIPDoorLockClusterGetPinResponseCallback(); + ~CHIPDoorLockClusterGetPINCodeResponseCallback(); - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & data); + static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPDoorLockClusterGetRfidResponseCallback : public Callback::Callback +class CHIPDoorLockClusterGetRFIDCodeResponseCallback : public Callback::Callback { public: - CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback); + CHIPDoorLockClusterGetRFIDCodeResponseCallback(jobject javaCallback); - ~CHIPDoorLockClusterGetRfidResponseCallback(); + ~CHIPDoorLockClusterGetRFIDCodeResponseCallback(); - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & data); + static void CallbackFn(void * context, + const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data); private: jobject javaCallbackRef; @@ -270,157 +170,31 @@ class CHIPDoorLockClusterGetUserTypeResponseCallback : public Callback::Callback jobject javaCallbackRef; }; -class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback - : public Callback::Callback +class CHIPDoorLockClusterGetWeekDayScheduleResponseCallback + : public Callback::Callback { public: - CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback); + CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(jobject javaCallback); - ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(); + ~CHIPDoorLockClusterGetWeekDayScheduleResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterGetYeardayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterGetYeardayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterLockDoorResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterLockDoorResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetHolidayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetHolidayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetPinResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetPinResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetRfidResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetRfidResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetUserTypeResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetUserTypeResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterSetYeardayScheduleResponseCallback - : public Callback::Callback -{ -public: - CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterSetYeardayScheduleResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback -{ -public: - CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback); - - ~CHIPDoorLockClusterUnlockDoorResponseCallback(); - - static void CallbackFn(void * context, const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & data); + const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback - : public Callback::Callback +class CHIPDoorLockClusterGetYearDayScheduleResponseCallback + : public Callback::Callback { public: - CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback); + CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback); - ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(); + ~CHIPDoorLockClusterGetYearDayScheduleResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & data); + const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data); private: jobject javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index fa6ab851e57427..82cf4da1419695 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -2938,125 +2938,6 @@ void CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(voi env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - -CHIPLevelControlOnLevelAttributeCallback::CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPLevelControlOnLevelAttributeCallback::~CHIPLevelControlOnLevelAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPLevelControlOnTransitionTimeAttributeCallback::CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -3179,67 +3060,6 @@ void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPLevelControlDefaultMoveRateAttributeCallback::CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPLevelControlDefaultMoveRateAttributeCallback::~CHIPLevelControlDefaultMoveRateAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPLevelControlDefaultMoveRateAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPMediaInputMediaInputListAttributeCallback::CHIPMediaInputMediaInputListAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { @@ -5151,67 +4971,6 @@ void CHIPTestClusterNullableBooleanAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPTestClusterNullableBitmap8AttributeCallback::CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPTestClusterNullableBitmap8AttributeCallback::~CHIPTestClusterNullableBitmap8AttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPTestClusterNullableBitmap8AttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPTestClusterNullableBitmap16AttributeCallback::CHIPTestClusterNullableBitmap16AttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -5395,65 +5154,6 @@ void CHIPTestClusterNullableBitmap64AttributeCallback::CallbackFn(void * context env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPTestClusterNullableInt8uAttributeCallback::CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPTestClusterNullableInt8uAttributeCallback::~CHIPTestClusterNullableInt8uAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPTestClusterNullableInt8uAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPTestClusterNullableInt16uAttributeCallback::CHIPTestClusterNullableInt16uAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -6366,65 +6066,6 @@ void CHIPTestClusterNullableInt64sAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPTestClusterNullableEnum8AttributeCallback::CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPTestClusterNullableEnum8AttributeCallback::~CHIPTestClusterNullableEnum8AttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPTestClusterNullableEnum8AttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPTestClusterNullableEnum16AttributeCallback::CHIPTestClusterNullableEnum16AttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -6726,67 +6367,6 @@ void CHIPTestClusterNullableCharStringAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), - value.Value(), javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback::CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback( jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index a01f24fd5149c9..b497adff751538 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -838,54 +838,6 @@ class CHIPIlluminanceMeasurementMaxMeasuredValueAttributeCallback bool keepAlive; }; -class CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback(); - - static void maybeDestroy(CHIPIlluminanceMeasurementLightSensorTypeAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - -class CHIPLevelControlOnLevelAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPLevelControlOnLevelAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPLevelControlOnLevelAttributeCallback(); - - static void maybeDestroy(CHIPLevelControlOnLevelAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPLevelControlOnTransitionTimeAttributeCallback : public chip::Callback::Callback { @@ -934,30 +886,6 @@ class CHIPLevelControlOffTransitionTimeAttributeCallback bool keepAlive; }; -class CHIPLevelControlDefaultMoveRateAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPLevelControlDefaultMoveRateAttributeCallback(); - - static void maybeDestroy(CHIPLevelControlDefaultMoveRateAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPMediaInputMediaInputListAttributeCallback : public chip::Callback::Callback { @@ -1385,30 +1313,6 @@ class CHIPTestClusterNullableBooleanAttributeCallback bool keepAlive; }; -class CHIPTestClusterNullableBitmap8AttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPTestClusterNullableBitmap8AttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPTestClusterNullableBitmap8AttributeCallback(); - - static void maybeDestroy(CHIPTestClusterNullableBitmap8AttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPTestClusterNullableBitmap16AttributeCallback : public chip::Callback::Callback { @@ -1481,30 +1385,6 @@ class CHIPTestClusterNullableBitmap64AttributeCallback bool keepAlive; }; -class CHIPTestClusterNullableInt8uAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPTestClusterNullableInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPTestClusterNullableInt8uAttributeCallback(); - - static void maybeDestroy(CHIPTestClusterNullableInt8uAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPTestClusterNullableInt16uAttributeCallback : public chip::Callback::Callback { @@ -1865,30 +1745,6 @@ class CHIPTestClusterNullableInt64sAttributeCallback bool keepAlive; }; -class CHIPTestClusterNullableEnum8AttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPTestClusterNullableEnum8AttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPTestClusterNullableEnum8AttributeCallback(); - - static void maybeDestroy(CHIPTestClusterNullableEnum8AttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPTestClusterNullableEnum16AttributeCallback : public chip::Callback::Callback { @@ -2009,30 +1865,6 @@ class CHIPTestClusterNullableCharStringAttributeCallback bool keepAlive; }; -class CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback(); - - static void maybeDestroy(CHIPTestClusterNullableRangeRestrictedInt8uAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPTestClusterNullableRangeRestrictedInt8sAttributeCallback : public chip::Callback::Callback { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index abf7ece1756ee5..6bd507ad9ba6cd 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -4102,124 +4102,117 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void clearAllPins(ClearAllPinsResponseCallback callback) { - clearAllPins(chipClusterPtr, callback); + public void clearAllPINCodes(DefaultClusterCallback callback) { + clearAllPINCodes(chipClusterPtr, callback); } - public void clearAllRfids(ClearAllRfidsResponseCallback callback) { - clearAllRfids(chipClusterPtr, callback); + public void clearAllRFIDCodes(DefaultClusterCallback callback) { + clearAllRFIDCodes(chipClusterPtr, callback); } - public void clearHolidaySchedule( - ClearHolidayScheduleResponseCallback callback, Integer scheduleId) { - clearHolidaySchedule(chipClusterPtr, callback, scheduleId); + public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) { + clearHolidaySchedule(chipClusterPtr, callback, holidayIndex); } - public void clearPin(ClearPinResponseCallback callback, Integer userId) { - clearPin(chipClusterPtr, callback, userId); + public void clearPINCode(DefaultClusterCallback callback, Integer pinSlotIndex) { + clearPINCode(chipClusterPtr, callback, pinSlotIndex); } - public void clearRfid(ClearRfidResponseCallback callback, Integer userId) { - clearRfid(chipClusterPtr, callback, userId); + public void clearRFIDCode(DefaultClusterCallback callback, Integer rfidSlotIndex) { + clearRFIDCode(chipClusterPtr, callback, rfidSlotIndex); } - public void clearWeekdaySchedule( - ClearWeekdayScheduleResponseCallback callback, Integer scheduleId, Integer userId) { - clearWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId); + public void clearWeekDaySchedule( + DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) { + clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex); } - public void clearYeardaySchedule( - ClearYeardayScheduleResponseCallback callback, Integer scheduleId, Integer userId) { - clearYeardaySchedule(chipClusterPtr, callback, scheduleId, userId); + public void clearYearDaySchedule( + DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) { + clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex); } public void getHolidaySchedule( - GetHolidayScheduleResponseCallback callback, Integer scheduleId) { - getHolidaySchedule(chipClusterPtr, callback, scheduleId); + GetHolidayScheduleResponseCallback callback, Integer holidayIndex) { + getHolidaySchedule(chipClusterPtr, callback, holidayIndex); } public void getLogRecord(GetLogRecordResponseCallback callback, Integer logIndex) { getLogRecord(chipClusterPtr, callback, logIndex); } - public void getPin(GetPinResponseCallback callback, Integer userId) { - getPin(chipClusterPtr, callback, userId); + public void getPINCode(GetPINCodeResponseCallback callback, Integer userId) { + getPINCode(chipClusterPtr, callback, userId); } - public void getRfid(GetRfidResponseCallback callback, Integer userId) { - getRfid(chipClusterPtr, callback, userId); + public void getRFIDCode(GetRFIDCodeResponseCallback callback, Integer userId) { + getRFIDCode(chipClusterPtr, callback, userId); } public void getUserType(GetUserTypeResponseCallback callback, Integer userId) { getUserType(chipClusterPtr, callback, userId); } - public void getWeekdaySchedule( - GetWeekdayScheduleResponseCallback callback, Integer scheduleId, Integer userId) { - getWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId); + public void getWeekDaySchedule( + GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) { + getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex); } - public void getYeardaySchedule( - GetYeardayScheduleResponseCallback callback, Integer scheduleId, Integer userId) { - getYeardaySchedule(chipClusterPtr, callback, scheduleId, userId); + public void getYearDaySchedule( + GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) { + getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex); } - public void lockDoor(LockDoorResponseCallback callback, byte[] pin) { - lockDoor(chipClusterPtr, callback, pin); + public void lockDoor(DefaultClusterCallback callback, Optional pinCode) { + lockDoor(chipClusterPtr, callback, pinCode); } public void setHolidaySchedule( - SetHolidayScheduleResponseCallback callback, - Integer scheduleId, + DefaultClusterCallback callback, + Integer holidayIndex, Long localStartTime, Long localEndTime, - Integer operatingModeDuringHoliday) { + Integer operatingMode) { setHolidaySchedule( - chipClusterPtr, - callback, - scheduleId, - localStartTime, - localEndTime, - operatingModeDuringHoliday); + chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode); } - public void setPin( - SetPinResponseCallback callback, + public void setPINCode( + DefaultClusterCallback callback, Integer userId, Integer userStatus, Integer userType, byte[] pin) { - setPin(chipClusterPtr, callback, userId, userStatus, userType, pin); + setPINCode(chipClusterPtr, callback, userId, userStatus, userType, pin); } - public void setRfid( - SetRfidResponseCallback callback, + public void setRFIDCode( + DefaultClusterCallback callback, Integer userId, Integer userStatus, Integer userType, - byte[] id) { - setRfid(chipClusterPtr, callback, userId, userStatus, userType, id); + byte[] rfidCode) { + setRFIDCode(chipClusterPtr, callback, userId, userStatus, userType, rfidCode); } - public void setUserType( - SetUserTypeResponseCallback callback, Integer userId, Integer userType) { + public void setUserType(DefaultClusterCallback callback, Integer userId, Integer userType) { setUserType(chipClusterPtr, callback, userId, userType); } - public void setWeekdaySchedule( - SetWeekdayScheduleResponseCallback callback, - Integer scheduleId, - Integer userId, + public void setWeekDaySchedule( + DefaultClusterCallback callback, + Integer weekDayIndex, + Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute) { - setWeekdaySchedule( + setWeekDaySchedule( chipClusterPtr, callback, - scheduleId, - userId, + weekDayIndex, + userIndex, daysMask, startHour, startMinute, @@ -4227,187 +4220,142 @@ public void setWeekdaySchedule( endMinute); } - public void setYeardaySchedule( - SetYeardayScheduleResponseCallback callback, - Integer scheduleId, - Integer userId, + public void setYearDaySchedule( + DefaultClusterCallback callback, + Integer yearDayIndex, + Integer userIndex, Long localStartTime, Long localEndTime) { - setYeardaySchedule( - chipClusterPtr, callback, scheduleId, userId, localStartTime, localEndTime); + setYearDaySchedule( + chipClusterPtr, callback, yearDayIndex, userIndex, localStartTime, localEndTime); } - public void unlockDoor(UnlockDoorResponseCallback callback, byte[] pin) { - unlockDoor(chipClusterPtr, callback, pin); + public void unlockDoor(DefaultClusterCallback callback, Optional pinCode) { + unlockDoor(chipClusterPtr, callback, pinCode); } public void unlockWithTimeout( - UnlockWithTimeoutResponseCallback callback, Integer timeoutInSeconds, byte[] pin) { - unlockWithTimeout(chipClusterPtr, callback, timeoutInSeconds, pin); + DefaultClusterCallback callback, Integer timeout, Optional pinCode) { + unlockWithTimeout(chipClusterPtr, callback, timeout, pinCode); } - private native void clearAllPins(long chipClusterPtr, ClearAllPinsResponseCallback Callback); + private native void clearAllPINCodes(long chipClusterPtr, DefaultClusterCallback Callback); - private native void clearAllRfids(long chipClusterPtr, ClearAllRfidsResponseCallback Callback); + private native void clearAllRFIDCodes(long chipClusterPtr, DefaultClusterCallback Callback); private native void clearHolidaySchedule( - long chipClusterPtr, ClearHolidayScheduleResponseCallback Callback, Integer scheduleId); + long chipClusterPtr, DefaultClusterCallback Callback, Integer holidayIndex); - private native void clearPin( - long chipClusterPtr, ClearPinResponseCallback Callback, Integer userId); + private native void clearPINCode( + long chipClusterPtr, DefaultClusterCallback Callback, Integer pinSlotIndex); - private native void clearRfid( - long chipClusterPtr, ClearRfidResponseCallback Callback, Integer userId); + private native void clearRFIDCode( + long chipClusterPtr, DefaultClusterCallback Callback, Integer rfidSlotIndex); - private native void clearWeekdaySchedule( + private native void clearWeekDaySchedule( long chipClusterPtr, - ClearWeekdayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId); + DefaultClusterCallback Callback, + Integer weekDayIndex, + Integer userIndex); - private native void clearYeardaySchedule( + private native void clearYearDaySchedule( long chipClusterPtr, - ClearYeardayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId); + DefaultClusterCallback Callback, + Integer yearDayIndex, + Integer userIndex); private native void getHolidaySchedule( - long chipClusterPtr, GetHolidayScheduleResponseCallback Callback, Integer scheduleId); + long chipClusterPtr, GetHolidayScheduleResponseCallback Callback, Integer holidayIndex); private native void getLogRecord( long chipClusterPtr, GetLogRecordResponseCallback Callback, Integer logIndex); - private native void getPin( - long chipClusterPtr, GetPinResponseCallback Callback, Integer userId); + private native void getPINCode( + long chipClusterPtr, GetPINCodeResponseCallback Callback, Integer userId); - private native void getRfid( - long chipClusterPtr, GetRfidResponseCallback Callback, Integer userId); + private native void getRFIDCode( + long chipClusterPtr, GetRFIDCodeResponseCallback Callback, Integer userId); private native void getUserType( long chipClusterPtr, GetUserTypeResponseCallback Callback, Integer userId); - private native void getWeekdaySchedule( + private native void getWeekDaySchedule( long chipClusterPtr, - GetWeekdayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId); + GetWeekDayScheduleResponseCallback Callback, + Integer weekDayIndex, + Integer userIndex); - private native void getYeardaySchedule( + private native void getYearDaySchedule( long chipClusterPtr, - GetYeardayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId); + GetYearDayScheduleResponseCallback Callback, + Integer yearDayIndex, + Integer userIndex); private native void lockDoor( - long chipClusterPtr, LockDoorResponseCallback Callback, byte[] pin); + long chipClusterPtr, DefaultClusterCallback Callback, Optional pinCode); private native void setHolidaySchedule( long chipClusterPtr, - SetHolidayScheduleResponseCallback Callback, - Integer scheduleId, + DefaultClusterCallback Callback, + Integer holidayIndex, Long localStartTime, Long localEndTime, - Integer operatingModeDuringHoliday); + Integer operatingMode); - private native void setPin( + private native void setPINCode( long chipClusterPtr, - SetPinResponseCallback Callback, + DefaultClusterCallback Callback, Integer userId, Integer userStatus, Integer userType, byte[] pin); - private native void setRfid( + private native void setRFIDCode( long chipClusterPtr, - SetRfidResponseCallback Callback, + DefaultClusterCallback Callback, Integer userId, Integer userStatus, Integer userType, - byte[] id); + byte[] rfidCode); private native void setUserType( - long chipClusterPtr, - SetUserTypeResponseCallback Callback, - Integer userId, - Integer userType); + long chipClusterPtr, DefaultClusterCallback Callback, Integer userId, Integer userType); - private native void setWeekdaySchedule( + private native void setWeekDaySchedule( long chipClusterPtr, - SetWeekdayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId, + DefaultClusterCallback Callback, + Integer weekDayIndex, + Integer userIndex, Integer daysMask, Integer startHour, Integer startMinute, Integer endHour, Integer endMinute); - private native void setYeardaySchedule( + private native void setYearDaySchedule( long chipClusterPtr, - SetYeardayScheduleResponseCallback Callback, - Integer scheduleId, - Integer userId, + DefaultClusterCallback Callback, + Integer yearDayIndex, + Integer userIndex, Long localStartTime, Long localEndTime); private native void unlockDoor( - long chipClusterPtr, UnlockDoorResponseCallback Callback, byte[] pin); + long chipClusterPtr, DefaultClusterCallback Callback, Optional pinCode); private native void unlockWithTimeout( long chipClusterPtr, - UnlockWithTimeoutResponseCallback Callback, - Integer timeoutInSeconds, - byte[] pin); - - public interface ClearAllPinsResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearAllRfidsResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearHolidayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearPinResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearRfidResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearWeekdayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface ClearYeardayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } + DefaultClusterCallback Callback, + Integer timeout, + Optional pinCode); public interface GetHolidayScheduleResponseCallback { void onSuccess( - Integer scheduleId, + Integer holidayIndex, Integer status, Long localStartTime, Long localEndTime, - Integer operatingModeDuringHoliday); + Integer operatingMode); void onError(Exception error); } @@ -4425,14 +4373,22 @@ void onSuccess( void onError(Exception error); } - public interface GetPinResponseCallback { - void onSuccess(Integer userId, Integer userStatus, Integer userType, byte[] pin); + public interface GetPINCodeResponseCallback { + void onSuccess( + Integer userId, + @Nullable Integer userStatus, + @Nullable Integer userType, + @Nullable byte[] pin); void onError(Exception error); } - public interface GetRfidResponseCallback { - void onSuccess(Integer userId, Integer userStatus, Integer userType, byte[] rfid); + public interface GetRFIDCodeResponseCallback { + void onSuccess( + Integer userId, + @Nullable Integer userStatus, + @Nullable Integer userType, + @Nullable byte[] rfidCode); void onError(Exception error); } @@ -4443,10 +4399,10 @@ public interface GetUserTypeResponseCallback { void onError(Exception error); } - public interface GetWeekdayScheduleResponseCallback { + public interface GetWeekDayScheduleResponseCallback { void onSuccess( - Integer scheduleId, - Integer userId, + Integer weekDayIndex, + Integer userIndex, Integer status, Integer daysMask, Integer startHour, @@ -4457,10 +4413,10 @@ void onSuccess( void onError(Exception error); } - public interface GetYeardayScheduleResponseCallback { + public interface GetYearDayScheduleResponseCallback { void onSuccess( - Integer scheduleId, - Integer userId, + Integer yearDayIndex, + Integer userIndex, Integer status, Long localStartTime, Long localEndTime); @@ -4468,86 +4424,6 @@ void onSuccess( void onError(Exception error); } - public interface LockDoorResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetHolidayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetPinResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetRfidResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetUserTypeResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetWeekdayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface SetYeardayScheduleResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface UnlockDoorResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public interface UnlockWithTimeoutResponseCallback { - void onSuccess(Integer status); - - void onError(Exception error); - } - - public void readLockStateAttribute(IntegerAttributeCallback callback) { - readLockStateAttribute(chipClusterPtr, callback); - } - - public void subscribeLockStateAttribute( - DefaultClusterCallback callback, int minInterval, int maxInterval) { - subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - - public void reportLockStateAttribute(IntegerAttributeCallback callback) { - reportLockStateAttribute(chipClusterPtr, callback); - } - - public void readLockTypeAttribute(IntegerAttributeCallback callback) { - readLockTypeAttribute(chipClusterPtr, callback); - } - - public void subscribeLockTypeAttribute( - DefaultClusterCallback callback, int minInterval, int maxInterval) { - subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - - public void reportLockTypeAttribute(IntegerAttributeCallback callback) { - reportLockTypeAttribute(chipClusterPtr, callback); - } - public void readActuatorEnabledAttribute(BooleanAttributeCallback callback) { readActuatorEnabledAttribute(chipClusterPtr, callback); } @@ -4574,24 +4450,6 @@ public void reportClusterRevisionAttribute(IntegerAttributeCallback callback) { reportClusterRevisionAttribute(chipClusterPtr, callback); } - private native void readLockStateAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); - - private native void subscribeLockStateAttribute( - long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval); - - private native void reportLockStateAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); - - private native void readLockTypeAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); - - private native void subscribeLockTypeAttribute( - long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval); - - private native void reportLockTypeAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); - private native void readActuatorEnabledAttribute( long chipClusterPtr, BooleanAttributeCallback callback); @@ -6132,12 +5990,6 @@ public interface MaxMeasuredValueAttributeCallback { void onError(Exception ex); } - public interface LightSensorTypeAttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public void readMeasuredValueAttribute(MeasuredValueAttributeCallback callback) { readMeasuredValueAttribute(chipClusterPtr, callback); } @@ -6190,7 +6042,7 @@ public void reportToleranceAttribute(IntegerAttributeCallback callback) { reportToleranceAttribute(chipClusterPtr, callback); } - public void readLightSensorTypeAttribute(LightSensorTypeAttributeCallback callback) { + public void readLightSensorTypeAttribute(IntegerAttributeCallback callback) { readLightSensorTypeAttribute(chipClusterPtr, callback); } @@ -6253,7 +6105,7 @@ private native void reportToleranceAttribute( long chipClusterPtr, IntegerAttributeCallback callback); private native void readLightSensorTypeAttribute( - long chipClusterPtr, LightSensorTypeAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void subscribeLightSensorTypeAttribute( long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval); @@ -6434,12 +6286,6 @@ private native void stop( private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback Callback); - public interface OnLevelAttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public interface OnTransitionTimeAttributeCallback { void onSuccess(@Nullable Integer value); @@ -6452,12 +6298,6 @@ public interface OffTransitionTimeAttributeCallback { void onError(Exception ex); } - public interface DefaultMoveRateAttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public void readCurrentLevelAttribute(IntegerAttributeCallback callback) { readCurrentLevelAttribute(chipClusterPtr, callback); } @@ -6583,7 +6423,7 @@ public void reportOnOffTransitionTimeAttribute(IntegerAttributeCallback callback reportOnOffTransitionTimeAttribute(chipClusterPtr, callback); } - public void readOnLevelAttribute(OnLevelAttributeCallback callback) { + public void readOnLevelAttribute(IntegerAttributeCallback callback) { readOnLevelAttribute(chipClusterPtr, callback); } @@ -6636,7 +6476,7 @@ public void reportOffTransitionTimeAttribute(IntegerAttributeCallback callback) reportOffTransitionTimeAttribute(chipClusterPtr, callback); } - public void readDefaultMoveRateAttribute(DefaultMoveRateAttributeCallback callback) { + public void readDefaultMoveRateAttribute(IntegerAttributeCallback callback) { readDefaultMoveRateAttribute(chipClusterPtr, callback); } @@ -6772,7 +6612,7 @@ private native void reportOnOffTransitionTimeAttribute( long chipClusterPtr, IntegerAttributeCallback callback); private native void readOnLevelAttribute( - long chipClusterPtr, OnLevelAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeOnLevelAttribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); @@ -6808,7 +6648,7 @@ private native void reportOffTransitionTimeAttribute( long chipClusterPtr, IntegerAttributeCallback callback); private native void readDefaultMoveRateAttribute( - long chipClusterPtr, DefaultMoveRateAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeDefaultMoveRateAttribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); @@ -11088,12 +10928,6 @@ public interface NullableBooleanAttributeCallback { void onError(Exception ex); } - public interface NullableBitmap8AttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public interface NullableBitmap16AttributeCallback { void onSuccess(@Nullable Integer value); @@ -11112,12 +10946,6 @@ public interface NullableBitmap64AttributeCallback { void onError(Exception ex); } - public interface NullableInt8uAttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public interface NullableInt16uAttributeCallback { void onSuccess(@Nullable Integer value); @@ -11208,12 +11036,6 @@ public interface NullableInt64sAttributeCallback { void onError(Exception ex); } - public interface NullableEnum8AttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public interface NullableEnum16AttributeCallback { void onSuccess(@Nullable Integer value); @@ -11244,12 +11066,6 @@ public interface NullableCharStringAttributeCallback { void onError(Exception ex); } - public interface NullableRangeRestrictedInt8uAttributeCallback { - void onSuccess(@Nullable Integer value); - - void onError(Exception ex); - } - public interface NullableRangeRestrictedInt8sAttributeCallback { void onSuccess(@Nullable Integer value); @@ -11943,7 +11759,7 @@ public void reportNullableBooleanAttribute(BooleanAttributeCallback callback) { reportNullableBooleanAttribute(chipClusterPtr, callback); } - public void readNullableBitmap8Attribute(NullableBitmap8AttributeCallback callback) { + public void readNullableBitmap8Attribute(IntegerAttributeCallback callback) { readNullableBitmap8Attribute(chipClusterPtr, callback); } @@ -12015,7 +11831,7 @@ public void reportNullableBitmap64Attribute(LongAttributeCallback callback) { reportNullableBitmap64Attribute(chipClusterPtr, callback); } - public void readNullableInt8uAttribute(NullableInt8uAttributeCallback callback) { + public void readNullableInt8uAttribute(IntegerAttributeCallback callback) { readNullableInt8uAttribute(chipClusterPtr, callback); } @@ -12303,7 +12119,7 @@ public void reportNullableInt64sAttribute(LongAttributeCallback callback) { reportNullableInt64sAttribute(chipClusterPtr, callback); } - public void readNullableEnum8Attribute(NullableEnum8AttributeCallback callback) { + public void readNullableEnum8Attribute(IntegerAttributeCallback callback) { readNullableEnum8Attribute(chipClusterPtr, callback); } @@ -12411,8 +12227,7 @@ public void reportNullableCharStringAttribute(CharStringAttributeCallback callba reportNullableCharStringAttribute(chipClusterPtr, callback); } - public void readNullableRangeRestrictedInt8uAttribute( - NullableRangeRestrictedInt8uAttributeCallback callback) { + public void readNullableRangeRestrictedInt8uAttribute(IntegerAttributeCallback callback) { readNullableRangeRestrictedInt8uAttribute(chipClusterPtr, callback); } @@ -12943,7 +12758,7 @@ private native void reportNullableBooleanAttribute( long chipClusterPtr, BooleanAttributeCallback callback); private native void readNullableBitmap8Attribute( - long chipClusterPtr, NullableBitmap8AttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeNullableBitmap8Attribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); @@ -12991,7 +12806,7 @@ private native void reportNullableBitmap64Attribute( long chipClusterPtr, LongAttributeCallback callback); private native void readNullableInt8uAttribute( - long chipClusterPtr, NullableInt8uAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeNullableInt8uAttribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); @@ -13183,7 +12998,7 @@ private native void reportNullableInt64sAttribute( long chipClusterPtr, LongAttributeCallback callback); private native void readNullableEnum8Attribute( - long chipClusterPtr, NullableEnum8AttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeNullableEnum8Attribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); @@ -13255,7 +13070,7 @@ private native void reportNullableCharStringAttribute( long chipClusterPtr, CharStringAttributeCallback callback); private native void readNullableRangeRestrictedInt8uAttribute( - long chipClusterPtr, NullableRangeRestrictedInt8uAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void writeNullableRangeRestrictedInt8uAttribute( long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer value); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 24ef1229868ef7..c1e5fb23ffc458 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -19,6 +19,7 @@ package chip.devicecontroller; +import androidx.annotation.Nullable; import chip.clusterinfo.ClusterCommandCallback; import chip.clusterinfo.ClusterInfo; import chip.clusterinfo.CommandParameterInfo; @@ -619,172 +620,6 @@ public void onError(Exception error) { } } - public static class DelegatedClearAllPinsResponseCallback - implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearAllRfidsResponseCallback - implements ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearHolidayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearPinResponseCallback - implements ChipClusters.DoorLockCluster.ClearPinResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearRfidResponseCallback - implements ChipClusters.DoorLockCluster.ClearRfidResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearWeekdayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedClearYeardayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - public static class DelegatedGetHolidayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback, DelegatedClusterCallback { @@ -797,14 +632,15 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer scheduleId, + Integer holidayIndex, Integer status, Long localStartTime, Long localEndTime, - Integer operatingModeDuringHoliday) { + Integer operatingMode) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo scheduleIdResponseValue = new CommandResponseInfo("scheduleId", "int"); - responseValues.put(scheduleIdResponseValue, scheduleId); + CommandResponseInfo holidayIndexResponseValue = + new CommandResponseInfo("holidayIndex", "int"); + responseValues.put(holidayIndexResponseValue, holidayIndex); CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); responseValues.put(statusResponseValue, status); CommandResponseInfo localStartTimeResponseValue = @@ -813,9 +649,9 @@ public void onSuccess( CommandResponseInfo localEndTimeResponseValue = new CommandResponseInfo("localEndTime", "long"); responseValues.put(localEndTimeResponseValue, localEndTime); - CommandResponseInfo operatingModeDuringHolidayResponseValue = - new CommandResponseInfo("operatingModeDuringHoliday", "int"); - responseValues.put(operatingModeDuringHolidayResponseValue, operatingModeDuringHoliday); + CommandResponseInfo operatingModeResponseValue = + new CommandResponseInfo("operatingMode", "int"); + responseValues.put(operatingModeResponseValue, operatingMode); callback.onSuccess(responseValues); } @@ -869,8 +705,8 @@ public void onError(Exception error) { } } - public static class DelegatedGetPinResponseCallback - implements ChipClusters.DoorLockCluster.GetPinResponseCallback, DelegatedClusterCallback { + public static class DelegatedGetPINCodeResponseCallback + implements ChipClusters.DoorLockCluster.GetPINCodeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -879,7 +715,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer userId, Integer userStatus, Integer userType, byte[] pin) { + public void onSuccess( + Integer userId, + @Nullable Integer userStatus, + @Nullable Integer userType, + @Nullable byte[] pin) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo userIdResponseValue = new CommandResponseInfo("userId", "int"); responseValues.put(userIdResponseValue, userId); @@ -898,8 +738,9 @@ public void onError(Exception error) { } } - public static class DelegatedGetRfidResponseCallback - implements ChipClusters.DoorLockCluster.GetRfidResponseCallback, DelegatedClusterCallback { + public static class DelegatedGetRFIDCodeResponseCallback + implements ChipClusters.DoorLockCluster.GetRFIDCodeResponseCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -908,7 +749,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer userId, Integer userStatus, Integer userType, byte[] rfid) { + public void onSuccess( + Integer userId, + @Nullable Integer userStatus, + @Nullable Integer userType, + @Nullable byte[] rfidCode) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo userIdResponseValue = new CommandResponseInfo("userId", "int"); responseValues.put(userIdResponseValue, userId); @@ -916,8 +761,8 @@ public void onSuccess(Integer userId, Integer userStatus, Integer userType, byte responseValues.put(userStatusResponseValue, userStatus); CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "int"); responseValues.put(userTypeResponseValue, userType); - CommandResponseInfo rfidResponseValue = new CommandResponseInfo("rfid", "byte[]"); - responseValues.put(rfidResponseValue, rfid); + CommandResponseInfo rfidCodeResponseValue = new CommandResponseInfo("rfidCode", "byte[]"); + responseValues.put(rfidCodeResponseValue, rfidCode); callback.onSuccess(responseValues); } @@ -953,8 +798,8 @@ public void onError(Exception error) { } } - public static class DelegatedGetWeekdayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback, + public static class DelegatedGetWeekDayScheduleResponseCallback + implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -965,8 +810,8 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer scheduleId, - Integer userId, + Integer weekDayIndex, + Integer userIndex, Integer status, Integer daysMask, Integer startHour, @@ -974,10 +819,11 @@ public void onSuccess( Integer endHour, Integer endMinute) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo scheduleIdResponseValue = new CommandResponseInfo("scheduleId", "int"); - responseValues.put(scheduleIdResponseValue, scheduleId); - CommandResponseInfo userIdResponseValue = new CommandResponseInfo("userId", "int"); - responseValues.put(userIdResponseValue, userId); + CommandResponseInfo weekDayIndexResponseValue = + new CommandResponseInfo("weekDayIndex", "int"); + responseValues.put(weekDayIndexResponseValue, weekDayIndex); + CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "int"); + responseValues.put(userIndexResponseValue, userIndex); CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); responseValues.put(statusResponseValue, status); CommandResponseInfo daysMaskResponseValue = new CommandResponseInfo("daysMask", "int"); @@ -999,8 +845,8 @@ public void onError(Exception error) { } } - public static class DelegatedGetYeardayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback, + public static class DelegatedGetYearDayScheduleResponseCallback + implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -1011,16 +857,17 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer scheduleId, - Integer userId, + Integer yearDayIndex, + Integer userIndex, Integer status, Long localStartTime, Long localEndTime) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo scheduleIdResponseValue = new CommandResponseInfo("scheduleId", "int"); - responseValues.put(scheduleIdResponseValue, scheduleId); - CommandResponseInfo userIdResponseValue = new CommandResponseInfo("userId", "int"); - responseValues.put(userIdResponseValue, userId); + CommandResponseInfo yearDayIndexResponseValue = + new CommandResponseInfo("yearDayIndex", "int"); + responseValues.put(yearDayIndexResponseValue, yearDayIndex); + CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "int"); + responseValues.put(userIndexResponseValue, userIndex); CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); responseValues.put(statusResponseValue, status); CommandResponseInfo localStartTimeResponseValue = @@ -1038,218 +885,6 @@ public void onError(Exception error) { } } - public static class DelegatedLockDoorResponseCallback - implements ChipClusters.DoorLockCluster.LockDoorResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetHolidayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetPinResponseCallback - implements ChipClusters.DoorLockCluster.SetPinResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetRfidResponseCallback - implements ChipClusters.DoorLockCluster.SetRfidResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetUserTypeResponseCallback - implements ChipClusters.DoorLockCluster.SetUserTypeResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetWeekdayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedSetYeardayScheduleResponseCallback - implements ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedUnlockDoorResponseCallback - implements ChipClusters.DoorLockCluster.UnlockDoorResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedUnlockWithTimeoutResponseCallback - implements ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer status) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - public static class DelegatedLabelListAttributeCallback implements ChipClusters.FixedLabelCluster.LabelListAttributeCallback, DelegatedClusterCallback { @@ -5290,38 +4925,38 @@ public Map> getCommandMap() { "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo); commandMap.put("diagnosticLogs", diagnosticLogsClusterInteractionInfoMap); Map doorLockClusterInteractionInfoMap = new LinkedHashMap<>(); - Map doorLockclearAllPinsCommandParams = + Map doorLockclearAllPINCodesCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo doorLockclearAllPinsInteractionInfo = + InteractionInfo doorLockclearAllPINCodesInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearAllPins( - (ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback); + .clearAllPINCodes((DefaultClusterCallback) callback); }, - () -> new DelegatedClearAllPinsResponseCallback(), - doorLockclearAllPinsCommandParams); - doorLockClusterInteractionInfoMap.put("clearAllPins", doorLockclearAllPinsInteractionInfo); - Map doorLockclearAllRfidsCommandParams = + () -> new DelegatedDefaultClusterCallback(), + doorLockclearAllPINCodesCommandParams); + doorLockClusterInteractionInfoMap.put( + "clearAllPINCodes", doorLockclearAllPINCodesInteractionInfo); + Map doorLockclearAllRFIDCodesCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo doorLockclearAllRfidsInteractionInfo = + InteractionInfo doorLockclearAllRFIDCodesInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearAllRfids( - (ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback); + .clearAllRFIDCodes((DefaultClusterCallback) callback); }, - () -> new DelegatedClearAllRfidsResponseCallback(), - doorLockclearAllRfidsCommandParams); - doorLockClusterInteractionInfoMap.put("clearAllRfids", doorLockclearAllRfidsInteractionInfo); + () -> new DelegatedDefaultClusterCallback(), + doorLockclearAllRFIDCodesCommandParams); + doorLockClusterInteractionInfoMap.put( + "clearAllRFIDCodes", doorLockclearAllRFIDCodesInteractionInfo); Map doorLockclearHolidayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockclearHolidaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); + CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo = + new CommandParameterInfo("holidayIndex", int.class); doorLockclearHolidayScheduleCommandParams.put( - "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameterInfo); + "holidayIndex", doorLockclearHolidayScheduleholidayIndexCommandParameterInfo); // Populate commands InteractionInfo doorLockclearHolidayScheduleInteractionInfo = @@ -5329,107 +4964,109 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .clearHolidaySchedule( - (ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId")); + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("holidayIndex")); }, - () -> new DelegatedClearHolidayScheduleResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLockclearHolidayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( "clearHolidaySchedule", doorLockclearHolidayScheduleInteractionInfo); - Map doorLockclearPinCommandParams = + Map doorLockclearPINCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockclearPinuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameterInfo); + CommandParameterInfo doorLockclearPINCodepinSlotIndexCommandParameterInfo = + new CommandParameterInfo("pinSlotIndex", int.class); + doorLockclearPINCodeCommandParams.put( + "pinSlotIndex", doorLockclearPINCodepinSlotIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockclearPinInteractionInfo = + InteractionInfo doorLockclearPINCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearPin( - (ChipClusters.DoorLockCluster.ClearPinResponseCallback) callback, - (Integer) commandArguments.get("userId")); + .clearPINCode( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("pinSlotIndex")); }, - () -> new DelegatedClearPinResponseCallback(), - doorLockclearPinCommandParams); - doorLockClusterInteractionInfoMap.put("clearPin", doorLockclearPinInteractionInfo); - Map doorLockclearRfidCommandParams = + () -> new DelegatedDefaultClusterCallback(), + doorLockclearPINCodeCommandParams); + doorLockClusterInteractionInfoMap.put("clearPINCode", doorLockclearPINCodeInteractionInfo); + Map doorLockclearRFIDCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockclearRfiduserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameterInfo); + CommandParameterInfo doorLockclearRFIDCoderfidSlotIndexCommandParameterInfo = + new CommandParameterInfo("rfidSlotIndex", int.class); + doorLockclearRFIDCodeCommandParams.put( + "rfidSlotIndex", doorLockclearRFIDCoderfidSlotIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockclearRfidInteractionInfo = + InteractionInfo doorLockclearRFIDCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearRfid( - (ChipClusters.DoorLockCluster.ClearRfidResponseCallback) callback, - (Integer) commandArguments.get("userId")); + .clearRFIDCode( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("rfidSlotIndex")); }, - () -> new DelegatedClearRfidResponseCallback(), - doorLockclearRfidCommandParams); - doorLockClusterInteractionInfoMap.put("clearRfid", doorLockclearRfidInteractionInfo); - Map doorLockclearWeekdayScheduleCommandParams = + () -> new DelegatedDefaultClusterCallback(), + doorLockclearRFIDCodeCommandParams); + doorLockClusterInteractionInfoMap.put("clearRFIDCode", doorLockclearRFIDCodeInteractionInfo); + Map doorLockclearWeekDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLockclearWeekdayScheduleCommandParams.put( - "scheduleId", doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo = + new CommandParameterInfo("weekDayIndex", int.class); + doorLockclearWeekDayScheduleCommandParams.put( + "weekDayIndex", doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo); - CommandParameterInfo doorLockclearWeekdayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockclearWeekdayScheduleCommandParams.put( - "userId", doorLockclearWeekdayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLockclearWeekDayScheduleCommandParams.put( + "userIndex", doorLockclearWeekDayScheduleuserIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockclearWeekdayScheduleInteractionInfo = + InteractionInfo doorLockclearWeekDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearWeekdaySchedule( - (ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId")); + .clearWeekDaySchedule( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("weekDayIndex"), + (Integer) commandArguments.get("userIndex")); }, - () -> new DelegatedClearWeekdayScheduleResponseCallback(), - doorLockclearWeekdayScheduleCommandParams); + () -> new DelegatedDefaultClusterCallback(), + doorLockclearWeekDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "clearWeekdaySchedule", doorLockclearWeekdayScheduleInteractionInfo); - Map doorLockclearYeardayScheduleCommandParams = + "clearWeekDaySchedule", doorLockclearWeekDayScheduleInteractionInfo); + Map doorLockclearYearDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockclearYeardaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLockclearYeardayScheduleCommandParams.put( - "scheduleId", doorLockclearYeardaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo = + new CommandParameterInfo("yearDayIndex", int.class); + doorLockclearYearDayScheduleCommandParams.put( + "yearDayIndex", doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo); - CommandParameterInfo doorLockclearYeardayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockclearYeardayScheduleCommandParams.put( - "userId", doorLockclearYeardayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLockclearYearDayScheduleCommandParams.put( + "userIndex", doorLockclearYearDayScheduleuserIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockclearYeardayScheduleInteractionInfo = + InteractionInfo doorLockclearYearDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .clearYeardaySchedule( - (ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId")); + .clearYearDaySchedule( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("yearDayIndex"), + (Integer) commandArguments.get("userIndex")); }, - () -> new DelegatedClearYeardayScheduleResponseCallback(), - doorLockclearYeardayScheduleCommandParams); + () -> new DelegatedDefaultClusterCallback(), + doorLockclearYearDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "clearYeardaySchedule", doorLockclearYeardayScheduleInteractionInfo); + "clearYearDaySchedule", doorLockclearYearDayScheduleInteractionInfo); Map doorLockgetHolidayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockgetHolidaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); + CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo = + new CommandParameterInfo("holidayIndex", int.class); doorLockgetHolidayScheduleCommandParams.put( - "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameterInfo); + "holidayIndex", doorLockgetHolidayScheduleholidayIndexCommandParameterInfo); // Populate commands InteractionInfo doorLockgetHolidayScheduleInteractionInfo = @@ -5438,7 +5075,7 @@ public Map> getCommandMap() { ((ChipClusters.DoorLockCluster) cluster) .getHolidaySchedule( (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId")); + (Integer) commandArguments.get("holidayIndex")); }, () -> new DelegatedGetHolidayScheduleResponseCallback(), doorLockgetHolidayScheduleCommandParams); @@ -5463,42 +5100,42 @@ public Map> getCommandMap() { () -> new DelegatedGetLogRecordResponseCallback(), doorLockgetLogRecordCommandParams); doorLockClusterInteractionInfoMap.put("getLogRecord", doorLockgetLogRecordInteractionInfo); - Map doorLockgetPinCommandParams = + Map doorLockgetPINCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockgetPinuserIdCommandParameterInfo = + CommandParameterInfo doorLockgetPINCodeuserIdCommandParameterInfo = new CommandParameterInfo("userId", int.class); - doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameterInfo); + doorLockgetPINCodeCommandParams.put("userId", doorLockgetPINCodeuserIdCommandParameterInfo); // Populate commands - InteractionInfo doorLockgetPinInteractionInfo = + InteractionInfo doorLockgetPINCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .getPin( - (ChipClusters.DoorLockCluster.GetPinResponseCallback) callback, + .getPINCode( + (ChipClusters.DoorLockCluster.GetPINCodeResponseCallback) callback, (Integer) commandArguments.get("userId")); }, - () -> new DelegatedGetPinResponseCallback(), - doorLockgetPinCommandParams); - doorLockClusterInteractionInfoMap.put("getPin", doorLockgetPinInteractionInfo); - Map doorLockgetRfidCommandParams = + () -> new DelegatedGetPINCodeResponseCallback(), + doorLockgetPINCodeCommandParams); + doorLockClusterInteractionInfoMap.put("getPINCode", doorLockgetPINCodeInteractionInfo); + Map doorLockgetRFIDCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockgetRfiduserIdCommandParameterInfo = + CommandParameterInfo doorLockgetRFIDCodeuserIdCommandParameterInfo = new CommandParameterInfo("userId", int.class); - doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameterInfo); + doorLockgetRFIDCodeCommandParams.put("userId", doorLockgetRFIDCodeuserIdCommandParameterInfo); // Populate commands - InteractionInfo doorLockgetRfidInteractionInfo = + InteractionInfo doorLockgetRFIDCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .getRfid( - (ChipClusters.DoorLockCluster.GetRfidResponseCallback) callback, + .getRFIDCode( + (ChipClusters.DoorLockCluster.GetRFIDCodeResponseCallback) callback, (Integer) commandArguments.get("userId")); }, - () -> new DelegatedGetRfidResponseCallback(), - doorLockgetRfidCommandParams); - doorLockClusterInteractionInfoMap.put("getRfid", doorLockgetRfidInteractionInfo); + () -> new DelegatedGetRFIDCodeResponseCallback(), + doorLockgetRFIDCodeCommandParams); + doorLockClusterInteractionInfoMap.put("getRFIDCode", doorLockgetRFIDCodeInteractionInfo); Map doorLockgetUserTypeCommandParams = new LinkedHashMap(); CommandParameterInfo doorLockgetUserTypeuserIdCommandParameterInfo = @@ -5517,63 +5154,63 @@ public Map> getCommandMap() { () -> new DelegatedGetUserTypeResponseCallback(), doorLockgetUserTypeCommandParams); doorLockClusterInteractionInfoMap.put("getUserType", doorLockgetUserTypeInteractionInfo); - Map doorLockgetWeekdayScheduleCommandParams = + Map doorLockgetWeekDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLockgetWeekdayScheduleCommandParams.put( - "scheduleId", doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo = + new CommandParameterInfo("weekDayIndex", int.class); + doorLockgetWeekDayScheduleCommandParams.put( + "weekDayIndex", doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo); - CommandParameterInfo doorLockgetWeekdayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockgetWeekdayScheduleCommandParams.put( - "userId", doorLockgetWeekdayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLockgetWeekDayScheduleCommandParams.put( + "userIndex", doorLockgetWeekDayScheduleuserIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockgetWeekdayScheduleInteractionInfo = + InteractionInfo doorLockgetWeekDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .getWeekdaySchedule( - (ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId")); + .getWeekDaySchedule( + (ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback) callback, + (Integer) commandArguments.get("weekDayIndex"), + (Integer) commandArguments.get("userIndex")); }, - () -> new DelegatedGetWeekdayScheduleResponseCallback(), - doorLockgetWeekdayScheduleCommandParams); + () -> new DelegatedGetWeekDayScheduleResponseCallback(), + doorLockgetWeekDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "getWeekdaySchedule", doorLockgetWeekdayScheduleInteractionInfo); - Map doorLockgetYeardayScheduleCommandParams = + "getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo); + Map doorLockgetYearDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockgetYeardaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLockgetYeardayScheduleCommandParams.put( - "scheduleId", doorLockgetYeardaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo = + new CommandParameterInfo("yearDayIndex", int.class); + doorLockgetYearDayScheduleCommandParams.put( + "yearDayIndex", doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo); - CommandParameterInfo doorLockgetYeardayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLockgetYeardayScheduleCommandParams.put( - "userId", doorLockgetYeardayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLockgetYearDayScheduleCommandParams.put( + "userIndex", doorLockgetYearDayScheduleuserIndexCommandParameterInfo); // Populate commands - InteractionInfo doorLockgetYeardayScheduleInteractionInfo = + InteractionInfo doorLockgetYearDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .getYeardaySchedule( - (ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId")); + .getYearDaySchedule( + (ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback) callback, + (Integer) commandArguments.get("yearDayIndex"), + (Integer) commandArguments.get("userIndex")); }, - () -> new DelegatedGetYeardayScheduleResponseCallback(), - doorLockgetYeardayScheduleCommandParams); + () -> new DelegatedGetYearDayScheduleResponseCallback(), + doorLockgetYearDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "getYeardaySchedule", doorLockgetYeardayScheduleInteractionInfo); + "getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo); Map doorLocklockDoorCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocklockDoorpinCommandParameterInfo = - new CommandParameterInfo("pin", byte[].class); - doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameterInfo); + CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo = + new CommandParameterInfo("pinCode", byte[].class); + doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo); // Populate commands InteractionInfo doorLocklockDoorInteractionInfo = @@ -5581,18 +5218,18 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .lockDoor( - (ChipClusters.DoorLockCluster.LockDoorResponseCallback) callback, - (byte[]) commandArguments.get("pin")); + (DefaultClusterCallback) callback, + (Optional) commandArguments.get("pinCode")); }, - () -> new DelegatedLockDoorResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLocklockDoorCommandParams); doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo); Map doorLocksetHolidayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocksetHolidaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); + CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo = + new CommandParameterInfo("holidayIndex", int.class); doorLocksetHolidayScheduleCommandParams.put( - "scheduleId", doorLocksetHolidaySchedulescheduleIdCommandParameterInfo); + "holidayIndex", doorLocksetHolidayScheduleholidayIndexCommandParameterInfo); CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", long.class); @@ -5604,11 +5241,10 @@ public Map> getCommandMap() { doorLocksetHolidayScheduleCommandParams.put( "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo); - CommandParameterInfo doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo = - new CommandParameterInfo("operatingModeDuringHoliday", int.class); + CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo = + new CommandParameterInfo("operatingMode", int.class); doorLocksetHolidayScheduleCommandParams.put( - "operatingModeDuringHoliday", - doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo); + "operatingMode", doorLocksetHolidayScheduleoperatingModeCommandParameterInfo); // Populate commands InteractionInfo doorLocksetHolidayScheduleInteractionInfo = @@ -5616,82 +5252,86 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .setHolidaySchedule( - (ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("holidayIndex"), (Long) commandArguments.get("localStartTime"), (Long) commandArguments.get("localEndTime"), - (Integer) commandArguments.get("operatingModeDuringHoliday")); + (Integer) commandArguments.get("operatingMode")); }, - () -> new DelegatedSetHolidayScheduleResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLocksetHolidayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( "setHolidaySchedule", doorLocksetHolidayScheduleInteractionInfo); - Map doorLocksetPinCommandParams = + Map doorLocksetPINCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocksetPinuserIdCommandParameterInfo = + CommandParameterInfo doorLocksetPINCodeuserIdCommandParameterInfo = new CommandParameterInfo("userId", int.class); - doorLocksetPinCommandParams.put("userId", doorLocksetPinuserIdCommandParameterInfo); + doorLocksetPINCodeCommandParams.put("userId", doorLocksetPINCodeuserIdCommandParameterInfo); - CommandParameterInfo doorLocksetPinuserStatusCommandParameterInfo = + CommandParameterInfo doorLocksetPINCodeuserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", int.class); - doorLocksetPinCommandParams.put("userStatus", doorLocksetPinuserStatusCommandParameterInfo); + doorLocksetPINCodeCommandParams.put( + "userStatus", doorLocksetPINCodeuserStatusCommandParameterInfo); - CommandParameterInfo doorLocksetPinuserTypeCommandParameterInfo = + CommandParameterInfo doorLocksetPINCodeuserTypeCommandParameterInfo = new CommandParameterInfo("userType", int.class); - doorLocksetPinCommandParams.put("userType", doorLocksetPinuserTypeCommandParameterInfo); + doorLocksetPINCodeCommandParams.put("userType", doorLocksetPINCodeuserTypeCommandParameterInfo); - CommandParameterInfo doorLocksetPinpinCommandParameterInfo = + CommandParameterInfo doorLocksetPINCodepinCommandParameterInfo = new CommandParameterInfo("pin", byte[].class); - doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameterInfo); + doorLocksetPINCodeCommandParams.put("pin", doorLocksetPINCodepinCommandParameterInfo); // Populate commands - InteractionInfo doorLocksetPinInteractionInfo = + InteractionInfo doorLocksetPINCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .setPin( - (ChipClusters.DoorLockCluster.SetPinResponseCallback) callback, + .setPINCode( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("userId"), (Integer) commandArguments.get("userStatus"), (Integer) commandArguments.get("userType"), (byte[]) commandArguments.get("pin")); }, - () -> new DelegatedSetPinResponseCallback(), - doorLocksetPinCommandParams); - doorLockClusterInteractionInfoMap.put("setPin", doorLocksetPinInteractionInfo); - Map doorLocksetRfidCommandParams = + () -> new DelegatedDefaultClusterCallback(), + doorLocksetPINCodeCommandParams); + doorLockClusterInteractionInfoMap.put("setPINCode", doorLocksetPINCodeInteractionInfo); + Map doorLocksetRFIDCodeCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocksetRfiduserIdCommandParameterInfo = + CommandParameterInfo doorLocksetRFIDCodeuserIdCommandParameterInfo = new CommandParameterInfo("userId", int.class); - doorLocksetRfidCommandParams.put("userId", doorLocksetRfiduserIdCommandParameterInfo); + doorLocksetRFIDCodeCommandParams.put("userId", doorLocksetRFIDCodeuserIdCommandParameterInfo); - CommandParameterInfo doorLocksetRfiduserStatusCommandParameterInfo = + CommandParameterInfo doorLocksetRFIDCodeuserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", int.class); - doorLocksetRfidCommandParams.put("userStatus", doorLocksetRfiduserStatusCommandParameterInfo); + doorLocksetRFIDCodeCommandParams.put( + "userStatus", doorLocksetRFIDCodeuserStatusCommandParameterInfo); - CommandParameterInfo doorLocksetRfiduserTypeCommandParameterInfo = + CommandParameterInfo doorLocksetRFIDCodeuserTypeCommandParameterInfo = new CommandParameterInfo("userType", int.class); - doorLocksetRfidCommandParams.put("userType", doorLocksetRfiduserTypeCommandParameterInfo); + doorLocksetRFIDCodeCommandParams.put( + "userType", doorLocksetRFIDCodeuserTypeCommandParameterInfo); - CommandParameterInfo doorLocksetRfididCommandParameterInfo = - new CommandParameterInfo("id", byte[].class); - doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameterInfo); + CommandParameterInfo doorLocksetRFIDCoderfidCodeCommandParameterInfo = + new CommandParameterInfo("rfidCode", byte[].class); + doorLocksetRFIDCodeCommandParams.put( + "rfidCode", doorLocksetRFIDCoderfidCodeCommandParameterInfo); // Populate commands - InteractionInfo doorLocksetRfidInteractionInfo = + InteractionInfo doorLocksetRFIDCodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .setRfid( - (ChipClusters.DoorLockCluster.SetRfidResponseCallback) callback, + .setRFIDCode( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("userId"), (Integer) commandArguments.get("userStatus"), (Integer) commandArguments.get("userType"), - (byte[]) commandArguments.get("id")); + (byte[]) commandArguments.get("rfidCode")); }, - () -> new DelegatedSetRfidResponseCallback(), - doorLocksetRfidCommandParams); - doorLockClusterInteractionInfoMap.put("setRfid", doorLocksetRfidInteractionInfo); + () -> new DelegatedDefaultClusterCallback(), + doorLocksetRFIDCodeCommandParams); + doorLockClusterInteractionInfoMap.put("setRFIDCode", doorLocksetRFIDCodeInteractionInfo); Map doorLocksetUserTypeCommandParams = new LinkedHashMap(); CommandParameterInfo doorLocksetUserTypeuserIdCommandParameterInfo = @@ -5709,112 +5349,112 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .setUserType( - (ChipClusters.DoorLockCluster.SetUserTypeResponseCallback) callback, + (DefaultClusterCallback) callback, (Integer) commandArguments.get("userId"), (Integer) commandArguments.get("userType")); }, - () -> new DelegatedSetUserTypeResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLocksetUserTypeCommandParams); doorLockClusterInteractionInfoMap.put("setUserType", doorLocksetUserTypeInteractionInfo); - Map doorLocksetWeekdayScheduleCommandParams = + Map doorLocksetWeekDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "scheduleId", doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo = + new CommandParameterInfo("weekDayIndex", int.class); + doorLocksetWeekDayScheduleCommandParams.put( + "weekDayIndex", doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "userId", doorLocksetWeekdayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLocksetWeekDayScheduleCommandParams.put( + "userIndex", doorLocksetWeekDayScheduleuserIndexCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdayScheduledaysMaskCommandParameterInfo = + CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo = new CommandParameterInfo("daysMask", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "daysMask", doorLocksetWeekdayScheduledaysMaskCommandParameterInfo); + doorLocksetWeekDayScheduleCommandParams.put( + "daysMask", doorLocksetWeekDayScheduledaysMaskCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdaySchedulestartHourCommandParameterInfo = + CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo = new CommandParameterInfo("startHour", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "startHour", doorLocksetWeekdaySchedulestartHourCommandParameterInfo); + doorLocksetWeekDayScheduleCommandParams.put( + "startHour", doorLocksetWeekDaySchedulestartHourCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo = + CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo = new CommandParameterInfo("startMinute", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "startMinute", doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo); + doorLocksetWeekDayScheduleCommandParams.put( + "startMinute", doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdayScheduleendHourCommandParameterInfo = + CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo = new CommandParameterInfo("endHour", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "endHour", doorLocksetWeekdayScheduleendHourCommandParameterInfo); + doorLocksetWeekDayScheduleCommandParams.put( + "endHour", doorLocksetWeekDayScheduleendHourCommandParameterInfo); - CommandParameterInfo doorLocksetWeekdayScheduleendMinuteCommandParameterInfo = + CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo = new CommandParameterInfo("endMinute", int.class); - doorLocksetWeekdayScheduleCommandParams.put( - "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameterInfo); + doorLocksetWeekDayScheduleCommandParams.put( + "endMinute", doorLocksetWeekDayScheduleendMinuteCommandParameterInfo); // Populate commands - InteractionInfo doorLocksetWeekdayScheduleInteractionInfo = + InteractionInfo doorLocksetWeekDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .setWeekdaySchedule( - (ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId"), + .setWeekDaySchedule( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("weekDayIndex"), + (Integer) commandArguments.get("userIndex"), (Integer) commandArguments.get("daysMask"), (Integer) commandArguments.get("startHour"), (Integer) commandArguments.get("startMinute"), (Integer) commandArguments.get("endHour"), (Integer) commandArguments.get("endMinute")); }, - () -> new DelegatedSetWeekdayScheduleResponseCallback(), - doorLocksetWeekdayScheduleCommandParams); + () -> new DelegatedDefaultClusterCallback(), + doorLocksetWeekDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "setWeekdaySchedule", doorLocksetWeekdayScheduleInteractionInfo); - Map doorLocksetYeardayScheduleCommandParams = + "setWeekDaySchedule", doorLocksetWeekDayScheduleInteractionInfo); + Map doorLocksetYearDayScheduleCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLocksetYeardaySchedulescheduleIdCommandParameterInfo = - new CommandParameterInfo("scheduleId", int.class); - doorLocksetYeardayScheduleCommandParams.put( - "scheduleId", doorLocksetYeardaySchedulescheduleIdCommandParameterInfo); + CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo = + new CommandParameterInfo("yearDayIndex", int.class); + doorLocksetYearDayScheduleCommandParams.put( + "yearDayIndex", doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo); - CommandParameterInfo doorLocksetYeardayScheduleuserIdCommandParameterInfo = - new CommandParameterInfo("userId", int.class); - doorLocksetYeardayScheduleCommandParams.put( - "userId", doorLocksetYeardayScheduleuserIdCommandParameterInfo); + CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo = + new CommandParameterInfo("userIndex", int.class); + doorLocksetYearDayScheduleCommandParams.put( + "userIndex", doorLocksetYearDayScheduleuserIndexCommandParameterInfo); - CommandParameterInfo doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo = + CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", long.class); - doorLocksetYeardayScheduleCommandParams.put( - "localStartTime", doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo); + doorLocksetYearDayScheduleCommandParams.put( + "localStartTime", doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo); - CommandParameterInfo doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo = + CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo = new CommandParameterInfo("localEndTime", long.class); - doorLocksetYeardayScheduleCommandParams.put( - "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo); + doorLocksetYearDayScheduleCommandParams.put( + "localEndTime", doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo); // Populate commands - InteractionInfo doorLocksetYeardayScheduleInteractionInfo = + InteractionInfo doorLocksetYearDayScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) - .setYeardaySchedule( - (ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback) callback, - (Integer) commandArguments.get("scheduleId"), - (Integer) commandArguments.get("userId"), + .setYearDaySchedule( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("yearDayIndex"), + (Integer) commandArguments.get("userIndex"), (Long) commandArguments.get("localStartTime"), (Long) commandArguments.get("localEndTime")); }, - () -> new DelegatedSetYeardayScheduleResponseCallback(), - doorLocksetYeardayScheduleCommandParams); + () -> new DelegatedDefaultClusterCallback(), + doorLocksetYearDayScheduleCommandParams); doorLockClusterInteractionInfoMap.put( - "setYeardaySchedule", doorLocksetYeardayScheduleInteractionInfo); + "setYearDaySchedule", doorLocksetYearDayScheduleInteractionInfo); Map doorLockunlockDoorCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockunlockDoorpinCommandParameterInfo = - new CommandParameterInfo("pin", byte[].class); - doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameterInfo); + CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo = + new CommandParameterInfo("pinCode", byte[].class); + doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo); // Populate commands InteractionInfo doorLockunlockDoorInteractionInfo = @@ -5822,23 +5462,23 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .unlockDoor( - (ChipClusters.DoorLockCluster.UnlockDoorResponseCallback) callback, - (byte[]) commandArguments.get("pin")); + (DefaultClusterCallback) callback, + (Optional) commandArguments.get("pinCode")); }, - () -> new DelegatedUnlockDoorResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLockunlockDoorCommandParams); doorLockClusterInteractionInfoMap.put("unlockDoor", doorLockunlockDoorInteractionInfo); Map doorLockunlockWithTimeoutCommandParams = new LinkedHashMap(); - CommandParameterInfo doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo = - new CommandParameterInfo("timeoutInSeconds", int.class); + CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo = + new CommandParameterInfo("timeout", int.class); doorLockunlockWithTimeoutCommandParams.put( - "timeoutInSeconds", doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo); + "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo); - CommandParameterInfo doorLockunlockWithTimeoutpinCommandParameterInfo = - new CommandParameterInfo("pin", byte[].class); + CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo = + new CommandParameterInfo("pinCode", byte[].class); doorLockunlockWithTimeoutCommandParams.put( - "pin", doorLockunlockWithTimeoutpinCommandParameterInfo); + "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo); // Populate commands InteractionInfo doorLockunlockWithTimeoutInteractionInfo = @@ -5846,11 +5486,11 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.DoorLockCluster) cluster) .unlockWithTimeout( - (ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback) callback, - (Integer) commandArguments.get("timeoutInSeconds"), - (byte[]) commandArguments.get("pin")); + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("timeout"), + (Optional) commandArguments.get("pinCode")); }, - () -> new DelegatedUnlockWithTimeoutResponseCallback(), + () -> new DelegatedDefaultClusterCallback(), doorLockunlockWithTimeoutCommandParams); doorLockClusterInteractionInfoMap.put( "unlockWithTimeout", doorLockunlockWithTimeoutInteractionInfo); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 52695b28c0b32a..12df6a1498dec6 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -1699,30 +1699,6 @@ public Map> getReadAttributeMap() { Map readDiagnosticLogsInteractionInfo = new LinkedHashMap<>(); readAttributeMap.put("diagnosticLogs", readDiagnosticLogsInteractionInfo); Map readDoorLockInteractionInfo = new LinkedHashMap<>(); - Map readDoorLockLockStateCommandParams = - new LinkedHashMap(); - InteractionInfo readDoorLockLockStateAttributeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.DoorLockCluster) cluster) - .readLockStateAttribute((ChipClusters.IntegerAttributeCallback) callback); - }, - () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readDoorLockLockStateCommandParams); - readDoorLockInteractionInfo.put( - "readLockStateAttribute", readDoorLockLockStateAttributeInteractionInfo); - Map readDoorLockLockTypeCommandParams = - new LinkedHashMap(); - InteractionInfo readDoorLockLockTypeAttributeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.DoorLockCluster) cluster) - .readLockTypeAttribute((ChipClusters.IntegerAttributeCallback) callback); - }, - () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readDoorLockLockTypeCommandParams); - readDoorLockInteractionInfo.put( - "readLockTypeAttribute", readDoorLockLockTypeAttributeInteractionInfo); Map readDoorLockActuatorEnabledCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockActuatorEnabledAttributeInteractionInfo = @@ -2505,9 +2481,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.IlluminanceMeasurementCluster) cluster) - .readLightSensorTypeAttribute( - (ChipClusters.IlluminanceMeasurementCluster.LightSensorTypeAttributeCallback) - callback); + .readLightSensorTypeAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIlluminanceMeasurementLightSensorTypeCommandParams); @@ -2659,8 +2633,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.LevelControlCluster) cluster) - .readOnLevelAttribute( - (ChipClusters.LevelControlCluster.OnLevelAttributeCallback) callback); + .readOnLevelAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlOnLevelCommandParams); @@ -2701,8 +2674,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.LevelControlCluster) cluster) - .readDefaultMoveRateAttribute( - (ChipClusters.LevelControlCluster.DefaultMoveRateAttributeCallback) callback); + .readDefaultMoveRateAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlDefaultMoveRateCommandParams); @@ -4854,8 +4826,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.TestClusterCluster) cluster) - .readNullableBitmap8Attribute( - (ChipClusters.TestClusterCluster.NullableBitmap8AttributeCallback) callback); + .readNullableBitmap8Attribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTestClusterNullableBitmap8CommandParams); @@ -4906,8 +4877,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.TestClusterCluster) cluster) - .readNullableInt8uAttribute( - (ChipClusters.TestClusterCluster.NullableInt8uAttributeCallback) callback); + .readNullableInt8uAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTestClusterNullableInt8uCommandParams); @@ -5114,8 +5084,7 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.TestClusterCluster) cluster) - .readNullableEnum8Attribute( - (ChipClusters.TestClusterCluster.NullableEnum8AttributeCallback) callback); + .readNullableEnum8Attribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTestClusterNullableEnum8CommandParams); @@ -5201,9 +5170,7 @@ public Map> getReadAttributeMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.TestClusterCluster) cluster) .readNullableRangeRestrictedInt8uAttribute( - (ChipClusters.TestClusterCluster - .NullableRangeRestrictedInt8uAttributeCallback) - callback); + (ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTestClusterNullableRangeRestrictedInt8uCommandParams); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 0fa2845fc44cf7..be67bbb15d09ef 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -1397,13 +1397,13 @@ class ChipClusters: "commands": { 0x00000008: { "commandId": 0x00000008, - "commandName": "ClearAllPins", + "commandName": "ClearAllPINCodes", "args": { }, }, 0x00000019: { "commandId": 0x00000019, - "commandName": "ClearAllRfids", + "commandName": "ClearAllRFIDCodes", "args": { }, }, @@ -1411,44 +1411,44 @@ class ChipClusters: "commandId": 0x00000013, "commandName": "ClearHolidaySchedule", "args": { - "scheduleId": "int", + "holidayIndex": "int", }, }, 0x00000007: { "commandId": 0x00000007, - "commandName": "ClearPin", + "commandName": "ClearPINCode", "args": { - "userId": "int", + "pinSlotIndex": "int", }, }, 0x00000018: { "commandId": 0x00000018, - "commandName": "ClearRfid", + "commandName": "ClearRFIDCode", "args": { - "userId": "int", + "rfidSlotIndex": "int", }, }, 0x0000000D: { "commandId": 0x0000000D, - "commandName": "ClearWeekdaySchedule", + "commandName": "ClearWeekDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "weekDayIndex": "int", + "userIndex": "int", }, }, 0x00000010: { "commandId": 0x00000010, - "commandName": "ClearYeardaySchedule", + "commandName": "ClearYearDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "yearDayIndex": "int", + "userIndex": "int", }, }, 0x00000012: { "commandId": 0x00000012, "commandName": "GetHolidaySchedule", "args": { - "scheduleId": "int", + "holidayIndex": "int", }, }, 0x00000004: { @@ -1460,14 +1460,14 @@ class ChipClusters: }, 0x00000006: { "commandId": 0x00000006, - "commandName": "GetPin", + "commandName": "GetPINCode", "args": { "userId": "int", }, }, 0x00000017: { "commandId": 0x00000017, - "commandName": "GetRfid", + "commandName": "GetRFIDCode", "args": { "userId": "int", }, @@ -1481,40 +1481,40 @@ class ChipClusters: }, 0x0000000C: { "commandId": 0x0000000C, - "commandName": "GetWeekdaySchedule", + "commandName": "GetWeekDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "weekDayIndex": "int", + "userIndex": "int", }, }, 0x0000000F: { "commandId": 0x0000000F, - "commandName": "GetYeardaySchedule", + "commandName": "GetYearDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "yearDayIndex": "int", + "userIndex": "int", }, }, 0x00000000: { "commandId": 0x00000000, "commandName": "LockDoor", "args": { - "pin": "bytes", + "pinCode": "bytes", }, }, 0x00000011: { "commandId": 0x00000011, "commandName": "SetHolidaySchedule", "args": { - "scheduleId": "int", + "holidayIndex": "int", "localStartTime": "int", "localEndTime": "int", - "operatingModeDuringHoliday": "int", + "operatingMode": "int", }, }, 0x00000005: { "commandId": 0x00000005, - "commandName": "SetPin", + "commandName": "SetPINCode", "args": { "userId": "int", "userStatus": "int", @@ -1524,12 +1524,12 @@ class ChipClusters: }, 0x00000016: { "commandId": 0x00000016, - "commandName": "SetRfid", + "commandName": "SetRFIDCode", "args": { "userId": "int", "userStatus": "int", "userType": "int", - "id": "bytes", + "rfidCode": "bytes", }, }, 0x00000014: { @@ -1542,10 +1542,10 @@ class ChipClusters: }, 0x0000000B: { "commandId": 0x0000000B, - "commandName": "SetWeekdaySchedule", + "commandName": "SetWeekDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "weekDayIndex": "int", + "userIndex": "int", "daysMask": "int", "startHour": "int", "startMinute": "int", @@ -1555,10 +1555,10 @@ class ChipClusters: }, 0x0000000E: { "commandId": 0x0000000E, - "commandName": "SetYeardaySchedule", + "commandName": "SetYearDaySchedule", "args": { - "scheduleId": "int", - "userId": "int", + "yearDayIndex": "int", + "userIndex": "int", "localStartTime": "int", "localEndTime": "int", }, @@ -1567,15 +1567,15 @@ class ChipClusters: "commandId": 0x00000001, "commandName": "UnlockDoor", "args": { - "pin": "bytes", + "pinCode": "bytes", }, }, 0x00000003: { "commandId": 0x00000003, "commandName": "UnlockWithTimeout", "args": { - "timeoutInSeconds": "int", - "pin": "bytes", + "timeout": "int", + "pinCode": "bytes", }, }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 1cc87e60e41424..652b05fd51b2d4 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -11153,6 +11153,132 @@ class DoorLock(Cluster): id: typing.ClassVar[int] = 0x0101 class Enums: + class DlAlarmCode(IntEnum): + kLockJammed = 0x00 + kLockFactoryReset = 0x01 + kLockRadioPowerCycled = 0x03 + kWrongCodeEntryLimit = 0x04 + kFrontEsceutcheonRemoved = 0x05 + kDoorForcedOpen = 0x06 + kDoorAjar = 0x07 + kForcedUser = 0x08 + + class DlCredentialRule(IntEnum): + kSingle = 0x00 + kDouble = 0x01 + kTri = 0x02 + + class DlCredentialType(IntEnum): + kProgrammingPIN = 0x00 + kPin = 0x01 + kRfid = 0x02 + kFingerprint = 0x03 + kFingerVein = 0x04 + kFace = 0x05 + + class DlDataOperationType(IntEnum): + kAdd = 0x00 + kClear = 0x01 + kModify = 0x02 + + class DlDoorLockStatus(IntEnum): + kDuplicate = 0x02 + kOccupied = 0x03 + + 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 + kUnlocked = 0x02 + + class DlLockType(IntEnum): + kDeadBolt = 0x00 + kMagnetic = 0x01 + kOther = 0x02 + kMortise = 0x03 + kRim = 0x04 + kLatchBolt = 0x05 + kCylindricalLock = 0x06 + kTubularLock = 0x07 + kInterconnectedLock = 0x08 + 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 + kDuplicate = 0x02 + kOccupied = 0x03 + kInvalidField = 0x85 + 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 @@ -11199,43 +11325,27 @@ class DoorLockUserType(IntEnum): kNonAccessUser = 0x04 kNotSupported = 0xFF - class Commands: + class Structs: @dataclass - class LockDoor(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - + class DlCredential(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="pin", Tag=0, Type=bytes), - ]) - - pin: 'bytes' = None - - @dataclass - class LockDoorResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ + Label="credentialType", Tag=1, Type=DoorLock.Enums.DlCredentialType), ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="credentialIndex", Tag=2, Type=uint), ]) - status: 'uint' = None + credentialType: 'DoorLock.Enums.DlCredentialType' = None + credentialIndex: 'uint' = None + class Commands: @dataclass - class UnlockDoor(ClusterCommand): + class LockDoor(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0001 + command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11243,31 +11353,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="pin", Tag=0, Type=bytes), + Label="pinCode", Tag=0, Type=typing.Optional[bytes]), ]) - pin: 'bytes' = None + pinCode: 'typing.Optional[bytes]' = None @dataclass - class UnlockDoorResponse(ClusterCommand): + class UnlockDoor(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None - - @dataclass - class Toggle(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11275,26 +11369,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="pin", Tag=0, Type=str), + Label="pinCode", Tag=0, Type=typing.Optional[bytes]), ]) - pin: 'str' = None - - @dataclass - class ToggleResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None + pinCode: 'typing.Optional[bytes]' = None @dataclass class UnlockWithTimeout(ClusterCommand): @@ -11307,29 +11385,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="timeoutInSeconds", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="pin", Tag=1, Type=bytes), - ]) - - timeoutInSeconds: 'uint' = None - pin: 'bytes' = None - - @dataclass - class UnlockWithTimeoutResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0003 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ + Label="timeout", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="pinCode", Tag=1, Type=typing.Optional[bytes]), ]) - status: 'uint' = None + timeout: 'uint' = None + pinCode: 'typing.Optional[bytes]' = None @dataclass class GetLogRecord(ClusterCommand): @@ -11382,7 +11444,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: pin: 'bytes' = None @dataclass - class SetPin(ClusterCommand): + class SetPINCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0005 is_client: typing.ClassVar[bool] = True @@ -11394,36 +11456,20 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor( Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userStatus", Tag=1, Type=DoorLock.Enums.DoorLockUserStatus), + Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus), ClusterObjectFieldDescriptor( - Label="userType", Tag=2, Type=DoorLock.Enums.DoorLockUserType), + Label="userType", Tag=2, Type=DoorLock.Enums.DlUserType), ClusterObjectFieldDescriptor( Label="pin", Tag=3, Type=bytes), ]) userId: 'uint' = None - userStatus: 'DoorLock.Enums.DoorLockUserStatus' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None + userType: 'DoorLock.Enums.DlUserType' = None pin: 'bytes' = None @dataclass - class SetPinResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0005 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=DoorLock.Enums.DoorLockSetPinOrIdStatus), - ]) - - status: 'DoorLock.Enums.DoorLockSetPinOrIdStatus' = None - - @dataclass - class GetPin(ClusterCommand): + class GetPINCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0006 is_client: typing.ClassVar[bool] = True @@ -11439,7 +11485,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: userId: 'uint' = None @dataclass - class GetPinResponse(ClusterCommand): + class GetPINCodeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0006 is_client: typing.ClassVar[bool] = False @@ -11451,20 +11497,20 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor( Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userStatus", Tag=1, Type=DoorLock.Enums.DoorLockUserStatus), + Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]), ClusterObjectFieldDescriptor( - Label="userType", Tag=2, Type=DoorLock.Enums.DoorLockUserType), + Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]), ClusterObjectFieldDescriptor( - Label="pin", Tag=3, Type=bytes), + Label="pin", Tag=3, Type=typing.Union[Nullable, bytes]), ]) userId: 'uint' = None - userStatus: 'DoorLock.Enums.DoorLockUserStatus' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None - pin: 'bytes' = None + userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = None + userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = None + pin: 'typing.Union[Nullable, bytes]' = None @dataclass - class ClearPin(ClusterCommand): + class ClearPINCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0007 is_client: typing.ClassVar[bool] = True @@ -11474,29 +11520,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), + Label="pinSlotIndex", Tag=0, Type=uint), ]) - userId: 'uint' = None + pinSlotIndex: 'uint' = None @dataclass - class ClearPinResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0007 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None - - @dataclass - class ClearAllPins(ClusterCommand): + class ClearAllPINCodes(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x0008 is_client: typing.ClassVar[bool] = True @@ -11507,22 +11537,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ]) - @dataclass - class ClearAllPinsResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0008 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None - @dataclass class SetUserStatus(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 @@ -11536,27 +11550,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor( Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userStatus", Tag=1, Type=uint), + Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus), ]) userId: 'uint' = None - userStatus: 'uint' = None - - @dataclass - class SetUserStatusResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0009 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None @dataclass class GetUserStatus(ClusterCommand): @@ -11587,14 +11585,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor( Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="status", Tag=1, Type=uint), + Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus), ]) userId: 'uint' = None - status: 'uint' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None @dataclass - class SetWeekdaySchedule(ClusterCommand): + class SetWeekDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x000B is_client: typing.ClassVar[bool] = True @@ -11604,9 +11602,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="weekDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="userIndex", Tag=1, Type=uint), ClusterObjectFieldDescriptor( Label="daysMask", Tag=2, Type=uint), ClusterObjectFieldDescriptor( @@ -11619,8 +11617,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: Label="endMinute", Tag=6, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None + weekDayIndex: 'uint' = None + userIndex: 'uint' = None daysMask: 'uint' = None startHour: 'uint' = None startMinute: 'uint' = None @@ -11628,23 +11626,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: endMinute: 'uint' = None @dataclass - class SetWeekdayScheduleResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000B - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), - ]) - - status: 'uint' = None - - @dataclass - class GetWeekdaySchedule(ClusterCommand): + class GetWeekDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x000C is_client: typing.ClassVar[bool] = True @@ -11654,16 +11636,16 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="weekDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="userIndex", Tag=1, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None + weekDayIndex: 'uint' = None + userIndex: 'uint' = None @dataclass - class GetWeekdayScheduleResponse(ClusterCommand): + class GetWeekDayScheduleResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x000C is_client: typing.ClassVar[bool] = False @@ -11673,11 +11655,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="weekDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="userIndex", Tag=1, Type=uint), ClusterObjectFieldDescriptor( - Label="status", Tag=2, Type=uint), + Label="status", Tag=2, Type=DoorLock.Enums.DlStatus), ClusterObjectFieldDescriptor( Label="daysMask", Tag=3, Type=uint), ClusterObjectFieldDescriptor( @@ -11690,9 +11672,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: Label="endMinute", Tag=7, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None - status: 'uint' = None + weekDayIndex: 'uint' = None + userIndex: 'uint' = None + status: 'DoorLock.Enums.DlStatus' = None daysMask: 'uint' = None startHour: 'uint' = None startMinute: 'uint' = None @@ -11700,7 +11682,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: endMinute: 'uint' = None @dataclass - class ClearWeekdaySchedule(ClusterCommand): + class ClearWeekDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 command_id: typing.ClassVar[int] = 0x000D is_client: typing.ClassVar[bool] = True @@ -11710,34 +11692,43 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="weekDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="userIndex", Tag=1, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None + weekDayIndex: 'uint' = None + userIndex: 'uint' = None @dataclass - class ClearWeekdayScheduleResponse(ClusterCommand): + class SetYearDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000D - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x000E + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="yearDayIndex", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="userIndex", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="localStartTime", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="localEndTime", Tag=3, Type=uint), ]) - status: 'uint' = None + yearDayIndex: 'uint' = None + userIndex: 'uint' = None + localStartTime: 'uint' = None + localEndTime: 'uint' = None @dataclass - class SetYeardaySchedule(ClusterCommand): + class GetYearDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000E + command_id: typing.ClassVar[int] = 0x000F is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11745,24 +11736,18 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="yearDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="localStartTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="localEndTime", Tag=3, Type=uint), + Label="userIndex", Tag=1, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None - localStartTime: 'uint' = None - localEndTime: 'uint' = None + yearDayIndex: 'uint' = None + userIndex: 'uint' = None @dataclass - class SetYeardayScheduleResponse(ClusterCommand): + class GetYearDayScheduleResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000E + command_id: typing.ClassVar[int] = 0x000F is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -11770,15 +11755,27 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="yearDayIndex", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="userIndex", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="status", Tag=2, Type=DoorLock.Enums.DlStatus), + ClusterObjectFieldDescriptor( + Label="localStartTime", Tag=3, Type=uint), + ClusterObjectFieldDescriptor( + Label="localEndTime", Tag=4, Type=uint), ]) - status: 'uint' = None + yearDayIndex: 'uint' = None + userIndex: 'uint' = None + status: 'DoorLock.Enums.DlStatus' = None + localStartTime: 'uint' = None + localEndTime: 'uint' = None @dataclass - class GetYeardaySchedule(ClusterCommand): + class ClearYearDaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000F + command_id: typing.ClassVar[int] = 0x0010 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11786,46 +11783,43 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="yearDayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="userIndex", Tag=1, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None + yearDayIndex: 'uint' = None + userIndex: 'uint' = None @dataclass - class GetYeardayScheduleResponse(ClusterCommand): + class SetHolidaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x000F - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0011 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="holidayIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="status", Tag=2, Type=uint), + Label="localStartTime", Tag=1, Type=uint), ClusterObjectFieldDescriptor( - Label="localStartTime", Tag=3, Type=uint), + Label="localEndTime", Tag=2, Type=uint), ClusterObjectFieldDescriptor( - Label="localEndTime", Tag=4, Type=uint), + Label="operatingMode", Tag=3, Type=DoorLock.Enums.DlOperatingMode), ]) - scheduleId: 'uint' = None - userId: 'uint' = None - status: 'uint' = None + holidayIndex: 'uint' = None localStartTime: 'uint' = None localEndTime: 'uint' = None + operatingMode: 'DoorLock.Enums.DlOperatingMode' = None @dataclass - class ClearYeardaySchedule(ClusterCommand): + class GetHolidaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0010 + command_id: typing.ClassVar[int] = 0x0012 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11833,18 +11827,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="userId", Tag=1, Type=uint), + Label="holidayIndex", Tag=0, Type=uint), ]) - scheduleId: 'uint' = None - userId: 'uint' = None + holidayIndex: 'uint' = None @dataclass - class ClearYeardayScheduleResponse(ClusterCommand): + class GetHolidayScheduleResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0010 + command_id: typing.ClassVar[int] = 0x0012 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -11852,15 +11843,27 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="holidayIndex", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="status", Tag=1, Type=DoorLock.Enums.DlStatus), + ClusterObjectFieldDescriptor( + Label="localStartTime", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="localEndTime", Tag=3, Type=uint), + ClusterObjectFieldDescriptor( + Label="operatingMode", Tag=4, Type=DoorLock.Enums.DlOperatingMode), ]) - status: 'uint' = None + holidayIndex: 'uint' = None + status: 'DoorLock.Enums.DlStatus' = None + localStartTime: 'uint' = None + localEndTime: 'uint' = None + operatingMode: 'DoorLock.Enums.DlOperatingMode' = None @dataclass - class SetHolidaySchedule(ClusterCommand): + class ClearHolidaySchedule(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0011 + command_id: typing.ClassVar[int] = 0x0013 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11868,40 +11871,34 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="localStartTime", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="localEndTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="operatingModeDuringHoliday", Tag=3, Type=uint), + Label="holidayIndex", Tag=0, Type=uint), ]) - scheduleId: 'uint' = None - localStartTime: 'uint' = None - localEndTime: 'uint' = None - operatingModeDuringHoliday: 'uint' = None + holidayIndex: 'uint' = None @dataclass - class SetHolidayScheduleResponse(ClusterCommand): + class SetUserType(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0011 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0014 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="userId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="userType", Tag=1, Type=DoorLock.Enums.DlUserType), ]) - status: 'uint' = None + userId: 'uint' = None + userType: 'DoorLock.Enums.DlUserType' = None @dataclass - class GetHolidaySchedule(ClusterCommand): + class GetUserType(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0012 + command_id: typing.ClassVar[int] = 0x0015 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11909,15 +11906,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="userId", Tag=0, Type=uint), ]) - scheduleId: 'uint' = None + userId: 'uint' = None @dataclass - class GetHolidayScheduleResponse(ClusterCommand): + class GetUserTypeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0012 + command_id: typing.ClassVar[int] = 0x0015 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -11925,27 +11922,18 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="status", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="localStartTime", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="localEndTime", Tag=3, Type=uint), + Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="operatingModeDuringHoliday", Tag=4, Type=uint), + Label="userType", Tag=1, Type=DoorLock.Enums.DlUserType), ]) - scheduleId: 'uint' = None - status: 'uint' = None - localStartTime: 'uint' = None - localEndTime: 'uint' = None - operatingModeDuringHoliday: 'uint' = None + userId: 'uint' = None + userType: 'DoorLock.Enums.DlUserType' = None @dataclass - class ClearHolidaySchedule(ClusterCommand): + class SetRFIDCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0013 + command_id: typing.ClassVar[int] = 0x0016 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -11953,32 +11941,41 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="scheduleId", Tag=0, Type=uint), + Label="userId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="userStatus", Tag=1, Type=DoorLock.Enums.DlUserStatus), + ClusterObjectFieldDescriptor( + Label="userType", Tag=2, Type=DoorLock.Enums.DlUserType), + ClusterObjectFieldDescriptor( + Label="rfidCode", Tag=3, Type=bytes), ]) - scheduleId: 'uint' = None + userId: 'uint' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None + userType: 'DoorLock.Enums.DlUserType' = None + rfidCode: 'bytes' = None @dataclass - class ClearHolidayScheduleResponse(ClusterCommand): + class GetRFIDCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0013 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0017 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="userId", Tag=0, Type=uint), ]) - status: 'uint' = None + userId: 'uint' = None @dataclass - class SetUserType(ClusterCommand): + class GetRFIDCodeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0014 - is_client: typing.ClassVar[bool] = True + command_id: typing.ClassVar[int] = 0x0017 + is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: @@ -11987,67 +11984,84 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor( Label="userId", Tag=0, Type=uint), ClusterObjectFieldDescriptor( - Label="userType", Tag=1, Type=DoorLock.Enums.DoorLockUserType), + Label="userStatus", Tag=1, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]), + ClusterObjectFieldDescriptor( + Label="userType", Tag=2, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]), + ClusterObjectFieldDescriptor( + Label="rfidCode", Tag=3, Type=typing.Union[Nullable, bytes]), ]) userId: 'uint' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None + userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = None + userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = None + rfidCode: 'typing.Union[Nullable, bytes]' = None @dataclass - class SetUserTypeResponse(ClusterCommand): + class ClearRFIDCode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0014 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0018 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="rfidSlotIndex", Tag=0, Type=uint), ]) - status: 'uint' = None + rfidSlotIndex: 'uint' = None @dataclass - class GetUserType(ClusterCommand): + class ClearAllRFIDCodes(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0015 + command_id: typing.ClassVar[int] = 0x0019 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), ]) - userId: 'uint' = None - @dataclass - class GetUserTypeResponse(ClusterCommand): + class SetUser(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0015 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x001A + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), + Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType), + 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=DoorLock.Enums.DlUserStatus), + ClusterObjectFieldDescriptor( + Label="userType", Tag=5, Type=DoorLock.Enums.DlUserType), ClusterObjectFieldDescriptor( - Label="userType", Tag=1, Type=DoorLock.Enums.DoorLockUserType), + Label="credentialRule", Tag=6, Type=typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]), ]) - userId: 'uint' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None + operationType: 'DoorLock.Enums.DlDataOperationType' = None + userIndex: 'uint' = None + userName: 'typing.Union[Nullable, str]' = None + userUniqueId: 'typing.Union[Nullable, uint]' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None + userType: 'DoorLock.Enums.DlUserType' = None + credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = None @dataclass - class SetRfid(ClusterCommand): + class GetUser(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0016 + command_id: typing.ClassVar[int] = 0x001B is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -12055,24 +12069,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="userStatus", Tag=1, Type=DoorLock.Enums.DoorLockUserStatus), - ClusterObjectFieldDescriptor( - Label="userType", Tag=2, Type=DoorLock.Enums.DoorLockUserType), - ClusterObjectFieldDescriptor( - Label="id", Tag=3, Type=bytes), + Label="userIndex", Tag=0, Type=uint), ]) - userId: 'uint' = None - userStatus: 'DoorLock.Enums.DoorLockUserStatus' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None - id: 'bytes' = None + userIndex: 'uint' = None @dataclass - class SetRfidResponse(ClusterCommand): + class GetUserResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0016 + command_id: typing.ClassVar[int] = 0x001C is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -12080,15 +12085,42 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=DoorLock.Enums.DoorLockSetPinOrIdStatus), + 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="creatorFabricIndex", Tag=7, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor( + Label="lastModifiedFabricIndex", Tag=8, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor( + Label="nextUserIndex", Tag=9, Type=uint), ]) - status: 'DoorLock.Enums.DoorLockSetPinOrIdStatus' = None + userIndex: 'uint' = None + userName: 'typing.Union[Nullable, str]' = None + userUniqueId: 'typing.Union[Nullable, uint]' = None + userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = None + userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = None + credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = None + credentials: 'typing.Union[Nullable, typing.List[DoorLock.Structs.DlCredential]]' = None + creatorFabricIndex: 'typing.Union[Nullable, uint]' = None + lastModifiedFabricIndex: 'typing.Union[Nullable, uint]' = None + nextUserIndex: 'uint' = None @dataclass - class GetRfid(ClusterCommand): + class ClearUser(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0017 + command_id: typing.ClassVar[int] = 0x001D is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -12096,15 +12128,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), + Label="userIndex", Tag=0, Type=uint), ]) - userId: 'uint' = None + userIndex: 'uint' = None @dataclass - class GetRfidResponse(ClusterCommand): + class OperatingEventNotification(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0017 + command_id: typing.ClassVar[int] = 0x0020 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -12112,84 +12144,133 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), + Label="operationEventSource", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="operationEventCode", Tag=1, Type=uint), ClusterObjectFieldDescriptor( - Label="userStatus", Tag=1, Type=DoorLock.Enums.DoorLockUserStatus), + Label="userId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="pin", Tag=3, Type=bytes), ClusterObjectFieldDescriptor( - Label="userType", Tag=2, Type=DoorLock.Enums.DoorLockUserType), + Label="localTime", Tag=4, Type=uint), ClusterObjectFieldDescriptor( - Label="rfid", Tag=3, Type=bytes), + Label="data", Tag=5, Type=typing.Optional[str]), ]) + operationEventSource: 'uint' = None + operationEventCode: 'uint' = None userId: 'uint' = None - userStatus: 'DoorLock.Enums.DoorLockUserStatus' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None - rfid: 'bytes' = None + pin: 'bytes' = None + localTime: 'uint' = None + data: 'typing.Optional[str]' = None @dataclass - class ClearRfid(ClusterCommand): + class ProgrammingEventNotification(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0018 - is_client: typing.ClassVar[bool] = True + command_id: typing.ClassVar[int] = 0x0021 + is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="userId", Tag=0, Type=uint), + Label="programEventSource", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="programEventCode", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="userId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="pin", Tag=3, Type=bytes), + ClusterObjectFieldDescriptor( + Label="userType", Tag=4, Type=DoorLock.Enums.DlUserType), + ClusterObjectFieldDescriptor( + Label="userStatus", Tag=5, Type=DoorLock.Enums.DlUserStatus), + ClusterObjectFieldDescriptor( + Label="localTime", Tag=6, Type=uint), + ClusterObjectFieldDescriptor( + Label="data", Tag=7, Type=typing.Optional[str]), ]) + programEventSource: 'uint' = None + programEventCode: 'uint' = None userId: 'uint' = None + pin: 'bytes' = None + userType: 'DoorLock.Enums.DlUserType' = None + userStatus: 'DoorLock.Enums.DlUserStatus' = None + localTime: 'uint' = None + data: 'typing.Optional[str]' = None @dataclass - class ClearRfidResponse(ClusterCommand): + class SetCredential(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0018 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0022 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType), + ClusterObjectFieldDescriptor( + Label="credential", Tag=1, Type=DoorLock.Structs.DlCredential), + 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]), ]) - status: 'uint' = None + operationType: 'DoorLock.Enums.DlDataOperationType' = None + credential: 'DoorLock.Structs.DlCredential' = None + credentialData: 'bytes' = None + userIndex: 'typing.Union[Nullable, uint]' = None + userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = None @dataclass - class ClearAllRfids(ClusterCommand): + class SetCredentialResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0019 - is_client: typing.ClassVar[bool] = True + command_id: typing.ClassVar[int] = 0x0023 + is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ + ClusterObjectFieldDescriptor( + Label="status", Tag=0, Type=DoorLock.Enums.DlStatus), + ClusterObjectFieldDescriptor( + Label="userIndex", Tag=1, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor( + Label="nextCredentialIndex", Tag=2, Type=typing.Union[Nullable, uint]), ]) + status: 'DoorLock.Enums.DlStatus' = None + userIndex: 'typing.Union[Nullable, uint]' = None + nextCredentialIndex: 'typing.Union[Nullable, uint]' = None + @dataclass - class ClearAllRfidsResponse(ClusterCommand): + class GetCredentialStatus(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0019 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0024 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="status", Tag=0, Type=uint), + Label="credential", Tag=0, Type=DoorLock.Structs.DlCredential), ]) - status: 'uint' = None + credential: 'DoorLock.Structs.DlCredential' = None @dataclass - class OperationEventNotification(ClusterCommand): + class GetCredentialStatusResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0020 + command_id: typing.ClassVar[int] = 0x0025 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -12197,62 +12278,32 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="source", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="eventCode", Tag=1, Type=DoorLock.Enums.DoorLockOperationEventCode), - ClusterObjectFieldDescriptor( - Label="userId", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="pin", Tag=3, Type=bytes), + Label="credentialExists", Tag=0, Type=bool), ClusterObjectFieldDescriptor( - Label="timeStamp", Tag=4, Type=uint), + Label="userIndex", Tag=1, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor( - Label="data", Tag=5, Type=str), + Label="nextCredentialIndex", Tag=2, Type=typing.Union[Nullable, uint]), ]) - source: 'uint' = None - eventCode: 'DoorLock.Enums.DoorLockOperationEventCode' = None - userId: 'uint' = None - pin: 'bytes' = None - timeStamp: 'uint' = None - data: 'str' = None + credentialExists: 'bool' = None + userIndex: 'typing.Union[Nullable, uint]' = None + nextCredentialIndex: 'typing.Union[Nullable, uint]' = None @dataclass - class ProgrammingEventNotification(ClusterCommand): + class ClearCredential(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0101 - command_id: typing.ClassVar[int] = 0x0021 - is_client: typing.ClassVar[bool] = False + command_id: typing.ClassVar[int] = 0x0026 + is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor( - Label="source", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="eventCode", Tag=1, Type=DoorLock.Enums.DoorLockProgrammingEventCode), - ClusterObjectFieldDescriptor( - Label="userId", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="pin", Tag=3, Type=bytes), - ClusterObjectFieldDescriptor( - Label="userType", Tag=4, Type=DoorLock.Enums.DoorLockUserType), - ClusterObjectFieldDescriptor( - Label="userStatus", Tag=5, Type=DoorLock.Enums.DoorLockUserStatus), - ClusterObjectFieldDescriptor( - Label="timeStamp", Tag=6, Type=uint), - ClusterObjectFieldDescriptor( - Label="data", Tag=7, Type=str), + Label="credential", Tag=0, Type=DoorLock.Structs.DlCredential), ]) - source: 'uint' = None - eventCode: 'DoorLock.Enums.DoorLockProgrammingEventCode' = None - userId: 'uint' = None - pin: 'bytes' = None - userType: 'DoorLock.Enums.DoorLockUserType' = None - userStatus: 'DoorLock.Enums.DoorLockUserStatus' = None - timeStamp: 'uint' = None - data: 'str' = None + credential: 'DoorLock.Structs.DlCredential' = None class Attributes: @dataclass @@ -12267,9 +12318,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, DoorLock.Enums.DlLockState]) - value: 'uint' = None + value: 'typing.Union[Nullable, DoorLock.Enums.DlLockState]' = None @dataclass class LockType(ClusterAttributeDescriptor): @@ -12283,9 +12334,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) + return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.DlLockType) - value: 'uint' = None + value: 'DoorLock.Enums.DlLockType' = None @dataclass class ActuatorEnabled(ClusterAttributeDescriptor): @@ -12315,9 +12366,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]) - value: 'typing.Optional[uint]' = None + value: 'typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]' = None @dataclass class DoorOpenEvents(ClusterAttributeDescriptor): @@ -12368,7 +12419,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumLockRecordsSupported(ClusterAttributeDescriptor): + class NumberOfLogRecordsSupported(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12379,12 +12430,12 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=uint) - value: 'typing.Optional[uint]' = None + value: 'uint' = None @dataclass - class NumTotalUsersSupported(ClusterAttributeDescriptor): + class NumberOfTotalUsersSupported(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12400,7 +12451,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumPinUsersSupported(ClusterAttributeDescriptor): + class NumberOfPINUsersSupported(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12416,7 +12467,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumRfidUsersSupported(ClusterAttributeDescriptor): + class NumberOfRFIDUsersSupported(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12432,7 +12483,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumWeekdaySchedulesSupportedPerUser(ClusterAttributeDescriptor): + class NumberOfWeekDaySchedulesSupportedPerUser(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12448,7 +12499,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumYeardaySchedulesSupportedPerUser(ClusterAttributeDescriptor): + class NumberOfYearDaySchedulesSupportedPerUser(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12464,7 +12515,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class NumHolidaySchedulesSupportedPerUser(ClusterAttributeDescriptor): + class NumberOfHolidaySchedulesSupported(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12480,7 +12531,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class MaxPinLength(ClusterAttributeDescriptor): + class MaxPINCodeLength(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12496,7 +12547,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class MinPinLength(ClusterAttributeDescriptor): + class MinPINCodeLength(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12512,7 +12563,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class MaxRfidCodeLength(ClusterAttributeDescriptor): + class MaxRFIDCodeLength(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12528,7 +12579,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class MinRfidCodeLength(ClusterAttributeDescriptor): + class MinRFIDCodeLength(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12543,6 +12594,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None + @dataclass + class CredentialRulesSupport(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0101 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000001B + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + @dataclass class EnableLogging(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -12576,7 +12643,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[str]' = None @dataclass - class LedSettings(ClusterAttributeDescriptor): + class LEDSettings(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12603,9 +12670,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=uint) - value: 'typing.Optional[uint]' = None + value: 'uint' = None @dataclass class SoundVolume(ClusterAttributeDescriptor): @@ -12635,9 +12702,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.DlOperatingMode) - value: 'typing.Optional[uint]' = None + value: 'DoorLock.Enums.DlOperatingMode' = None @dataclass class SupportedOperatingModes(ClusterAttributeDescriptor): @@ -12651,9 +12718,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=uint) - value: 'typing.Optional[uint]' = None + value: 'uint' = None @dataclass class DefaultConfigurationRegister(ClusterAttributeDescriptor): @@ -12704,7 +12771,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[bool]' = None @dataclass - class EnableInsideStatusLed(ClusterAttributeDescriptor): + class EnableInsideStatusLED(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12735,6 +12802,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[bool]' = None + @dataclass + class LocalProgrammingFeatures(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0101 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000002C + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + @dataclass class WrongCodeEntryLimit(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -12768,7 +12851,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class SendPinOverTheAir(ClusterAttributeDescriptor): + class SendPINOverTheAir(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12784,7 +12867,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[bool]' = None @dataclass - class RequirePinForRfOperation(ClusterAttributeDescriptor): + class RequirePINforRemoteOperation(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12800,14 +12883,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[bool]' = None @dataclass - class ZigbeeSecurityLevel(ClusterAttributeDescriptor): + class ExpiringUserTimeout(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000034 + return 0x00000035 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -12848,7 +12931,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class RfOperationEventMask(ClusterAttributeDescriptor): + class RemoteOperationEventMask(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12880,7 +12963,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class RfidOperationEventMask(ClusterAttributeDescriptor): + class RFIDOperationEventMask(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12912,7 +12995,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class RfProgrammingEventMask(ClusterAttributeDescriptor): + class RemoteProgrammingEventMask(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12928,7 +13011,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class RfidProgrammingEventMask(ClusterAttributeDescriptor): + class RFIDProgrammingEventMask(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0101 @@ -12975,6 +13058,133 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = None + class Events: + @dataclass + class DoorLockAlarm(ClusterEventDescriptor): + cluster_id: typing.ClassVar[int] = 0x0101 + event_id: typing.ClassVar[int] = 0x00000000 + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="alarmCode", Tag=0, Type=DoorLock.Enums.DlAlarmCode), + ]) + + alarmCode: 'DoorLock.Enums.DlAlarmCode' = None + + @dataclass + class DoorStateChange(ClusterEventDescriptor): + cluster_id: typing.ClassVar[int] = 0x0101 + event_id: typing.ClassVar[int] = 0x00000001 + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="doorState", Tag=0, Type=DoorLock.Enums.DlDoorState), + ]) + + doorState: 'DoorLock.Enums.DlDoorState' = None + + @dataclass + class LockOperation(ClusterEventDescriptor): + cluster_id: typing.ClassVar[int] = 0x0101 + event_id: typing.ClassVar[int] = 0x00000002 + + @ChipUtility.classproperty + 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="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]], IsArray=True), + ]) + + lockOperationType: 'DoorLock.Enums.DlLockOperationType' = None + operationSource: 'DoorLock.Enums.DlOperationSource' = None + userIndex: 'typing.Union[Nullable, uint]' = None + fabricIndex: 'typing.Union[Nullable, uint]' = None + sourceNode: 'typing.Union[Nullable, uint]' = None + credentials: typing.List['typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]'] = None + + @dataclass + class LockOperationError(ClusterEventDescriptor): + cluster_id: typing.ClassVar[int] = 0x0101 + event_id: typing.ClassVar[int] = 0x00000003 + + @ChipUtility.classproperty + 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="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]], IsArray=True), + ]) + + lockOperationType: 'DoorLock.Enums.DlLockOperationType' = None + operationSource: 'DoorLock.Enums.DlOperationSource' = None + operationError: 'DoorLock.Enums.DlOperationError' = None + userIndex: 'typing.Union[Nullable, uint]' = None + fabricIndex: 'typing.Union[Nullable, uint]' = None + sourceNode: 'typing.Union[Nullable, uint]' = None + credentials: typing.List['typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]'] = None + + @dataclass + class LockUserChange(ClusterEventDescriptor): + cluster_id: typing.ClassVar[int] = 0x0101 + event_id: typing.ClassVar[int] = 0x00000004 + + @ChipUtility.classproperty + 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="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' = None + dataOperationType: 'DoorLock.Enums.DlDataOperationType' = None + operationSource: 'DoorLock.Enums.DlOperationSource' = None + userIndex: 'typing.Union[Nullable, uint]' = None + fabricIndex: 'typing.Union[Nullable, uint]' = None + sourceNode: 'typing.Union[Nullable, uint]' = None + dataIndex: 'typing.Union[Nullable, uint]' = None + @dataclass class WindowCovering(Cluster): diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index d5f788acf59967..6622417c7e4743 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -1382,102 +1382,18 @@ DispatchSuccess(context, response); }; -void CHIPDoorLockClusterClearAllPinsResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearAllPinsResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearAllRfidsResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearHolidayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearPinResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearPinResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearRfidResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearRfidResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearWeekdayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterClearYeardayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - void CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge::OnSuccessFn( void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data) { auto * response = [CHIPDoorLockClusterGetHolidayScheduleResponseParams new]; { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.scheduleId]; - response.scheduleId = value; + value = [NSNumber numberWithUnsignedChar:data.holidayIndex]; + response.holidayIndex = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; response.status = value; } { @@ -1492,8 +1408,8 @@ } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.operatingModeDuringHoliday]; - response.operatingModeDuringHoliday = value; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.operatingMode)]; + response.operatingMode = value; } DispatchSuccess(context, response); }; @@ -1540,10 +1456,10 @@ DispatchSuccess(context, response); }; -void CHIPDoorLockClusterGetPinResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & data) +void CHIPDoorLockClusterGetPINCodeResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data) { - auto * response = [CHIPDoorLockClusterGetPinResponseParams new]; + auto * response = [CHIPDoorLockClusterGetPINCodeResponseParams new]; { NSNumber * value; value = [NSNumber numberWithUnsignedShort:data.userId]; @@ -1551,26 +1467,38 @@ } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus)]; + if (data.userStatus.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())]; + } response.userStatus = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType)]; + if (data.userType.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())]; + } response.userType = value; } { NSData * value; - value = [NSData dataWithBytes:data.pin.data() length:data.pin.size()]; + if (data.pin.IsNull()) { + value = nil; + } else { + value = [NSData dataWithBytes:data.pin.Value().data() length:data.pin.Value().size()]; + } response.pin = value; } DispatchSuccess(context, response); }; -void CHIPDoorLockClusterGetRfidResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & data) +void CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data) { - auto * response = [CHIPDoorLockClusterGetRfidResponseParams new]; + auto * response = [CHIPDoorLockClusterGetRFIDCodeResponseParams new]; { NSNumber * value; value = [NSNumber numberWithUnsignedShort:data.userId]; @@ -1578,18 +1506,30 @@ } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus)]; + if (data.userStatus.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userStatus.Value())]; + } response.userStatus = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType)]; + if (data.userType.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.userType.Value())]; + } response.userType = value; } { NSData * value; - value = [NSData dataWithBytes:data.rfid.data() length:data.rfid.size()]; - response.rfid = value; + if (data.rfidCode.IsNull()) { + value = nil; + } else { + value = [NSData dataWithBytes:data.rfidCode.Value().data() length:data.rfidCode.Value().size()]; + } + response.rfidCode = value; } DispatchSuccess(context, response); }; @@ -1611,28 +1551,28 @@ DispatchSuccess(context, response); }; -void CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & data) +void CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data) { - auto * response = [CHIPDoorLockClusterGetWeekdayScheduleResponseParams new]; + auto * response = [CHIPDoorLockClusterGetWeekDayScheduleResponseParams new]; { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.scheduleId]; - response.scheduleId = value; + value = [NSNumber numberWithUnsignedChar:data.weekDayIndex]; + response.weekDayIndex = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedShort:data.userId]; - response.userId = value; + value = [NSNumber numberWithUnsignedShort:data.userIndex]; + response.userIndex = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; response.status = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.daysMask]; + value = [NSNumber numberWithUnsignedChar:data.daysMask.Raw()]; response.daysMask = value; } { @@ -1658,23 +1598,23 @@ DispatchSuccess(context, response); }; -void CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & data) +void CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data) { - auto * response = [CHIPDoorLockClusterGetYeardayScheduleResponseParams new]; + auto * response = [CHIPDoorLockClusterGetYearDayScheduleResponseParams new]; { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.scheduleId]; - response.scheduleId = value; + value = [NSNumber numberWithUnsignedChar:data.yearDayIndex]; + response.yearDayIndex = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedShort:data.userId]; - response.userId = value; + value = [NSNumber numberWithUnsignedShort:data.userIndex]; + response.userIndex = value; } { NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; response.status = value; } { @@ -1690,114 +1630,6 @@ DispatchSuccess(context, response); }; -void CHIPDoorLockClusterLockDoorResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterLockDoorResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetHolidayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetPinResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetPinResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetRfidResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetRfidResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetUserTypeResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetUserTypeResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetWeekdayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterSetYeardayScheduleResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterUnlockDoorResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterUnlockDoorResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - -void CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & data) -{ - auto * response = [CHIPDoorLockClusterUnlockWithTimeoutResponseParams new]; - { - NSNumber * value; - value = [NSNumber numberWithUnsignedChar:data.status]; - response.status = value; - } - DispatchSuccess(context, response); -}; - void CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge::OnSuccessFn( void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index eb40c41448cad6..ecf7dc89dfcbf6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -41,52 +41,20 @@ typedef void (*CHIPContentLauncherClusterLaunchURLResponseCallbackType)( void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType &); typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)( void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearAllPinsResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearAllRfidsResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearHolidayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterClearYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetLogRecordResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetPINCodeResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetRFIDCodeResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetUserTypeResponseCallbackType)( void *, const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterGetYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterLockDoorResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetHolidayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetPinResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetRfidResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetUserTypeResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterSetYeardayScheduleResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterUnlockDoorResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType &); -typedef void (*CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackType)( - void *, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType &); +typedef void (*CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType)( + void *, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType &); typedef void (*CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType)( void *, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType &); typedef void (*CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType)( @@ -1003,90 +971,6 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & data); }; -class CHIPDoorLockClusterClearAllPinsResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearPinResponseCallbackBridge : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearPinResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearRfidResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearRfidResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & data); -}; - class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge : public CHIPCallbackBridge { @@ -1112,24 +996,28 @@ class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge const chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & data); }; -class CHIPDoorLockClusterGetPinResponseCallbackBridge : public CHIPCallbackBridge +class CHIPDoorLockClusterGetPINCodeResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPDoorLockClusterGetPinResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPDoorLockClusterGetPINCodeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & data); + static void OnSuccessFn(void * context, + const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data); }; -class CHIPDoorLockClusterGetRfidResponseCallbackBridge : public CHIPCallbackBridge +class CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPDoorLockClusterGetRfidResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & data); + static void OnSuccessFn(void * context, + const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data); }; class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge @@ -1144,136 +1032,30 @@ class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge const chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & data); }; -class CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterLockDoorResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterSetPinResponseCallbackBridge : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterSetPinResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterSetRfidResponseCallbackBridge : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterSetRfidResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterSetUserTypeResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge - : public CHIPCallbackBridge +class CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & data); + const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data); }; -class CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge - : public CHIPCallbackBridge +class CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & data); -}; - -class CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & data); + const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data); }; class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index 10d07aaf6bbff8..0b3c8344d76804 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -1259,88 +1259,54 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPDoorLock : CHIPCluster -- (void)clearAllPinsWithCompletionHandler:(void (^)(CHIPDoorLockClusterClearAllPinsResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)clearAllRfidsWithCompletionHandler:(void (^)(CHIPDoorLockClusterClearAllRfidsResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; +- (void)clearAllPINCodesWithCompletionHandler:(StatusCompletion)completionHandler; +- (void)clearAllRFIDCodesWithCompletionHandler:(StatusCompletion)completionHandler; - (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearHolidayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)clearPinWithParams:(CHIPDoorLockClusterClearPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterClearPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)clearRfidWithParams:(CHIPDoorLockClusterClearRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterClearRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)clearWeekdayScheduleWithParams:(CHIPDoorLockClusterClearWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearWeekdayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)clearYeardayScheduleWithParams:(CHIPDoorLockClusterClearYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearYeardayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; + completionHandler:(StatusCompletion)completionHandler; +- (void)clearPINCodeWithParams:(CHIPDoorLockClusterClearPINCodeParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)clearRFIDCodeWithParams:(CHIPDoorLockClusterClearRFIDCodeParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler; - (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParams *)params completionHandler:(void (^)(CHIPDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; - (void)getLogRecordWithParams:(CHIPDoorLockClusterGetLogRecordParams *)params completionHandler:(void (^)(CHIPDoorLockClusterGetLogRecordResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)getPinWithParams:(CHIPDoorLockClusterGetPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterGetPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)getRfidWithParams:(CHIPDoorLockClusterGetRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterGetRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; +- (void)getPINCodeWithParams:(CHIPDoorLockClusterGetPINCodeParams *)params + completionHandler: + (void (^)(CHIPDoorLockClusterGetPINCodeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; +- (void)getRFIDCodeWithParams:(CHIPDoorLockClusterGetRFIDCodeParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetRFIDCodeResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)getUserTypeWithParams:(CHIPDoorLockClusterGetUserTypeParams *)params completionHandler:(void (^)(CHIPDoorLockClusterGetUserTypeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)getWeekdayScheduleWithParams:(CHIPDoorLockClusterGetWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterGetWeekdayScheduleResponseParams * _Nullable data, +- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)getYeardayScheduleWithParams:(CHIPDoorLockClusterGetYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterGetYeardayScheduleResponseParams * _Nullable data, +- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterLockDoorResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; +- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler; - (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetHolidayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)setPinWithParams:(CHIPDoorLockClusterSetPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterSetPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)setRfidWithParams:(CHIPDoorLockClusterSetRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterSetRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetUserTypeResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)setWeekdayScheduleWithParams:(CHIPDoorLockClusterSetWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetWeekdayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)setYeardayScheduleWithParams:(CHIPDoorLockClusterSetYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetYeardayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterUnlockDoorResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; + completionHandler:(StatusCompletion)completionHandler; +- (void)setPINCodeWithParams:(CHIPDoorLockClusterSetPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler; +- (void)setRFIDCodeWithParams:(CHIPDoorLockClusterSetRFIDCodeParams *)params completionHandler:(StatusCompletion)completionHandler; +- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params completionHandler:(StatusCompletion)completionHandler; +- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler; - (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterUnlockWithTimeoutResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; - -- (void)readAttributeLockStateWithCompletionHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)subscribeAttributeLockStateWithMinInterval:(uint16_t)minInterval - maxInterval:(uint16_t)maxInterval - responseHandler:(ResponseHandler)responseHandler; -- (void)reportAttributeLockStateWithResponseHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))responseHandler; - -- (void)readAttributeLockTypeWithCompletionHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)subscribeAttributeLockTypeWithMinInterval:(uint16_t)minInterval - maxInterval:(uint16_t)maxInterval - responseHandler:(ResponseHandler)responseHandler; -- (void)reportAttributeLockTypeWithResponseHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))responseHandler; + completionHandler:(StatusCompletion)completionHandler; - (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 669c77ceaa2cc0..4ce736f57c8b43 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -6328,139 +6328,131 @@ @implementation CHIPDoorLock return &_cppCluster; } -- (void)clearAllPinsWithCompletionHandler:(void (^)(CHIPDoorLockClusterClearAllPinsResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)clearAllPINCodesWithCompletionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearAllPins::Type request; + DoorLock::Commands::ClearAllPINCodes::Type request; - new CHIPDoorLockClusterClearAllPinsResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)clearAllRfidsWithCompletionHandler:(void (^)(CHIPDoorLockClusterClearAllRfidsResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)clearAllRFIDCodesWithCompletionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearAllRfids::Type request; + DoorLock::Commands::ClearAllRFIDCodes::Type request; - new CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } - (void)clearHolidayScheduleWithParams:(CHIPDoorLockClusterClearHolidayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearHolidayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::ClearHolidaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; + request.holidayIndex = params.holidayIndex.unsignedCharValue; - new CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)clearPinWithParams:(CHIPDoorLockClusterClearPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterClearPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)clearPINCodeWithParams:(CHIPDoorLockClusterClearPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearPin::Type request; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::ClearPINCode::Type request; + request.pinSlotIndex = params.pinSlotIndex.unsignedShortValue; - new CHIPDoorLockClusterClearPinResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)clearRfidWithParams:(CHIPDoorLockClusterClearRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterClearRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)clearRFIDCodeWithParams:(CHIPDoorLockClusterClearRFIDCodeParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearRfid::Type request; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::ClearRFIDCode::Type request; + request.rfidSlotIndex = params.rfidSlotIndex.unsignedShortValue; - new CHIPDoorLockClusterClearRfidResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)clearWeekdayScheduleWithParams:(CHIPDoorLockClusterClearWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearWeekdayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)clearWeekDayScheduleWithParams:(CHIPDoorLockClusterClearWeekDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearWeekdaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::ClearWeekDaySchedule::Type request; + request.weekDayIndex = params.weekDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; - new CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)clearYeardayScheduleWithParams:(CHIPDoorLockClusterClearYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterClearYeardayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)clearYearDayScheduleWithParams:(CHIPDoorLockClusterClearYearDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::ClearYeardaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::ClearYearDaySchedule::Type request; + request.yearDayIndex = params.yearDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; - new CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -6472,7 +6464,7 @@ - (void)getHolidayScheduleWithParams:(CHIPDoorLockClusterGetHolidayScheduleParam { ListFreer listFreer; DoorLock::Commands::GetHolidaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; + request.holidayIndex = params.holidayIndex.unsignedCharValue; new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge( self.callbackQueue, @@ -6506,41 +6498,41 @@ new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge( }); } -- (void)getPinWithParams:(CHIPDoorLockClusterGetPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterGetPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)getPINCodeWithParams:(CHIPDoorLockClusterGetPINCodeParams *)params + completionHandler: + (void (^)(CHIPDoorLockClusterGetPINCodeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler { ListFreer listFreer; - DoorLock::Commands::GetPin::Type request; + DoorLock::Commands::GetPINCode::Type request; request.userId = params.userId.unsignedShortValue; - new CHIPDoorLockClusterGetPinResponseCallbackBridge( + new CHIPDoorLockClusterGetPINCodeResponseCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { completionHandler(value, error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)getRfidWithParams:(CHIPDoorLockClusterGetRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterGetRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)getRFIDCodeWithParams:(CHIPDoorLockClusterGetRFIDCodeParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetRFIDCodeResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - DoorLock::Commands::GetRfid::Type request; + DoorLock::Commands::GetRFIDCode::Type request; request.userId = params.userId.unsignedShortValue; - new CHIPDoorLockClusterGetRfidResponseCallbackBridge( + new CHIPDoorLockClusterGetRFIDCodeResponseCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { completionHandler(value, error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -6566,324 +6558,250 @@ new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge( }); } -- (void)getWeekdayScheduleWithParams:(CHIPDoorLockClusterGetWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterGetWeekdayScheduleResponseParams * _Nullable data, +- (void)getWeekDayScheduleWithParams:(CHIPDoorLockClusterGetWeekDayScheduleParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler { ListFreer listFreer; - DoorLock::Commands::GetWeekdaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::GetWeekDaySchedule::Type request; + request.weekDayIndex = params.weekDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; - new CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge( + new CHIPDoorLockClusterGetWeekDayScheduleResponseCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { completionHandler(value, error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)getYeardayScheduleWithParams:(CHIPDoorLockClusterGetYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterGetYeardayScheduleResponseParams * _Nullable data, +- (void)getYearDayScheduleWithParams:(CHIPDoorLockClusterGetYearDayScheduleParams *)params + completionHandler:(void (^)(CHIPDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler { ListFreer listFreer; - DoorLock::Commands::GetYeardaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::GetYearDaySchedule::Type request; + request.yearDayIndex = params.yearDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; - new CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge( + new CHIPDoorLockClusterGetYearDayScheduleResponseCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { completionHandler(value, error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterLockDoorResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)lockDoorWithParams:(CHIPDoorLockClusterLockDoorParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::LockDoor::Type request; - request.pin = [self asByteSpan:params.pin]; + if (params != nil) { + if (params.pinCode != nil) { + auto & definedValue_0 = request.pinCode.Emplace(); + definedValue_0 = [self asByteSpan:params.pinCode]; + } + } - new CHIPDoorLockClusterLockDoorResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } - (void)setHolidayScheduleWithParams:(CHIPDoorLockClusterSetHolidayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetHolidayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::SetHolidaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; + request.holidayIndex = params.holidayIndex.unsignedCharValue; request.localStartTime = params.localStartTime.unsignedIntValue; request.localEndTime = params.localEndTime.unsignedIntValue; - request.operatingModeDuringHoliday = params.operatingModeDuringHoliday.unsignedCharValue; + request.operatingMode + = static_cast>(params.operatingMode.unsignedCharValue); - new CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)setPinWithParams:(CHIPDoorLockClusterSetPinParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterSetPinResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)setPINCodeWithParams:(CHIPDoorLockClusterSetPINCodeParams *)params completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::SetPin::Type request; + DoorLock::Commands::SetPINCode::Type request; request.userId = params.userId.unsignedShortValue; request.userStatus = static_cast>(params.userStatus.unsignedCharValue); request.userType = static_cast>(params.userType.unsignedCharValue); request.pin = [self asByteSpan:params.pin]; - new CHIPDoorLockClusterSetPinResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)setRfidWithParams:(CHIPDoorLockClusterSetRfidParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterSetRfidResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)setRFIDCodeWithParams:(CHIPDoorLockClusterSetRFIDCodeParams *)params completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::SetRfid::Type request; + DoorLock::Commands::SetRFIDCode::Type request; request.userId = params.userId.unsignedShortValue; request.userStatus = static_cast>(params.userStatus.unsignedCharValue); request.userType = static_cast>(params.userType.unsignedCharValue); - request.id = [self asByteSpan:params.id]; + request.rfidCode = [self asByteSpan:params.rfidCode]; - new CHIPDoorLockClusterSetRfidResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetUserTypeResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)setUserTypeWithParams:(CHIPDoorLockClusterSetUserTypeParams *)params completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::SetUserType::Type request; request.userId = params.userId.unsignedShortValue; request.userType = static_cast>(params.userType.unsignedCharValue); - new CHIPDoorLockClusterSetUserTypeResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)setWeekdayScheduleWithParams:(CHIPDoorLockClusterSetWeekdayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetWeekdayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)setWeekDayScheduleWithParams:(CHIPDoorLockClusterSetWeekDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::SetWeekdaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::SetWeekDaySchedule::Type request; + request.weekDayIndex = params.weekDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; request.daysMask = static_cast>(params.daysMask.unsignedCharValue); request.startHour = params.startHour.unsignedCharValue; request.startMinute = params.startMinute.unsignedCharValue; request.endHour = params.endHour.unsignedCharValue; request.endMinute = params.endMinute.unsignedCharValue; - new CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)setYeardayScheduleWithParams:(CHIPDoorLockClusterSetYeardayScheduleParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterSetYeardayScheduleResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)setYearDayScheduleWithParams:(CHIPDoorLockClusterSetYearDayScheduleParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - DoorLock::Commands::SetYeardaySchedule::Type request; - request.scheduleId = params.scheduleId.unsignedCharValue; - request.userId = params.userId.unsignedShortValue; + DoorLock::Commands::SetYearDaySchedule::Type request; + request.yearDayIndex = params.yearDayIndex.unsignedCharValue; + request.userIndex = params.userIndex.unsignedShortValue; request.localStartTime = params.localStartTime.unsignedIntValue; request.localEndTime = params.localEndTime.unsignedIntValue; - new CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams *)params - completionHandler: - (void (^)(CHIPDoorLockClusterUnlockDoorResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)unlockDoorWithParams:(CHIPDoorLockClusterUnlockDoorParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::UnlockDoor::Type request; - request.pin = [self asByteSpan:params.pin]; + if (params != nil) { + if (params.pinCode != nil) { + auto & definedValue_0 = request.pinCode.Emplace(); + definedValue_0 = [self asByteSpan:params.pinCode]; + } + } - new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } - (void)unlockWithTimeoutWithParams:(CHIPDoorLockClusterUnlockWithTimeoutParams *)params - completionHandler:(void (^)(CHIPDoorLockClusterUnlockWithTimeoutResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; DoorLock::Commands::UnlockWithTimeout::Type request; - request.timeoutInSeconds = params.timeoutInSeconds.unsignedShortValue; - request.pin = [self asByteSpan:params.pin]; + request.timeout = params.timeout.unsignedShortValue; + if (params.pinCode != nil) { + auto & definedValue_0 = request.pinCode.Emplace(); + definedValue_0 = [self asByteSpan:params.pinCode]; + } - new CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge( + new CHIPCommandSuccessCallbackBridge( self.callbackQueue, ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); + completionHandler(error); }, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)readAttributeLockStateWithCompletionHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))completionHandler -{ - new CHIPInt8uAttributeCallbackBridge( - self.callbackQueue, - ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); - }, - ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = DoorLock::Attributes::LockState::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); -} - -- (void)subscribeAttributeLockStateWithMinInterval:(uint16_t)minInterval - maxInterval:(uint16_t)maxInterval - responseHandler:(ResponseHandler)responseHandler -{ - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, responseHandler, ^(Cancelable * success, Cancelable * failure) { - return self.cppCluster.SubscribeAttributeLockState(success, failure, minInterval, maxInterval); - }); -} - -- (void)reportAttributeLockStateWithResponseHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))responseHandler -{ - new CHIPInt8uAttributeCallbackBridge( - self.callbackQueue, - ^(NSError * _Nullable error, id _Nullable value) { - responseHandler(value, error); - }, - ^(Cancelable * success, Cancelable * failure) { - return self.cppCluster.ReportAttributeLockState(success); - }, - true); -} - -- (void)readAttributeLockTypeWithCompletionHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))completionHandler -{ - new CHIPInt8uAttributeCallbackBridge( - self.callbackQueue, - ^(NSError * _Nullable error, id _Nullable value) { - completionHandler(value, error); - }, - ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = DoorLock::Attributes::LockType::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); -} - -- (void)subscribeAttributeLockTypeWithMinInterval:(uint16_t)minInterval - maxInterval:(uint16_t)maxInterval - responseHandler:(ResponseHandler)responseHandler -{ - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, responseHandler, ^(Cancelable * success, Cancelable * failure) { - return self.cppCluster.SubscribeAttributeLockType(success, failure, minInterval, maxInterval); - }); -} - -- (void)reportAttributeLockTypeWithResponseHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))responseHandler -{ - new CHIPInt8uAttributeCallbackBridge( - self.callbackQueue, - ^(NSError * _Nullable error, id _Nullable value) { - responseHandler(value, error); - }, - ^(Cancelable * success, Cancelable * failure) { - return self.cppCluster.ReportAttributeLockType(success); - }, - true); -} - - (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 7162d7dc269979..43b9c3fafb9154 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -864,43 +864,18 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPDoorLockClusterLockDoorParams : NSObject -@property (strong, nonatomic) NSData * _Nonnull pin; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterLockDoorResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSData * _Nullable pinCode; - (instancetype)init; @end @interface CHIPDoorLockClusterUnlockDoorParams : NSObject -@property (strong, nonatomic) NSData * _Nonnull pin; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterUnlockDoorResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterToggleParams : NSObject -@property (strong, nonatomic) NSString * _Nonnull pin; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterToggleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSData * _Nullable pinCode; - (instancetype)init; @end @interface CHIPDoorLockClusterUnlockWithTimeoutParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull timeoutInSeconds; -@property (strong, nonatomic) NSData * _Nonnull pin; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterUnlockWithTimeoutResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSNumber * _Nonnull timeout; +@property (strong, nonatomic) NSData * _Nullable pinCode; - (instancetype)init; @end @@ -920,7 +895,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetPinParams : NSObject +@interface CHIPDoorLockClusterSetPINCodeParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; @property (strong, nonatomic) NSNumber * _Nonnull userStatus; @property (strong, nonatomic) NSNumber * _Nonnull userType; @@ -928,36 +903,21 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetPinResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterGetPinParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull userId; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterGetPinResponseParams : NSObject +@interface CHIPDoorLockClusterGetPINCodeParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; -@property (strong, nonatomic) NSNumber * _Nonnull userStatus; -@property (strong, nonatomic) NSNumber * _Nonnull userType; -@property (strong, nonatomic) NSData * _Nonnull pin; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearPinParams : NSObject +@interface CHIPDoorLockClusterGetPINCodeResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; +@property (strong, nonatomic) NSNumber * _Nullable userStatus; +@property (strong, nonatomic) NSNumber * _Nullable userType; +@property (strong, nonatomic) NSData * _Nullable pin; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearPinResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterClearAllPinsResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterClearPINCodeParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull pinSlotIndex; - (instancetype)init; @end @@ -967,11 +927,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetUserStatusResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - @interface CHIPDoorLockClusterGetUserStatusParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; - (instancetype)init; @@ -979,13 +934,13 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPDoorLockClusterGetUserStatusResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSNumber * _Nonnull userStatus; - (instancetype)init; @end -@interface CHIPDoorLockClusterSetWeekdayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterSetWeekDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; @property (strong, nonatomic) NSNumber * _Nonnull daysMask; @property (strong, nonatomic) NSNumber * _Nonnull startHour; @property (strong, nonatomic) NSNumber * _Nonnull startMinute; @@ -994,20 +949,15 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetWeekdayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterGetWeekdayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterGetWeekDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterGetWeekdayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterGetWeekDayScheduleResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; @property (strong, nonatomic) NSNumber * _Nonnull status; @property (strong, nonatomic) NSNumber * _Nonnull daysMask; @property (strong, nonatomic) NSNumber * _Nonnull startHour; @@ -1017,90 +967,65 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterClearWeekdayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterClearWeekdayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterClearWeekDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull weekDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterSetYeardayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterSetYearDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; @property (strong, nonatomic) NSNumber * _Nonnull localStartTime; @property (strong, nonatomic) NSNumber * _Nonnull localEndTime; - (instancetype)init; @end -@interface CHIPDoorLockClusterSetYeardayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterGetYeardayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterGetYearDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterGetYeardayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterGetYearDayScheduleResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; @property (strong, nonatomic) NSNumber * _Nonnull status; @property (strong, nonatomic) NSNumber * _Nonnull localStartTime; @property (strong, nonatomic) NSNumber * _Nonnull localEndTime; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearYeardayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -@property (strong, nonatomic) NSNumber * _Nonnull userId; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterClearYeardayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterClearYearDayScheduleParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull yearDayIndex; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end @interface CHIPDoorLockClusterSetHolidayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; +@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex; @property (strong, nonatomic) NSNumber * _Nonnull localStartTime; @property (strong, nonatomic) NSNumber * _Nonnull localEndTime; -@property (strong, nonatomic) NSNumber * _Nonnull operatingModeDuringHoliday; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterSetHolidayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSNumber * _Nonnull operatingMode; - (instancetype)init; @end @interface CHIPDoorLockClusterGetHolidayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; +@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex; - (instancetype)init; @end @interface CHIPDoorLockClusterGetHolidayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; +@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex; @property (strong, nonatomic) NSNumber * _Nonnull status; @property (strong, nonatomic) NSNumber * _Nonnull localStartTime; @property (strong, nonatomic) NSNumber * _Nonnull localEndTime; -@property (strong, nonatomic) NSNumber * _Nonnull operatingModeDuringHoliday; +@property (strong, nonatomic) NSNumber * _Nonnull operatingMode; - (instancetype)init; @end @interface CHIPDoorLockClusterClearHolidayScheduleParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull scheduleId; -- (instancetype)init; -@end - -@interface CHIPDoorLockClusterClearHolidayScheduleResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSNumber * _Nonnull holidayIndex; - (instancetype)init; @end @@ -1110,11 +1035,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetUserTypeResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - @interface CHIPDoorLockClusterGetUserTypeParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; - (instancetype)init; @@ -1126,66 +1046,119 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPDoorLockClusterSetRfidParams : NSObject +@interface CHIPDoorLockClusterSetRFIDCodeParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; @property (strong, nonatomic) NSNumber * _Nonnull userStatus; @property (strong, nonatomic) NSNumber * _Nonnull userType; -@property (strong, nonatomic) NSData * _Nonnull id; +@property (strong, nonatomic) NSData * _Nonnull rfidCode; - (instancetype)init; @end -@interface CHIPDoorLockClusterSetRfidResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterGetRFIDCodeParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull userId; - (instancetype)init; @end -@interface CHIPDoorLockClusterGetRfidParams : NSObject +@interface CHIPDoorLockClusterGetRFIDCodeResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull userId; +@property (strong, nonatomic) NSNumber * _Nullable userStatus; +@property (strong, nonatomic) NSNumber * _Nullable userType; +@property (strong, nonatomic) NSData * _Nullable rfidCode; - (instancetype)init; @end -@interface CHIPDoorLockClusterGetRfidResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterClearRFIDCodeParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull rfidSlotIndex; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterSetUserParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull operationType; +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; +@property (strong, nonatomic) NSString * _Nullable userName; +@property (strong, nonatomic) NSNumber * _Nullable userUniqueId; @property (strong, nonatomic) NSNumber * _Nonnull userStatus; @property (strong, nonatomic) NSNumber * _Nonnull userType; -@property (strong, nonatomic) NSData * _Nonnull rfid; +@property (strong, nonatomic) NSNumber * _Nullable credentialRule; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearRfidParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull userId; +@interface CHIPDoorLockClusterGetUserParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearRfidResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterGetUserResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; +@property (strong, nonatomic) NSString * _Nullable userName; +@property (strong, nonatomic) NSNumber * _Nullable userUniqueId; +@property (strong, nonatomic) NSNumber * _Nullable userStatus; +@property (strong, nonatomic) NSNumber * _Nullable userType; +@property (strong, nonatomic) NSNumber * _Nullable credentialRule; +@property (strong, nonatomic) NSArray * _Nullable credentials; +@property (strong, nonatomic) NSNumber * _Nullable creatorFabricIndex; +@property (strong, nonatomic) NSNumber * _Nullable lastModifiedFabricIndex; +@property (strong, nonatomic) NSNumber * _Nonnull nextUserIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterClearAllRfidsResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; +@interface CHIPDoorLockClusterClearUserParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull userIndex; - (instancetype)init; @end -@interface CHIPDoorLockClusterOperationEventNotificationParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull source; -@property (strong, nonatomic) NSNumber * _Nonnull eventCode; +@interface CHIPDoorLockClusterOperatingEventNotificationParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull operationEventSource; +@property (strong, nonatomic) NSNumber * _Nonnull operationEventCode; @property (strong, nonatomic) NSNumber * _Nonnull userId; @property (strong, nonatomic) NSData * _Nonnull pin; -@property (strong, nonatomic) NSNumber * _Nonnull timeStamp; -@property (strong, nonatomic) NSString * _Nonnull data; +@property (strong, nonatomic) NSNumber * _Nonnull localTime; +@property (strong, nonatomic) NSString * _Nullable data; - (instancetype)init; @end @interface CHIPDoorLockClusterProgrammingEventNotificationParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull source; -@property (strong, nonatomic) NSNumber * _Nonnull eventCode; +@property (strong, nonatomic) NSNumber * _Nonnull programEventSource; +@property (strong, nonatomic) NSNumber * _Nonnull programEventCode; @property (strong, nonatomic) NSNumber * _Nonnull userId; @property (strong, nonatomic) NSData * _Nonnull pin; @property (strong, nonatomic) NSNumber * _Nonnull userType; @property (strong, nonatomic) NSNumber * _Nonnull userStatus; -@property (strong, nonatomic) NSNumber * _Nonnull timeStamp; -@property (strong, nonatomic) NSString * _Nonnull data; +@property (strong, nonatomic) NSNumber * _Nonnull localTime; +@property (strong, nonatomic) NSString * _Nullable data; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterSetCredentialParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull operationType; +@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential; +@property (strong, nonatomic) NSData * _Nonnull credentialData; +@property (strong, nonatomic) NSNumber * _Nullable userIndex; +@property (strong, nonatomic) NSNumber * _Nullable userStatus; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterSetCredentialResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull status; +@property (strong, nonatomic) NSNumber * _Nullable userIndex; +@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterGetCredentialStatusParams : NSObject +@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterGetCredentialStatusResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull credentialExists; +@property (strong, nonatomic) NSNumber * _Nullable userIndex; +@property (strong, nonatomic) NSNumber * _Nullable nextCredentialIndex; +- (instancetype)init; +@end + +@interface CHIPDoorLockClusterClearCredentialParams : NSObject +@property (strong, nonatomic) CHIPDoorLockClusterDlCredential * _Nonnull credential; - (instancetype)init; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index 7d34f5b44d8fe6..21fb7e38e07c2f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -1829,18 +1829,7 @@ - (instancetype)init { if (self = [super init]) { - _pin = [NSData data]; - } - return self; -} -@end - -@implementation CHIPDoorLockClusterLockDoorResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); + _pinCode = nil; } return self; } @@ -1851,40 +1840,7 @@ - (instancetype)init { if (self = [super init]) { - _pin = [NSData data]; - } - return self; -} -@end - -@implementation CHIPDoorLockClusterUnlockDoorResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - } - return self; -} -@end - -@implementation CHIPDoorLockClusterToggleParams -- (instancetype)init -{ - if (self = [super init]) { - - _pin = @""; - } - return self; -} -@end - -@implementation CHIPDoorLockClusterToggleResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); + _pinCode = nil; } return self; } @@ -1895,20 +1851,9 @@ - (instancetype)init { if (self = [super init]) { - _timeoutInSeconds = @(0); - - _pin = [NSData data]; - } - return self; -} -@end - -@implementation CHIPDoorLockClusterUnlockWithTimeoutResponseParams -- (instancetype)init -{ - if (self = [super init]) { + _timeout = @(0); - _status = @(0); + _pinCode = nil; } return self; } @@ -1948,7 +1893,7 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterSetPinParams +@implementation CHIPDoorLockClusterSetPINCodeParams - (instancetype)init { if (self = [super init]) { @@ -1965,18 +1910,7 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterSetPinResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - } - return self; -} -@end - -@implementation CHIPDoorLockClusterGetPinParams +@implementation CHIPDoorLockClusterGetPINCodeParams - (instancetype)init { if (self = [super init]) { @@ -1987,51 +1921,29 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterGetPinResponseParams +@implementation CHIPDoorLockClusterGetPINCodeResponseParams - (instancetype)init { if (self = [super init]) { _userId = @(0); - _userStatus = @(0); - - _userType = @(0); - - _pin = [NSData data]; - } - return self; -} -@end - -@implementation CHIPDoorLockClusterClearPinParams -- (instancetype)init -{ - if (self = [super init]) { - - _userId = @(0); - } - return self; -} -@end + _userStatus = nil; -@implementation CHIPDoorLockClusterClearPinResponseParams -- (instancetype)init -{ - if (self = [super init]) { + _userType = nil; - _status = @(0); + _pin = nil; } return self; } @end -@implementation CHIPDoorLockClusterClearAllPinsResponseParams +@implementation CHIPDoorLockClusterClearPINCodeParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _pinSlotIndex = @(0); } return self; } @@ -2050,17 +1962,6 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterSetUserStatusResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - } - return self; -} -@end - @implementation CHIPDoorLockClusterGetUserStatusParams - (instancetype)init { @@ -2079,20 +1980,20 @@ - (instancetype)init _userId = @(0); - _status = @(0); + _userStatus = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetWeekdayScheduleParams +@implementation CHIPDoorLockClusterSetWeekDayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _weekDayIndex = @(0); - _userId = @(0); + _userIndex = @(0); _daysMask = @(0); @@ -2108,38 +2009,27 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterSetWeekdayScheduleResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - } - return self; -} -@end - -@implementation CHIPDoorLockClusterGetWeekdayScheduleParams +@implementation CHIPDoorLockClusterGetWeekDayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _weekDayIndex = @(0); - _userId = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetWeekdayScheduleResponseParams +@implementation CHIPDoorLockClusterGetWeekDayScheduleResponseParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _weekDayIndex = @(0); - _userId = @(0); + _userIndex = @(0); _status = @(0); @@ -2157,372 +2047,418 @@ - (instancetype)init } @end -@implementation CHIPDoorLockClusterClearWeekdayScheduleParams +@implementation CHIPDoorLockClusterClearWeekDayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _weekDayIndex = @(0); - _userId = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterClearWeekdayScheduleResponseParams +@implementation CHIPDoorLockClusterSetYearDayScheduleParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _yearDayIndex = @(0); + + _userIndex = @(0); + + _localStartTime = @(0); + + _localEndTime = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetYeardayScheduleParams +@implementation CHIPDoorLockClusterGetYearDayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); - - _userId = @(0); - - _localStartTime = @(0); + _yearDayIndex = @(0); - _localEndTime = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetYeardayScheduleResponseParams +@implementation CHIPDoorLockClusterGetYearDayScheduleResponseParams - (instancetype)init { if (self = [super init]) { + _yearDayIndex = @(0); + + _userIndex = @(0); + _status = @(0); + + _localStartTime = @(0); + + _localEndTime = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetYeardayScheduleParams +@implementation CHIPDoorLockClusterClearYearDayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _yearDayIndex = @(0); - _userId = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetYeardayScheduleResponseParams +@implementation CHIPDoorLockClusterSetHolidayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); - - _userId = @(0); - - _status = @(0); + _holidayIndex = @(0); _localStartTime = @(0); _localEndTime = @(0); + + _operatingMode = @(0); } return self; } @end -@implementation CHIPDoorLockClusterClearYeardayScheduleParams +@implementation CHIPDoorLockClusterGetHolidayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); - - _userId = @(0); + _holidayIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterClearYeardayScheduleResponseParams +@implementation CHIPDoorLockClusterGetHolidayScheduleResponseParams - (instancetype)init { if (self = [super init]) { + _holidayIndex = @(0); + _status = @(0); + + _localStartTime = @(0); + + _localEndTime = @(0); + + _operatingMode = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetHolidayScheduleParams +@implementation CHIPDoorLockClusterClearHolidayScheduleParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); - - _localStartTime = @(0); - - _localEndTime = @(0); - - _operatingModeDuringHoliday = @(0); + _holidayIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetHolidayScheduleResponseParams +@implementation CHIPDoorLockClusterSetUserTypeParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _userId = @(0); + + _userType = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetHolidayScheduleParams +@implementation CHIPDoorLockClusterGetUserTypeParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _userId = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetHolidayScheduleResponseParams +@implementation CHIPDoorLockClusterGetUserTypeResponseParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); - - _status = @(0); - - _localStartTime = @(0); - - _localEndTime = @(0); + _userId = @(0); - _operatingModeDuringHoliday = @(0); + _userType = @(0); } return self; } @end -@implementation CHIPDoorLockClusterClearHolidayScheduleParams +@implementation CHIPDoorLockClusterSetRFIDCodeParams - (instancetype)init { if (self = [super init]) { - _scheduleId = @(0); + _userId = @(0); + + _userStatus = @(0); + + _userType = @(0); + + _rfidCode = [NSData data]; } return self; } @end -@implementation CHIPDoorLockClusterClearHolidayScheduleResponseParams +@implementation CHIPDoorLockClusterGetRFIDCodeParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _userId = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetUserTypeParams +@implementation CHIPDoorLockClusterGetRFIDCodeResponseParams - (instancetype)init { if (self = [super init]) { _userId = @(0); - _userType = @(0); + _userStatus = nil; + + _userType = nil; + + _rfidCode = nil; } return self; } @end -@implementation CHIPDoorLockClusterSetUserTypeResponseParams +@implementation CHIPDoorLockClusterClearRFIDCodeParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _rfidSlotIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetUserTypeParams +@implementation CHIPDoorLockClusterSetUserParams - (instancetype)init { if (self = [super init]) { - _userId = @(0); + _operationType = @(0); + + _userIndex = @(0); + + _userName = nil; + + _userUniqueId = nil; + + _userStatus = @(0); + + _userType = @(0); + + _credentialRule = nil; } return self; } @end -@implementation CHIPDoorLockClusterGetUserTypeResponseParams +@implementation CHIPDoorLockClusterGetUserParams - (instancetype)init { if (self = [super init]) { - _userId = @(0); - - _userType = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetRfidParams +@implementation CHIPDoorLockClusterGetUserResponseParams - (instancetype)init { if (self = [super init]) { - _userId = @(0); + _userIndex = @(0); - _userStatus = @(0); + _userName = nil; - _userType = @(0); + _userUniqueId = nil; + + _userStatus = nil; + + _userType = nil; + + _credentialRule = nil; + + _credentials = nil; + + _creatorFabricIndex = nil; - _id = [NSData data]; + _lastModifiedFabricIndex = nil; + + _nextUserIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterSetRfidResponseParams +@implementation CHIPDoorLockClusterClearUserParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _userIndex = @(0); } return self; } @end -@implementation CHIPDoorLockClusterGetRfidParams +@implementation CHIPDoorLockClusterOperatingEventNotificationParams - (instancetype)init { if (self = [super init]) { + _operationEventSource = @(0); + + _operationEventCode = @(0); + _userId = @(0); + + _pin = [NSData data]; + + _localTime = @(0); + + _data = nil; } return self; } @end -@implementation CHIPDoorLockClusterGetRfidResponseParams +@implementation CHIPDoorLockClusterProgrammingEventNotificationParams - (instancetype)init { if (self = [super init]) { + _programEventSource = @(0); + + _programEventCode = @(0); + _userId = @(0); - _userStatus = @(0); + _pin = [NSData data]; _userType = @(0); - _rfid = [NSData data]; + _userStatus = @(0); + + _localTime = @(0); + + _data = nil; } return self; } @end -@implementation CHIPDoorLockClusterClearRfidParams +@implementation CHIPDoorLockClusterSetCredentialParams - (instancetype)init { if (self = [super init]) { - _userId = @(0); + _operationType = @(0); + + _credential = [CHIPDoorLockClusterDlCredential new]; + + _credentialData = [NSData data]; + + _userIndex = nil; + + _userStatus = nil; } return self; } @end -@implementation CHIPDoorLockClusterClearRfidResponseParams +@implementation CHIPDoorLockClusterSetCredentialResponseParams - (instancetype)init { if (self = [super init]) { _status = @(0); + + _userIndex = nil; + + _nextCredentialIndex = nil; } return self; } @end -@implementation CHIPDoorLockClusterClearAllRfidsResponseParams +@implementation CHIPDoorLockClusterGetCredentialStatusParams - (instancetype)init { if (self = [super init]) { - _status = @(0); + _credential = [CHIPDoorLockClusterDlCredential new]; } return self; } @end -@implementation CHIPDoorLockClusterOperationEventNotificationParams +@implementation CHIPDoorLockClusterGetCredentialStatusResponseParams - (instancetype)init { if (self = [super init]) { - _source = @(0); - - _eventCode = @(0); - - _userId = @(0); + _credentialExists = @(0); - _pin = [NSData data]; - - _timeStamp = @(0); + _userIndex = nil; - _data = @""; + _nextCredentialIndex = nil; } return self; } @end -@implementation CHIPDoorLockClusterProgrammingEventNotificationParams +@implementation CHIPDoorLockClusterClearCredentialParams - (instancetype)init { if (self = [super init]) { - _source = @(0); - - _eventCode = @(0); - - _userId = @(0); - - _pin = [NSData data]; - - _userType = @(0); - - _userStatus = @(0); - - _timeStamp = @(0); - - _data = @""; + _credential = [CHIPDoorLockClusterDlCredential new]; } return self; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index 14bab1b5a81c82..3db676581fb675 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -219,6 +219,12 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end +@interface CHIPDoorLockClusterDlCredential : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull credentialType; +@property (strong, nonatomic) NSNumber * _Nonnull credentialIndex; +- (instancetype)init; +@end + @interface CHIPIasAceClusterIasAceZoneStatusResult : NSObject @property (strong, nonatomic) NSNumber * _Nonnull zoneId; @property (strong, nonatomic) NSNumber * _Nonnull zoneStatus; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 1f8a534ebd9474..058c1dbb6af809 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -434,6 +434,19 @@ - (instancetype)init } @end +@implementation CHIPDoorLockClusterDlCredential +- (instancetype)init +{ + if (self = [super init]) { + + _credentialType = @(0); + + _credentialIndex = @(0); + } + return self; +} +@end + @implementation CHIPIasAceClusterIasAceZoneStatusResult - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h index 6a738cdb34b1b5..aca21a7a489f5d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h @@ -294,7 +294,7 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPTestDoorLock : CHIPDoorLock -- (void)writeAttributeLockStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeLockTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeActuatorEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm index 990a4ee32561d8..d4fcab97b05ac8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm @@ -2493,7 +2493,7 @@ @implementation CHIPTestDoorLock return &_cppCluster; } -- (void)writeAttributeLockStateWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeLockStateWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -2504,7 +2504,12 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = DoorLock::Attributes::LockState::TypeInfo; TypeInfo::Type cppValue; - cppValue = static_cast>(value.unsignedCharValue); + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = static_cast>(value.unsignedCharValue); + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 3fce4a0cebe43c..791268d6715d06 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -34607,54 +34607,6 @@ - (void)testSendClusterDescriptorReadAttributeClusterRevisionWithCompletionHandl [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterDoorLockReadAttributeLockStateWithCompletionHandler -{ - dispatch_queue_t queue = dispatch_get_main_queue(); - - XCTestExpectation * connectedExpectation = - [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; - WaitForCommissionee(connectedExpectation, queue); - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; - - CHIPDevice * device = GetConnectedDevice(); - CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:1 queue:queue]; - XCTAssertNotNil(cluster); - - XCTestExpectation * expectation = [self expectationWithDescription:@"DoorLockReadAttributeLockStateWithCompletionHandler"]; - - [cluster readAttributeLockStateWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"DoorLock LockState Error: %@", err); - XCTAssertEqual(err.code, 0); - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} - -- (void)testSendClusterDoorLockReadAttributeLockTypeWithCompletionHandler -{ - dispatch_queue_t queue = dispatch_get_main_queue(); - - XCTestExpectation * connectedExpectation = - [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; - WaitForCommissionee(connectedExpectation, queue); - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; - - CHIPDevice * device = GetConnectedDevice(); - CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:1 queue:queue]; - XCTAssertNotNil(cluster); - - XCTestExpectation * expectation = [self expectationWithDescription:@"DoorLockReadAttributeLockTypeWithCompletionHandler"]; - - [cluster readAttributeLockTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"DoorLock LockType Error: %@", err); - XCTAssertEqual(err.code, 0); - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} - - (void)testSendClusterDoorLockReadAttributeActuatorEnabledWithCompletionHandler { dispatch_queue_t queue = dispatch_get_main_queue(); diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index ee163b34d597d1..f125b0f5eec346 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -468,21 +468,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ClearAllPins::Id: { - Commands::ClearAllPins::DecodableType commandData; + case Commands::ClearAllPINCodes::Id: { + Commands::ClearAllPINCodes::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearAllPinsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearAllPINCodesCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearAllRfids::Id: { - Commands::ClearAllRfids::DecodableType commandData; + case Commands::ClearAllRFIDCodes::Id: { + Commands::ClearAllRFIDCodes::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearAllRFIDCodesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -495,39 +495,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ClearPin::Id: { - Commands::ClearPin::DecodableType commandData; + case Commands::ClearPINCode::Id: { + Commands::ClearPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearRfid::Id: { - Commands::ClearRfid::DecodableType commandData; + case Commands::ClearRFIDCode::Id: { + Commands::ClearRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearWeekdaySchedule::Id: { - Commands::ClearWeekdaySchedule::DecodableType commandData; + case Commands::ClearWeekDaySchedule::Id: { + Commands::ClearWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearYeardaySchedule::Id: { - Commands::ClearYeardaySchedule::DecodableType commandData; + case Commands::ClearYearDaySchedule::Id: { + Commands::ClearYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -549,21 +549,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetPin::Id: { - Commands::GetPin::DecodableType commandData; + case Commands::GetPINCode::Id: { + Commands::GetPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetRfid::Id: { - Commands::GetRfid::DecodableType commandData; + case Commands::GetRFIDCode::Id: { + Commands::GetRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -576,21 +576,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetWeekdaySchedule::Id: { - Commands::GetWeekdaySchedule::DecodableType commandData; + case Commands::GetWeekDaySchedule::Id: { + Commands::GetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetYeardaySchedule::Id: { - Commands::GetYeardaySchedule::DecodableType commandData; + case Commands::GetYearDaySchedule::Id: { + Commands::GetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -612,21 +612,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetPin::Id: { - Commands::SetPin::DecodableType commandData; + case Commands::SetPINCode::Id: { + Commands::SetPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRfid::Id: { - Commands::SetRfid::DecodableType commandData; + case Commands::SetRFIDCode::Id: { + Commands::SetRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -639,21 +639,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetWeekdaySchedule::Id: { - Commands::SetWeekdaySchedule::DecodableType commandData; + case Commands::SetWeekDaySchedule::Id: { + Commands::SetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetYeardaySchedule::Id: { - Commands::SetYeardaySchedule::DecodableType commandData; + case Commands::SetYearDaySchedule::Id: { + Commands::SetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } 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 4f1b02239b9f02..07b38ca460f077 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -355,38 +355,43 @@ /* 1410 - Description, */ \ 6, 'C', 'o', 'f', 'f', 'e', 'e', \ \ + /* Endpoint: 1, Cluster: Door Lock (server), big-endian */ \ + \ + /* 1417 - AutoRelockTime, */ \ + 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 1, Cluster: Window Covering (server), big-endian */ \ \ - /* 1417 - FeatureMap, */ \ + /* 1421 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server), big-endian */ \ \ - /* 1421 - LifetimeRunningHours, */ \ + /* 1425 - LifetimeRunningHours, */ \ 0x00, 0x00, 0x00, \ \ - /* 1424 - Power, */ \ + /* 1428 - Power, */ \ 0x00, 0x00, 0x00, \ \ - /* 1427 - LifetimeEnergyConsumed, */ \ + /* 1431 - LifetimeEnergyConsumed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 1431 - FeatureMap, */ \ + /* 1435 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Thermostat (server), big-endian */ \ \ - /* 1435 - FeatureMap, */ \ + /* 1439 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x0B, \ \ /* Endpoint: 1, Cluster: IAS Zone (server), big-endian */ \ \ - /* 1439 - IAS CIE address, */ \ + /* 1443 - IAS CIE address, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: TV Channel (server), big-endian */ \ \ - /* 1447 - tv channel list, */ \ + /* 1451 - tv channel list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -404,7 +409,7 @@ \ /* Endpoint: 1, Cluster: Target Navigator (server), big-endian */ \ \ - /* 1701 - target navigator list, */ \ + /* 1705 - target navigator list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -422,30 +427,30 @@ \ /* Endpoint: 1, Cluster: Media Playback (server), big-endian */ \ \ - /* 1955 - start time, */ \ + /* 1959 - start time, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, \ \ - /* 1963 - duration, */ \ + /* 1967 - duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1971 - position updated at, */ \ + /* 1975 - position updated at, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1979 - position, */ \ + /* 1983 - position, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1987 - playback speed, */ \ + /* 1991 - playback speed, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1995 - seek range end, */ \ + /* 1999 - seek range end, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2003 - seek range start, */ \ + /* 2007 - seek range start, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Media Input (server), big-endian */ \ \ - /* 2011 - media input list, */ \ + /* 2015 - media input list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -463,7 +468,7 @@ \ /* Endpoint: 1, Cluster: Content Launcher (server), big-endian */ \ \ - /* 2265 - accepts header list, */ \ + /* 2269 - accepts header list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -479,7 +484,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2519 - supported streaming types, */ \ + /* 2523 - supported streaming types, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -497,7 +502,7 @@ \ /* Endpoint: 1, Cluster: Audio Output (server), big-endian */ \ \ - /* 2773 - audio output list, */ \ + /* 2777 - audio output list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -515,7 +520,7 @@ \ /* Endpoint: 1, Cluster: Application Launcher (server), big-endian */ \ \ - /* 3027 - application launcher list, */ \ + /* 3031 - application launcher list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -533,119 +538,119 @@ \ /* Endpoint: 1, Cluster: Test Cluster (server), big-endian */ \ \ - /* 3281 - bitmap32, */ \ + /* 3285 - bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3285 - bitmap64, */ \ + /* 3289 - bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3293 - int24u, */ \ + /* 3297 - int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3296 - int32u, */ \ + /* 3300 - int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3300 - int40u, */ \ + /* 3304 - int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3305 - int48u, */ \ + /* 3309 - int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3311 - int56u, */ \ + /* 3315 - int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3318 - int64u, */ \ + /* 3322 - int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3326 - int24s, */ \ + /* 3330 - int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3329 - int32s, */ \ + /* 3333 - int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3333 - int40s, */ \ + /* 3337 - int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3338 - int48s, */ \ + /* 3342 - int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3344 - int56s, */ \ + /* 3348 - int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3351 - int64s, */ \ + /* 3355 - int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3359 - float_single, */ \ + /* 3363 - float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3363 - float_double, */ \ + /* 3367 - float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3371 - epoch_us, */ \ + /* 3375 - epoch_us, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3379 - epoch_s, */ \ + /* 3383 - epoch_s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3383 - nullable_bitmap32, */ \ + /* 3387 - nullable_bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3387 - nullable_bitmap64, */ \ + /* 3391 - nullable_bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3395 - nullable_int24u, */ \ + /* 3399 - nullable_int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3398 - nullable_int32u, */ \ + /* 3402 - nullable_int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3402 - nullable_int40u, */ \ + /* 3406 - nullable_int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3407 - nullable_int48u, */ \ + /* 3411 - nullable_int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3413 - nullable_int56u, */ \ + /* 3417 - nullable_int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3420 - nullable_int64u, */ \ + /* 3424 - nullable_int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3428 - nullable_int24s, */ \ + /* 3432 - nullable_int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3431 - nullable_int32s, */ \ + /* 3435 - nullable_int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3435 - nullable_int40s, */ \ + /* 3439 - nullable_int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3440 - nullable_int48s, */ \ + /* 3444 - nullable_int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3446 - nullable_int56s, */ \ + /* 3450 - nullable_int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3453 - nullable_int64s, */ \ + /* 3457 - nullable_int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3461 - nullable_float_single, */ \ + /* 3465 - nullable_float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3465 - nullable_float_double, */ \ + /* 3469 - nullable_float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server), big-endian */ \ \ - /* 3473 - measurement type, */ \ + /* 3477 - measurement type, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3477 - total active power, */ \ + /* 3481 - total active power, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: On/Off (server), big-endian */ \ \ - /* 3481 - FeatureMap, */ \ + /* 3485 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ } @@ -981,38 +986,43 @@ /* 1410 - Description, */ \ 6, 'C', 'o', 'f', 'f', 'e', 'e', \ \ + /* Endpoint: 1, Cluster: Door Lock (server), little-endian */ \ + \ + /* 1417 - AutoRelockTime, */ \ + 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 1, Cluster: Window Covering (server), little-endian */ \ \ - /* 1417 - FeatureMap, */ \ + /* 1421 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server), little-endian */ \ \ - /* 1421 - LifetimeRunningHours, */ \ + /* 1425 - LifetimeRunningHours, */ \ 0x00, 0x00, 0x00, \ \ - /* 1424 - Power, */ \ + /* 1428 - Power, */ \ 0x00, 0x00, 0x00, \ \ - /* 1427 - LifetimeEnergyConsumed, */ \ + /* 1431 - LifetimeEnergyConsumed, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 1431 - FeatureMap, */ \ + /* 1435 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Thermostat (server), little-endian */ \ \ - /* 1435 - FeatureMap, */ \ + /* 1439 - FeatureMap, */ \ 0x0B, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: IAS Zone (server), little-endian */ \ \ - /* 1439 - IAS CIE address, */ \ + /* 1443 - IAS CIE address, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: TV Channel (server), little-endian */ \ \ - /* 1447 - tv channel list, */ \ + /* 1451 - tv channel list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1030,7 +1040,7 @@ \ /* Endpoint: 1, Cluster: Target Navigator (server), little-endian */ \ \ - /* 1701 - target navigator list, */ \ + /* 1705 - target navigator list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1048,30 +1058,30 @@ \ /* Endpoint: 1, Cluster: Media Playback (server), little-endian */ \ \ - /* 1955 - start time, */ \ + /* 1959 - start time, */ \ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1963 - duration, */ \ + /* 1967 - duration, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1971 - position updated at, */ \ + /* 1975 - position updated at, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1979 - position, */ \ + /* 1983 - position, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1987 - playback speed, */ \ + /* 1991 - playback speed, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 1995 - seek range end, */ \ + /* 1999 - seek range end, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2003 - seek range start, */ \ + /* 2007 - seek range start, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Media Input (server), little-endian */ \ \ - /* 2011 - media input list, */ \ + /* 2015 - media input list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1089,7 +1099,7 @@ \ /* Endpoint: 1, Cluster: Content Launcher (server), little-endian */ \ \ - /* 2265 - accepts header list, */ \ + /* 2269 - accepts header list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1105,7 +1115,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2519 - supported streaming types, */ \ + /* 2523 - supported streaming types, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1123,7 +1133,7 @@ \ /* Endpoint: 1, Cluster: Audio Output (server), little-endian */ \ \ - /* 2773 - audio output list, */ \ + /* 2777 - audio output list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1141,7 +1151,7 @@ \ /* Endpoint: 1, Cluster: Application Launcher (server), little-endian */ \ \ - /* 3027 - application launcher list, */ \ + /* 3031 - application launcher list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1159,125 +1169,125 @@ \ /* Endpoint: 1, Cluster: Test Cluster (server), little-endian */ \ \ - /* 3281 - bitmap32, */ \ + /* 3285 - bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3285 - bitmap64, */ \ + /* 3289 - bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3293 - int24u, */ \ + /* 3297 - int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3296 - int32u, */ \ + /* 3300 - int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3300 - int40u, */ \ + /* 3304 - int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3305 - int48u, */ \ + /* 3309 - int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3311 - int56u, */ \ + /* 3315 - int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3318 - int64u, */ \ + /* 3322 - int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3326 - int24s, */ \ + /* 3330 - int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3329 - int32s, */ \ + /* 3333 - int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3333 - int40s, */ \ + /* 3337 - int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3338 - int48s, */ \ + /* 3342 - int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3344 - int56s, */ \ + /* 3348 - int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3351 - int64s, */ \ + /* 3355 - int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3359 - float_single, */ \ + /* 3363 - float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3363 - float_double, */ \ + /* 3367 - float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3371 - epoch_us, */ \ + /* 3375 - epoch_us, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3379 - epoch_s, */ \ + /* 3383 - epoch_s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3383 - nullable_bitmap32, */ \ + /* 3387 - nullable_bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3387 - nullable_bitmap64, */ \ + /* 3391 - nullable_bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3395 - nullable_int24u, */ \ + /* 3399 - nullable_int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3398 - nullable_int32u, */ \ + /* 3402 - nullable_int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3402 - nullable_int40u, */ \ + /* 3406 - nullable_int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3407 - nullable_int48u, */ \ + /* 3411 - nullable_int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3413 - nullable_int56u, */ \ + /* 3417 - nullable_int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3420 - nullable_int64u, */ \ + /* 3424 - nullable_int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3428 - nullable_int24s, */ \ + /* 3432 - nullable_int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3431 - nullable_int32s, */ \ + /* 3435 - nullable_int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3435 - nullable_int40s, */ \ + /* 3439 - nullable_int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3440 - nullable_int48s, */ \ + /* 3444 - nullable_int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3446 - nullable_int56s, */ \ + /* 3450 - nullable_int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3453 - nullable_int64s, */ \ + /* 3457 - nullable_int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3461 - nullable_float_single, */ \ + /* 3465 - nullable_float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3465 - nullable_float_double, */ \ + /* 3469 - nullable_float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server), little-endian */ \ \ - /* 3473 - measurement type, */ \ + /* 3477 - measurement type, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3477 - total active power, */ \ + /* 3481 - total active power, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: On/Off (server), little-endian */ \ \ - /* 3481 - FeatureMap, */ \ + /* 3485 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (140) +#define GENERATED_DEFAULTS_COUNT (141) #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -1298,7 +1308,7 @@ } // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 35 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 36 #define GENERATED_MIN_MAX_DEFAULTS \ { \ \ @@ -1317,6 +1327,9 @@ /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* out of service */ \ \ + /* Endpoint: 1, Cluster: Door Lock (server) */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x4 }, /* OperatingMode */ \ + \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xF }, /* Mode */ \ \ @@ -1364,7 +1377,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 564 +#define GENERATED_ATTRIBUTE_COUNT 568 #define GENERATED_ATTRIBUTES \ { \ \ @@ -1705,10 +1718,15 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ - { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* lock state */ \ - { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* lock type */ \ - { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* actuator enabled */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ + { 0x0000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(2) }, /* LockState */ \ + { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* LockType */ \ + { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* ActuatorEnabled */ \ + { 0x0010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) }, /* NumberOfLogRecordsSupported */ \ + { 0x0023, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1417) }, /* AutoRelockTime */ \ + { 0x0025, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* OperatingMode */ \ + { 0x0026, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFF6) }, /* SupportedOperatingModes */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Type */ \ @@ -1728,9 +1746,9 @@ { 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* InstalledOpenLimitTilt */ \ { 0x0013, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFFFF) }, /* InstalledClosedLimitTilt */ \ { 0x0017, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* Mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* Mode */ \ { 0x001A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* SafetyStatus */ \ - { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1417) }, /* FeatureMap */ \ + { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1421) }, /* FeatureMap */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Barrier Control (server) */ \ @@ -1760,16 +1778,16 @@ { 0x0013, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Capacity */ \ { 0x0014, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Speed */ \ { 0x0015, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(1421) }, /* LifetimeRunningHours */ \ - { 0x0016, ZAP_TYPE(INT24U), 3, 0, ZAP_LONG_DEFAULTS_INDEX(1424) }, /* Power */ \ + ZAP_LONG_DEFAULTS_INDEX(1425) }, /* LifetimeRunningHours */ \ + { 0x0016, ZAP_TYPE(INT24U), 3, 0, ZAP_LONG_DEFAULTS_INDEX(1428) }, /* Power */ \ { 0x0017, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(1427) }, /* LifetimeEnergyConsumed */ \ + ZAP_LONG_DEFAULTS_INDEX(1431) }, /* LifetimeEnergyConsumed */ \ { 0x0020, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* OperationMode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* OperationMode */ \ { 0x0021, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* ControlMode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* ControlMode */ \ { 0x0022, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* AlarmMask */ \ - { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1431) }, /* FeatureMap */ \ + { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1435) }, /* FeatureMap */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ @@ -1783,32 +1801,32 @@ { 0x0012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_SIMPLE_DEFAULT(0x07D0) }, /* occupied heating setpoint */ \ { 0x0015, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* min heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* min heat setpoint limit */ \ { 0x0016, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* max heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* max heat setpoint limit */ \ { 0x0017, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* min cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* min cool setpoint limit */ \ { 0x0018, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* max cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* max cool setpoint limit */ \ { 0x0019, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* min setpoint dead band */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* min setpoint dead band */ \ { 0x001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* control sequence of operation */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* control sequence of operation */ \ { 0x001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* system mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* system mode */ \ { 0x0020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* start of week */ \ { 0x0021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* number of weekly transitions */ \ { 0x0022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* number of daily transitions */ \ - { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1435) }, /* FeatureMap */ \ + { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(1439) }, /* FeatureMap */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x0000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* temperature display mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* temperature display mode */ \ { 0x0001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* keypad lockout */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(17) }, /* keypad lockout */ \ { 0x0002, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(17) }, /* schedule programming visibility */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(18) }, /* schedule programming visibility */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ @@ -1842,23 +1860,23 @@ { 0x0029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* primary 6 y */ \ { 0x002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* primary 6 intensity */ \ { 0x0030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(18) }, /* white point x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* white point x */ \ { 0x0031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* white point y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(20) }, /* white point y */ \ { 0x0032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(20) }, /* color point r x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(21) }, /* color point r x */ \ { 0x0033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(21) }, /* color point r y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(22) }, /* color point r y */ \ { 0x0034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point r intensity */ \ { 0x0036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(22) }, /* color point g x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(23) }, /* color point g x */ \ { 0x0037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(23) }, /* color point g y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(24) }, /* color point g y */ \ { 0x0038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point g intensity */ \ { 0x003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(24) }, /* color point b x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(25) }, /* color point b x */ \ { 0x003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(25) }, /* color point b y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(26) }, /* color point b y */ \ { 0x003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point b intensity */ \ { 0x4000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* enhanced current hue */ \ { 0x4001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* enhanced color mode */ \ @@ -1872,7 +1890,7 @@ { 0x400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* color temp physical max */ \ { 0x400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* couple color temp to level min-mireds */ \ { 0x4010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(26) }, /* start up color temperature mireds */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(27) }, /* start up color temperature mireds */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ @@ -1920,7 +1938,7 @@ { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* zone state */ \ { 0x0001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* zone type */ \ { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* zone status */ \ - { 0x0010, ZAP_TYPE(NODE_ID), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1439) }, /* IAS CIE address */ \ + { 0x0010, ZAP_TYPE(NODE_ID), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1443) }, /* IAS CIE address */ \ { 0x0011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) }, /* Zone ID */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ @@ -1929,28 +1947,28 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: TV Channel (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1447) }, /* tv channel list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1451) }, /* tv channel list */ \ { 0x0001, ZAP_TYPE(OCTET_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* tv channel lineup */ \ { 0x0002, ZAP_TYPE(OCTET_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* current tv channel */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1701) }, /* target navigator list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(1705) }, /* target navigator list */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* playback state */ \ - { 0x0001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1955) }, /* start time */ \ - { 0x0002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1963) }, /* duration */ \ - { 0x0003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1971) }, /* position updated at */ \ - { 0x0004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1979) }, /* position */ \ - { 0x0005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1987) }, /* playback speed */ \ - { 0x0006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1995) }, /* seek range end */ \ - { 0x0007, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2003) }, /* seek range start */ \ + { 0x0001, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1959) }, /* start time */ \ + { 0x0002, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1967) }, /* duration */ \ + { 0x0003, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1975) }, /* position updated at */ \ + { 0x0004, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1983) }, /* position */ \ + { 0x0005, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1991) }, /* playback speed */ \ + { 0x0006, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(1999) }, /* seek range end */ \ + { 0x0007, ZAP_TYPE(INT64U), 8, 0, ZAP_LONG_DEFAULTS_INDEX(2007) }, /* seek range start */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Media Input (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2011) }, /* media input list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2015) }, /* media input list */ \ { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current media input */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ @@ -1961,17 +1979,17 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2265) }, /* accepts header list */ \ - { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2519) }, /* supported streaming types */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2269) }, /* accepts header list */ \ + { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2523) }, /* supported streaming types */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2773) }, /* audio output list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2777) }, /* audio output list */ \ { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* current audio output */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(3027) }, /* application launcher list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(3031) }, /* application launcher list */ \ { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* catalog vendor id */ \ { 0x0002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* application id */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ @@ -1993,28 +2011,28 @@ { 0x0000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(false) }, /* boolean */ \ { 0x0001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* bitmap8 */ \ { 0x0002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* bitmap16 */ \ - { 0x0003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3281) }, /* bitmap32 */ \ - { 0x0004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3285) }, /* bitmap64 */ \ + { 0x0003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3285) }, /* bitmap32 */ \ + { 0x0004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3289) }, /* bitmap64 */ \ { 0x0005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int8u */ \ { 0x0006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int16u */ \ - { 0x0007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3293) }, /* int24u */ \ - { 0x0008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3296) }, /* int32u */ \ - { 0x0009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3300) }, /* int40u */ \ - { 0x000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3305) }, /* int48u */ \ - { 0x000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3311) }, /* int56u */ \ - { 0x000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3318) }, /* int64u */ \ + { 0x0007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3297) }, /* int24u */ \ + { 0x0008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3300) }, /* int32u */ \ + { 0x0009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3304) }, /* int40u */ \ + { 0x000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3309) }, /* int48u */ \ + { 0x000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3315) }, /* int56u */ \ + { 0x000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3322) }, /* int64u */ \ { 0x000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int8s */ \ { 0x000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int16s */ \ - { 0x000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3326) }, /* int24s */ \ - { 0x0010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3329) }, /* int32s */ \ - { 0x0011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3333) }, /* int40s */ \ - { 0x0012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3338) }, /* int48s */ \ - { 0x0013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3344) }, /* int56s */ \ - { 0x0014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3351) }, /* int64s */ \ + { 0x000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3330) }, /* int24s */ \ + { 0x0010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3333) }, /* int32s */ \ + { 0x0011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3337) }, /* int40s */ \ + { 0x0012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3342) }, /* int48s */ \ + { 0x0013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3348) }, /* int56s */ \ + { 0x0014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3355) }, /* int64s */ \ { 0x0015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* enum8 */ \ { 0x0016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* enum16 */ \ - { 0x0017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3359) }, /* float_single */ \ - { 0x0018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3363) }, /* float_double */ \ + { 0x0017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3363) }, /* float_single */ \ + { 0x0018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3367) }, /* float_double */ \ { 0x0019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* octet_string */ \ { 0x001A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* list_int8u */ \ @@ -2027,8 +2045,8 @@ { 0x001E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* char_string */ \ { 0x001F, ZAP_TYPE(LONG_CHAR_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* long_char_string */ \ - { 0x0020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3371) }, /* epoch_us */ \ - { 0x0021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3379) }, /* epoch_s */ \ + { 0x0020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3375) }, /* epoch_us */ \ + { 0x0021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(3383) }, /* epoch_s */ \ { 0x0022, ZAP_TYPE(VENDOR_ID), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* vendor_id */ \ { 0x0023, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* list_nullables_and_optionals_struct */ \ @@ -2036,13 +2054,13 @@ { 0x0025, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* struct */ \ { 0x0026, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(27) }, /* range_restricted_int8u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(28) }, /* range_restricted_int8u */ \ { 0x0027, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(28) }, /* range_restricted_int8s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(29) }, /* range_restricted_int8s */ \ { 0x0028, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(29) }, /* range_restricted_int16u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(30) }, /* range_restricted_int16u */ \ { 0x0029, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(30) }, /* range_restricted_int16s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(31) }, /* range_restricted_int16s */ \ { 0x0030, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE), \ ZAP_EMPTY_DEFAULT() }, /* timed_write_boolean */ \ { 0x8000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ @@ -2052,49 +2070,49 @@ { 0x8002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap16 */ \ { 0x8003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3383) }, /* nullable_bitmap32 */ \ + ZAP_LONG_DEFAULTS_INDEX(3387) }, /* nullable_bitmap32 */ \ { 0x8004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3387) }, /* nullable_bitmap64 */ \ + ZAP_LONG_DEFAULTS_INDEX(3391) }, /* nullable_bitmap64 */ \ { 0x8005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8u */ \ { 0x8006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16u */ \ { 0x8007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3395) }, /* nullable_int24u */ \ + ZAP_LONG_DEFAULTS_INDEX(3399) }, /* nullable_int24u */ \ { 0x8008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3398) }, /* nullable_int32u */ \ + ZAP_LONG_DEFAULTS_INDEX(3402) }, /* nullable_int32u */ \ { 0x8009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3402) }, /* nullable_int40u */ \ + ZAP_LONG_DEFAULTS_INDEX(3406) }, /* nullable_int40u */ \ { 0x800A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3407) }, /* nullable_int48u */ \ + ZAP_LONG_DEFAULTS_INDEX(3411) }, /* nullable_int48u */ \ { 0x800B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3413) }, /* nullable_int56u */ \ + ZAP_LONG_DEFAULTS_INDEX(3417) }, /* nullable_int56u */ \ { 0x800C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3420) }, /* nullable_int64u */ \ + ZAP_LONG_DEFAULTS_INDEX(3424) }, /* nullable_int64u */ \ { 0x800D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8s */ \ { 0x800E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16s */ \ { 0x800F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3428) }, /* nullable_int24s */ \ + ZAP_LONG_DEFAULTS_INDEX(3432) }, /* nullable_int24s */ \ { 0x8010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3431) }, /* nullable_int32s */ \ + ZAP_LONG_DEFAULTS_INDEX(3435) }, /* nullable_int32s */ \ { 0x8011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3435) }, /* nullable_int40s */ \ + ZAP_LONG_DEFAULTS_INDEX(3439) }, /* nullable_int40s */ \ { 0x8012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3440) }, /* nullable_int48s */ \ + ZAP_LONG_DEFAULTS_INDEX(3444) }, /* nullable_int48s */ \ { 0x8013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3446) }, /* nullable_int56s */ \ + ZAP_LONG_DEFAULTS_INDEX(3450) }, /* nullable_int56s */ \ { 0x8014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3453) }, /* nullable_int64s */ \ + ZAP_LONG_DEFAULTS_INDEX(3457) }, /* nullable_int64s */ \ { 0x8015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum8 */ \ { 0x8016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum16 */ \ { 0x8017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3461) }, /* nullable_float_single */ \ + ZAP_LONG_DEFAULTS_INDEX(3465) }, /* nullable_float_single */ \ { 0x8018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3465) }, /* nullable_float_double */ \ + ZAP_LONG_DEFAULTS_INDEX(3469) }, /* nullable_float_double */ \ { 0x8019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_octet_string */ \ { 0x801E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ @@ -2106,21 +2124,21 @@ ZAP_EMPTY_DEFAULT() }, /* nullable_struct */ \ { 0x8026, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(31) }, /* nullable_range_restricted_int8u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(32) }, /* nullable_range_restricted_int8u */ \ { 0x8027, ZAP_TYPE(INT8S), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(32) }, /* nullable_range_restricted_int8s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(33) }, /* nullable_range_restricted_int8s */ \ { 0x8028, ZAP_TYPE(INT16U), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(33) }, /* nullable_range_restricted_int16u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(34) }, /* nullable_range_restricted_int16u */ \ { 0x8029, ZAP_TYPE(INT16S), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(34) }, /* nullable_range_restricted_int16s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(35) }, /* nullable_range_restricted_int16s */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ - { 0x0000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3473) }, /* measurement type */ \ - { 0x0304, ZAP_TYPE(INT32S), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3477) }, /* total active power */ \ + { 0x0000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3477) }, /* measurement type */ \ + { 0x0304, ZAP_TYPE(INT32S), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3481) }, /* total active power */ \ { 0x0505, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) }, /* rms voltage */ \ { 0x0506, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* rms voltage min */ \ { 0x0507, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* rms voltage max */ \ @@ -2141,7 +2159,7 @@ { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OnTime */ \ { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OffWaitTime */ \ { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* StartUpOnOff */ \ - { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3481) }, /* FeatureMap */ \ + { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3485) }, /* FeatureMap */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -2330,125 +2348,125 @@ }, /* Endpoint: 1, Cluster: Mode Select (server) */ \ { 0x0101, \ ZAP_ATTRIBUTE_INDEX(251), \ - 4, \ - 5, \ + 8, \ + 14, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ { \ - 0x0102, ZAP_ATTRIBUTE_INDEX(255), 20, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0102, ZAP_ATTRIBUTE_INDEX(259), 20, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ { \ - 0x0103, ZAP_ATTRIBUTE_INDEX(275), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0103, ZAP_ATTRIBUTE_INDEX(279), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ { \ 0x0200, \ - ZAP_ATTRIBUTE_INDEX(280), \ + ZAP_ATTRIBUTE_INDEX(284), \ 26, \ 54, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayPumpConfigurationAndControlServer \ }, /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ { \ - 0x0201, ZAP_ATTRIBUTE_INDEX(306), 19, 34, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0201, ZAP_ATTRIBUTE_INDEX(310), 19, 34, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ { \ 0x0204, \ - ZAP_ATTRIBUTE_INDEX(325), \ + ZAP_ATTRIBUTE_INDEX(329), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayThermostatUserInterfaceConfigurationServer \ }, /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x0300, \ - ZAP_ATTRIBUTE_INDEX(329), \ + ZAP_ATTRIBUTE_INDEX(333), \ 53, \ 341, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ { \ - 0x0400, ZAP_ATTRIBUTE_INDEX(382), 6, 11, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0400, ZAP_ATTRIBUTE_INDEX(386), 6, 11, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ { \ - 0x0402, ZAP_ATTRIBUTE_INDEX(388), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0402, ZAP_ATTRIBUTE_INDEX(392), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ { \ - 0x0403, ZAP_ATTRIBUTE_INDEX(393), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0403, ZAP_ATTRIBUTE_INDEX(397), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ { \ - 0x0404, ZAP_ATTRIBUTE_INDEX(397), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0404, ZAP_ATTRIBUTE_INDEX(401), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(402), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0405, ZAP_ATTRIBUTE_INDEX(406), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ { 0x0406, \ - ZAP_ATTRIBUTE_INDEX(407), \ + ZAP_ATTRIBUTE_INDEX(411), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayOccupancySensingServer }, /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ { 0x0500, \ - ZAP_ATTRIBUTE_INDEX(411), \ + ZAP_ATTRIBUTE_INDEX(415), \ 6, \ 16, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ { \ - 0x0503, ZAP_ATTRIBUTE_INDEX(417), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0503, ZAP_ATTRIBUTE_INDEX(421), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ { \ - 0x0504, ZAP_ATTRIBUTE_INDEX(419), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0504, ZAP_ATTRIBUTE_INDEX(423), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: TV Channel (server) */ \ { \ - 0x0505, ZAP_ATTRIBUTE_INDEX(423), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0505, ZAP_ATTRIBUTE_INDEX(427), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ { \ - 0x0506, ZAP_ATTRIBUTE_INDEX(425), 9, 59, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0506, ZAP_ATTRIBUTE_INDEX(429), 9, 59, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Playback (server) */ \ { \ - 0x0507, ZAP_ATTRIBUTE_INDEX(434), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0507, ZAP_ATTRIBUTE_INDEX(438), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Input (server) */ \ { \ - 0x0508, ZAP_ATTRIBUTE_INDEX(437), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0508, ZAP_ATTRIBUTE_INDEX(441), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Low Power (server) */ \ { \ - 0x0509, ZAP_ATTRIBUTE_INDEX(438), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0509, ZAP_ATTRIBUTE_INDEX(442), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(439), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(443), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ { \ - 0x050B, ZAP_ATTRIBUTE_INDEX(442), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050B, ZAP_ATTRIBUTE_INDEX(446), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Audio Output (server) */ \ { \ - 0x050C, ZAP_ATTRIBUTE_INDEX(445), 4, 258, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050C, ZAP_ATTRIBUTE_INDEX(449), 4, 258, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(449), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(453), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(457), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(461), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Account Login (server) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(458), 77, 2285, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(462), 77, 2285, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ { \ - 0x0B04, ZAP_ATTRIBUTE_INDEX(535), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0B04, ZAP_ATTRIBUTE_INDEX(539), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(547), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0xF000, ZAP_ATTRIBUTE_INDEX(551), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Binding (server) */ \ { 0x0006, \ - ZAP_ATTRIBUTE_INDEX(548), \ + ZAP_ATTRIBUTE_INDEX(552), \ 7, \ 13, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ { \ - 0x001D, ZAP_ATTRIBUTE_INDEX(555), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001D, ZAP_ATTRIBUTE_INDEX(559), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ { 0x0406, \ - ZAP_ATTRIBUTE_INDEX(560), \ + ZAP_ATTRIBUTE_INDEX(564), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -2460,7 +2478,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 18, 1925 }, { ZAP_CLUSTER_INDEX(18), 44, 6035 }, { ZAP_CLUSTER_INDEX(62), 3, 18 }, \ + { ZAP_CLUSTER_INDEX(0), 18, 1925 }, { ZAP_CLUSTER_INDEX(18), 44, 6044 }, { ZAP_CLUSTER_INDEX(62), 3, 18 }, \ } // Largest attribute size is needed for various buffers @@ -2470,7 +2488,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (1333) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (7978) +#define ATTRIBUTE_MAX_SIZE (7987) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3) 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 c8956594092d85..c832afb892371e 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 @@ -179,6 +179,13 @@ typedef struct _DeviceType uint16_t revision; } DeviceType; +// Struct for DlCredential +typedef struct _DlCredential +{ + uint8_t CredentialType; + uint16_t CredentialIndex; +} DlCredential; + // Struct for EndpointListStruct typedef struct _EndpointListStruct { diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index b575b04d4dad0f..e1ba4b54913edb 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -617,17 +617,18 @@ #define ZCL_DOOR_OPEN_EVENTS_ATTRIBUTE_ID (0x0004) #define ZCL_DOOR_CLOSED_EVENTS_ATTRIBUTE_ID (0x0005) #define ZCL_OPEN_PERIOD_ATTRIBUTE_ID (0x0006) -#define ZCL_NUM_LOCK_RECORDS_SUPPORTED_ATTRIBUTE_ID (0x0010) +#define ZCL_NUM_LOG_RECORDS_SUPPORTED_ATTRIBUTE_ID (0x0010) #define ZCL_NUM_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID (0x0011) #define ZCL_NUM_PIN_USERS_SUPPORTED_ATTRIBUTE_ID (0x0012) #define ZCL_NUM_RFID_USERS_SUPPORTED_ATTRIBUTE_ID (0x0013) #define ZCL_NUM_WEEKDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0014) #define ZCL_NUM_YEARDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0015) -#define ZCL_NUM_HOLIDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0016) +#define ZCL_NUM_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID (0x0016) #define ZCL_MAX_PIN_LENGTH_ATTRIBUTE_ID (0x0017) #define ZCL_MIN_PIN_LENGTH_ATTRIBUTE_ID (0x0018) #define ZCL_MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x0019) #define ZCL_MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x001A) +#define ZCL_CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID (0x001B) #define ZCL_ENABLE_LOGGING_ATTRIBUTE_ID (0x0020) #define ZCL_LANGUAGE_ATTRIBUTE_ID (0x0021) #define ZCL_LED_SETTINGS_ATTRIBUTE_ID (0x0022) @@ -640,18 +641,19 @@ #define ZCL_ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID (0x0029) #define ZCL_ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID (0x002A) #define ZCL_ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID (0x002B) +#define ZCL_LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID (0x002C) #define ZCL_WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID (0x0030) #define ZCL_USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID (0x0031) #define ZCL_SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID (0x0032) -#define ZCL_REQUIRE_PIN_FOR_RF_OPERATION_ATTRIBUTE_ID (0x0033) -#define ZCL_ZIGBEE_SECURITY_LEVEL_ATTRIBUTE_ID (0x0034) -#define ZCL_DOOR_LOCK_ALARM_MASK_ATTRIBUTE_ID (0x0040) +#define ZCL_REQUIRE_PIN_FOR_REMOTE_OPERATION_ATTRIBUTE_ID (0x0033) +#define ZCL_EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID (0x0035) +#define ZCL_ALARM_MASK_ATTRIBUTE_ID (0x0040) #define ZCL_KEYPAD_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0041) -#define ZCL_RF_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0042) +#define ZCL_REMOTE_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0042) #define ZCL_MANUAL_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0043) #define ZCL_RFID_OPERATION_EVENT_MASK_ATTRIBUTE_ID (0x0044) #define ZCL_KEYPAD_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0045) -#define ZCL_RF_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0046) +#define ZCL_REMOTE_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0046) #define ZCL_RFID_PROGRAMMING_EVENT_MASK_ATTRIBUTE_ID (0x0047) // Attribute ids for cluster: Window Covering 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 5224549dfb43a7..0e0d213a00f24b 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 @@ -9162,22 +9162,25 @@ namespace Attributes { namespace LockState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { NumericAttributeTraits::StorageType temp; uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + if (NumericAttributeTraits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = NumericAttributeTraits::StorageToWorking(temp); } - *value = NumericAttributeTraits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) { - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -9187,6 +9190,24 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + NumericAttributeTraits::StorageType value; + NumericAttributeTraits::SetNull(value); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace LockState namespace LockType { @@ -9249,22 +9270,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) namespace DoorState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { NumericAttributeTraits::StorageType temp; uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + if (NumericAttributeTraits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = NumericAttributeTraits::StorageToWorking(temp); } - *value = NumericAttributeTraits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) { - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -9274,6 +9298,24 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + NumericAttributeTraits::StorageType value; + NumericAttributeTraits::SetNull(value); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace DoorState namespace DoorOpenEvents { @@ -9363,7 +9405,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace OpenPeriod -namespace NumLockRecordsSupported { +namespace NumberOfLogRecordsSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -9390,9 +9432,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumLockRecordsSupported +} // namespace NumberOfLogRecordsSupported -namespace NumTotalUsersSupported { +namespace NumberOfTotalUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -9419,9 +9461,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumTotalUsersSupported +} // namespace NumberOfTotalUsersSupported -namespace NumPinUsersSupported { +namespace NumberOfPINUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -9448,9 +9490,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumPinUsersSupported +} // namespace NumberOfPINUsersSupported -namespace NumRfidUsersSupported { +namespace NumberOfRFIDUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -9477,67 +9519,96 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumRfidUsersSupported +} // namespace NumberOfRFIDUsersSupported -namespace NumWeekdaySchedulesSupportedPerUser { +namespace NumberOfWeekDaySchedulesSupportedPerUser { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); + NumericAttributeTraits::StorageType temp; + uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - *value = NumericAttributeTraits::StorageToWorking(temp); + *value = NumericAttributeTraits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) { - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + NumericAttributeTraits::StorageType storageValue; + NumericAttributeTraits::WorkingToStorage(value, storageValue); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumWeekdaySchedulesSupportedPerUser +} // namespace NumberOfWeekDaySchedulesSupportedPerUser -namespace NumYeardaySchedulesSupportedPerUser { +namespace NumberOfYearDaySchedulesSupportedPerUser { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); + NumericAttributeTraits::StorageType temp; + uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - *value = NumericAttributeTraits::StorageToWorking(temp); + *value = NumericAttributeTraits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) { - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + NumericAttributeTraits::StorageType storageValue; + NumericAttributeTraits::WorkingToStorage(value, storageValue); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace NumYeardaySchedulesSupportedPerUser +} // namespace NumberOfYearDaySchedulesSupportedPerUser -namespace NumHolidaySchedulesSupportedPerUser { +namespace NumberOfHolidaySchedulesSupported { + +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +{ + NumericAttributeTraits::StorageType temp; + uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + *value = NumericAttributeTraits::StorageToWorking(temp); + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) +{ + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + NumericAttributeTraits::StorageType storageValue; + NumericAttributeTraits::WorkingToStorage(value, storageValue); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); +} + +} // namespace NumberOfHolidaySchedulesSupported + +namespace MaxPINCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9564,9 +9635,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace NumHolidaySchedulesSupportedPerUser +} // namespace MaxPINCodeLength -namespace MaxPinLength { +namespace MinPINCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9593,9 +9664,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace MaxPinLength +} // namespace MinPINCodeLength -namespace MinPinLength { +namespace MaxRFIDCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9622,9 +9693,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace MinPinLength +} // namespace MaxRFIDCodeLength -namespace MaxRfidCodeLength { +namespace MinRFIDCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9651,9 +9722,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace MaxRfidCodeLength +} // namespace MinRFIDCodeLength -namespace MinRfidCodeLength { +namespace CredentialRulesSupport { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9677,10 +9748,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) NumericAttributeTraits::StorageType storageValue; NumericAttributeTraits::WorkingToStorage(value, storageValue); uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE); } -} // namespace MinRfidCodeLength +} // namespace CredentialRulesSupport namespace EnableLogging { @@ -9715,7 +9786,7 @@ namespace Language { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { - uint8_t zclString[2 + 1]; + uint8_t zclString[3 + 1]; EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); @@ -9724,16 +9795,16 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - VerifyOrReturnError(value.size() == 2, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 2); + VerifyOrReturnError(value.size() == 3, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); + memcpy(value.data(), &zclString[1], 3); value.reduce_size(length); return status; } EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) { - static_assert(2 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 2, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[2 + 1]; + static_assert(3 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); + VerifyOrReturnError(value.size() <= 3, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); + uint8_t zclString[3 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); @@ -9741,7 +9812,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) } // namespace Language -namespace LedSettings { +namespace LEDSettings { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -9768,7 +9839,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace LedSettings +} // namespace LEDSettings namespace AutoRelockTime { @@ -9973,7 +10044,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) } // namespace EnableOneTouchLocking -namespace EnableInsideStatusLed { +namespace EnableInsideStatusLED { EmberAfStatus Get(chip::EndpointId endpoint, bool * value) { @@ -10000,7 +10071,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE); } -} // namespace EnableInsideStatusLed +} // namespace EnableInsideStatusLED namespace EnablePrivacyModeButton { @@ -10031,6 +10102,35 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) } // namespace EnablePrivacyModeButton +namespace LocalProgrammingFeatures { + +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +{ + NumericAttributeTraits::StorageType temp; + uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + *value = NumericAttributeTraits::StorageToWorking(temp); + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + NumericAttributeTraits::StorageType storageValue; + NumericAttributeTraits::WorkingToStorage(value, storageValue); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE); +} + +} // namespace LocalProgrammingFeatures + namespace WrongCodeEntryLimit { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -10089,7 +10189,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace UserCodeTemporaryDisableTime -namespace SendPinOverTheAir { +namespace SendPINOverTheAir { EmberAfStatus Get(chip::EndpointId endpoint, bool * value) { @@ -10116,9 +10216,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE); } -} // namespace SendPinOverTheAir +} // namespace SendPINOverTheAir -namespace RequirePinForRfOperation { +namespace RequirePINforRemoteOperation { EmberAfStatus Get(chip::EndpointId endpoint, bool * value) { @@ -10145,36 +10245,36 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE); } -} // namespace RequirePinForRfOperation +} // namespace RequirePINforRemoteOperation -namespace ZigbeeSecurityLevel { +namespace ExpiringUserTimeout { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { - NumericAttributeTraits::StorageType temp; - uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); + NumericAttributeTraits::StorageType temp; + uint8_t * readable = NumericAttributeTraits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, temp)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - *value = NumericAttributeTraits::StorageToWorking(temp); + *value = NumericAttributeTraits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) { - if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) + if (!NumericAttributeTraits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } - NumericAttributeTraits::StorageType storageValue; - NumericAttributeTraits::WorkingToStorage(value, storageValue); - uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); + NumericAttributeTraits::StorageType storageValue; + NumericAttributeTraits::WorkingToStorage(value, storageValue); + uint8_t * writable = NumericAttributeTraits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace ZigbeeSecurityLevel +} // namespace ExpiringUserTimeout namespace AlarmMask { @@ -10234,7 +10334,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace KeypadOperationEventMask -namespace RfOperationEventMask { +namespace RemoteOperationEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -10261,7 +10361,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE); } -} // namespace RfOperationEventMask +} // namespace RemoteOperationEventMask namespace ManualOperationEventMask { @@ -10292,7 +10392,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace ManualOperationEventMask -namespace RfidOperationEventMask { +namespace RFIDOperationEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -10319,7 +10419,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE); } -} // namespace RfidOperationEventMask +} // namespace RFIDOperationEventMask namespace KeypadProgrammingEventMask { @@ -10350,7 +10450,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace KeypadProgrammingEventMask -namespace RfProgrammingEventMask { +namespace RemoteProgrammingEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -10377,9 +10477,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE); } -} // namespace RfProgrammingEventMask +} // namespace RemoteProgrammingEventMask -namespace RfidProgrammingEventMask { +namespace RFIDProgrammingEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -10406,7 +10506,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE); } -} // namespace RfidProgrammingEventMask +} // namespace RFIDProgrammingEventMask } // namespace Attributes } // namespace DoorLock 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 eb7e8a63df0989..8bc3b866bf7de8 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 @@ -1752,12 +1752,14 @@ namespace DoorLock { namespace Attributes { namespace LockState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // DlLockState EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const DataModel::Nullable & value); } // namespace LockState namespace LockType { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // DlLockType EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace LockType @@ -1767,8 +1769,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value); } // namespace ActuatorEnabled namespace DoorState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // DlDoorState EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const DataModel::Nullable & value); } // namespace DoorState namespace DoorOpenEvents { @@ -1786,60 +1790,65 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace OpenPeriod -namespace NumLockRecordsSupported { +namespace NumberOfLogRecordsSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace NumLockRecordsSupported +} // namespace NumberOfLogRecordsSupported -namespace NumTotalUsersSupported { +namespace NumberOfTotalUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace NumTotalUsersSupported +} // namespace NumberOfTotalUsersSupported -namespace NumPinUsersSupported { +namespace NumberOfPINUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace NumPinUsersSupported +} // namespace NumberOfPINUsersSupported -namespace NumRfidUsersSupported { +namespace NumberOfRFIDUsersSupported { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace NumRfidUsersSupported +} // namespace NumberOfRFIDUsersSupported -namespace NumWeekdaySchedulesSupportedPerUser { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace NumWeekdaySchedulesSupportedPerUser +namespace NumberOfWeekDaySchedulesSupportedPerUser { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace NumberOfWeekDaySchedulesSupportedPerUser -namespace NumYeardaySchedulesSupportedPerUser { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace NumYeardaySchedulesSupportedPerUser +namespace NumberOfYearDaySchedulesSupportedPerUser { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace NumberOfYearDaySchedulesSupportedPerUser + +namespace NumberOfHolidaySchedulesSupported { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace NumberOfHolidaySchedulesSupported -namespace NumHolidaySchedulesSupportedPerUser { +namespace MaxPINCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace NumHolidaySchedulesSupportedPerUser +} // namespace MaxPINCodeLength -namespace MaxPinLength { +namespace MinPINCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace MaxPinLength +} // namespace MinPINCodeLength -namespace MinPinLength { +namespace MaxRFIDCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace MinPinLength +} // namespace MaxRFIDCodeLength -namespace MaxRfidCodeLength { +namespace MinRFIDCodeLength { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace MaxRfidCodeLength +} // namespace MinRFIDCodeLength -namespace MinRfidCodeLength { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u +namespace CredentialRulesSupport { +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace MinRfidCodeLength +} // namespace CredentialRulesSupport namespace EnableLogging { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean @@ -1851,10 +1860,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // ch EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); } // namespace Language -namespace LedSettings { +namespace LEDSettings { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace LedSettings +} // namespace LEDSettings namespace AutoRelockTime { EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u @@ -1867,7 +1876,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace SoundVolume namespace OperatingMode { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // DlOperatingMode EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace OperatingMode @@ -1891,16 +1900,21 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); } // namespace EnableOneTouchLocking -namespace EnableInsideStatusLed { +namespace EnableInsideStatusLED { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); -} // namespace EnableInsideStatusLed +} // namespace EnableInsideStatusLED namespace EnablePrivacyModeButton { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); } // namespace EnablePrivacyModeButton +namespace LocalProgrammingFeatures { +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +} // namespace LocalProgrammingFeatures + namespace WrongCodeEntryLimit { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1911,20 +1925,20 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace UserCodeTemporaryDisableTime -namespace SendPinOverTheAir { +namespace SendPINOverTheAir { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); -} // namespace SendPinOverTheAir +} // namespace SendPINOverTheAir -namespace RequirePinForRfOperation { +namespace RequirePINforRemoteOperation { EmberAfStatus Get(chip::EndpointId endpoint, bool * value); // boolean EmberAfStatus Set(chip::EndpointId endpoint, bool value); -} // namespace RequirePinForRfOperation +} // namespace RequirePINforRemoteOperation -namespace ZigbeeSecurityLevel { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace ZigbeeSecurityLevel +namespace ExpiringUserTimeout { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace ExpiringUserTimeout namespace AlarmMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 @@ -1936,35 +1950,35 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace KeypadOperationEventMask -namespace RfOperationEventMask { +namespace RemoteOperationEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace RfOperationEventMask +} // namespace RemoteOperationEventMask namespace ManualOperationEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ManualOperationEventMask -namespace RfidOperationEventMask { +namespace RFIDOperationEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace RfidOperationEventMask +} // namespace RFIDOperationEventMask namespace KeypadProgrammingEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace KeypadProgrammingEventMask -namespace RfProgrammingEventMask { +namespace RemoteProgrammingEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace RfProgrammingEventMask +} // namespace RemoteProgrammingEventMask -namespace RfidProgrammingEventMask { +namespace RFIDProgrammingEventMask { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace RfidProgrammingEventMask +} // namespace RFIDProgrammingEventMask } // namespace Attributes } // namespace DoorLock 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 35af34a06322fe..69bdb5c3bafd06 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -13616,43 +13616,18 @@ bool emberAfModeSelectClusterChangeToModeCallback( bool emberAfDoorLockClusterLockDoorCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::LockDoor::DecodableType & commandData); -/** - * @brief Door Lock Cluster LockDoorResponse Command callback (from server) - */ -bool emberAfDoorLockClusterLockDoorResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster UnlockDoor 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 UnlockDoorResponse Command callback (from server) - */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); -/** - * @brief Door Lock Cluster Toggle Command callback (from client) - */ -bool emberAfDoorLockClusterToggleCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::Toggle::DecodableType & commandData); -/** - * @brief Door Lock Cluster ToggleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterToggleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeout 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 UnlockWithTimeoutResponse Command callback (from server) - */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster GetLogRecord Command callback (from client) */ @@ -13666,59 +13641,40 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::EndpointId endpoin uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin); /** - * @brief Door Lock Cluster SetPin Command callback (from client) - */ -bool emberAfDoorLockClusterSetPinCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::SetPin::DecodableType & commandData); -/** - * @brief Door Lock Cluster SetPinResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status); -/** - * @brief Door Lock Cluster GetPin Command callback (from client) - */ -bool emberAfDoorLockClusterGetPinCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::GetPin::DecodableType & commandData); -/** - * @brief Door Lock Cluster GetPinResponse Command callback (from server) + * @brief Door Lock Cluster SetPINCode Command callback (from client) */ -bool emberAfDoorLockClusterGetPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint16_t userId, - uint8_t userStatus, uint8_t userType, chip::ByteSpan pin); +bool emberAfDoorLockClusterSetPINCodeCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::SetPINCode::DecodableType & commandData); /** - * @brief Door Lock Cluster ClearPin Command callback (from client) + * @brief Door Lock Cluster GetPINCode Command callback (from client) */ -bool emberAfDoorLockClusterClearPinCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearPin::DecodableType & commandData); +bool emberAfDoorLockClusterGetPINCodeCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::GetPINCode::DecodableType & commandData); /** - * @brief Door Lock Cluster ClearPinResponse Command callback (from server) + * @brief Door Lock Cluster GetPINCodeResponse Command callback (from server) */ -bool emberAfDoorLockClusterClearPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); +bool emberAfDoorLockClusterGetPINCodeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin); /** - * @brief Door Lock Cluster ClearAllPins Command callback (from client) + * @brief Door Lock Cluster ClearPINCode Command callback (from client) */ -bool emberAfDoorLockClusterClearAllPinsCallback( +bool emberAfDoorLockClusterClearPINCodeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearAllPins::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::ClearPINCode::DecodableType & commandData); /** - * @brief Door Lock Cluster ClearAllPinsResponse Command callback (from server) + * @brief Door Lock Cluster ClearAllPINCodes Command callback (from client) */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); +bool emberAfDoorLockClusterClearAllPINCodesCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::ClearAllPINCodes::DecodableType & commandData); /** * @brief Door Lock Cluster SetUserStatus Command callback (from client) */ bool emberAfDoorLockClusterSetUserStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetUserStatus::DecodableType & commandData); -/** - * @brief Door Lock Cluster SetUserStatusResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetUserStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster GetUserStatus Command callback (from client) */ @@ -13729,87 +13685,62 @@ bool emberAfDoorLockClusterGetUserStatusCallback( * @brief Door Lock Cluster GetUserStatusResponse Command callback (from server) */ bool emberAfDoorLockClusterGetUserStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t userId, uint8_t status); + uint16_t userId, uint8_t userStatus); /** - * @brief Door Lock Cluster SetWeekdaySchedule Command callback (from client) + * @brief Door Lock Cluster SetWeekDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterSetWeekdayScheduleCallback( +bool emberAfDoorLockClusterSetWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::SetWeekdaySchedule::DecodableType & commandData); -/** - * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); + const chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetWeekdaySchedule Command callback (from client) + * @brief Door Lock Cluster GetWeekDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterGetWeekdayScheduleCallback( +bool emberAfDoorLockClusterGetWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::GetWeekdaySchedule::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster GetWeekDayScheduleResponse Command callback (from server) */ -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, - uint8_t startHour, uint8_t startMinute, uint8_t endHour, - uint8_t endMinute); +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); /** - * @brief Door Lock Cluster ClearWeekdaySchedule Command callback (from client) + * @brief Door Lock Cluster ClearWeekDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterClearWeekdayScheduleCallback( +bool emberAfDoorLockClusterClearWeekDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearWeekdaySchedule::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster SetYearDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); -/** - * @brief Door Lock Cluster SetYeardaySchedule Command callback (from client) - */ -bool emberAfDoorLockClusterSetYeardayScheduleCallback( +bool emberAfDoorLockClusterSetYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::SetYeardaySchedule::DecodableType & commandData); -/** - * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); + const chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetYeardaySchedule Command callback (from client) + * @brief Door Lock Cluster GetYearDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterGetYeardayScheduleCallback( +bool emberAfDoorLockClusterGetYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::GetYeardaySchedule::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::DecodableType & commandData); /** - * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback (from server) + * @brief Door Lock Cluster GetYearDayScheduleResponse Command callback (from server) */ -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t scheduleId, uint16_t userId, uint8_t status, +bool emberAfDoorLockClusterGetYearDayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + 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 ClearYearDaySchedule Command callback (from client) */ -bool emberAfDoorLockClusterClearYeardayScheduleCallback( +bool emberAfDoorLockClusterClearYearDayScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearYeardaySchedule::DecodableType & commandData); -/** - * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); + const chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::DecodableType & commandData); /** * @brief Door Lock Cluster SetHolidaySchedule 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 SetHolidayScheduleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster GetHolidaySchedule Command callback (from client) */ @@ -13820,30 +13751,20 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback( * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback (from server) */ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday); + uint8_t holidayIndex, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime, uint8_t operatingMode); /** * @brief Door Lock Cluster ClearHolidaySchedule 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 ClearHolidayScheduleResponse Command callback (from server) - */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster SetUserType Command callback (from client) */ bool emberAfDoorLockClusterSetUserTypeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::DoorLock::Commands::SetUserType::DecodableType & commandData); -/** - * @brief Door Lock Cluster SetUserTypeResponse Command callback (from server) - */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); /** * @brief Door Lock Cluster GetUserType Command callback (from client) */ @@ -13856,62 +13777,105 @@ bool emberAfDoorLockClusterGetUserTypeCallback( bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint16_t userId, uint8_t userType); /** - * @brief Door Lock Cluster SetRfid Command callback (from client) + * @brief Door Lock Cluster SetRFIDCode Command callback (from client) */ -bool emberAfDoorLockClusterSetRfidCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::SetRfid::DecodableType & commandData); +bool emberAfDoorLockClusterSetRFIDCodeCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::SetRFIDCode::DecodableType & commandData); +/** + * @brief Door Lock Cluster GetRFIDCode Command callback (from client) + */ +bool emberAfDoorLockClusterGetRFIDCodeCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::GetRFIDCode::DecodableType & commandData); +/** + * @brief Door Lock Cluster GetRFIDCodeResponse Command callback (from server) + */ +bool emberAfDoorLockClusterGetRFIDCodeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint16_t userId, uint8_t userStatus, uint8_t userType, + chip::ByteSpan rfidCode); +/** + * @brief Door Lock Cluster ClearRFIDCode Command callback (from client) + */ +bool emberAfDoorLockClusterClearRFIDCodeCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::DecodableType & commandData); +/** + * @brief Door Lock Cluster ClearAllRFIDCodes Command callback (from client) + */ +bool emberAfDoorLockClusterClearAllRFIDCodesCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::ClearAllRFIDCodes::DecodableType & commandData); /** - * @brief Door Lock Cluster SetRfidResponse Command callback (from server) + * @brief Door Lock Cluster SetUser Command callback (from client) */ -bool emberAfDoorLockClusterSetRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); +bool emberAfDoorLockClusterSetUserCallback(chip::app::CommandHandler * commandObj, + const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::SetUser::DecodableType & commandData); /** - * @brief Door Lock Cluster GetRfid Command callback (from client) + * @brief Door Lock Cluster GetUser Command callback (from client) */ -bool emberAfDoorLockClusterGetRfidCallback(chip::app::CommandHandler * commandObj, +bool emberAfDoorLockClusterGetUserCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::GetRfid::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::GetUser::DecodableType & commandData); /** - * @brief Door Lock Cluster GetRfidResponse Command callback (from server) + * @brief Door Lock Cluster GetUserResponse Command callback (from server) */ -bool emberAfDoorLockClusterGetRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid); +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); /** - * @brief Door Lock Cluster ClearRfid Command callback (from client) + * @brief Door Lock Cluster ClearUser Command callback (from client) */ -bool emberAfDoorLockClusterClearRfidCallback(chip::app::CommandHandler * commandObj, +bool emberAfDoorLockClusterClearUserCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearRfid::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::ClearUser::DecodableType & commandData); +/** + * @brief Door Lock Cluster OperatingEventNotification Command callback (from server) + */ +bool emberAfDoorLockClusterOperatingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t operationEventSource, uint8_t operationEventCode, + uint16_t userId, chip::ByteSpan pin, uint32_t localTime, + chip::CharSpan data); /** - * @brief Door Lock Cluster ClearRfidResponse Command callback (from server) + * @brief Door Lock Cluster ProgrammingEventNotification Command callback (from server) */ -bool emberAfDoorLockClusterClearRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); +bool emberAfDoorLockClusterProgrammingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t programEventSource, uint8_t programEventCode, + uint16_t userId, chip::ByteSpan pin, uint8_t userType, + uint8_t userStatus, uint32_t localTime, chip::CharSpan data); /** - * @brief Door Lock Cluster ClearAllRfids Command callback (from client) + * @brief Door Lock Cluster SetCredential Command callback (from client) */ -bool emberAfDoorLockClusterClearAllRfidsCallback( +bool emberAfDoorLockClusterSetCredentialCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DoorLock::Commands::ClearAllRfids::DecodableType & commandData); + const chip::app::Clusters::DoorLock::Commands::SetCredential::DecodableType & commandData); /** - * @brief Door Lock Cluster ClearAllRfidsResponse Command callback (from server) + * @brief Door Lock Cluster SetCredentialResponse Command callback (from server) */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status); +bool emberAfDoorLockClusterSetCredentialResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t status, uint16_t userIndex, uint16_t nextCredentialIndex); /** - * @brief Door Lock Cluster OperationEventNotification Command callback (from server) + * @brief Door Lock Cluster GetCredentialStatus Command callback (from client) */ -bool emberAfDoorLockClusterOperationEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t source, uint8_t eventCode, uint16_t userId, - chip::ByteSpan pin, uint32_t timeStamp, chip::CharSpan data); +bool emberAfDoorLockClusterGetCredentialStatusCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::DecodableType & commandData); /** - * @brief Door Lock Cluster ProgrammingEventNotification Command callback (from server) + * @brief Door Lock Cluster GetCredentialStatusResponse Command callback (from server) */ -bool emberAfDoorLockClusterProgrammingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t source, uint8_t eventCode, uint16_t userId, - chip::ByteSpan pin, uint8_t userType, uint8_t userStatus, - uint32_t timeStamp, chip::CharSpan data); +bool emberAfDoorLockClusterGetCredentialStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + bool credentialExists, uint16_t userIndex, + uint16_t nextCredentialIndex); +/** + * @brief Door Lock Cluster ClearCredential Command callback (from client) + */ +bool emberAfDoorLockClusterClearCredentialCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::DoorLock::Commands::ClearCredential::DecodableType & commandData); /** * @brief Window Covering Cluster UpOrOpen Command callback (from client) */ 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 36f8cf3f2ff8de..083ca4faf8963e 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 @@ -8546,14 +8546,14 @@ namespace Events { } // namespace ShadeConfiguration namespace DoorLock { - -namespace Commands { -namespace LockDoor { +namespace Structs { +namespace DlCredential { 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::kPin)), pin)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialType)), credentialType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialIndex)), credentialIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -8563,48 +8563,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + case to_underlying(Fields::kCredentialType): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialType)); break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace LockDoor. -namespace LockDoorResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kCredentialIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialIndex)); break; default: break; @@ -8615,81 +8585,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LockDoorResponse. -namespace UnlockDoor { -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::kPin)), pin)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace UnlockDoor. -namespace UnlockDoorResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - default: - break; - } - } +} // namespace DlCredential +} // namespace Structs - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace UnlockDoorResponse. -namespace Toggle { +namespace Commands { +namespace LockDoor { 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::kPin)), pin)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -8705,8 +8611,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + case to_underlying(Fields::kPinCode): + ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); break; default: break; @@ -8717,13 +8623,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace Toggle. -namespace ToggleResponse { +} // namespace LockDoor. +namespace UnlockDoor { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -8739,8 +8645,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kPinCode): + ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); break; default: break; @@ -8751,14 +8657,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ToggleResponse. +} // namespace UnlockDoor. namespace UnlockWithTimeout { 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::kTimeoutInSeconds)), timeoutInSeconds)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeout)), timeout)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -8774,11 +8680,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kTimeoutInSeconds): - ReturnErrorOnFailure(DataModel::Decode(reader, timeoutInSeconds)); + case to_underlying(Fields::kTimeout): + ReturnErrorOnFailure(DataModel::Decode(reader, timeout)); break; - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + case to_underlying(Fields::kPinCode): + ReturnErrorOnFailure(DataModel::Decode(reader, pinCode)); break; default: break; @@ -8790,40 +8696,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace UnlockWithTimeout. -namespace UnlockWithTimeoutResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace UnlockWithTimeoutResponse. namespace GetLogRecord { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -8917,7 +8789,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace GetLogRecordResponse. -namespace SetPin { +namespace SetPINCode { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -8962,42 +8834,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetPin. -namespace SetPinResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SetPinResponse. -namespace GetPin { +} // namespace SetPINCode. +namespace GetPINCode { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -9030,8 +8868,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetPin. -namespace GetPinResponse { +} // namespace GetPINCode. +namespace GetPINCodeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -9076,13 +8914,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetPinResponse. -namespace ClearPin { +} // namespace GetPINCodeResponse. +namespace ClearPINCode { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinSlotIndex)), pinSlotIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9098,8 +8936,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kPinSlotIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, pinSlotIndex)); break; default: break; @@ -9110,13 +8948,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearPin. -namespace ClearPinResponse { +} // namespace ClearPINCode. +namespace ClearAllPINCodes { 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::kStatus)), status)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9132,9 +8969,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; default: break; } @@ -9144,12 +8978,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearPinResponse. -namespace ClearAllPins { +} // namespace ClearAllPINCodes. +namespace SetUserStatus { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9165,6 +9001,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { + case to_underlying(Fields::kUserId): + ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + break; default: break; } @@ -9174,13 +9016,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearAllPins. -namespace ClearAllPinsResponse { +} // namespace SetUserStatus. +namespace GetUserStatus { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9196,8 +9038,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kUserId): + ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; default: break; @@ -9208,8 +9050,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearAllPinsResponse. -namespace SetUserStatus { +} // namespace GetUserStatus. +namespace GetUserStatusResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -9246,13 +9088,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetUserStatus. -namespace SetUserStatusResponse { +} // namespace GetUserStatusResponse. +namespace SetWeekDaySchedule { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9268,8 +9116,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kWeekDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kDaysMask): + ReturnErrorOnFailure(DataModel::Decode(reader, daysMask)); + break; + case to_underlying(Fields::kStartHour): + ReturnErrorOnFailure(DataModel::Decode(reader, startHour)); + break; + case to_underlying(Fields::kStartMinute): + ReturnErrorOnFailure(DataModel::Decode(reader, startMinute)); + break; + case to_underlying(Fields::kEndHour): + ReturnErrorOnFailure(DataModel::Decode(reader, endHour)); + break; + case to_underlying(Fields::kEndMinute): + ReturnErrorOnFailure(DataModel::Decode(reader, endMinute)); break; default: break; @@ -9280,13 +9146,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetUserStatusResponse. -namespace GetUserStatus { +} // namespace SetWeekDaySchedule. +namespace GetWeekDaySchedule { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9302,8 +9169,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kWeekDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -9314,14 +9184,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetUserStatus. -namespace GetUserStatusResponse { +} // namespace GetWeekDaySchedule. +namespace GetWeekDayScheduleResponse { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9337,12 +9213,30 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kWeekDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; + case to_underlying(Fields::kDaysMask): + ReturnErrorOnFailure(DataModel::Decode(reader, daysMask)); + break; + case to_underlying(Fields::kStartHour): + ReturnErrorOnFailure(DataModel::Decode(reader, startHour)); + break; + case to_underlying(Fields::kStartMinute): + ReturnErrorOnFailure(DataModel::Decode(reader, startMinute)); + break; + case to_underlying(Fields::kEndHour): + ReturnErrorOnFailure(DataModel::Decode(reader, endHour)); + break; + case to_underlying(Fields::kEndMinute): + ReturnErrorOnFailure(DataModel::Decode(reader, endMinute)); + break; default: break; } @@ -9352,19 +9246,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetUserStatusResponse. -namespace SetWeekdaySchedule { +} // namespace GetWeekDayScheduleResponse. +namespace ClearWeekDaySchedule { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kWeekDayIndex)), weekDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9380,26 +9269,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); - break; - case to_underlying(Fields::kDaysMask): - ReturnErrorOnFailure(DataModel::Decode(reader, daysMask)); - break; - case to_underlying(Fields::kStartHour): - ReturnErrorOnFailure(DataModel::Decode(reader, startHour)); + case to_underlying(Fields::kWeekDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, weekDayIndex)); break; - case to_underlying(Fields::kStartMinute): - ReturnErrorOnFailure(DataModel::Decode(reader, startMinute)); - break; - case to_underlying(Fields::kEndHour): - ReturnErrorOnFailure(DataModel::Decode(reader, endHour)); - break; - case to_underlying(Fields::kEndMinute): - ReturnErrorOnFailure(DataModel::Decode(reader, endMinute)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -9410,13 +9284,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetWeekdaySchedule. -namespace SetWeekdayScheduleResponse { +} // namespace ClearWeekDaySchedule. +namespace SetYearDaySchedule { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9432,8 +9309,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kYearDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kLocalStartTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); + break; + case to_underlying(Fields::kLocalEndTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); break; default: break; @@ -9444,14 +9330,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetWeekdayScheduleResponse. -namespace GetWeekdaySchedule { +} // namespace SetYearDaySchedule. +namespace GetYearDaySchedule { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9467,11 +9353,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kYearDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -9482,20 +9368,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetWeekdaySchedule. -namespace GetWeekdayScheduleResponse { +} // namespace GetYearDaySchedule. +namespace GetYearDayScheduleResponse { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kYearDayIndex)), yearDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDaysMask)), daysMask)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartHour)), startHour)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStartMinute)), startMinute)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndHour)), endHour)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndMinute)), endMinute)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9511,29 +9394,58 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kYearDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kDaysMask): - ReturnErrorOnFailure(DataModel::Decode(reader, daysMask)); + case to_underlying(Fields::kLocalStartTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); break; - case to_underlying(Fields::kStartHour): - ReturnErrorOnFailure(DataModel::Decode(reader, startHour)); + case to_underlying(Fields::kLocalEndTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); break; - case to_underlying(Fields::kStartMinute): - ReturnErrorOnFailure(DataModel::Decode(reader, startMinute)); + default: break; - case to_underlying(Fields::kEndHour): - ReturnErrorOnFailure(DataModel::Decode(reader, endHour)); + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace GetYearDayScheduleResponse. +namespace ClearYearDaySchedule { +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::kYearDayIndex)), yearDayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kYearDayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, yearDayIndex)); break; - case to_underlying(Fields::kEndMinute): - ReturnErrorOnFailure(DataModel::Decode(reader, endMinute)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -9544,14 +9456,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetWeekdayScheduleResponse. -namespace ClearWeekdaySchedule { +} // namespace ClearYearDaySchedule. +namespace SetHolidaySchedule { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9567,11 +9481,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kHolidayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kLocalStartTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); + break; + case to_underlying(Fields::kLocalEndTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); + break; + case to_underlying(Fields::kOperatingMode): + ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode)); break; default: break; @@ -9582,13 +9502,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearWeekdaySchedule. -namespace ClearWeekdayScheduleResponse { +} // namespace SetHolidaySchedule. +namespace GetHolidaySchedule { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9604,8 +9524,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kHolidayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex)); break; default: break; @@ -9616,16 +9536,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearWeekdayScheduleResponse. -namespace SetYeardaySchedule { +} // namespace GetHolidaySchedule. +namespace GetHolidayScheduleResponse { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingMode)), operatingMode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9641,11 +9562,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kHolidayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; case to_underlying(Fields::kLocalStartTime): ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); @@ -9653,6 +9574,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLocalEndTime): ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); break; + case to_underlying(Fields::kOperatingMode): + ReturnErrorOnFailure(DataModel::Decode(reader, operatingMode)); + break; default: break; } @@ -9662,13 +9586,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetYeardaySchedule. -namespace SetYeardayScheduleResponse { +} // namespace GetHolidayScheduleResponse. +namespace ClearHolidaySchedule { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHolidayIndex)), holidayIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9684,8 +9608,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kHolidayIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, holidayIndex)); break; default: break; @@ -9696,14 +9620,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetYeardayScheduleResponse. -namespace GetYeardaySchedule { +} // namespace ClearHolidaySchedule. +namespace SetUserType { 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::kScheduleId)), scheduleId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9719,12 +9643,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; case to_underlying(Fields::kUserId): ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; + case to_underlying(Fields::kUserType): + ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + break; default: break; } @@ -9734,17 +9658,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetYeardaySchedule. -namespace GetYeardayScheduleResponse { +} // namespace SetUserType. +namespace GetUserType { 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::kScheduleId)), scheduleId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9760,21 +9680,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; case to_underlying(Fields::kUserId): ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - case to_underlying(Fields::kLocalStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); - break; - case to_underlying(Fields::kLocalEndTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); - break; default: break; } @@ -9784,14 +9692,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetYeardayScheduleResponse. -namespace ClearYeardaySchedule { +} // namespace GetUserType. +namespace GetUserTypeResponse { 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::kScheduleId)), scheduleId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9807,12 +9715,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; case to_underlying(Fields::kUserId): ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; + case to_underlying(Fields::kUserType): + ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + break; default: break; } @@ -9822,13 +9730,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearYeardaySchedule. -namespace ClearYeardayScheduleResponse { +} // namespace GetUserTypeResponse. +namespace SetRFIDCode { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + 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::kRfidCode)), rfidCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9844,8 +9755,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kUserId): + ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + break; + case to_underlying(Fields::kUserType): + ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + break; + case to_underlying(Fields::kRfidCode): + ReturnErrorOnFailure(DataModel::Decode(reader, rfidCode)); break; default: break; @@ -9856,17 +9776,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearYeardayScheduleResponse. -namespace SetHolidaySchedule { +} // namespace SetRFIDCode. +namespace GetRFIDCode { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); - ReturnErrorOnFailure( - DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingModeDuringHoliday)), operatingModeDuringHoliday)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9882,17 +9798,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; - case to_underlying(Fields::kLocalStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); - break; - case to_underlying(Fields::kLocalEndTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); - break; - case to_underlying(Fields::kOperatingModeDuringHoliday): - ReturnErrorOnFailure(DataModel::Decode(reader, operatingModeDuringHoliday)); + case to_underlying(Fields::kUserId): + ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; default: break; @@ -9903,13 +9810,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetHolidaySchedule. -namespace SetHolidayScheduleResponse { +} // namespace GetRFIDCode. +namespace GetRFIDCodeResponse { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + 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::kRfidCode)), rfidCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9925,8 +9835,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kUserId): + ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + break; + case to_underlying(Fields::kUserType): + ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + break; + case to_underlying(Fields::kRfidCode): + ReturnErrorOnFailure(DataModel::Decode(reader, rfidCode)); break; default: break; @@ -9937,13 +9856,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetHolidayScheduleResponse. -namespace GetHolidaySchedule { +} // namespace GetRFIDCodeResponse. +namespace ClearRFIDCode { 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::kScheduleId)), scheduleId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRfidSlotIndex)), rfidSlotIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9959,8 +9878,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kRfidSlotIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, rfidSlotIndex)); break; default: break; @@ -9971,18 +9890,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetHolidaySchedule. -namespace GetHolidayScheduleResponse { +} // namespace ClearRFIDCode. +namespace ClearAllRFIDCodes { 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::kScheduleId)), scheduleId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalStartTime)), localStartTime)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalEndTime)), localEndTime)); - ReturnErrorOnFailure( - DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperatingModeDuringHoliday)), operatingModeDuringHoliday)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -9998,21 +9911,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); - break; - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - case to_underlying(Fields::kLocalStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localStartTime)); - break; - case to_underlying(Fields::kLocalEndTime): - ReturnErrorOnFailure(DataModel::Decode(reader, localEndTime)); - break; - case to_underlying(Fields::kOperatingModeDuringHoliday): - ReturnErrorOnFailure(DataModel::Decode(reader, operatingModeDuringHoliday)); - break; default: break; } @@ -10022,13 +9920,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetHolidayScheduleResponse. -namespace ClearHolidaySchedule { +} // namespace ClearAllRFIDCodes. +namespace SetUser { 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::kScheduleId)), scheduleId)); + 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::kUserStatus)), userStatus)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10044,8 +9948,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kScheduleId): - ReturnErrorOnFailure(DataModel::Decode(reader, scheduleId)); + case to_underlying(Fields::kOperationType): + ReturnErrorOnFailure(DataModel::Decode(reader, operationType)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kUserName): + ReturnErrorOnFailure(DataModel::Decode(reader, userName)); + break; + case to_underlying(Fields::kUserUniqueId): + ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + break; + case to_underlying(Fields::kUserType): + ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + break; + case to_underlying(Fields::kCredentialRule): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule)); break; default: break; @@ -10056,13 +9978,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearHolidaySchedule. -namespace ClearHolidayScheduleResponse { +} // namespace SetUser. +namespace GetUser { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10078,8 +10000,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -10090,14 +10012,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearHolidayScheduleResponse. -namespace SetUserType { +} // namespace GetUser. +namespace GetUserResponse { 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::kUserId)), userId)); + 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::kUserStatus)), userStatus)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCreatorFabricIndex)), creatorFabricIndex)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLastModifiedFabricIndex)), lastModifiedFabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextUserIndex)), nextUserIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10113,12 +10045,36 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kUserName): + ReturnErrorOnFailure(DataModel::Decode(reader, userName)); + break; + case to_underlying(Fields::kUserUniqueId): + ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); break; case to_underlying(Fields::kUserType): ReturnErrorOnFailure(DataModel::Decode(reader, userType)); break; + case to_underlying(Fields::kCredentialRule): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialRule)); + break; + case to_underlying(Fields::kCredentials): + ReturnErrorOnFailure(DataModel::Decode(reader, credentials)); + break; + case to_underlying(Fields::kCreatorFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, creatorFabricIndex)); + break; + case to_underlying(Fields::kLastModifiedFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, lastModifiedFabricIndex)); + break; + case to_underlying(Fields::kNextUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, nextUserIndex)); + break; default: break; } @@ -10128,13 +10084,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetUserType. -namespace SetUserTypeResponse { +} // namespace GetUserResponse. +namespace ClearUser { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10150,8 +10106,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; default: break; @@ -10162,13 +10118,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetUserTypeResponse. -namespace GetUserType { +} // namespace ClearUser. +namespace OperatingEventNotification { 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::kOperationEventSource)), operationEventSource)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationEventCode)), operationEventCode)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalTime)), localTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10184,9 +10147,24 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { + case to_underlying(Fields::kOperationEventSource): + ReturnErrorOnFailure(DataModel::Decode(reader, operationEventSource)); + break; + case to_underlying(Fields::kOperationEventCode): + ReturnErrorOnFailure(DataModel::Decode(reader, operationEventCode)); + break; case to_underlying(Fields::kUserId): ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; + case to_underlying(Fields::kPin): + ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + break; + case to_underlying(Fields::kLocalTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localTime)); + break; + case to_underlying(Fields::kData): + ReturnErrorOnFailure(DataModel::Decode(reader, data)); + break; default: break; } @@ -10196,14 +10174,21 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetUserType. -namespace GetUserTypeResponse { +} // namespace OperatingEventNotification. +namespace ProgrammingEventNotification { 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::kProgramEventSource)), programEventSource)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProgramEventCode)), programEventCode)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLocalTime)), localTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10219,12 +10204,30 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { + case to_underlying(Fields::kProgramEventSource): + ReturnErrorOnFailure(DataModel::Decode(reader, programEventSource)); + break; + case to_underlying(Fields::kProgramEventCode): + ReturnErrorOnFailure(DataModel::Decode(reader, programEventCode)); + break; case to_underlying(Fields::kUserId): ReturnErrorOnFailure(DataModel::Decode(reader, userId)); break; + case to_underlying(Fields::kPin): + ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + break; case to_underlying(Fields::kUserType): ReturnErrorOnFailure(DataModel::Decode(reader, userType)); break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + break; + case to_underlying(Fields::kLocalTime): + ReturnErrorOnFailure(DataModel::Decode(reader, localTime)); + break; + case to_underlying(Fields::kData): + ReturnErrorOnFailure(DataModel::Decode(reader, data)); + break; default: break; } @@ -10234,16 +10237,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetUserTypeResponse. -namespace SetRfid { +} // namespace ProgrammingEventNotification. +namespace SetCredential { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialData)), credentialData)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); 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::kId)), id)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10259,17 +10263,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kOperationType): + ReturnErrorOnFailure(DataModel::Decode(reader, operationType)); break; - case to_underlying(Fields::kUserStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + case to_underlying(Fields::kCredential): + ReturnErrorOnFailure(DataModel::Decode(reader, credential)); break; - case to_underlying(Fields::kUserType): - ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + case to_underlying(Fields::kCredentialData): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialData)); break; - case to_underlying(Fields::kId): - ReturnErrorOnFailure(DataModel::Decode(reader, id)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kUserStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); break; default: break; @@ -10280,13 +10287,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetRfid. -namespace SetRfidResponse { +} // namespace SetCredential. +namespace SetCredentialResponse { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10305,6 +10315,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kNextCredentialIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex)); + break; default: break; } @@ -10314,13 +10330,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SetRfidResponse. -namespace GetRfid { +} // namespace SetCredentialResponse. +namespace GetCredentialStatus { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10336,8 +10352,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kCredential): + ReturnErrorOnFailure(DataModel::Decode(reader, credential)); break; default: break; @@ -10348,16 +10364,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetRfid. -namespace GetRfidResponse { +} // namespace GetCredentialStatus. +namespace GetCredentialStatusResponse { 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::kUserId)), userId)); - 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::kRfid)), rfid)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialExists)), credentialExists)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNextCredentialIndex)), nextCredentialIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10373,17 +10389,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kCredentialExists): + ReturnErrorOnFailure(DataModel::Decode(reader, credentialExists)); break; - case to_underlying(Fields::kUserStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); - break; - case to_underlying(Fields::kUserType): - ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; - case to_underlying(Fields::kRfid): - ReturnErrorOnFailure(DataModel::Decode(reader, rfid)); + case to_underlying(Fields::kNextCredentialIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, nextCredentialIndex)); break; default: break; @@ -10394,13 +10407,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetRfidResponse. -namespace ClearRfid { +} // namespace GetCredentialStatusResponse. +namespace ClearCredential { 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::kUserId)), userId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredential)), credential)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10416,8 +10429,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kCredential): + ReturnErrorOnFailure(DataModel::Decode(reader, credential)); break; default: break; @@ -10428,13 +10441,16 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearRfid. -namespace ClearRfidResponse { +} // namespace ClearCredential. +} // namespace Commands + +namespace Events { +namespace DoorLockAlarm { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAlarmCode)), alarmCode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10450,8 +10466,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kAlarmCode): + ReturnErrorOnFailure(DataModel::Decode(reader, alarmCode)); break; default: break; @@ -10462,12 +10478,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearRfidResponse. -namespace ClearAllRfids { +} // namespace DoorLockAlarm. +namespace DoorStateChange { 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::kDoorState)), doorState)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10483,6 +10500,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { + case to_underlying(Fields::kDoorState): + ReturnErrorOnFailure(DataModel::Decode(reader, doorState)); + break; default: break; } @@ -10492,13 +10512,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearAllRfids. -namespace ClearAllRfidsResponse { +} // namespace DoorStateChange. +namespace LockOperation { 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::kStatus)), status)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10514,8 +10539,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); + case to_underlying(Fields::kLockOperationType): + ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType)); + break; + case to_underlying(Fields::kOperationSource): + ReturnErrorOnFailure(DataModel::Decode(reader, operationSource)); + break; + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); + break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; + case to_underlying(Fields::kSourceNode): + ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode)); + break; + case to_underlying(Fields::kCredentials): + ReturnErrorOnFailure(DataModel::Decode(reader, credentials)); break; default: break; @@ -10526,18 +10566,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearAllRfidsResponse. -namespace OperationEventNotification { +} // namespace LockOperation. +namespace LockOperationError { 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::kSource)), source)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventCode)), eventCode)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockOperationType)), lockOperationType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationError)), operationError)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentials)), credentials)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10553,23 +10594,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kSource): - ReturnErrorOnFailure(DataModel::Decode(reader, source)); + case to_underlying(Fields::kLockOperationType): + ReturnErrorOnFailure(DataModel::Decode(reader, lockOperationType)); break; - case to_underlying(Fields::kEventCode): - ReturnErrorOnFailure(DataModel::Decode(reader, eventCode)); + case to_underlying(Fields::kOperationSource): + ReturnErrorOnFailure(DataModel::Decode(reader, operationSource)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kOperationError): + ReturnErrorOnFailure(DataModel::Decode(reader, operationError)); break; - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; - case to_underlying(Fields::kTimeStamp): - ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp)); + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); break; - case to_underlying(Fields::kData): - ReturnErrorOnFailure(DataModel::Decode(reader, data)); + case to_underlying(Fields::kSourceNode): + ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode)); + break; + case to_underlying(Fields::kCredentials): + ReturnErrorOnFailure(DataModel::Decode(reader, credentials)); break; default: break; @@ -10580,20 +10624,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace OperationEventNotification. -namespace ProgrammingEventNotification { +} // namespace LockOperationError. +namespace LockUserChange { 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::kSource)), source)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEventCode)), eventCode)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserId)), userId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPin)), pin)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeStamp)), timeStamp)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLockDataType)), lockDataType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataOperationType)), dataOperationType)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationSource)), operationSource)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSourceNode)), sourceNode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDataIndex)), dataIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10609,29 +10652,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kSource): - ReturnErrorOnFailure(DataModel::Decode(reader, source)); - break; - case to_underlying(Fields::kEventCode): - ReturnErrorOnFailure(DataModel::Decode(reader, eventCode)); + case to_underlying(Fields::kLockDataType): + ReturnErrorOnFailure(DataModel::Decode(reader, lockDataType)); break; - case to_underlying(Fields::kUserId): - ReturnErrorOnFailure(DataModel::Decode(reader, userId)); + case to_underlying(Fields::kDataOperationType): + ReturnErrorOnFailure(DataModel::Decode(reader, dataOperationType)); break; - case to_underlying(Fields::kPin): - ReturnErrorOnFailure(DataModel::Decode(reader, pin)); + case to_underlying(Fields::kOperationSource): + ReturnErrorOnFailure(DataModel::Decode(reader, operationSource)); break; - case to_underlying(Fields::kUserType): - ReturnErrorOnFailure(DataModel::Decode(reader, userType)); + case to_underlying(Fields::kUserIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, userIndex)); break; - case to_underlying(Fields::kUserStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, userStatus)); + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); break; - case to_underlying(Fields::kTimeStamp): - ReturnErrorOnFailure(DataModel::Decode(reader, timeStamp)); + case to_underlying(Fields::kSourceNode): + ReturnErrorOnFailure(DataModel::Decode(reader, sourceNode)); break; - case to_underlying(Fields::kData): - ReturnErrorOnFailure(DataModel::Decode(reader, data)); + case to_underlying(Fields::kDataIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, dataIndex)); break; default: break; @@ -10642,10 +10682,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ProgrammingEventNotification. -} // namespace Commands - -namespace Events { +} // namespace LockUserChange. } // namespace Events } // namespace DoorLock 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 33092c6c16a65f..777fbb9d196d0e 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 @@ -13748,6 +13748,164 @@ struct TypeInfo } // namespace Attributes } // namespace ShadeConfiguration namespace DoorLock { +// Enum for DlAlarmCode +enum class DlAlarmCode : uint8_t +{ + kLockJammed = 0x00, + kLockFactoryReset = 0x01, + kLockRadioPowerCycled = 0x03, + kWrongCodeEntryLimit = 0x04, + kFrontEsceutcheonRemoved = 0x05, + kDoorForcedOpen = 0x06, + kDoorAjar = 0x07, + kForcedUser = 0x08, +}; +// Enum for DlCredentialRule +enum class DlCredentialRule : uint8_t +{ + kSingle = 0x00, + kDouble = 0x01, + kTri = 0x02, +}; +// Enum for DlCredentialType +enum class DlCredentialType : uint8_t +{ + kProgrammingPIN = 0x00, + kPin = 0x01, + kRfid = 0x02, + kFingerprint = 0x03, + kFingerVein = 0x04, + kFace = 0x05, +}; +// Enum for DlDataOperationType +enum class DlDataOperationType : uint8_t +{ + kAdd = 0x00, + kClear = 0x01, + kModify = 0x02, +}; +// Enum for DlDoorLockStatus +enum class DlDoorLockStatus : uint8_t +{ + kDuplicate = 0x02, + kOccupied = 0x03, +}; +// Enum for DlDoorState +enum class DlDoorState : uint8_t +{ + kDoorOpen = 0x00, + kDoorClosed = 0x01, + kDoorJammed = 0x02, + kDoorForcedOpen = 0x03, + kDoorUnspecifiedError = 0x04, + kDoorAjar = 0x05, +}; +// 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, +}; +// Enum for DlLockOperationType +enum class DlLockOperationType : uint8_t +{ + kLock = 0x00, + kUnlock = 0x01, + kNonAccessUserEvent = 0x02, + kForcedUserEvent = 0x03, +}; +// Enum for DlLockState +enum class DlLockState : uint8_t +{ + kNotFullyLocked = 0x00, + kLocked = 0x01, + kUnlocked = 0x02, +}; +// Enum for DlLockType +enum class DlLockType : uint8_t +{ + kDeadBolt = 0x00, + kMagnetic = 0x01, + kOther = 0x02, + kMortise = 0x03, + kRim = 0x04, + kLatchBolt = 0x05, + kCylindricalLock = 0x06, + kTubularLock = 0x07, + kInterconnectedLock = 0x08, + kDeadLatch = 0x09, + kDoorFurniture = 0x0A, +}; +// Enum for DlOperatingMode +enum class DlOperatingMode : uint8_t +{ + kNormal = 0x00, + kVacation = 0x01, + kPrivacy = 0x02, + kNoRemoteLockUnlock = 0x03, + kPassage = 0x04, +}; +// Enum for DlOperationError +enum class DlOperationError : uint8_t +{ + kUnspecified = 0x00, + kInvalidCredential = 0x01, + kDisabledUserDenied = 0x02, + kRestricted = 0x03, + kInsufficientBattery = 0x04, +}; +// 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, +}; +// Enum for DlStatus +enum class DlStatus : uint8_t +{ + kSuccess = 0x00, + kFailure = 0x01, + kDuplicate = 0x02, + kOccupied = 0x03, + kInvalidField = 0x85, + kNotFound = 0x8B, +}; +// Enum for DlUserStatus +enum class DlUserStatus : uint8_t +{ + kAvailable = 0x00, + kOccupiedEnabled = 0x01, + kOccupiedDisabled = 0x03, +}; +// 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, +}; // Need to convert consumers to using the new enum classes, so we // don't just have casts all over. #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM @@ -13829,6 +13987,151 @@ enum class DoorLockUserType : uint8_t using DoorLockUserType = EmberAfDoorLockUserType; #endif +// Bitmap for DlAlarmMask +enum class DlAlarmMask : uint16_t +{ + kLockingMechanismJammed = 0x1, + kLockResetToFactoryDefaults = 0x2, + kReserved = 0x4, + kRFModulePowerCycled = 0x8, + kWrongCodeEntryLimit = 0x10, + kFrontEscutcheonRemovedFromMain = 0x20, + kForcedDoorOpenUnderDoorLockedCondition = 0x40, +}; + +// Bitmap for DlCredentialRulesSupport +enum class DlCredentialRulesSupport : uint8_t +{ + kSingle = 0x1, + kDual = 0x2, + kTri = 0x4, +}; + +// Bitmap for DlDaysMaskMap +enum class DlDaysMaskMap : uint8_t +{ + kSunday = 0x1, + kMonday = 0x2, + kTuesday = 0x4, + kWednesday = 0x8, + kThursday = 0x10, + kFriday = 0x20, + kSaturday = 0x40, +}; + +// Bitmap for DlDefaultConfigurationRegister +enum class DlDefaultConfigurationRegister : uint16_t +{ + kEnableLocalProgrammingEnabled = 0x1, + kKeypadInterfaceDefaultAccessEnabled = 0x2, + kRemoteInterfaceDefaultAccessIsEnabled = 0x4, + kSoundEnabled = 0x20, + kAutoRelockTimeSet = 0x40, + kLEDSettingsSet = 0x80, +}; + +// Bitmap for DlKeypadOperationEventMask +enum class DlKeypadOperationEventMask : uint16_t +{ + kUnknown = 0x1, + kLock = 0x2, + kUnlock = 0x4, + kLockInvalidPIN = 0x8, + kLockInvalidSchedule = 0x10, + kUnlockInvalidCode = 0x20, + kUnlockInvalidSchedule = 0x40, + kNonAccessUserOpEvent = 0x80, +}; + +// Bitmap for DlKeypadProgrammingEventMask +enum class DlKeypadProgrammingEventMask : uint16_t +{ + kUnknown = 0x1, + kProgrammingPINChanged = 0x2, + kPINAdded = 0x4, + kPINCleared = 0x8, + kPINChanged = 0x10, +}; + +// Bitmap for DlLocalProgrammingFeatures +enum class DlLocalProgrammingFeatures : uint8_t +{ + kAddUsersCredentialsSchedulesLocally = 0x1, + kModifyUsersCredentialsSchedulesLocally = 0x2, + kClearUsersCredentialsSchedulesLocally = 0x4, + kAdjustLockSettingsLocally = 0x8, +}; + +// Bitmap for DlManualOperationEventMask +enum class DlManualOperationEventMask : uint16_t +{ + kUnknown = 0x1, + kThumbturnLock = 0x2, + kThumbturnUnlock = 0x4, + kOneTouchLock = 0x8, + kKeyLock = 0x10, + kKeyUnlock = 0x20, + kAutoLock = 0x40, + kScheduleLock = 0x80, + kScheduleUnlock = 0x100, + kManualLock = 0x200, + kManualUnlock = 0x400, +}; + +// Bitmap for DlRFIDOperationEventMask +enum class DlRFIDOperationEventMask : uint16_t +{ + kUnknown = 0x1, + kLock = 0x2, + kUnlock = 0x4, + kLockInvalidRFID = 0x8, + kLockInvalidSchedule = 0x10, + kUnlockInvalidRFID = 0x20, + kUnlockInvalidSchedule = 0x40, +}; + +// Bitmap for DlRFIDProgrammingEventMask +enum class DlRFIDProgrammingEventMask : uint16_t +{ + kUnknown = 0x1, + kRFIDCodeAdded = 0x20, + kRFIDCodeCleared = 0x40, +}; + +// Bitmap for DlRemoteOperationEventMask +enum class DlRemoteOperationEventMask : uint16_t +{ + kUnknown = 0x1, + kLock = 0x2, + kUnlock = 0x4, + kLockInvalidCode = 0x8, + kLockInvalidSchedule = 0x10, + kUnlockInvalidCode = 0x20, + kUnlockInvalidSchedule = 0x40, +}; + +// Bitmap for DlRemoteProgrammingEventMask +enum class DlRemoteProgrammingEventMask : uint16_t +{ + kUnknown = 0x1, + kProgrammingPINChanged = 0x2, + kPINAdded = 0x4, + kPINCleared = 0x8, + kPINChanged = 0x10, + kRFIDCodeAdded = 0x20, + kRFIDCodeCleared = 0x40, +}; + +// Bitmap for DlSupportedOperatingModes +enum class DlSupportedOperatingModes : uint16_t +{ + kNormal = 0x1, + kVacation = 0x2, + kPrivacy = 0x4, + kNoRemoteLockUnlock = 0x8, + kPassage = 0x10, +}; + // Bitmap for DoorLockDayOfWeek enum class DoorLockDayOfWeek : uint8_t { @@ -13841,6 +14144,29 @@ enum class DoorLockDayOfWeek : uint8_t kSaturday = 0x40, }; +namespace Structs { +namespace DlCredential { +enum class Fields +{ + kCredentialType = 1, + kCredentialIndex = 2, +}; + +struct Type +{ +public: + DlCredentialType credentialType; + uint16_t credentialIndex; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; + +using DecodableType = Type; + +} // namespace DlCredential +} // namespace Structs + namespace Commands { // Forward-declarations so we can reference these later. @@ -13849,41 +14175,16 @@ struct Type; struct DecodableType; } // namespace LockDoor -namespace LockDoorResponse { -struct Type; -struct DecodableType; -} // namespace LockDoorResponse - namespace UnlockDoor { struct Type; struct DecodableType; } // namespace UnlockDoor -namespace UnlockDoorResponse { -struct Type; -struct DecodableType; -} // namespace UnlockDoorResponse - -namespace Toggle { -struct Type; -struct DecodableType; -} // namespace Toggle - -namespace ToggleResponse { -struct Type; -struct DecodableType; -} // namespace ToggleResponse - namespace UnlockWithTimeout { struct Type; struct DecodableType; } // namespace UnlockWithTimeout -namespace UnlockWithTimeoutResponse { -struct Type; -struct DecodableType; -} // namespace UnlockWithTimeoutResponse - namespace GetLogRecord { struct Type; struct DecodableType; @@ -13894,56 +14195,36 @@ struct Type; struct DecodableType; } // namespace GetLogRecordResponse -namespace SetPin { -struct Type; -struct DecodableType; -} // namespace SetPin - -namespace SetPinResponse { -struct Type; -struct DecodableType; -} // namespace SetPinResponse - -namespace GetPin { -struct Type; -struct DecodableType; -} // namespace GetPin - -namespace GetPinResponse { +namespace SetPINCode { struct Type; struct DecodableType; -} // namespace GetPinResponse +} // namespace SetPINCode -namespace ClearPin { +namespace GetPINCode { struct Type; struct DecodableType; -} // namespace ClearPin +} // namespace GetPINCode -namespace ClearPinResponse { +namespace GetPINCodeResponse { struct Type; struct DecodableType; -} // namespace ClearPinResponse +} // namespace GetPINCodeResponse -namespace ClearAllPins { +namespace ClearPINCode { struct Type; struct DecodableType; -} // namespace ClearAllPins +} // namespace ClearPINCode -namespace ClearAllPinsResponse { +namespace ClearAllPINCodes { struct Type; struct DecodableType; -} // namespace ClearAllPinsResponse +} // namespace ClearAllPINCodes namespace SetUserStatus { struct Type; struct DecodableType; } // namespace SetUserStatus -namespace SetUserStatusResponse { -struct Type; -struct DecodableType; -} // namespace SetUserStatusResponse - namespace GetUserStatus { struct Type; struct DecodableType; @@ -13954,165 +14235,160 @@ struct Type; struct DecodableType; } // namespace GetUserStatusResponse -namespace SetWeekdaySchedule { +namespace SetWeekDaySchedule { struct Type; struct DecodableType; -} // namespace SetWeekdaySchedule +} // namespace SetWeekDaySchedule -namespace SetWeekdayScheduleResponse { +namespace GetWeekDaySchedule { struct Type; struct DecodableType; -} // namespace SetWeekdayScheduleResponse +} // namespace GetWeekDaySchedule -namespace GetWeekdaySchedule { +namespace GetWeekDayScheduleResponse { struct Type; struct DecodableType; -} // namespace GetWeekdaySchedule +} // namespace GetWeekDayScheduleResponse -namespace GetWeekdayScheduleResponse { +namespace ClearWeekDaySchedule { struct Type; struct DecodableType; -} // namespace GetWeekdayScheduleResponse +} // namespace ClearWeekDaySchedule -namespace ClearWeekdaySchedule { +namespace SetYearDaySchedule { struct Type; struct DecodableType; -} // namespace ClearWeekdaySchedule +} // namespace SetYearDaySchedule -namespace ClearWeekdayScheduleResponse { +namespace GetYearDaySchedule { struct Type; struct DecodableType; -} // namespace ClearWeekdayScheduleResponse +} // namespace GetYearDaySchedule -namespace SetYeardaySchedule { +namespace GetYearDayScheduleResponse { struct Type; struct DecodableType; -} // namespace SetYeardaySchedule +} // namespace GetYearDayScheduleResponse -namespace SetYeardayScheduleResponse { +namespace ClearYearDaySchedule { struct Type; struct DecodableType; -} // namespace SetYeardayScheduleResponse +} // namespace ClearYearDaySchedule -namespace GetYeardaySchedule { +namespace SetHolidaySchedule { struct Type; struct DecodableType; -} // namespace GetYeardaySchedule +} // namespace SetHolidaySchedule -namespace GetYeardayScheduleResponse { +namespace GetHolidaySchedule { struct Type; struct DecodableType; -} // namespace GetYeardayScheduleResponse +} // namespace GetHolidaySchedule -namespace ClearYeardaySchedule { +namespace GetHolidayScheduleResponse { struct Type; struct DecodableType; -} // namespace ClearYeardaySchedule +} // namespace GetHolidayScheduleResponse -namespace ClearYeardayScheduleResponse { +namespace ClearHolidaySchedule { struct Type; struct DecodableType; -} // namespace ClearYeardayScheduleResponse +} // namespace ClearHolidaySchedule -namespace SetHolidaySchedule { +namespace SetUserType { struct Type; struct DecodableType; -} // namespace SetHolidaySchedule +} // namespace SetUserType -namespace SetHolidayScheduleResponse { +namespace GetUserType { struct Type; struct DecodableType; -} // namespace SetHolidayScheduleResponse +} // namespace GetUserType -namespace GetHolidaySchedule { +namespace GetUserTypeResponse { struct Type; struct DecodableType; -} // namespace GetHolidaySchedule +} // namespace GetUserTypeResponse -namespace GetHolidayScheduleResponse { +namespace SetRFIDCode { struct Type; struct DecodableType; -} // namespace GetHolidayScheduleResponse +} // namespace SetRFIDCode -namespace ClearHolidaySchedule { +namespace GetRFIDCode { struct Type; struct DecodableType; -} // namespace ClearHolidaySchedule +} // namespace GetRFIDCode -namespace ClearHolidayScheduleResponse { +namespace GetRFIDCodeResponse { struct Type; struct DecodableType; -} // namespace ClearHolidayScheduleResponse +} // namespace GetRFIDCodeResponse -namespace SetUserType { +namespace ClearRFIDCode { struct Type; struct DecodableType; -} // namespace SetUserType +} // namespace ClearRFIDCode -namespace SetUserTypeResponse { +namespace ClearAllRFIDCodes { struct Type; struct DecodableType; -} // namespace SetUserTypeResponse +} // namespace ClearAllRFIDCodes -namespace GetUserType { +namespace SetUser { struct Type; struct DecodableType; -} // namespace GetUserType +} // namespace SetUser -namespace GetUserTypeResponse { +namespace GetUser { struct Type; struct DecodableType; -} // namespace GetUserTypeResponse +} // namespace GetUser -namespace SetRfid { +namespace GetUserResponse { struct Type; struct DecodableType; -} // namespace SetRfid +} // namespace GetUserResponse -namespace SetRfidResponse { +namespace ClearUser { struct Type; struct DecodableType; -} // namespace SetRfidResponse +} // namespace ClearUser -namespace GetRfid { +namespace OperatingEventNotification { struct Type; struct DecodableType; -} // namespace GetRfid +} // namespace OperatingEventNotification -namespace GetRfidResponse { +namespace ProgrammingEventNotification { struct Type; struct DecodableType; -} // namespace GetRfidResponse +} // namespace ProgrammingEventNotification -namespace ClearRfid { +namespace SetCredential { struct Type; struct DecodableType; -} // namespace ClearRfid +} // namespace SetCredential -namespace ClearRfidResponse { +namespace SetCredentialResponse { struct Type; struct DecodableType; -} // namespace ClearRfidResponse +} // namespace SetCredentialResponse -namespace ClearAllRfids { +namespace GetCredentialStatus { struct Type; struct DecodableType; -} // namespace ClearAllRfids +} // namespace GetCredentialStatus -namespace ClearAllRfidsResponse { +namespace GetCredentialStatusResponse { struct Type; struct DecodableType; -} // namespace ClearAllRfidsResponse +} // namespace GetCredentialStatusResponse -namespace OperationEventNotification { +namespace ClearCredential { struct Type; struct DecodableType; -} // namespace OperationEventNotification - -namespace ProgrammingEventNotification { -struct Type; -struct DecodableType; -} // namespace ProgrammingEventNotification +} // namespace ClearCredential } // namespace Commands @@ -14120,7 +14396,7 @@ namespace Commands { namespace LockDoor { enum class Fields { - kPin = 0, + kPinCode = 0, }; struct Type @@ -14130,11 +14406,11 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - chip::ByteSpan pin; + Optional pinCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::LockDoorResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14145,46 +14421,14 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - chip::ByteSpan pin; + Optional pinCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace LockDoor -namespace LockDoorResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LockDoorResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::LockDoorResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace LockDoorResponse namespace UnlockDoor { enum class Fields { - kPin = 0, + kPinCode = 0, }; struct Type @@ -14194,11 +14438,11 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - chip::ByteSpan pin; + Optional pinCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14209,111 +14453,15 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - chip::ByteSpan pin; + Optional pinCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace UnlockDoor -namespace UnlockDoorResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::UnlockDoorResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::UnlockDoorResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace UnlockDoorResponse -namespace Toggle { -enum class Fields -{ - kPin = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::Toggle::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - chip::CharSpan pin; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::DoorLock::Commands::ToggleResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::Toggle::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - chip::CharSpan pin; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace Toggle -namespace ToggleResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ToggleResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ToggleResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ToggleResponse namespace UnlockWithTimeout { enum class Fields { - kTimeoutInSeconds = 0, - kPin = 1, + kTimeout = 0, + kPinCode = 1, }; struct Type @@ -14323,12 +14471,12 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::UnlockWithTimeout::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t timeoutInSeconds; - chip::ByteSpan pin; + uint16_t timeout; + Optional pinCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14339,43 +14487,11 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::UnlockWithTimeout::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t timeoutInSeconds; - chip::ByteSpan pin; + uint16_t timeout; + Optional pinCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace UnlockWithTimeout -namespace UnlockWithTimeoutResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::UnlockWithTimeoutResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::UnlockWithTimeoutResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace UnlockWithTimeoutResponse namespace GetLogRecord { enum class Fields { @@ -14437,118 +14553,7 @@ struct Type CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::GetLogRecordResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint16_t logEntryId; - uint32_t timestamp; - uint8_t eventType; - uint8_t source; - uint8_t eventIdOrAlarmCode; - uint16_t userId; - chip::ByteSpan pin; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace GetLogRecordResponse -namespace SetPin { -enum class Fields -{ - kUserId = 0, - kUserStatus = 1, - kUserType = 2, - kPin = 3, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetPin::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan pin; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::DoorLock::Commands::SetPinResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SetPin::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan pin; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SetPin -namespace SetPinResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetPinResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - DoorLockSetPinOrIdStatus status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SetPinResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - DoorLockSetPinOrIdStatus status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SetPinResponse -namespace GetPin { -enum class Fields -{ - kUserId = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetPin::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint16_t userId; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::DoorLock::Commands::GetPinResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14556,14 +14561,20 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetPin::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetLogRecordResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint16_t logEntryId; + uint32_t timestamp; + uint8_t eventType; + uint8_t source; + uint8_t eventIdOrAlarmCode; uint16_t userId; + chip::ByteSpan pin; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetPin -namespace GetPinResponse { +}; // namespace GetLogRecordResponse +namespace SetPINCode { enum class Fields { kUserId = 0, @@ -14576,12 +14587,12 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetPinResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; + DlUserStatus userStatus; + DlUserType userType; chip::ByteSpan pin; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14594,17 +14605,17 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetPinResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; + DlUserStatus userStatus; + DlUserType userType; chip::ByteSpan pin; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetPinResponse -namespace ClearPin { +}; // namespace SetPINCode +namespace GetPINCode { enum class Fields { kUserId = 0, @@ -14614,14 +14625,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearPin::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearPinResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14629,27 +14640,33 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearPin::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearPin -namespace ClearPinResponse { +}; // namespace GetPINCode +namespace GetPINCodeResponse { enum class Fields { - kStatus = 0, + kUserId = 0, + kUserStatus = 1, + kUserType = 2, + kPin = 3, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearPinResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetPINCodeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable pin; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14661,28 +14678,34 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearPinResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetPINCodeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable pin; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearPinResponse -namespace ClearAllPins { +}; // namespace GetPINCodeResponse +namespace ClearPINCode { enum class Fields { + kPinSlotIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearAllPins::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint16_t pinSlotIndex; + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14690,27 +14713,25 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearAllPins::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearPINCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint16_t pinSlotIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearAllPins -namespace ClearAllPinsResponse { +}; // namespace ClearPINCode +namespace ClearAllPINCodes { enum class Fields { - kStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearAllPinsResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearAllPINCodes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; using ResponseType = DataModel::NullObjectType; @@ -14721,13 +14742,12 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearAllPinsResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearAllPINCodes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearAllPinsResponse +}; // namespace ClearAllPINCodes namespace SetUserStatus { enum class Fields { @@ -14743,11 +14763,11 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - uint8_t userStatus; + DlUserStatus userStatus; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetUserStatusResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14759,42 +14779,10 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - uint8_t userStatus; + DlUserStatus userStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetUserStatus -namespace SetUserStatusResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetUserStatusResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SetUserStatusResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SetUserStatusResponse namespace GetUserStatus { enum class Fields { @@ -14830,8 +14818,8 @@ struct DecodableType namespace GetUserStatusResponse { enum class Fields { - kUserId = 0, - kStatus = 1, + kUserId = 0, + kUserStatus = 1, }; struct Type @@ -14842,7 +14830,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - uint8_t status; + DlUserStatus userStatus; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14858,32 +14846,32 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - uint8_t status; + DlUserStatus userStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetUserStatusResponse -namespace SetWeekdaySchedule { +namespace SetWeekDaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, - kDaysMask = 2, - kStartHour = 3, - kStartMinute = 4, - kEndHour = 5, - kEndMinute = 6, + kWeekDayIndex = 0, + kUserIndex = 1, + kDaysMask = 2, + kStartHour = 3, + kStartMinute = 4, + kEndHour = 5, + kEndMinute = 6, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - chip::BitFlags daysMask; + uint8_t weekDayIndex; + uint16_t userIndex; + chip::BitFlags daysMask; uint8_t startHour; uint8_t startMinute; uint8_t endHour; @@ -14891,7 +14879,7 @@ struct Type CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14899,71 +14887,39 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - chip::BitFlags daysMask; + uint8_t weekDayIndex; + uint16_t userIndex; + chip::BitFlags daysMask; uint8_t startHour; uint8_t startMinute; uint8_t endHour; uint8_t endMinute; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetWeekdaySchedule -namespace SetWeekdayScheduleResponse { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetWeekdayScheduleResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::SetWeekdayScheduleResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - - uint8_t status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace SetWeekdayScheduleResponse -namespace GetWeekdaySchedule { +}; // namespace SetWeekDaySchedule +namespace GetWeekDaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, + kWeekDayIndex = 0, + kUserIndex = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t weekDayIndex; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14971,38 +14927,38 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t weekDayIndex; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetWeekdaySchedule -namespace GetWeekdayScheduleResponse { +}; // namespace GetWeekDaySchedule +namespace GetWeekDayScheduleResponse { enum class Fields { - kScheduleId = 0, - kUserId = 1, - kStatus = 2, - kDaysMask = 3, - kStartHour = 4, - kStartMinute = 5, - kEndHour = 6, - kEndMinute = 7, + kWeekDayIndex = 0, + kUserIndex = 1, + kStatus = 2, + kDaysMask = 3, + kStartHour = 4, + kStartMinute = 5, + kEndHour = 6, + kEndMinute = 7, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetWeekdayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeekDayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint8_t status; - uint8_t daysMask; + uint8_t weekDayIndex; + uint16_t userIndex; + DlStatus status; + chip::BitFlags daysMask; uint8_t startHour; uint8_t startMinute; uint8_t endHour; @@ -15018,40 +14974,40 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetWeekdayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeekDayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint8_t status; - uint8_t daysMask; + uint8_t weekDayIndex; + uint16_t userIndex; + DlStatus status; + chip::BitFlags daysMask; uint8_t startHour; uint8_t startMinute; uint8_t endHour; uint8_t endMinute; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetWeekdayScheduleResponse -namespace ClearWeekdaySchedule { +}; // namespace GetWeekDayScheduleResponse +namespace ClearWeekDaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, + kWeekDayIndex = 0, + kUserIndex = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t weekDayIndex; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15059,28 +15015,34 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearWeekdaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearWeekDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t weekDayIndex; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearWeekdaySchedule -namespace ClearWeekdayScheduleResponse { +}; // namespace ClearWeekDaySchedule +namespace SetYearDaySchedule { enum class Fields { - kStatus = 0, + kYearDayIndex = 0, + kUserIndex = 1, + kLocalStartTime = 2, + kLocalEndTime = 3, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearWeekdayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t yearDayIndex; + uint16_t userIndex; + uint32_t localStartTime; + uint32_t localEndTime; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15092,37 +15054,36 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearWeekdayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t yearDayIndex; + uint16_t userIndex; + uint32_t localStartTime; + uint32_t localEndTime; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearWeekdayScheduleResponse -namespace SetYeardaySchedule { +}; // namespace SetYearDaySchedule +namespace GetYearDaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, - kLocalStartTime = 2, - kLocalEndTime = 3, + kYearDayIndex = 0, + kUserIndex = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint32_t localStartTime; - uint32_t localEndTime; + uint8_t yearDayIndex; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15130,30 +15091,36 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint32_t localStartTime; - uint32_t localEndTime; + uint8_t yearDayIndex; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetYeardaySchedule -namespace SetYeardayScheduleResponse { +}; // namespace GetYearDaySchedule +namespace GetYearDayScheduleResponse { enum class Fields { - kStatus = 0, + kYearDayIndex = 0, + kUserIndex = 1, + kStatus = 2, + kLocalStartTime = 3, + kLocalEndTime = 4, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetYearDayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t yearDayIndex; + uint16_t userIndex; + DlStatus status; + uint32_t localStartTime; + uint32_t localEndTime; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15165,33 +15132,37 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetYearDayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t yearDayIndex; + uint16_t userIndex; + DlStatus status; + uint32_t localStartTime; + uint32_t localEndTime; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetYeardayScheduleResponse -namespace GetYeardaySchedule { +}; // namespace GetYearDayScheduleResponse +namespace ClearYearDaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, + kYearDayIndex = 0, + kUserIndex = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t yearDayIndex; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15199,36 +15170,34 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearYearDaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t yearDayIndex; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetYeardaySchedule -namespace GetYeardayScheduleResponse { +}; // namespace ClearYearDaySchedule +namespace SetHolidaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, - kStatus = 2, - kLocalStartTime = 3, - kLocalEndTime = 4, + kHolidayIndex = 0, + kLocalStartTime = 1, + kLocalEndTime = 2, + kOperatingMode = 3, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint8_t status; + uint8_t holidayIndex; uint32_t localStartTime; uint32_t localEndTime; + DlOperatingMode operatingMode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15240,37 +15209,34 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; - uint8_t status; + uint8_t holidayIndex; uint32_t localStartTime; uint32_t localEndTime; + DlOperatingMode operatingMode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetYeardayScheduleResponse -namespace ClearYeardaySchedule { +}; // namespace SetHolidaySchedule +namespace GetHolidaySchedule { enum class Fields { - kScheduleId = 0, - kUserId = 1, + kHolidayIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t holidayIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15278,28 +15244,35 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearYeardaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint16_t userId; + uint8_t holidayIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearYeardaySchedule -namespace ClearYeardayScheduleResponse { +}; // namespace GetHolidaySchedule +namespace GetHolidayScheduleResponse { enum class Fields { - kStatus = 0, + kHolidayIndex = 0, + kStatus = 1, + kLocalStartTime = 2, + kLocalEndTime = 3, + kOperatingMode = 4, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetHolidayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t holidayIndex; + DlStatus status; + uint32_t localStartTime; + uint32_t localEndTime; + DlOperatingMode operatingMode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15311,37 +15284,35 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearYeardayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetHolidayScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint8_t holidayIndex; + DlStatus status; + uint32_t localStartTime; + uint32_t localEndTime; + DlOperatingMode operatingMode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearYeardayScheduleResponse -namespace SetHolidaySchedule { +}; // namespace GetHolidayScheduleResponse +namespace ClearHolidaySchedule { enum class Fields { - kScheduleId = 0, - kLocalStartTime = 1, - kLocalEndTime = 2, - kOperatingModeDuringHoliday = 3, + kHolidayIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint32_t localStartTime; - uint32_t localEndTime; - uint8_t operatingModeDuringHoliday; + uint8_t holidayIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15349,30 +15320,29 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearHolidaySchedule::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint32_t localStartTime; - uint32_t localEndTime; - uint8_t operatingModeDuringHoliday; + uint8_t holidayIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetHolidaySchedule -namespace SetHolidayScheduleResponse { +}; // namespace ClearHolidaySchedule +namespace SetUserType { enum class Fields { - kStatus = 0, + kUserId = 0, + kUserType = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; + DlUserType userType; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15384,31 +15354,32 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; + DlUserType userType; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetHolidayScheduleResponse -namespace GetHolidaySchedule { +}; // namespace SetUserType +namespace GetUserType { enum class Fields { - kScheduleId = 0, + kUserId = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; + uint16_t userId; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15416,35 +15387,29 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; + uint16_t userId; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetHolidaySchedule -namespace GetHolidayScheduleResponse { +}; // namespace GetUserType +namespace GetUserTypeResponse { enum class Fields { - kScheduleId = 0, - kStatus = 1, - kLocalStartTime = 2, - kLocalEndTime = 3, - kOperatingModeDuringHoliday = 4, + kUserId = 0, + kUserType = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint8_t status; - uint32_t localStartTime; - uint32_t localEndTime; - uint8_t operatingModeDuringHoliday; + uint16_t userId; + DlUserType userType; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15456,35 +15421,38 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; - uint8_t status; - uint32_t localStartTime; - uint32_t localEndTime; - uint8_t operatingModeDuringHoliday; + uint16_t userId; + DlUserType userType; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetHolidayScheduleResponse -namespace ClearHolidaySchedule { +}; // namespace GetUserTypeResponse +namespace SetRFIDCode { enum class Fields { - kScheduleId = 0, + kUserId = 0, + kUserStatus = 1, + kUserType = 2, + kRfidCode = 3, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; + uint16_t userId; + DlUserStatus userStatus; + DlUserType userType; + chip::ByteSpan rfidCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15492,31 +15460,34 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearHolidaySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t scheduleId; + uint16_t userId; + DlUserStatus userStatus; + DlUserType userType; + chip::ByteSpan rfidCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearHolidaySchedule -namespace ClearHolidayScheduleResponse { +}; // namespace SetRFIDCode +namespace GetRFIDCode { enum class Fields { - kStatus = 0, + kUserId = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15524,33 +15495,37 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearHolidayScheduleResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t userId; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearHolidayScheduleResponse -namespace SetUserType { +}; // namespace GetRFIDCode +namespace GetRFIDCodeResponse { enum class Fields { - kUserId = 0, - kUserType = 1, + kUserId = 0, + kUserStatus = 1, + kUserType = 2, + kRfidCode = 3, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRFIDCodeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - DoorLockUserType userType; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable rfidCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15558,28 +15533,30 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetUserType::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRFIDCodeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } uint16_t userId; - DoorLockUserType userType; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable rfidCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetUserType -namespace SetUserTypeResponse { +}; // namespace GetRFIDCodeResponse +namespace ClearRFIDCode { enum class Fields { - kStatus = 0, + kRfidSlotIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetUserTypeResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t rfidSlotIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15591,31 +15568,28 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetUserTypeResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearRFIDCode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + uint16_t rfidSlotIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetUserTypeResponse -namespace GetUserType { +}; // namespace ClearRFIDCode +namespace ClearAllRFIDCodes { enum class Fields { - kUserId = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearAllRFIDCodes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15623,29 +15597,38 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetUserType::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearAllRFIDCodes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetUserType -namespace GetUserTypeResponse { +}; // namespace ClearAllRFIDCodes +namespace SetUser { enum class Fields { - kUserId = 0, - kUserType = 1, + kOperationType = 0, + kUserIndex = 1, + kUserName = 2, + kUserUniqueId = 3, + kUserStatus = 4, + kUserType = 5, + kCredentialRule = 6, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; - DoorLockUserType userType; + DlDataOperationType operationType; + uint16_t userIndex; + DataModel::Nullable userName; + DataModel::Nullable userUniqueId; + DlUserStatus userStatus; + DlUserType userType; + DataModel::Nullable credentialRule; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15657,38 +15640,37 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetUserTypeResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; - DoorLockUserType userType; + DlDataOperationType operationType; + uint16_t userIndex; + DataModel::Nullable userName; + DataModel::Nullable userUniqueId; + DlUserStatus userStatus; + DlUserType userType; + DataModel::Nullable credentialRule; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetUserTypeResponse -namespace SetRfid { +}; // namespace SetUser +namespace GetUser { enum class Fields { - kUserId = 0, - kUserStatus = 1, - kUserType = 2, - kId = 3, + kUserIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan id; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::SetRfidResponse::DecodableType; + using ResponseType = Clusters::DoorLock::Commands::GetUserResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15696,30 +15678,45 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan id; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetRfid -namespace SetRfidResponse { +}; // namespace GetUser +namespace GetUserResponse { enum class Fields { - kStatus = 0, + kUserIndex = 0, + kUserName = 1, + kUserUniqueId = 2, + kUserStatus = 3, + kUserType = 4, + kCredentialRule = 5, + kCredentials = 6, + kCreatorFabricIndex = 7, + kLastModifiedFabricIndex = 8, + kNextUserIndex = 9, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SetRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DoorLockSetPinOrIdStatus status; + uint16_t userIndex; + DataModel::Nullable userName; + DataModel::Nullable userUniqueId; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; + DataModel::Nullable> credentials; + DataModel::Nullable creatorFabricIndex; + DataModel::Nullable lastModifiedFabricIndex; + uint16_t nextUserIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15731,31 +15728,40 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SetRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetUserResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - DoorLockSetPinOrIdStatus status; + uint16_t userIndex; + DataModel::Nullable userName; + DataModel::Nullable userUniqueId; + DataModel::Nullable userStatus; + DataModel::Nullable userType; + DataModel::Nullable credentialRule; + DataModel::Nullable> credentials; + DataModel::Nullable creatorFabricIndex; + DataModel::Nullable lastModifiedFabricIndex; + uint16_t nextUserIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SetRfidResponse -namespace GetRfid { +}; // namespace GetUserResponse +namespace ClearUser { enum class Fields { - kUserId = 0, + kUserIndex = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; + uint16_t userIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::GetRfidResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15763,33 +15769,37 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearUser::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint16_t userId; + uint16_t userIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetRfid -namespace GetRfidResponse { +}; // namespace ClearUser +namespace OperatingEventNotification { enum class Fields { - kUserId = 0, - kUserStatus = 1, - kUserType = 2, - kRfid = 3, + kOperationEventSource = 0, + kOperationEventCode = 1, + kUserId = 2, + kPin = 3, + kLocalTime = 4, + kData = 5, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::OperatingEventNotification::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint8_t operationEventSource; + uint8_t operationEventCode; uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan rfid; + chip::ByteSpan pin; + uint32_t localTime; + Optional data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15801,34 +15811,50 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::OperatingEventNotification::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint8_t operationEventSource; + uint8_t operationEventCode; uint16_t userId; - DoorLockUserStatus userStatus; - DoorLockUserType userType; - chip::ByteSpan rfid; + chip::ByteSpan pin; + uint32_t localTime; + Optional data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetRfidResponse -namespace ClearRfid { +}; // namespace OperatingEventNotification +namespace ProgrammingEventNotification { enum class Fields { - kUserId = 0, + kProgramEventSource = 0, + kProgramEventCode = 1, + kUserId = 2, + kPin = 3, + kUserType = 4, + kUserStatus = 5, + kLocalTime = 6, + kData = 7, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint8_t programEventSource; + uint8_t programEventCode; uint16_t userId; + chip::ByteSpan pin; + DlUserType userType; + DlUserStatus userStatus; + uint32_t localTime; + Optional data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15836,31 +15862,46 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearRfid::Id; } + static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + uint8_t programEventSource; + uint8_t programEventCode; uint16_t userId; + chip::ByteSpan pin; + DlUserType userType; + DlUserStatus userStatus; + uint32_t localTime; + Optional data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearRfid -namespace ClearRfidResponse { +}; // namespace ProgrammingEventNotification +namespace SetCredential { enum class Fields { - kStatus = 0, + kOperationType = 0, + kCredential = 1, + kCredentialData = 2, + kUserIndex = 3, + kUserStatus = 4, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + DlDataOperationType operationType; + Structs::DlCredential::Type credential; + chip::ByteSpan credentialData; + DataModel::Nullable userIndex; + DataModel::Nullable userStatus; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15868,28 +15909,39 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearRfidResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + DlDataOperationType operationType; + Structs::DlCredential::DecodableType credential; + chip::ByteSpan credentialData; + DataModel::Nullable userIndex; + DataModel::Nullable userStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearRfidResponse -namespace ClearAllRfids { +}; // namespace SetCredential +namespace SetCredentialResponse { enum class Fields { + kStatus = 0, + kUserIndex = 1, + kNextCredentialIndex = 2, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearAllRfids::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetCredentialResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + DlStatus status; + DataModel::Nullable userIndex; + DataModel::Nullable nextCredentialIndex; + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType; + using ResponseType = DataModel::NullObjectType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15897,30 +15949,33 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearAllRfids::Id; } + static constexpr CommandId GetCommandId() { return Commands::SetCredentialResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + DlStatus status; + DataModel::Nullable userIndex; + DataModel::Nullable nextCredentialIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearAllRfids -namespace ClearAllRfidsResponse { +}; // namespace SetCredentialResponse +namespace GetCredentialStatus { enum class Fields { - kStatus = 0, + kCredential = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ClearAllRfidsResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + Structs::DlCredential::Type credential; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15928,37 +15983,31 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ClearAllRfidsResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t status; + Structs::DlCredential::DecodableType credential; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ClearAllRfidsResponse -namespace OperationEventNotification { +}; // namespace GetCredentialStatus +namespace GetCredentialStatusResponse { enum class Fields { - kSource = 0, - kEventCode = 1, - kUserId = 2, - kPin = 3, - kTimeStamp = 4, - kData = 5, + kCredentialExists = 0, + kUserIndex = 1, + kNextCredentialIndex = 2, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::OperationEventNotification::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatusResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t source; - DoorLockOperationEventCode eventCode; - uint16_t userId; - chip::ByteSpan pin; - uint32_t timeStamp; - chip::CharSpan data; + bool credentialExists; + DataModel::Nullable userIndex; + DataModel::Nullable nextCredentialIndex; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15970,46 +16019,29 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::OperationEventNotification::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatusResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t source; - DoorLockOperationEventCode eventCode; - uint16_t userId; - chip::ByteSpan pin; - uint32_t timeStamp; - chip::CharSpan data; + bool credentialExists; + DataModel::Nullable userIndex; + DataModel::Nullable nextCredentialIndex; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace OperationEventNotification -namespace ProgrammingEventNotification { +}; // namespace GetCredentialStatusResponse +namespace ClearCredential { enum class Fields { - kSource = 0, - kEventCode = 1, - kUserId = 2, - kPin = 3, - kUserType = 4, - kUserStatus = 5, - kTimeStamp = 6, - kData = 7, + kCredential = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t source; - DoorLockProgrammingEventCode eventCode; - uint16_t userId; - chip::ByteSpan pin; - DoorLockUserType userType; - DoorLockUserStatus userStatus; - uint32_t timeStamp; - chip::CharSpan data; + Structs::DlCredential::Type credential; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -16021,29 +16053,22 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ProgrammingEventNotification::Id; } + static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; } static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - uint8_t source; - DoorLockProgrammingEventCode eventCode; - uint16_t userId; - chip::ByteSpan pin; - DoorLockUserType userType; - DoorLockUserStatus userStatus; - uint32_t timeStamp; - chip::CharSpan data; + Structs::DlCredential::DecodableType credential; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ProgrammingEventNotification +}; // namespace ClearCredential } // namespace Commands namespace Attributes { namespace LockState { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = DataModel::Nullable; + using DecodableType = DataModel::Nullable; + using DecodableArgType = const DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::LockState::Id; } @@ -16053,9 +16078,9 @@ struct TypeInfo namespace LockType { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = DlLockType; + using DecodableType = DlLockType; + using DecodableArgType = DlLockType; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::LockType::Id; } @@ -16077,9 +16102,9 @@ struct TypeInfo namespace DoorState { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = DataModel::Nullable; + using DecodableType = DataModel::Nullable; + using DecodableArgType = const DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::DoorState::Id; } @@ -16122,7 +16147,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace OpenPeriod -namespace NumLockRecordsSupported { +namespace NumberOfLogRecordsSupported { struct TypeInfo { using Type = uint16_t; @@ -16130,11 +16155,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumLockRecordsSupported::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfLogRecordsSupported::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumLockRecordsSupported -namespace NumTotalUsersSupported { +} // namespace NumberOfLogRecordsSupported +namespace NumberOfTotalUsersSupported { struct TypeInfo { using Type = uint16_t; @@ -16142,11 +16167,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumTotalUsersSupported::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfTotalUsersSupported::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumTotalUsersSupported -namespace NumPinUsersSupported { +} // namespace NumberOfTotalUsersSupported +namespace NumberOfPINUsersSupported { struct TypeInfo { using Type = uint16_t; @@ -16154,11 +16179,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumPinUsersSupported::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfPINUsersSupported::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumPinUsersSupported -namespace NumRfidUsersSupported { +} // namespace NumberOfPINUsersSupported +namespace NumberOfRFIDUsersSupported { struct TypeInfo { using Type = uint16_t; @@ -16166,35 +16191,47 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumRfidUsersSupported::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfRFIDUsersSupported::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumRfidUsersSupported -namespace NumWeekdaySchedulesSupportedPerUser { +} // namespace NumberOfRFIDUsersSupported +namespace NumberOfWeekDaySchedulesSupportedPerUser { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumWeekdaySchedulesSupportedPerUser::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumWeekdaySchedulesSupportedPerUser -namespace NumYeardaySchedulesSupportedPerUser { +} // namespace NumberOfWeekDaySchedulesSupportedPerUser +namespace NumberOfYearDaySchedulesSupportedPerUser { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace NumberOfYearDaySchedulesSupportedPerUser +namespace NumberOfHolidaySchedulesSupported { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumYeardaySchedulesSupportedPerUser::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfHolidaySchedulesSupported::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumYeardaySchedulesSupportedPerUser -namespace NumHolidaySchedulesSupportedPerUser { +} // namespace NumberOfHolidaySchedulesSupported +namespace MaxPINCodeLength { struct TypeInfo { using Type = uint8_t; @@ -16202,11 +16239,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumHolidaySchedulesSupportedPerUser::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MaxPINCodeLength::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumHolidaySchedulesSupportedPerUser -namespace MaxPinLength { +} // namespace MaxPINCodeLength +namespace MinPINCodeLength { struct TypeInfo { using Type = uint8_t; @@ -16214,11 +16251,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MaxPinLength::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MinPINCodeLength::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MaxPinLength -namespace MinPinLength { +} // namespace MinPINCodeLength +namespace MaxRFIDCodeLength { struct TypeInfo { using Type = uint8_t; @@ -16226,11 +16263,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MinPinLength::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MaxRFIDCodeLength::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MinPinLength -namespace MaxRfidCodeLength { +} // namespace MaxRFIDCodeLength +namespace MinRFIDCodeLength { struct TypeInfo { using Type = uint8_t; @@ -16238,11 +16275,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MaxRfidCodeLength::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MinRFIDCodeLength::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MaxRfidCodeLength -namespace MinRfidCodeLength { +} // namespace MinRFIDCodeLength +namespace CredentialRulesSupport { struct TypeInfo { using Type = uint8_t; @@ -16250,10 +16287,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MinRfidCodeLength::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::CredentialRulesSupport::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MinRfidCodeLength +} // namespace CredentialRulesSupport namespace EnableLogging { struct TypeInfo { @@ -16278,7 +16315,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace Language -namespace LedSettings { +namespace LEDSettings { struct TypeInfo { using Type = uint8_t; @@ -16286,10 +16323,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::LedSettings::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::LEDSettings::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace LedSettings +} // namespace LEDSettings namespace AutoRelockTime { struct TypeInfo { @@ -16317,9 +16354,9 @@ struct TypeInfo namespace OperatingMode { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = DlOperatingMode; + using DecodableType = DlOperatingMode; + using DecodableArgType = DlOperatingMode; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OperatingMode::Id; } @@ -16374,7 +16411,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace EnableOneTouchLocking -namespace EnableInsideStatusLed { +namespace EnableInsideStatusLED { struct TypeInfo { using Type = bool; @@ -16382,10 +16419,10 @@ struct TypeInfo using DecodableArgType = bool; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::EnableInsideStatusLed::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::EnableInsideStatusLED::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace EnableInsideStatusLed +} // namespace EnableInsideStatusLED namespace EnablePrivacyModeButton { struct TypeInfo { @@ -16398,6 +16435,18 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace EnablePrivacyModeButton +namespace LocalProgrammingFeatures { +struct TypeInfo +{ + using Type = uint8_t; + using DecodableType = uint8_t; + using DecodableArgType = uint8_t; + + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::LocalProgrammingFeatures::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace LocalProgrammingFeatures namespace WrongCodeEntryLimit { struct TypeInfo { @@ -16422,7 +16471,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace UserCodeTemporaryDisableTime -namespace SendPinOverTheAir { +namespace SendPINOverTheAir { struct TypeInfo { using Type = bool; @@ -16430,11 +16479,11 @@ struct TypeInfo using DecodableArgType = bool; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SendPinOverTheAir::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::SendPINOverTheAir::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace SendPinOverTheAir -namespace RequirePinForRfOperation { +} // namespace SendPINOverTheAir +namespace RequirePINforRemoteOperation { struct TypeInfo { using Type = bool; @@ -16442,22 +16491,22 @@ struct TypeInfo using DecodableArgType = bool; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::RequirePinForRfOperation::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::RequirePINforRemoteOperation::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace RequirePinForRfOperation -namespace ZigbeeSecurityLevel { +} // namespace RequirePINforRemoteOperation +namespace ExpiringUserTimeout { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ZigbeeSecurityLevel::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ExpiringUserTimeout::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace ZigbeeSecurityLevel +} // namespace ExpiringUserTimeout namespace AlarmMask { struct TypeInfo { @@ -16482,7 +16531,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace KeypadOperationEventMask -namespace RfOperationEventMask { +namespace RemoteOperationEventMask { struct TypeInfo { using Type = uint16_t; @@ -16490,10 +16539,10 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::RfOperationEventMask::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::RemoteOperationEventMask::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace RfOperationEventMask +} // namespace RemoteOperationEventMask namespace ManualOperationEventMask { struct TypeInfo { @@ -16506,7 +16555,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ManualOperationEventMask -namespace RfidOperationEventMask { +namespace RFIDOperationEventMask { struct TypeInfo { using Type = uint16_t; @@ -16514,10 +16563,10 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::RfidOperationEventMask::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::RFIDOperationEventMask::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace RfidOperationEventMask +} // namespace RFIDOperationEventMask namespace KeypadProgrammingEventMask { struct TypeInfo { @@ -16530,7 +16579,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace KeypadProgrammingEventMask -namespace RfProgrammingEventMask { +namespace RemoteProgrammingEventMask { struct TypeInfo { using Type = uint16_t; @@ -16538,11 +16587,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::RfProgrammingEventMask::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::RemoteProgrammingEventMask::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace RfProgrammingEventMask -namespace RfidProgrammingEventMask { +} // namespace RemoteProgrammingEventMask +namespace RFIDProgrammingEventMask { struct TypeInfo { using Type = uint16_t; @@ -16550,10 +16599,10 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::RfidProgrammingEventMask::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::RFIDProgrammingEventMask::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace RfidProgrammingEventMask +} // namespace RFIDProgrammingEventMask namespace FeatureMap { struct TypeInfo { @@ -16579,6 +16628,224 @@ struct TypeInfo }; } // namespace ClusterRevision } // namespace Attributes +namespace Events { +namespace DoorLockAlarm { +static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical; +static constexpr EventId kEventId = 0x00000000; + +enum class Fields +{ + kAlarmCode = 0, +}; + +struct Type +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlAlarmCode alarmCode; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlAlarmCode alarmCode; + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +} // namespace DoorLockAlarm +namespace DoorStateChange { +static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical; +static constexpr EventId kEventId = 0x00000001; + +enum class Fields +{ + kDoorState = 0, +}; + +struct Type +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlDoorState doorState; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlDoorState doorState; + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +} // namespace DoorStateChange +namespace LockOperation { +static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical; +static constexpr EventId kEventId = 0x00000002; + +enum class Fields +{ + kLockOperationType = 0, + kOperationSource = 1, + kUserIndex = 2, + kFabricIndex = 3, + kSourceNode = 4, + kCredentials = 5, +}; + +struct Type +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockOperationType lockOperationType; + DlOperationSource operationSource; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + Optional>> credentials; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockOperationType lockOperationType; + DlOperationSource operationSource; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + Optional>> credentials; + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +} // namespace LockOperation +namespace LockOperationError { +static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical; +static constexpr EventId kEventId = 0x00000003; + +enum class Fields +{ + kLockOperationType = 0, + kOperationSource = 1, + kOperationError = 2, + kUserIndex = 3, + kFabricIndex = 4, + kSourceNode = 5, + kCredentials = 6, +}; + +struct Type +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockOperationType lockOperationType; + DlOperationSource operationSource; + DlOperationError operationError; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + Optional>> credentials; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockOperationType lockOperationType; + DlOperationSource operationSource; + DlOperationError operationError; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + Optional>> credentials; + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +} // namespace LockOperationError +namespace LockUserChange { +static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; +static constexpr EventId kEventId = 0x00000004; + +enum class Fields +{ + kLockDataType = 0, + kDataOperationType = 1, + kOperationSource = 2, + kUserIndex = 3, + kFabricIndex = 4, + kSourceNode = 5, + kDataIndex = 6, +}; + +struct Type +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockDataType lockDataType; + DlDataOperationType dataOperationType; + DlOperationSource operationSource; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + DataModel::Nullable dataIndex; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } + static constexpr EventId GetEventId() { return kEventId; } + static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; } + + DlLockDataType lockDataType; + DlDataOperationType dataOperationType; + DlOperationSource operationSource; + DataModel::Nullable userIndex; + DataModel::Nullable fabricIndex; + DataModel::Nullable sourceNode; + DataModel::Nullable dataIndex; + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +} // namespace LockUserChange +} // namespace Events } // namespace DoorLock namespace WindowCovering { diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index e8a5414033816b..9d71139d46086f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -240,59 +240,49 @@ // Commands for cluster: Door Lock #define ZCL_LOCK_DOOR_COMMAND_ID (0x00) -#define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00) #define ZCL_UNLOCK_DOOR_COMMAND_ID (0x01) -#define ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID (0x01) -#define ZCL_TOGGLE_COMMAND_ID (0x02) -#define ZCL_TOGGLE_RESPONSE_COMMAND_ID (0x02) #define ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID (0x03) -#define ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID (0x03) #define ZCL_GET_LOG_RECORD_COMMAND_ID (0x04) #define ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID (0x04) -#define ZCL_SET_PIN_COMMAND_ID (0x05) -#define ZCL_SET_PIN_RESPONSE_COMMAND_ID (0x05) -#define ZCL_GET_PIN_COMMAND_ID (0x06) -#define ZCL_GET_PIN_RESPONSE_COMMAND_ID (0x06) -#define ZCL_CLEAR_PIN_COMMAND_ID (0x07) -#define ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID (0x07) -#define ZCL_CLEAR_ALL_PINS_COMMAND_ID (0x08) -#define ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID (0x08) +#define ZCL_SET_PIN_CODE_COMMAND_ID (0x05) +#define ZCL_GET_PIN_CODE_COMMAND_ID (0x06) +#define ZCL_GET_PIN_CODE_RESPONSE_COMMAND_ID (0x06) +#define ZCL_CLEAR_PIN_CODE_COMMAND_ID (0x07) +#define ZCL_CLEAR_ALL_PIN_CODES_COMMAND_ID (0x08) #define ZCL_SET_USER_STATUS_COMMAND_ID (0x09) -#define ZCL_SET_USER_STATUS_RESPONSE_COMMAND_ID (0x09) #define ZCL_GET_USER_STATUS_COMMAND_ID (0x0A) #define ZCL_GET_USER_STATUS_RESPONSE_COMMAND_ID (0x0A) -#define ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID (0x0B) -#define ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0B) -#define ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID (0x0C) -#define ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0C) -#define ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID (0x0D) -#define ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0D) -#define ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID (0x0E) -#define ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0E) -#define ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID (0x0F) -#define ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0F) -#define ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID (0x10) -#define ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x10) +#define ZCL_SET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0B) +#define ZCL_GET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0C) +#define ZCL_GET_WEEK_DAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0C) +#define ZCL_CLEAR_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0D) +#define ZCL_SET_YEAR_DAY_SCHEDULE_COMMAND_ID (0x0E) +#define ZCL_GET_YEAR_DAY_SCHEDULE_COMMAND_ID (0x0F) +#define ZCL_GET_YEAR_DAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0F) +#define ZCL_CLEAR_YEAR_DAY_SCHEDULE_COMMAND_ID (0x10) #define ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID (0x11) -#define ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x11) #define ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID (0x12) #define ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x12) #define ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID (0x13) -#define ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x13) #define ZCL_SET_USER_TYPE_COMMAND_ID (0x14) -#define ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID (0x14) #define ZCL_GET_USER_TYPE_COMMAND_ID (0x15) #define ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID (0x15) -#define ZCL_SET_RFID_COMMAND_ID (0x16) -#define ZCL_SET_RFID_RESPONSE_COMMAND_ID (0x16) -#define ZCL_GET_RFID_COMMAND_ID (0x17) -#define ZCL_GET_RFID_RESPONSE_COMMAND_ID (0x17) -#define ZCL_CLEAR_RFID_COMMAND_ID (0x18) -#define ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID (0x18) -#define ZCL_CLEAR_ALL_RFIDS_COMMAND_ID (0x19) -#define ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID (0x19) -#define ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID (0x20) +#define ZCL_SET_RFID_CODE_COMMAND_ID (0x16) +#define ZCL_GET_RFID_CODE_COMMAND_ID (0x17) +#define ZCL_GET_RFID_CODE_RESPONSE_COMMAND_ID (0x17) +#define ZCL_CLEAR_RFID_CODE_COMMAND_ID (0x18) +#define ZCL_CLEAR_ALL_RFID_CODES_COMMAND_ID (0x19) +#define ZCL_SET_USER_COMMAND_ID (0x1A) +#define ZCL_GET_USER_COMMAND_ID (0x1B) +#define ZCL_GET_USER_RESPONSE_COMMAND_ID (0x1C) +#define ZCL_CLEAR_USER_COMMAND_ID (0x1D) +#define ZCL_OPERATING_EVENT_NOTIFICATION_COMMAND_ID (0x20) #define ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID (0x21) +#define ZCL_SET_CREDENTIAL_COMMAND_ID (0x22) +#define ZCL_SET_CREDENTIAL_RESPONSE_COMMAND_ID (0x23) +#define ZCL_GET_CREDENTIAL_STATUS_COMMAND_ID (0x24) +#define ZCL_GET_CREDENTIAL_STATUS_RESPONSE_COMMAND_ID (0x25) +#define ZCL_CLEAR_CREDENTIAL_COMMAND_ID (0x26) // Commands for cluster: Window Covering #define ZCL_UP_OR_OPEN_COMMAND_ID (0x00) 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 f5bf03f33af663..87f04547bd3a96 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -930,6 +930,166 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW_OFFSET (0) #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH (2) #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH_OFFSET (1) +#define EMBER_AF_DL_ALARM_MASK_LOCKING_MECHANISM_JAMMED (1) +#define EMBER_AF_DL_ALARM_MASK_LOCKING_MECHANISM_JAMMED_OFFSET (0) +#define EMBER_AF_DL_ALARM_MASK_LOCK_RESET_TO_FACTORY_DEFAULTS (2) +#define EMBER_AF_DL_ALARM_MASK_LOCK_RESET_TO_FACTORY_DEFAULTS_OFFSET (1) +#define EMBER_AF_DL_ALARM_MASK_RESERVED (4) +#define EMBER_AF_DL_ALARM_MASK_RESERVED_OFFSET (2) +#define EMBER_AF_DL_ALARM_MASK_RF_MODULE_POWER_CYCLED (8) +#define EMBER_AF_DL_ALARM_MASK_RF_MODULE_POWER_CYCLED_OFFSET (3) +#define EMBER_AF_DL_ALARM_MASK_WRONG_CODE_ENTRY_LIMIT (16) +#define EMBER_AF_DL_ALARM_MASK_WRONG_CODE_ENTRY_LIMIT_OFFSET (4) +#define EMBER_AF_DL_ALARM_MASK_FRONT_ESCUTCHEON_REMOVED_FROM_MAIN (32) +#define EMBER_AF_DL_ALARM_MASK_FRONT_ESCUTCHEON_REMOVED_FROM_MAIN_OFFSET (5) +#define EMBER_AF_DL_ALARM_MASK_FORCED_DOOR_OPEN_UNDER_DOOR_LOCKED_CONDITION (64) +#define EMBER_AF_DL_ALARM_MASK_FORCED_DOOR_OPEN_UNDER_DOOR_LOCKED_CONDITION_OFFSET (6) +#define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_SINGLE (1) +#define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_SINGLE_OFFSET (0) +#define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_DUAL (2) +#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) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_KEYPAD_INTERFACE_DEFAULT_ACCESS_ENABLED_OFFSET (1) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_REMOTE_INTERFACE_DEFAULT_ACCESS_IS_ENABLED (4) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_REMOTE_INTERFACE_DEFAULT_ACCESS_IS_ENABLED_OFFSET (2) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_SOUND_ENABLED (32) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_SOUND_ENABLED_OFFSET (5) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_AUTO_RELOCK_TIME_SET (64) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_AUTO_RELOCK_TIME_SET_OFFSET (6) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_LED_SETTINGS_SET (128) +#define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_LED_SETTINGS_SET_OFFSET (7) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK (2) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK_OFFSET (1) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK (4) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK_OFFSET (2) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK_INVALID_PIN (8) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK_INVALID_PIN_OFFSET (3) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE (16) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE_OFFSET (4) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK_INVALID_CODE (32) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK_INVALID_CODE_OFFSET (5) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE (64) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE_OFFSET (6) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_NON_ACCESS_USER_OP_EVENT (128) +#define EMBER_AF_DL_KEYPAD_OPERATION_EVENT_MASK_NON_ACCESS_USER_OP_EVENT_OFFSET (7) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PROGRAMMING_PIN_CHANGED (2) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PROGRAMMING_PIN_CHANGED_OFFSET (1) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_ADDED (4) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_ADDED_OFFSET (2) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_CLEARED (8) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_CLEARED_OFFSET (3) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_CHANGED (16) +#define EMBER_AF_DL_KEYPAD_PROGRAMMING_EVENT_MASK_PIN_CHANGED_OFFSET (4) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_ADD_USERS_CREDENTIALS_SCHEDULES_LOCALLY (1) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_ADD_USERS_CREDENTIALS_SCHEDULES_LOCALLY_OFFSET (0) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_MODIFY_USERS_CREDENTIALS_SCHEDULES_LOCALLY (2) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_MODIFY_USERS_CREDENTIALS_SCHEDULES_LOCALLY_OFFSET (1) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_CLEAR_USERS_CREDENTIALS_SCHEDULES_LOCALLY (4) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_CLEAR_USERS_CREDENTIALS_SCHEDULES_LOCALLY_OFFSET (2) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_ADJUST_LOCK_SETTINGS_LOCALLY (8) +#define EMBER_AF_DL_LOCAL_PROGRAMMING_FEATURES_ADJUST_LOCK_SETTINGS_LOCALLY_OFFSET (3) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_THUMBTURN_LOCK (2) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_THUMBTURN_LOCK_OFFSET (1) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_THUMBTURN_UNLOCK (4) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_THUMBTURN_UNLOCK_OFFSET (2) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_ONE_TOUCH_LOCK (8) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_ONE_TOUCH_LOCK_OFFSET (3) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_KEY_LOCK (16) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_KEY_LOCK_OFFSET (4) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_KEY_UNLOCK (32) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_KEY_UNLOCK_OFFSET (5) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_AUTO_LOCK (64) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_AUTO_LOCK_OFFSET (6) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_SCHEDULE_LOCK (128) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_SCHEDULE_LOCK_OFFSET (7) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_SCHEDULE_UNLOCK (256) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_SCHEDULE_UNLOCK_OFFSET (8) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_MANUAL_LOCK (512) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_MANUAL_LOCK_OFFSET (9) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_MANUAL_UNLOCK (1024) +#define EMBER_AF_DL_MANUAL_OPERATION_EVENT_MASK_MANUAL_UNLOCK_OFFSET (10) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK (2) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK_OFFSET (1) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK (4) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK_OFFSET (2) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK_INVALID_RFID (8) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK_INVALID_RFID_OFFSET (3) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE (16) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE_OFFSET (4) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK_INVALID_RFID (32) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK_INVALID_RFID_OFFSET (5) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE (64) +#define EMBER_AF_DL_RFID_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE_OFFSET (6) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_RFID_CODE_ADDED (32) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_RFID_CODE_ADDED_OFFSET (5) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_RFID_CODE_CLEARED (64) +#define EMBER_AF_DL_RFID_PROGRAMMING_EVENT_MASK_RFID_CODE_CLEARED_OFFSET (6) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK (2) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK_OFFSET (1) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK (4) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK_OFFSET (2) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK_INVALID_CODE (8) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK_INVALID_CODE_OFFSET (3) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE (16) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_LOCK_INVALID_SCHEDULE_OFFSET (4) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK_INVALID_CODE (32) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK_INVALID_CODE_OFFSET (5) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE (64) +#define EMBER_AF_DL_REMOTE_OPERATION_EVENT_MASK_UNLOCK_INVALID_SCHEDULE_OFFSET (6) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_UNKNOWN (1) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_UNKNOWN_OFFSET (0) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PROGRAMMING_PIN_CHANGED (2) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PROGRAMMING_PIN_CHANGED_OFFSET (1) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_ADDED (4) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_ADDED_OFFSET (2) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_CLEARED (8) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_CLEARED_OFFSET (3) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_CHANGED (16) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_PIN_CHANGED_OFFSET (4) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_RFID_CODE_ADDED (32) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_RFID_CODE_ADDED_OFFSET (5) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_RFID_CODE_CLEARED (64) +#define EMBER_AF_DL_REMOTE_PROGRAMMING_EVENT_MASK_RFID_CODE_CLEARED_OFFSET (6) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_NORMAL (1) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_NORMAL_OFFSET (0) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_VACATION (2) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_VACATION_OFFSET (1) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_PRIVACY (4) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_PRIVACY_OFFSET (2) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_NO_REMOTE_LOCK_UNLOCK (8) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_NO_REMOTE_LOCK_UNLOCK_OFFSET (3) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_PASSAGE (16) +#define EMBER_AF_DL_SUPPORTED_OPERATING_MODES_PASSAGE_OFFSET (4) #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SUNDAY (1) #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SUNDAY_OFFSET (0) #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_MONDAY (2) diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index d49050bf61d9e8..7460f124e21a43 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -1966,49 +1966,53 @@ namespace OpenPeriod { static constexpr AttributeId Id = 0x00000006; } // namespace OpenPeriod -namespace NumLockRecordsSupported { +namespace NumberOfLogRecordsSupported { static constexpr AttributeId Id = 0x00000010; -} // namespace NumLockRecordsSupported +} // namespace NumberOfLogRecordsSupported -namespace NumTotalUsersSupported { +namespace NumberOfTotalUsersSupported { static constexpr AttributeId Id = 0x00000011; -} // namespace NumTotalUsersSupported +} // namespace NumberOfTotalUsersSupported -namespace NumPinUsersSupported { +namespace NumberOfPINUsersSupported { static constexpr AttributeId Id = 0x00000012; -} // namespace NumPinUsersSupported +} // namespace NumberOfPINUsersSupported -namespace NumRfidUsersSupported { +namespace NumberOfRFIDUsersSupported { static constexpr AttributeId Id = 0x00000013; -} // namespace NumRfidUsersSupported +} // namespace NumberOfRFIDUsersSupported -namespace NumWeekdaySchedulesSupportedPerUser { +namespace NumberOfWeekDaySchedulesSupportedPerUser { static constexpr AttributeId Id = 0x00000014; -} // namespace NumWeekdaySchedulesSupportedPerUser +} // namespace NumberOfWeekDaySchedulesSupportedPerUser -namespace NumYeardaySchedulesSupportedPerUser { +namespace NumberOfYearDaySchedulesSupportedPerUser { static constexpr AttributeId Id = 0x00000015; -} // namespace NumYeardaySchedulesSupportedPerUser +} // namespace NumberOfYearDaySchedulesSupportedPerUser -namespace NumHolidaySchedulesSupportedPerUser { +namespace NumberOfHolidaySchedulesSupported { static constexpr AttributeId Id = 0x00000016; -} // namespace NumHolidaySchedulesSupportedPerUser +} // namespace NumberOfHolidaySchedulesSupported -namespace MaxPinLength { +namespace MaxPINCodeLength { static constexpr AttributeId Id = 0x00000017; -} // namespace MaxPinLength +} // namespace MaxPINCodeLength -namespace MinPinLength { +namespace MinPINCodeLength { static constexpr AttributeId Id = 0x00000018; -} // namespace MinPinLength +} // namespace MinPINCodeLength -namespace MaxRfidCodeLength { +namespace MaxRFIDCodeLength { static constexpr AttributeId Id = 0x00000019; -} // namespace MaxRfidCodeLength +} // namespace MaxRFIDCodeLength -namespace MinRfidCodeLength { +namespace MinRFIDCodeLength { static constexpr AttributeId Id = 0x0000001A; -} // namespace MinRfidCodeLength +} // namespace MinRFIDCodeLength + +namespace CredentialRulesSupport { +static constexpr AttributeId Id = 0x0000001B; +} // namespace CredentialRulesSupport namespace EnableLogging { static constexpr AttributeId Id = 0x00000020; @@ -2018,9 +2022,9 @@ namespace Language { static constexpr AttributeId Id = 0x00000021; } // namespace Language -namespace LedSettings { +namespace LEDSettings { static constexpr AttributeId Id = 0x00000022; -} // namespace LedSettings +} // namespace LEDSettings namespace AutoRelockTime { static constexpr AttributeId Id = 0x00000023; @@ -2050,14 +2054,18 @@ namespace EnableOneTouchLocking { static constexpr AttributeId Id = 0x00000029; } // namespace EnableOneTouchLocking -namespace EnableInsideStatusLed { +namespace EnableInsideStatusLED { static constexpr AttributeId Id = 0x0000002A; -} // namespace EnableInsideStatusLed +} // namespace EnableInsideStatusLED namespace EnablePrivacyModeButton { static constexpr AttributeId Id = 0x0000002B; } // namespace EnablePrivacyModeButton +namespace LocalProgrammingFeatures { +static constexpr AttributeId Id = 0x0000002C; +} // namespace LocalProgrammingFeatures + namespace WrongCodeEntryLimit { static constexpr AttributeId Id = 0x00000030; } // namespace WrongCodeEntryLimit @@ -2066,17 +2074,17 @@ namespace UserCodeTemporaryDisableTime { static constexpr AttributeId Id = 0x00000031; } // namespace UserCodeTemporaryDisableTime -namespace SendPinOverTheAir { +namespace SendPINOverTheAir { static constexpr AttributeId Id = 0x00000032; -} // namespace SendPinOverTheAir +} // namespace SendPINOverTheAir -namespace RequirePinForRfOperation { +namespace RequirePINforRemoteOperation { static constexpr AttributeId Id = 0x00000033; -} // namespace RequirePinForRfOperation +} // namespace RequirePINforRemoteOperation -namespace ZigbeeSecurityLevel { -static constexpr AttributeId Id = 0x00000034; -} // namespace ZigbeeSecurityLevel +namespace ExpiringUserTimeout { +static constexpr AttributeId Id = 0x00000035; +} // namespace ExpiringUserTimeout namespace AlarmMask { static constexpr AttributeId Id = 0x00000040; @@ -2086,29 +2094,29 @@ namespace KeypadOperationEventMask { static constexpr AttributeId Id = 0x00000041; } // namespace KeypadOperationEventMask -namespace RfOperationEventMask { +namespace RemoteOperationEventMask { static constexpr AttributeId Id = 0x00000042; -} // namespace RfOperationEventMask +} // namespace RemoteOperationEventMask namespace ManualOperationEventMask { static constexpr AttributeId Id = 0x00000043; } // namespace ManualOperationEventMask -namespace RfidOperationEventMask { +namespace RFIDOperationEventMask { static constexpr AttributeId Id = 0x00000044; -} // namespace RfidOperationEventMask +} // namespace RFIDOperationEventMask namespace KeypadProgrammingEventMask { static constexpr AttributeId Id = 0x00000045; } // namespace KeypadProgrammingEventMask -namespace RfProgrammingEventMask { +namespace RemoteProgrammingEventMask { static constexpr AttributeId Id = 0x00000046; -} // namespace RfProgrammingEventMask +} // namespace RemoteProgrammingEventMask -namespace RfidProgrammingEventMask { +namespace RFIDProgrammingEventMask { static constexpr AttributeId Id = 0x00000047; -} // namespace RfidProgrammingEventMask +} // namespace RFIDProgrammingEventMask namespace FeatureMap { static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index bc4a5b4f07ccc6..004ac46f9322ea 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -810,34 +810,14 @@ namespace LockDoor { static constexpr CommandId Id = 0x00000000; } // namespace LockDoor -namespace LockDoorResponse { -static constexpr CommandId Id = 0x00000000; -} // namespace LockDoorResponse - namespace UnlockDoor { static constexpr CommandId Id = 0x00000001; } // namespace UnlockDoor -namespace UnlockDoorResponse { -static constexpr CommandId Id = 0x00000001; -} // namespace UnlockDoorResponse - -namespace Toggle { -static constexpr CommandId Id = 0x00000002; -} // namespace Toggle - -namespace ToggleResponse { -static constexpr CommandId Id = 0x00000002; -} // namespace ToggleResponse - namespace UnlockWithTimeout { static constexpr CommandId Id = 0x00000003; } // namespace UnlockWithTimeout -namespace UnlockWithTimeoutResponse { -static constexpr CommandId Id = 0x00000003; -} // namespace UnlockWithTimeoutResponse - namespace GetLogRecord { static constexpr CommandId Id = 0x00000004; } // namespace GetLogRecord @@ -846,46 +826,30 @@ namespace GetLogRecordResponse { static constexpr CommandId Id = 0x00000004; } // namespace GetLogRecordResponse -namespace SetPin { +namespace SetPINCode { static constexpr CommandId Id = 0x00000005; -} // namespace SetPin +} // namespace SetPINCode -namespace SetPinResponse { -static constexpr CommandId Id = 0x00000005; -} // namespace SetPinResponse - -namespace GetPin { +namespace GetPINCode { static constexpr CommandId Id = 0x00000006; -} // namespace GetPin +} // namespace GetPINCode -namespace GetPinResponse { +namespace GetPINCodeResponse { static constexpr CommandId Id = 0x00000006; -} // namespace GetPinResponse - -namespace ClearPin { -static constexpr CommandId Id = 0x00000007; -} // namespace ClearPin +} // namespace GetPINCodeResponse -namespace ClearPinResponse { +namespace ClearPINCode { static constexpr CommandId Id = 0x00000007; -} // namespace ClearPinResponse - -namespace ClearAllPins { -static constexpr CommandId Id = 0x00000008; -} // namespace ClearAllPins +} // namespace ClearPINCode -namespace ClearAllPinsResponse { +namespace ClearAllPINCodes { static constexpr CommandId Id = 0x00000008; -} // namespace ClearAllPinsResponse +} // namespace ClearAllPINCodes namespace SetUserStatus { static constexpr CommandId Id = 0x00000009; } // namespace SetUserStatus -namespace SetUserStatusResponse { -static constexpr CommandId Id = 0x00000009; -} // namespace SetUserStatusResponse - namespace GetUserStatus { static constexpr CommandId Id = 0x0000000A; } // namespace GetUserStatus @@ -894,62 +858,42 @@ namespace GetUserStatusResponse { static constexpr CommandId Id = 0x0000000A; } // namespace GetUserStatusResponse -namespace SetWeekdaySchedule { -static constexpr CommandId Id = 0x0000000B; -} // namespace SetWeekdaySchedule - -namespace SetWeekdayScheduleResponse { +namespace SetWeekDaySchedule { static constexpr CommandId Id = 0x0000000B; -} // namespace SetWeekdayScheduleResponse +} // namespace SetWeekDaySchedule -namespace GetWeekdaySchedule { +namespace GetWeekDaySchedule { static constexpr CommandId Id = 0x0000000C; -} // namespace GetWeekdaySchedule +} // namespace GetWeekDaySchedule -namespace GetWeekdayScheduleResponse { +namespace GetWeekDayScheduleResponse { static constexpr CommandId Id = 0x0000000C; -} // namespace GetWeekdayScheduleResponse - -namespace ClearWeekdaySchedule { -static constexpr CommandId Id = 0x0000000D; -} // namespace ClearWeekdaySchedule +} // namespace GetWeekDayScheduleResponse -namespace ClearWeekdayScheduleResponse { +namespace ClearWeekDaySchedule { static constexpr CommandId Id = 0x0000000D; -} // namespace ClearWeekdayScheduleResponse +} // namespace ClearWeekDaySchedule -namespace SetYeardaySchedule { +namespace SetYearDaySchedule { static constexpr CommandId Id = 0x0000000E; -} // namespace SetYeardaySchedule +} // namespace SetYearDaySchedule -namespace SetYeardayScheduleResponse { -static constexpr CommandId Id = 0x0000000E; -} // namespace SetYeardayScheduleResponse - -namespace GetYeardaySchedule { +namespace GetYearDaySchedule { static constexpr CommandId Id = 0x0000000F; -} // namespace GetYeardaySchedule +} // namespace GetYearDaySchedule -namespace GetYeardayScheduleResponse { +namespace GetYearDayScheduleResponse { static constexpr CommandId Id = 0x0000000F; -} // namespace GetYeardayScheduleResponse - -namespace ClearYeardaySchedule { -static constexpr CommandId Id = 0x00000010; -} // namespace ClearYeardaySchedule +} // namespace GetYearDayScheduleResponse -namespace ClearYeardayScheduleResponse { +namespace ClearYearDaySchedule { static constexpr CommandId Id = 0x00000010; -} // namespace ClearYeardayScheduleResponse +} // namespace ClearYearDaySchedule namespace SetHolidaySchedule { static constexpr CommandId Id = 0x00000011; } // namespace SetHolidaySchedule -namespace SetHolidayScheduleResponse { -static constexpr CommandId Id = 0x00000011; -} // namespace SetHolidayScheduleResponse - namespace GetHolidaySchedule { static constexpr CommandId Id = 0x00000012; } // namespace GetHolidaySchedule @@ -962,18 +906,10 @@ namespace ClearHolidaySchedule { static constexpr CommandId Id = 0x00000013; } // namespace ClearHolidaySchedule -namespace ClearHolidayScheduleResponse { -static constexpr CommandId Id = 0x00000013; -} // namespace ClearHolidayScheduleResponse - namespace SetUserType { static constexpr CommandId Id = 0x00000014; } // namespace SetUserType -namespace SetUserTypeResponse { -static constexpr CommandId Id = 0x00000014; -} // namespace SetUserTypeResponse - namespace GetUserType { static constexpr CommandId Id = 0x00000015; } // namespace GetUserType @@ -982,46 +918,70 @@ namespace GetUserTypeResponse { static constexpr CommandId Id = 0x00000015; } // namespace GetUserTypeResponse -namespace SetRfid { -static constexpr CommandId Id = 0x00000016; -} // namespace SetRfid - -namespace SetRfidResponse { +namespace SetRFIDCode { static constexpr CommandId Id = 0x00000016; -} // namespace SetRfidResponse +} // namespace SetRFIDCode -namespace GetRfid { +namespace GetRFIDCode { static constexpr CommandId Id = 0x00000017; -} // namespace GetRfid +} // namespace GetRFIDCode -namespace GetRfidResponse { +namespace GetRFIDCodeResponse { static constexpr CommandId Id = 0x00000017; -} // namespace GetRfidResponse +} // namespace GetRFIDCodeResponse -namespace ClearRfid { +namespace ClearRFIDCode { static constexpr CommandId Id = 0x00000018; -} // namespace ClearRfid +} // namespace ClearRFIDCode -namespace ClearRfidResponse { -static constexpr CommandId Id = 0x00000018; -} // namespace ClearRfidResponse - -namespace ClearAllRfids { +namespace ClearAllRFIDCodes { static constexpr CommandId Id = 0x00000019; -} // namespace ClearAllRfids +} // namespace ClearAllRFIDCodes -namespace ClearAllRfidsResponse { -static constexpr CommandId Id = 0x00000019; -} // namespace ClearAllRfidsResponse +namespace SetUser { +static constexpr CommandId Id = 0x0000001A; +} // namespace SetUser + +namespace GetUser { +static constexpr CommandId Id = 0x0000001B; +} // namespace GetUser + +namespace GetUserResponse { +static constexpr CommandId Id = 0x0000001C; +} // namespace GetUserResponse + +namespace ClearUser { +static constexpr CommandId Id = 0x0000001D; +} // namespace ClearUser -namespace OperationEventNotification { +namespace OperatingEventNotification { static constexpr CommandId Id = 0x00000020; -} // namespace OperationEventNotification +} // namespace OperatingEventNotification namespace ProgrammingEventNotification { static constexpr CommandId Id = 0x00000021; } // namespace ProgrammingEventNotification +namespace SetCredential { +static constexpr CommandId Id = 0x00000022; +} // namespace SetCredential + +namespace SetCredentialResponse { +static constexpr CommandId Id = 0x00000023; +} // namespace SetCredentialResponse + +namespace GetCredentialStatus { +static constexpr CommandId Id = 0x00000024; +} // namespace GetCredentialStatus + +namespace GetCredentialStatusResponse { +static constexpr CommandId Id = 0x00000025; +} // namespace GetCredentialStatusResponse + +namespace ClearCredential { +static constexpr CommandId Id = 0x00000026; +} // namespace ClearCredential + } // namespace Commands } // namespace DoorLock diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 0ea4a7775f0314..0776c0e40c18a9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -86,6 +86,8 @@ CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ModeSelect::Structs::SemanticTag::DecodableType & value); +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, @@ -1258,6 +1260,31 @@ CHIP_ERROR LogValue(const char * label, size_t indent, ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); return CHIP_NO_ERROR; } +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value) +{ + ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); + { + CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'CredentialType'", + IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'CredentialIndex'", + IndentStr(indent + 1).c_str()); + return err; + } + } + ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); + return CHIP_NO_ERROR; +} CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::IasAce::Structs::IasAceZoneStatusResult::DecodableType & value) { @@ -2733,107 +2760,6 @@ static void OnDiagnosticLogsRetrieveLogsResponseSuccess( command->SetCommandExitStatus(err); }; -static void -OnDoorLockClearAllPinsResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearAllPinsResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnDoorLockClearAllRfidsResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearAllRfidsResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockClearHolidayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearHolidayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockClearPinResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearPinResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnDoorLockClearRfidResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearRfidResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockClearWeekdayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearWeekdayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockClearYeardayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received ClearYeardayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - static void OnDoorLockGetHolidayScheduleResponseSuccess( void * context, const chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & data) { @@ -2841,7 +2767,7 @@ static void OnDoorLockGetHolidayScheduleResponseSuccess( CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { - err = LogValue("scheduleId", 1, data.scheduleId); + err = LogValue("holidayIndex", 1, data.holidayIndex); } if (err == CHIP_NO_ERROR) { @@ -2857,7 +2783,7 @@ static void OnDoorLockGetHolidayScheduleResponseSuccess( } if (err == CHIP_NO_ERROR) { - err = LogValue("operatingModeDuringHoliday", 1, data.operatingModeDuringHoliday); + err = LogValue("operatingMode", 1, data.operatingMode); } ModelCommand * command = static_cast(context); @@ -2903,10 +2829,11 @@ OnDoorLockGetLogRecordResponseSuccess(void * context, command->SetCommandExitStatus(err); }; -static void OnDoorLockGetPinResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & data) +static void +OnDoorLockGetPINCodeResponseSuccess(void * context, + const chip::app::Clusters::DoorLock::Commands::GetPINCodeResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received GetPinResponse:"); + ChipLogProgress(Zcl, "Received GetPINCodeResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { @@ -2929,10 +2856,11 @@ static void OnDoorLockGetPinResponseSuccess(void * context, command->SetCommandExitStatus(err); }; -static void OnDoorLockGetRfidResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & data) +static void +OnDoorLockGetRFIDCodeResponseSuccess(void * context, + const chip::app::Clusters::DoorLock::Commands::GetRFIDCodeResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received GetRfidResponse:"); + ChipLogProgress(Zcl, "Received GetRFIDCodeResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { @@ -2948,7 +2876,7 @@ static void OnDoorLockGetRfidResponseSuccess(void * context, } if (err == CHIP_NO_ERROR) { - err = LogValue("rfid", 1, data.rfid); + err = LogValue("rfidCode", 1, data.rfidCode); } ModelCommand * command = static_cast(context); @@ -2974,18 +2902,18 @@ OnDoorLockGetUserTypeResponseSuccess(void * context, command->SetCommandExitStatus(err); }; -static void OnDoorLockGetWeekdayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & data) +static void OnDoorLockGetWeekDayScheduleResponseSuccess( + void * context, const chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received GetWeekdayScheduleResponse:"); + ChipLogProgress(Zcl, "Received GetWeekDayScheduleResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { - err = LogValue("scheduleId", 1, data.scheduleId); + err = LogValue("weekDayIndex", 1, data.weekDayIndex); } if (err == CHIP_NO_ERROR) { - err = LogValue("userId", 1, data.userId); + err = LogValue("userIndex", 1, data.userIndex); } if (err == CHIP_NO_ERROR) { @@ -3016,18 +2944,18 @@ static void OnDoorLockGetWeekdayScheduleResponseSuccess( command->SetCommandExitStatus(err); }; -static void OnDoorLockGetYeardayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & data) +static void OnDoorLockGetYearDayScheduleResponseSuccess( + void * context, const chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received GetYeardayScheduleResponse:"); + ChipLogProgress(Zcl, "Received GetYearDayScheduleResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { - err = LogValue("scheduleId", 1, data.scheduleId); + err = LogValue("yearDayIndex", 1, data.yearDayIndex); } if (err == CHIP_NO_ERROR) { - err = LogValue("userId", 1, data.userId); + err = LogValue("userIndex", 1, data.userIndex); } if (err == CHIP_NO_ERROR) { @@ -3046,134 +2974,6 @@ static void OnDoorLockGetYeardayScheduleResponseSuccess( command->SetCommandExitStatus(err); }; -static void OnDoorLockLockDoorResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received LockDoorResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockSetHolidayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetHolidayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockSetPinResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetPinResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockSetRfidResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetRfidResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnDoorLockSetUserTypeResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetUserTypeResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockSetWeekdayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetWeekdayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockSetYeardayScheduleResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received SetYeardayScheduleResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnDoorLockUnlockDoorResponseSuccess(void * context, - const chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received UnlockDoorResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnDoorLockUnlockWithTimeoutResponseSuccess( - void * context, const chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received UnlockWithTimeoutResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - static void OnGeneralCommissioningArmFailSafeResponseSuccess( void * context, const chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & data) { @@ -16908,27 +16708,27 @@ class DiagnosticLogsRetrieveLogsRequest : public ModelCommand | Cluster DoorLock | 0x0101 | |------------------------------------------------------------------------------| | Commands: | | -| * ClearAllPins | 0x08 | -| * ClearAllRfids | 0x19 | +| * ClearAllPINCodes | 0x08 | +| * ClearAllRFIDCodes | 0x19 | | * ClearHolidaySchedule | 0x13 | -| * ClearPin | 0x07 | -| * ClearRfid | 0x18 | -| * ClearWeekdaySchedule | 0x0D | -| * ClearYeardaySchedule | 0x10 | +| * ClearPINCode | 0x07 | +| * ClearRFIDCode | 0x18 | +| * ClearWeekDaySchedule | 0x0D | +| * ClearYearDaySchedule | 0x10 | | * GetHolidaySchedule | 0x12 | | * GetLogRecord | 0x04 | -| * GetPin | 0x06 | -| * GetRfid | 0x17 | +| * GetPINCode | 0x06 | +| * GetRFIDCode | 0x17 | | * GetUserType | 0x15 | -| * GetWeekdaySchedule | 0x0C | -| * GetYeardaySchedule | 0x0F | +| * GetWeekDaySchedule | 0x0C | +| * GetYearDaySchedule | 0x0F | | * LockDoor | 0x00 | | * SetHolidaySchedule | 0x11 | -| * SetPin | 0x05 | -| * SetRfid | 0x16 | +| * SetPINCode | 0x05 | +| * SetRFIDCode | 0x16 | | * SetUserType | 0x14 | -| * SetWeekdaySchedule | 0x0B | -| * SetYeardaySchedule | 0x0E | +| * SetWeekDaySchedule | 0x0B | +| * SetYearDaySchedule | 0x0E | | * UnlockDoor | 0x01 | | * UnlockWithTimeout | 0x03 | |------------------------------------------------------------------------------| @@ -16940,43 +16740,43 @@ class DiagnosticLogsRetrieveLogsRequest : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command ClearAllPins + * Command ClearAllPINCodes */ -class DoorLockClearAllPins : public ModelCommand +class DoorLockClearAllPINCodes : public ModelCommand { public: - DoorLockClearAllPins() : ModelCommand("clear-all-pins") { ModelCommand::AddArguments(); } + DoorLockClearAllPINCodes() : ModelCommand("clear-all-pincodes") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000008) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearAllPinsResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearAllPins::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearAllPINCodes::Type mRequest; }; /* - * Command ClearAllRfids + * Command ClearAllRFIDCodes */ -class DoorLockClearAllRfids : public ModelCommand +class DoorLockClearAllRFIDCodes : public ModelCommand { public: - DoorLockClearAllRfids() : ModelCommand("clear-all-rfids") { ModelCommand::AddArguments(); } + DoorLockClearAllRFIDCodes() : ModelCommand("clear-all-rfidcodes") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000019) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearAllRfidsResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearAllRfids::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearAllRFIDCodes::Type mRequest; }; /* @@ -16987,7 +16787,7 @@ class DoorLockClearHolidaySchedule : public ModelCommand public: DoorLockClearHolidaySchedule() : ModelCommand("clear-holiday-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); + AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex); ModelCommand::AddArguments(); } @@ -16995,8 +16795,8 @@ class DoorLockClearHolidaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000013) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearHolidayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: @@ -17004,14 +16804,14 @@ class DoorLockClearHolidaySchedule : public ModelCommand }; /* - * Command ClearPin + * Command ClearPINCode */ -class DoorLockClearPin : public ModelCommand +class DoorLockClearPINCode : public ModelCommand { public: - DoorLockClearPin() : ModelCommand("clear-pin") + DoorLockClearPINCode() : ModelCommand("clear-pincode") { - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("PinSlotIndex", 0, UINT16_MAX, &mRequest.pinSlotIndex); ModelCommand::AddArguments(); } @@ -17019,23 +16819,23 @@ class DoorLockClearPin : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000007) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearPinResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearPin::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearPINCode::Type mRequest; }; /* - * Command ClearRfid + * Command ClearRFIDCode */ -class DoorLockClearRfid : public ModelCommand +class DoorLockClearRFIDCode : public ModelCommand { public: - DoorLockClearRfid() : ModelCommand("clear-rfid") + DoorLockClearRFIDCode() : ModelCommand("clear-rfidcode") { - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("RfidSlotIndex", 0, UINT16_MAX, &mRequest.rfidSlotIndex); ModelCommand::AddArguments(); } @@ -17043,24 +16843,24 @@ class DoorLockClearRfid : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000018) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearRfidResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearRfid::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearRFIDCode::Type mRequest; }; /* - * Command ClearWeekdaySchedule + * Command ClearWeekDaySchedule */ -class DoorLockClearWeekdaySchedule : public ModelCommand +class DoorLockClearWeekDaySchedule : public ModelCommand { public: - DoorLockClearWeekdaySchedule() : ModelCommand("clear-weekday-schedule") + DoorLockClearWeekDaySchedule() : ModelCommand("clear-week-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); ModelCommand::AddArguments(); } @@ -17068,24 +16868,24 @@ class DoorLockClearWeekdaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000D) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearWeekdayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearWeekdaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearWeekDaySchedule::Type mRequest; }; /* - * Command ClearYeardaySchedule + * Command ClearYearDaySchedule */ -class DoorLockClearYeardaySchedule : public ModelCommand +class DoorLockClearYearDaySchedule : public ModelCommand { public: - DoorLockClearYeardaySchedule() : ModelCommand("clear-yearday-schedule") + DoorLockClearYearDaySchedule() : ModelCommand("clear-year-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); ModelCommand::AddArguments(); } @@ -17093,12 +16893,12 @@ class DoorLockClearYeardaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000010) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockClearYeardayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::ClearYeardaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::ClearYearDaySchedule::Type mRequest; }; /* @@ -17109,7 +16909,7 @@ class DoorLockGetHolidaySchedule : public ModelCommand public: DoorLockGetHolidaySchedule() : ModelCommand("get-holiday-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); + AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex); ModelCommand::AddArguments(); } @@ -17150,12 +16950,12 @@ class DoorLockGetLogRecord : public ModelCommand }; /* - * Command GetPin + * Command GetPINCode */ -class DoorLockGetPin : public ModelCommand +class DoorLockGetPINCode : public ModelCommand { public: - DoorLockGetPin() : ModelCommand("get-pin") + DoorLockGetPINCode() : ModelCommand("get-pincode") { AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); ModelCommand::AddArguments(); @@ -17165,21 +16965,21 @@ class DoorLockGetPin : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000006) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockGetPinResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnDoorLockGetPINCodeResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::GetPin::Type mRequest; + chip::app::Clusters::DoorLock::Commands::GetPINCode::Type mRequest; }; /* - * Command GetRfid + * Command GetRFIDCode */ -class DoorLockGetRfid : public ModelCommand +class DoorLockGetRFIDCode : public ModelCommand { public: - DoorLockGetRfid() : ModelCommand("get-rfid") + DoorLockGetRFIDCode() : ModelCommand("get-rfidcode") { AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); ModelCommand::AddArguments(); @@ -17189,12 +16989,12 @@ class DoorLockGetRfid : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000017) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockGetRfidResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnDoorLockGetRFIDCodeResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::GetRfid::Type mRequest; + chip::app::Clusters::DoorLock::Commands::GetRFIDCode::Type mRequest; }; /* @@ -17222,15 +17022,15 @@ class DoorLockGetUserType : public ModelCommand }; /* - * Command GetWeekdaySchedule + * Command GetWeekDaySchedule */ -class DoorLockGetWeekdaySchedule : public ModelCommand +class DoorLockGetWeekDaySchedule : public ModelCommand { public: - DoorLockGetWeekdaySchedule() : ModelCommand("get-weekday-schedule") + DoorLockGetWeekDaySchedule() : ModelCommand("get-week-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); ModelCommand::AddArguments(); } @@ -17238,24 +17038,24 @@ class DoorLockGetWeekdaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000C) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockGetWeekdayScheduleResponseSuccess, OnDefaultFailure, + return chip::Controller::InvokeCommand(device, this, OnDoorLockGetWeekDayScheduleResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::GetWeekdaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::GetWeekDaySchedule::Type mRequest; }; /* - * Command GetYeardaySchedule + * Command GetYearDaySchedule */ -class DoorLockGetYeardaySchedule : public ModelCommand +class DoorLockGetYearDaySchedule : public ModelCommand { public: - DoorLockGetYeardaySchedule() : ModelCommand("get-yearday-schedule") + DoorLockGetYearDaySchedule() : ModelCommand("get-year-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); ModelCommand::AddArguments(); } @@ -17263,12 +17063,12 @@ class DoorLockGetYeardaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000F) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockGetYeardayScheduleResponseSuccess, OnDefaultFailure, + return chip::Controller::InvokeCommand(device, this, OnDoorLockGetYearDayScheduleResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::GetYeardaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::GetYearDaySchedule::Type mRequest; }; /* @@ -17279,7 +17079,7 @@ class DoorLockLockDoor : public ModelCommand public: DoorLockLockDoor() : ModelCommand("lock-door") { - AddArgument("Pin", &mRequest.pin); + AddArgument("PinCode", &mRequest.pinCode); ModelCommand::AddArguments(); } @@ -17287,8 +17087,8 @@ class DoorLockLockDoor : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000000) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockLockDoorResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: @@ -17303,10 +17103,11 @@ class DoorLockSetHolidaySchedule : public ModelCommand public: DoorLockSetHolidaySchedule() : ModelCommand("set-holiday-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); + AddArgument("HolidayIndex", 0, UINT8_MAX, &mRequest.holidayIndex); AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime); AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime); - AddArgument("OperatingModeDuringHoliday", 0, UINT8_MAX, &mRequest.operatingModeDuringHoliday); + AddArgument("OperatingMode", 0, UINT8_MAX, + reinterpret_cast *>(&mRequest.operatingMode)); ModelCommand::AddArguments(); } @@ -17314,8 +17115,8 @@ class DoorLockSetHolidaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000011) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetHolidayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: @@ -17323,12 +17124,12 @@ class DoorLockSetHolidaySchedule : public ModelCommand }; /* - * Command SetPin + * Command SetPINCode */ -class DoorLockSetPin : public ModelCommand +class DoorLockSetPINCode : public ModelCommand { public: - DoorLockSetPin() : ModelCommand("set-pin") + DoorLockSetPINCode() : ModelCommand("set-pincode") { AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); AddArgument("UserStatus", 0, UINT8_MAX, @@ -17343,28 +17144,28 @@ class DoorLockSetPin : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000005) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetPinResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::SetPin::Type mRequest; + chip::app::Clusters::DoorLock::Commands::SetPINCode::Type mRequest; }; /* - * Command SetRfid + * Command SetRFIDCode */ -class DoorLockSetRfid : public ModelCommand +class DoorLockSetRFIDCode : public ModelCommand { public: - DoorLockSetRfid() : ModelCommand("set-rfid") + DoorLockSetRFIDCode() : ModelCommand("set-rfidcode") { AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); AddArgument("UserStatus", 0, UINT8_MAX, reinterpret_cast *>(&mRequest.userStatus)); AddArgument("UserType", 0, UINT8_MAX, reinterpret_cast *>(&mRequest.userType)); - AddArgument("Id", &mRequest.id); + AddArgument("RfidCode", &mRequest.rfidCode); ModelCommand::AddArguments(); } @@ -17372,12 +17173,12 @@ class DoorLockSetRfid : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000016) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetRfidResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::SetRfid::Type mRequest; + chip::app::Clusters::DoorLock::Commands::SetRFIDCode::Type mRequest; }; /* @@ -17398,8 +17199,8 @@ class DoorLockSetUserType : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000014) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetUserTypeResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: @@ -17407,18 +17208,17 @@ class DoorLockSetUserType : public ModelCommand }; /* - * Command SetWeekdaySchedule + * Command SetWeekDaySchedule */ -class DoorLockSetWeekdaySchedule : public ModelCommand +class DoorLockSetWeekDaySchedule : public ModelCommand { public: - DoorLockSetWeekdaySchedule() : ModelCommand("set-weekday-schedule") + DoorLockSetWeekDaySchedule() : ModelCommand("set-week-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); - AddArgument( - "DaysMask", 0, UINT8_MAX, - reinterpret_cast *>(&mRequest.daysMask)); + AddArgument("WeekDayIndex", 0, UINT8_MAX, &mRequest.weekDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); + AddArgument("DaysMask", 0, UINT8_MAX, + reinterpret_cast *>(&mRequest.daysMask)); AddArgument("StartHour", 0, UINT8_MAX, &mRequest.startHour); AddArgument("StartMinute", 0, UINT8_MAX, &mRequest.startMinute); AddArgument("EndHour", 0, UINT8_MAX, &mRequest.endHour); @@ -17430,24 +17230,24 @@ class DoorLockSetWeekdaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000B) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetWeekdayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::SetWeekdaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type mRequest; }; /* - * Command SetYeardaySchedule + * Command SetYearDaySchedule */ -class DoorLockSetYeardaySchedule : public ModelCommand +class DoorLockSetYearDaySchedule : public ModelCommand { public: - DoorLockSetYeardaySchedule() : ModelCommand("set-yearday-schedule") + DoorLockSetYearDaySchedule() : ModelCommand("set-year-day-schedule") { - AddArgument("ScheduleId", 0, UINT8_MAX, &mRequest.scheduleId); - AddArgument("UserId", 0, UINT16_MAX, &mRequest.userId); + AddArgument("YearDayIndex", 0, UINT8_MAX, &mRequest.yearDayIndex); + AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex); AddArgument("LocalStartTime", 0, UINT32_MAX, &mRequest.localStartTime); AddArgument("LocalEndTime", 0, UINT32_MAX, &mRequest.localEndTime); ModelCommand::AddArguments(); @@ -17457,12 +17257,12 @@ class DoorLockSetYeardaySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x0000000E) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockSetYeardayScheduleResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::DoorLock::Commands::SetYeardaySchedule::Type mRequest; + chip::app::Clusters::DoorLock::Commands::SetYearDaySchedule::Type mRequest; }; /* @@ -17473,7 +17273,7 @@ class DoorLockUnlockDoor : public ModelCommand public: DoorLockUnlockDoor() : ModelCommand("unlock-door") { - AddArgument("Pin", &mRequest.pin); + AddArgument("PinCode", &mRequest.pinCode); ModelCommand::AddArguments(); } @@ -17481,8 +17281,8 @@ class DoorLockUnlockDoor : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000001) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockUnlockDoorResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: @@ -17497,8 +17297,8 @@ class DoorLockUnlockWithTimeout : public ModelCommand public: DoorLockUnlockWithTimeout() : ModelCommand("unlock-with-timeout") { - AddArgument("TimeoutInSeconds", 0, UINT16_MAX, &mRequest.timeoutInSeconds); - AddArgument("Pin", &mRequest.pin); + AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout); + AddArgument("PinCode", &mRequest.pinCode); ModelCommand::AddArguments(); } @@ -17506,186 +17306,14 @@ class DoorLockUnlockWithTimeout : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000101) command (0x00000003) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDoorLockUnlockWithTimeoutResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type mRequest; }; -/* - * Attribute LockState - */ -class ReadDoorLockLockState : public ModelCommand -{ -public: - ReadDoorLockLockState() : ModelCommand("read") - { - AddArgument("attr-name", "lock-state"); - ModelCommand::AddArguments(); - } - - ~ReadDoorLockLockState() - { - delete onSuccessCallback; - delete onFailureCallback; - } - - CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x0101) command (0x00) on endpoint %" PRIu8, endpointId); - - chip::Controller::DoorLockCluster cluster; - cluster.Associate(device, endpointId); - return cluster.ReadAttributeLockState(onSuccessCallback->Cancel(), onFailureCallback->Cancel()); - } - -private: - chip::Callback::Callback * onSuccessCallback = - new chip::Callback::Callback(OnInt8uAttributeResponse, this); - chip::Callback::Callback * onFailureCallback = - new chip::Callback::Callback(OnDefaultFailureResponse, this); -}; - -class ReportDoorLockLockState : public ModelCommand -{ -public: - ReportDoorLockLockState() : ModelCommand("report") - { - AddArgument("attr-name", "lock-state"); - AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); - AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); - AddArgument("wait", 0, 1, &mWait); - ModelCommand::AddArguments(); - } - - ~ReportDoorLockLockState() - { - delete onSuccessCallback; - delete onSuccessCallbackWithoutExit; - delete onFailureCallback; - delete onReportCallback; - } - - CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x0101) command (0x06) on endpoint %" PRIu8, endpointId); - - chip::Controller::DoorLockCluster cluster; - cluster.Associate(device, endpointId); - - ReturnErrorOnFailure(cluster.ReportAttributeLockState(onReportCallback->Cancel())); - - chip::Callback::Cancelable * successCallback = mWait ? onSuccessCallbackWithoutExit->Cancel() : onSuccessCallback->Cancel(); - return cluster.SubscribeAttributeLockState(successCallback, onFailureCallback->Cancel(), mMinInterval, mMaxInterval); - } - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); - } - -private: - chip::Callback::Callback * onSuccessCallback = - new chip::Callback::Callback(OnDefaultSuccessResponse, this); - chip::Callback::Callback * onSuccessCallbackWithoutExit = - new chip::Callback::Callback(OnDefaultSuccessResponseWithoutExit, this); - chip::Callback::Callback * onFailureCallback = - new chip::Callback::Callback(OnDefaultFailureResponse, this); - chip::Callback::Callback * onReportCallback = - new chip::Callback::Callback(OnInt8uAttributeReport, this); - uint16_t mMinInterval; - uint16_t mMaxInterval; - bool mWait; -}; - -/* - * Attribute LockType - */ -class ReadDoorLockLockType : public ModelCommand -{ -public: - ReadDoorLockLockType() : ModelCommand("read") - { - AddArgument("attr-name", "lock-type"); - ModelCommand::AddArguments(); - } - - ~ReadDoorLockLockType() - { - delete onSuccessCallback; - delete onFailureCallback; - } - - CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x0101) command (0x00) on endpoint %" PRIu8, endpointId); - - chip::Controller::DoorLockCluster cluster; - cluster.Associate(device, endpointId); - return cluster.ReadAttributeLockType(onSuccessCallback->Cancel(), onFailureCallback->Cancel()); - } - -private: - chip::Callback::Callback * onSuccessCallback = - new chip::Callback::Callback(OnInt8uAttributeResponse, this); - chip::Callback::Callback * onFailureCallback = - new chip::Callback::Callback(OnDefaultFailureResponse, this); -}; - -class ReportDoorLockLockType : public ModelCommand -{ -public: - ReportDoorLockLockType() : ModelCommand("report") - { - AddArgument("attr-name", "lock-type"); - AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); - AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); - AddArgument("wait", 0, 1, &mWait); - ModelCommand::AddArguments(); - } - - ~ReportDoorLockLockType() - { - delete onSuccessCallback; - delete onSuccessCallbackWithoutExit; - delete onFailureCallback; - delete onReportCallback; - } - - CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x0101) command (0x06) on endpoint %" PRIu8, endpointId); - - chip::Controller::DoorLockCluster cluster; - cluster.Associate(device, endpointId); - - ReturnErrorOnFailure(cluster.ReportAttributeLockType(onReportCallback->Cancel())); - - chip::Callback::Cancelable * successCallback = mWait ? onSuccessCallbackWithoutExit->Cancel() : onSuccessCallback->Cancel(); - return cluster.SubscribeAttributeLockType(successCallback, onFailureCallback->Cancel(), mMinInterval, mMaxInterval); - } - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); - } - -private: - chip::Callback::Callback * onSuccessCallback = - new chip::Callback::Callback(OnDefaultSuccessResponse, this); - chip::Callback::Callback * onSuccessCallbackWithoutExit = - new chip::Callback::Callback(OnDefaultSuccessResponseWithoutExit, this); - chip::Callback::Callback * onFailureCallback = - new chip::Callback::Callback(OnDefaultFailureResponse, this); - chip::Callback::Callback * onReportCallback = - new chip::Callback::Callback(OnInt8uAttributeReport, this); - uint16_t mMinInterval; - uint16_t mMaxInterval; - bool mWait; -}; - /* * Attribute ActuatorEnabled */ @@ -57229,33 +56857,29 @@ void registerClusterDoorLock(Commands & commands) const char * clusterName = "DoorLock"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h index 60f7842582e1c6..d30328496698fe 100644 --- a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h @@ -148,8 +148,6 @@ class Listen : public ReportingCommand delete onReportColorControlClusterRevisionCallback; delete onReportContentLauncherClusterRevisionCallback; delete onReportDescriptorClusterRevisionCallback; - delete onReportDoorLockLockStateCallback; - delete onReportDoorLockLockTypeCallback; delete onReportDoorLockActuatorEnabledCallback; delete onReportDoorLockClusterRevisionCallback; delete onReportElectricalMeasurementMeasurementTypeCallback; @@ -803,10 +801,6 @@ class Listen : public ReportingCommand BasicAttributeFilter); callbacksMgr.AddReportCallback(remoteId, endpointId, 0x001D, 0xFFFD, onReportDescriptorClusterRevisionCallback->Cancel(), BasicAttributeFilter); - callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0101, 0x0000, onReportDoorLockLockStateCallback->Cancel(), - BasicAttributeFilter); - callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0101, 0x0001, onReportDoorLockLockTypeCallback->Cancel(), - BasicAttributeFilter); callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0101, 0x0002, onReportDoorLockActuatorEnabledCallback->Cancel(), BasicAttributeFilter); callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0101, 0xFFFD, onReportDoorLockClusterRevisionCallback->Cancel(), @@ -2024,10 +2018,6 @@ class Listen : public ReportingCommand new chip::Callback::Callback(OnInt16uAttributeResponse, this); chip::Callback::Callback * onReportDescriptorClusterRevisionCallback = new chip::Callback::Callback(OnInt16uAttributeResponse, this); - chip::Callback::Callback * onReportDoorLockLockStateCallback = - new chip::Callback::Callback(OnInt8uAttributeResponse, this); - chip::Callback::Callback * onReportDoorLockLockTypeCallback = - new chip::Callback::Callback(OnInt8uAttributeResponse, this); chip::Callback::Callback * onReportDoorLockActuatorEnabledCallback = new chip::Callback::Callback(OnBooleanAttributeResponse, this); chip::Callback::Callback * onReportDoorLockClusterRevisionCallback = diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp index 8c77edd9386c03..1f8ec3e13c0732 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp @@ -966,116 +966,22 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsResponseCallback(EndpointId endpoin return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "ClearAllPinsResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearAllPinsResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearAllRfidsResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status) -{ - ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearHolidayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "ClearPinResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearPinResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "ClearRfidResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearRfidResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status) -{ - ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearWeekdayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status) -{ - ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterClearYeardayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday) + uint8_t holidayIndex, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime, uint8_t operatingMode) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); - ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); + ChipLogProgress(Zcl, " holidayIndex: %" PRIu8 "", holidayIndex); ChipLogProgress(Zcl, " status: %" PRIu8 "", status); ChipLogProgress(Zcl, " localStartTime: %" PRIu32 "", localStartTime); ChipLogProgress(Zcl, " localEndTime: %" PRIu32 "", localEndTime); - ChipLogProgress(Zcl, " operatingModeDuringHoliday: %" PRIu8 "", operatingModeDuringHoliday); + ChipLogProgress(Zcl, " operatingMode: %" PRIu8 "", operatingMode); GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetHolidayScheduleResponseCallback"); Callback::Callback * cb = Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday); + cb->mCall(cb->mContext, holidayIndex, status, localStartTime, localEndTime, operatingMode); return true; } @@ -1100,37 +1006,37 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(EndpointId endpoint, app return true; } -bool emberAfDoorLockClusterGetPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId, - uint8_t userStatus, uint8_t userType, chip::ByteSpan pin) +bool emberAfDoorLockClusterGetPINCodeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId, + uint8_t userStatus, uint8_t userType, chip::ByteSpan pin) { - ChipLogProgress(Zcl, "GetPinResponse:"); + ChipLogProgress(Zcl, "GetPINCodeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); ChipLogProgress(Zcl, " userStatus: %" PRIu8 "", userStatus); ChipLogProgress(Zcl, " userType: %" PRIu8 "", userType); ChipLogProgress(Zcl, " pin: %zu", pin.size()); - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetPinResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetPINCodeResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, userId, userStatus, userType, pin); return true; } -bool emberAfDoorLockClusterGetRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId, - uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid) +bool emberAfDoorLockClusterGetRFIDCodeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId, + uint8_t userStatus, uint8_t userType, chip::ByteSpan rfidCode) { - ChipLogProgress(Zcl, "GetRfidResponse:"); + ChipLogProgress(Zcl, "GetRFIDCodeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); ChipLogProgress(Zcl, " userStatus: %" PRIu8 "", userStatus); ChipLogProgress(Zcl, " userType: %" PRIu8 "", userType); - ChipLogProgress(Zcl, " rfid: %zu", rfid.size()); + ChipLogProgress(Zcl, " rfidCode: %zu", rfidCode.size()); - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetRfidResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetRFIDCodeResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, userId, userStatus, userType, rfid); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, userId, userStatus, userType, rfidCode); return true; } @@ -1149,14 +1055,14 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(EndpointId endpoint, app: return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, - uint8_t startHour, uint8_t startMinute, uint8_t endHour, - uint8_t endMinute) +bool emberAfDoorLockClusterGetWeekDayScheduleResponseCallback(EndpointId endpoint, 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) { - ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:"); - ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); - ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); + ChipLogProgress(Zcl, "GetWeekDayScheduleResponse:"); + ChipLogProgress(Zcl, " weekDayIndex: %" PRIu8 "", weekDayIndex); + ChipLogProgress(Zcl, " userIndex: %" PRIu16 "", userIndex); ChipLogProgress(Zcl, " status: %" PRIu8 "", status); ChipLogProgress(Zcl, " daysMask: %" PRIu8 "", daysMask); ChipLogProgress(Zcl, " startHour: %" PRIu8 "", startHour); @@ -1164,147 +1070,30 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(EndpointId endpoin ChipLogProgress(Zcl, " endHour: %" PRIu8 "", endHour); ChipLogProgress(Zcl, " endMinute: %" PRIu8 "", endMinute); - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetWeekdayScheduleResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetWeekDayScheduleResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, scheduleId, userId, status, daysMask, startHour, startMinute, endHour, endMinute); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour, endMinute); return true; } -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t scheduleId, uint16_t userId, uint8_t status, +bool emberAfDoorLockClusterGetYearDayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, + uint8_t yearDayIndex, uint16_t userIndex, uint8_t status, uint32_t localStartTime, uint32_t localEndTime) { - ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); - ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); - ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); + ChipLogProgress(Zcl, "GetYearDayScheduleResponse:"); + ChipLogProgress(Zcl, " yearDayIndex: %" PRIu8 "", yearDayIndex); + ChipLogProgress(Zcl, " userIndex: %" PRIu16 "", userIndex); ChipLogProgress(Zcl, " status: %" PRIu8 "", status); ChipLogProgress(Zcl, " localStartTime: %" PRIu32 "", localStartTime); ChipLogProgress(Zcl, " localEndTime: %" PRIu32 "", localEndTime); - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetYeardayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, scheduleId, userId, status, localStartTime, localEndTime); - return true; -} - -bool emberAfDoorLockClusterLockDoorResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "LockDoorResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterLockDoorResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterGetYearDayScheduleResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetHolidayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetPinResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetPinResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetRfidResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetRfidResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetUserTypeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetUserTypeResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetUserTypeResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetWeekdayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterSetYeardayScheduleResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterUnlockDoorResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "UnlockDoorResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterUnlockDoorResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("DoorLockClusterUnlockWithTimeoutResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, yearDayIndex, userIndex, status, localStartTime, localEndTime); return true; } diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index 7878f809b2dad2..ea6fdad5b71e85 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -43,38 +43,22 @@ typedef void (*ContentLauncherClusterLaunchContentResponseCallback)(void * conte typedef void (*ContentLauncherClusterLaunchURLResponseCallback)(void * context, chip::CharSpan data, uint8_t contentLaunchStatus); typedef void (*DiagnosticLogsClusterRetrieveLogsResponseCallback)(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot); -typedef void (*DoorLockClusterClearAllPinsResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearAllRfidsResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearHolidayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearPinResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearRfidResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearWeekdayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterClearYeardayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint8_t status, +typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t holidayIndex, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday); + uint8_t operatingMode); typedef void (*DoorLockClusterGetLogRecordResponseCallback)(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin); -typedef void (*DoorLockClusterGetPinResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, - chip::ByteSpan pin); -typedef void (*DoorLockClusterGetRfidResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, - chip::ByteSpan rfid); +typedef void (*DoorLockClusterGetPINCodeResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, + chip::ByteSpan pin); +typedef void (*DoorLockClusterGetRFIDCodeResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, + chip::ByteSpan rfidCode); typedef void (*DoorLockClusterGetUserTypeResponseCallback)(void * context, uint16_t userId, uint8_t userType); -typedef void (*DoorLockClusterGetWeekdayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, +typedef void (*DoorLockClusterGetWeekDayScheduleResponseCallback)(void * context, uint8_t weekDayIndex, uint16_t userIndex, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute); -typedef void (*DoorLockClusterGetYeardayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, +typedef void (*DoorLockClusterGetYearDayScheduleResponseCallback)(void * context, uint8_t yearDayIndex, uint16_t userIndex, uint8_t status, uint32_t localStartTime, uint32_t localEndTime); -typedef void (*DoorLockClusterLockDoorResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetHolidayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetPinResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetRfidResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetUserTypeResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetWeekdayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterSetYeardayScheduleResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterUnlockDoorResponseCallback)(void * context, uint8_t status); -typedef void (*DoorLockClusterUnlockWithTimeoutResponseCallback)(void * context, uint8_t status); typedef void (*GeneralCommissioningClusterArmFailSafeResponseCallback)(void * context, uint8_t errorCode, chip::CharSpan debugText); typedef void (*GeneralCommissioningClusterCommissioningCompleteResponseCallback)(void * context, uint8_t errorCode, chip::CharSpan debugText); diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp index 5255266c94db58..0722875104f7ad 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp @@ -5911,7 +5911,7 @@ CHIP_ERROR DiagnosticLogsCluster::RetrieveLogsRequest(Callback::Cancelable * onS // DiagnosticLogs Cluster Attributes // DoorLock Cluster Commands -CHIP_ERROR DoorLockCluster::ClearAllPins(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR DoorLockCluster::ClearAllPINCodes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -5923,7 +5923,7 @@ CHIP_ERROR DoorLockCluster::ClearAllPins(Callback::Cancelable * onSuccessCallbac VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearAllPins::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearAllPINCodes::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -5949,7 +5949,7 @@ CHIP_ERROR DoorLockCluster::ClearAllPins(Callback::Cancelable * onSuccessCallbac return err; } -CHIP_ERROR DoorLockCluster::ClearAllRfids(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR DoorLockCluster::ClearAllRFIDCodes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -5961,7 +5961,7 @@ CHIP_ERROR DoorLockCluster::ClearAllRfids(Callback::Cancelable * onSuccessCallba VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearAllRfids::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearAllRFIDCodes::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -5988,7 +5988,7 @@ CHIP_ERROR DoorLockCluster::ClearAllRfids(Callback::Cancelable * onSuccessCallba } CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId) + uint8_t holidayIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6011,8 +6011,8 @@ CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSucces SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); + // holidayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), holidayIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6028,8 +6028,8 @@ CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSucces return err; } -CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId) +CHIP_ERROR DoorLockCluster::ClearPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t pinSlotIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6041,7 +6041,7 @@ CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, C VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearPin::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearPINCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6052,8 +6052,8 @@ CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, C SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // pinSlotIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pinSlotIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6069,8 +6069,8 @@ CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, C return err; } -CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId) +CHIP_ERROR DoorLockCluster::ClearRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t rfidSlotIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6082,7 +6082,7 @@ CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearRfid::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearRFIDCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6093,8 +6093,8 @@ CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // rfidSlotIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), rfidSlotIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6110,8 +6110,8 @@ CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, return err; } -CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId) +CHIP_ERROR DoorLockCluster::ClearWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6123,7 +6123,7 @@ CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearWeekdaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearWeekDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6134,10 +6134,10 @@ CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSucces SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // weekDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), weekDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6153,8 +6153,8 @@ CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSucces return err; } -CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId) +CHIP_ERROR DoorLockCluster::ClearYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6166,7 +6166,7 @@ CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearYeardaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::ClearYearDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6177,10 +6177,10 @@ CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSucces SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // yearDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), yearDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6197,7 +6197,7 @@ CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSucces } CHIP_ERROR DoorLockCluster::GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId) + uint8_t holidayIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6220,8 +6220,8 @@ CHIP_ERROR DoorLockCluster::GetHolidaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); + // holidayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), holidayIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6278,8 +6278,8 @@ CHIP_ERROR DoorLockCluster::GetLogRecord(Callback::Cancelable * onSuccessCallbac return err; } -CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId) +CHIP_ERROR DoorLockCluster::GetPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t userId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6291,7 +6291,7 @@ CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Cal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetPin::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetPINCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6319,8 +6319,8 @@ CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Cal return err; } -CHIP_ERROR DoorLockCluster::GetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId) +CHIP_ERROR DoorLockCluster::GetRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t userId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6332,7 +6332,7 @@ CHIP_ERROR DoorLockCluster::GetRfid(Callback::Cancelable * onSuccessCallback, Ca VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetRfid::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetRFIDCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6401,8 +6401,8 @@ CHIP_ERROR DoorLockCluster::GetUserType(Callback::Cancelable * onSuccessCallback return err; } -CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId) +CHIP_ERROR DoorLockCluster::GetWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6414,7 +6414,7 @@ CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetWeekdaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetWeekDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6425,10 +6425,10 @@ CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // weekDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), weekDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6444,8 +6444,8 @@ CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId) +CHIP_ERROR DoorLockCluster::GetYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6457,7 +6457,7 @@ CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetYeardaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::GetYearDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6468,10 +6468,10 @@ CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); + // yearDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), yearDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); SuccessOrExit(err = sender->FinishCommand()); @@ -6488,7 +6488,7 @@ CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessC } CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan pin) + chip::ByteSpan pinCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6511,8 +6511,8 @@ CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, C SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // pin: octetString - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pin)); + // pinCode: octetString + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pinCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -6529,8 +6529,8 @@ CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, C } CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday) + uint8_t holidayIndex, uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingMode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6553,14 +6553,14 @@ CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // localStartTime: int32u + // holidayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), holidayIndex)); + // localStartTime: epochS SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), localStartTime)); - // localEndTime: int32u + // localEndTime: epochS SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), localEndTime)); - // operatingModeDuringHoliday: enum8 - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), operatingModeDuringHoliday)); + // operatingMode: dlOperatingMode + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), operatingMode)); SuccessOrExit(err = sender->FinishCommand()); @@ -6576,8 +6576,8 @@ CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin) +CHIP_ERROR DoorLockCluster::SetPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6589,7 +6589,7 @@ CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Cal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetPin::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetPINCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6602,9 +6602,9 @@ CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Cal VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); // userId: int16u SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); - // userStatus: doorLockUserStatus + // userStatus: dlUserStatus SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userStatus)); - // userType: doorLockUserType + // userType: dlUserType SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userType)); // pin: octetString SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pin)); @@ -6623,8 +6623,8 @@ CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Cal return err; } -CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id) +CHIP_ERROR DoorLockCluster::SetRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfidCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6636,7 +6636,7 @@ CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Ca VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetRfid::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetRFIDCode::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6649,12 +6649,12 @@ CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Ca VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); // userId: int16u SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); - // userStatus: doorLockUserStatus + // userStatus: dlUserStatus SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userStatus)); - // userType: doorLockUserType + // userType: dlUserType SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userType)); - // id: octetString - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), id)); + // rfidCode: octetString + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), rfidCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -6696,7 +6696,7 @@ CHIP_ERROR DoorLockCluster::SetUserType(Callback::Cancelable * onSuccessCallback VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); // userId: int16u SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); - // userType: doorLockUserType + // userType: dlUserType SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userType)); SuccessOrExit(err = sender->FinishCommand()); @@ -6713,8 +6713,8 @@ CHIP_ERROR DoorLockCluster::SetUserType(Callback::Cancelable * onSuccessCallback return err; } -CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, +CHIP_ERROR DoorLockCluster::SetWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -6727,7 +6727,7 @@ CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetWeekdaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetWeekDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6738,11 +6738,11 @@ CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); - // daysMask: doorLockDayOfWeek + // weekDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), weekDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); + // daysMask: dlDaysMaskMap SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), daysMask)); // startHour: int8u SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), startHour)); @@ -6767,8 +6767,9 @@ CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime) +CHIP_ERROR DoorLockCluster::SetYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex, uint32_t localStartTime, + uint32_t localEndTime) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6780,7 +6781,7 @@ CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetYeardaySchedule::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, DoorLock::Commands::SetYearDaySchedule::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6791,13 +6792,13 @@ CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessC SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // scheduleId: int8u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), scheduleId)); - // userId: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userId)); - // localStartTime: int32u + // yearDayIndex: int8u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), yearDayIndex)); + // userIndex: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), userIndex)); + // localStartTime: epochS SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), localStartTime)); - // localEndTime: int32u + // localEndTime: epochS SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), localEndTime)); SuccessOrExit(err = sender->FinishCommand()); @@ -6815,7 +6816,7 @@ CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessC } CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::ByteSpan pin) + chip::ByteSpan pinCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6838,8 +6839,8 @@ CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback, SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // pin: octetString - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pin)); + // pinCode: octetString + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pinCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -6856,7 +6857,7 @@ CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback, } CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t timeoutInSeconds, chip::ByteSpan pin) + uint16_t timeout, chip::ByteSpan pinCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6879,10 +6880,10 @@ CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCa SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // timeoutInSeconds: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), timeoutInSeconds)); - // pin: octetString - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pin)); + // timeout: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), timeout)); + // pinCode: octetString + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), pinCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -6899,62 +6900,6 @@ CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCa } // DoorLock Cluster Attributes -CHIP_ERROR DoorLockCluster::ReadAttributeLockState(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback) -{ - app::AttributePathParams attributePath; - attributePath.mEndpointId = mEndpoint; - attributePath.mClusterId = mClusterId; - attributePath.mAttributeId = 0x00000000; - return mDevice->SendReadAttributeRequest(attributePath, onSuccessCallback, onFailureCallback, - BasicAttributeFilter); -} - -CHIP_ERROR DoorLockCluster::SubscribeAttributeLockState(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint16_t minInterval, - uint16_t maxInterval) -{ - chip::app::AttributePathParams attributePath; - attributePath.mEndpointId = mEndpoint; - attributePath.mClusterId = mClusterId; - attributePath.mAttributeId = DoorLock::Attributes::LockState::Id; - return mDevice->SendSubscribeAttributeRequest(attributePath, minInterval, maxInterval, onSuccessCallback, onFailureCallback); -} - -CHIP_ERROR DoorLockCluster::ReportAttributeLockState(Callback::Cancelable * onReportCallback) -{ - return RequestAttributeReporting(DoorLock::Attributes::LockState::Id, onReportCallback, - BasicAttributeFilter); -} - -CHIP_ERROR DoorLockCluster::ReadAttributeLockType(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback) -{ - app::AttributePathParams attributePath; - attributePath.mEndpointId = mEndpoint; - attributePath.mClusterId = mClusterId; - attributePath.mAttributeId = 0x00000001; - return mDevice->SendReadAttributeRequest(attributePath, onSuccessCallback, onFailureCallback, - BasicAttributeFilter); -} - -CHIP_ERROR DoorLockCluster::SubscribeAttributeLockType(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint16_t minInterval, - uint16_t maxInterval) -{ - chip::app::AttributePathParams attributePath; - attributePath.mEndpointId = mEndpoint; - attributePath.mClusterId = mClusterId; - attributePath.mAttributeId = DoorLock::Attributes::LockType::Id; - return mDevice->SendSubscribeAttributeRequest(attributePath, minInterval, maxInterval, onSuccessCallback, onFailureCallback); -} - -CHIP_ERROR DoorLockCluster::ReportAttributeLockType(Callback::Cancelable * onReportCallback) -{ - return RequestAttributeReporting(DoorLock::Attributes::LockType::Id, onReportCallback, - BasicAttributeFilter); -} - CHIP_ERROR DoorLockCluster::ReadAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h index 75995b2ad3318b..eb50ebc5ad6f08 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h @@ -903,54 +903,48 @@ class DLL_EXPORT DoorLockCluster : public ClusterBase ~DoorLockCluster() {} // Cluster Commands - CHIP_ERROR ClearAllPins(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR ClearAllRfids(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR ClearAllPINCodes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR ClearAllRFIDCodes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); CHIP_ERROR ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId); - CHIP_ERROR ClearPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); - CHIP_ERROR ClearRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); - CHIP_ERROR ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId); - CHIP_ERROR ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId); + uint8_t holidayIndex); + CHIP_ERROR ClearPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t pinSlotIndex); + CHIP_ERROR ClearRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t rfidSlotIndex); + CHIP_ERROR ClearWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex); + CHIP_ERROR ClearYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex); CHIP_ERROR GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId); + uint8_t holidayIndex); CHIP_ERROR GetLogRecord(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t logIndex); - CHIP_ERROR GetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); - CHIP_ERROR GetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); + CHIP_ERROR GetPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); + CHIP_ERROR GetRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); CHIP_ERROR GetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId); - CHIP_ERROR GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId); - CHIP_ERROR GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId); - CHIP_ERROR LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin); + CHIP_ERROR GetWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex); + CHIP_ERROR GetYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex); + CHIP_ERROR LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pinCode); CHIP_ERROR SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday); - CHIP_ERROR SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, - uint8_t userStatus, uint8_t userType, chip::ByteSpan pin); - CHIP_ERROR SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, - uint8_t userStatus, uint8_t userType, chip::ByteSpan id); + uint8_t holidayIndex, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingMode); + CHIP_ERROR SetPINCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, + uint8_t userStatus, uint8_t userType, chip::ByteSpan pin); + CHIP_ERROR SetRFIDCode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, + uint8_t userStatus, uint8_t userType, chip::ByteSpan rfidCode); CHIP_ERROR SetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userType); - CHIP_ERROR SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, - uint8_t endHour, uint8_t endMinute); - CHIP_ERROR SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime); - CHIP_ERROR UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin); + CHIP_ERROR SetWeekDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t weekDayIndex, uint16_t userIndex, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); + CHIP_ERROR SetYearDaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t yearDayIndex, uint16_t userIndex, uint32_t localStartTime, uint32_t localEndTime); + CHIP_ERROR UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::ByteSpan pinCode); CHIP_ERROR UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t timeoutInSeconds, chip::ByteSpan pin); + uint16_t timeout, chip::ByteSpan pinCode); // Cluster Attributes - CHIP_ERROR ReadAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR SubscribeAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t minInterval, uint16_t maxInterval); - CHIP_ERROR ReportAttributeLockState(Callback::Cancelable * onReportCallback); - CHIP_ERROR ReadAttributeLockType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR SubscribeAttributeLockType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t minInterval, uint16_t maxInterval); - CHIP_ERROR ReportAttributeLockType(Callback::Cancelable * onReportCallback); CHIP_ERROR ReadAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); CHIP_ERROR SubscribeAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval); diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index 988e34086a4a9c..7b7c8e8f806474 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -549,10 +549,14 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa { switch (aCommandPath.mCommandId) { - case Commands::ClearAllPinsResponse::Id: { - expectArgumentCount = 1; + case Commands::GetHolidayScheduleResponse::Id: { + expectArgumentCount = 5; + uint8_t holidayIndex; uint8_t status; - bool argExists[1]; + uint32_t localStartTime; + uint32_t localEndTime; + uint8_t operatingMode; + bool argExists[5]; memset(argExists, 0, sizeof argExists); @@ -565,7 +569,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 5) { if (argExists[currentDecodeTagId]) { @@ -582,65 +586,19 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: + TLVUnpackError = aDataTlv.Get(holidayIndex); + break; + case 1: TLVUnpackError = aDataTlv.Get(status); break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); + case 2: + TLVUnpackError = aDataTlv.Get(localStartTime); break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { + case 3: + TLVUnpackError = aDataTlv.Get(localEndTime); break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::ClearAllRfidsResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); + case 4: + TLVUnpackError = aDataTlv.Get(operatingMode); break; default: // Unsupported tag, ignore it. @@ -659,16 +617,23 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { - wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback( + aCommandPath.mEndpointId, apCommandObj, holidayIndex, status, localStartTime, localEndTime, operatingMode); } break; } - case Commands::ClearHolidayScheduleResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; + case Commands::GetLogRecordResponse::Id: { + expectArgumentCount = 7; + uint16_t logEntryId; + uint32_t timestamp; + uint8_t eventType; + uint8_t source; + uint8_t eventIdOrAlarmCode; + uint16_t userId; + chip::ByteSpan pin; + bool argExists[7]; memset(argExists, 0, sizeof argExists); @@ -681,7 +646,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 7) { if (argExists[currentDecodeTagId]) { @@ -698,7 +663,25 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(status); + TLVUnpackError = aDataTlv.Get(logEntryId); + break; + case 1: + TLVUnpackError = aDataTlv.Get(timestamp); + break; + case 2: + TLVUnpackError = aDataTlv.Get(eventType); + break; + case 3: + TLVUnpackError = aDataTlv.Get(source); + break; + case 4: + TLVUnpackError = aDataTlv.Get(eventIdOrAlarmCode); + break; + case 5: + TLVUnpackError = aDataTlv.Get(userId); + break; + case 6: + TLVUnpackError = aDataTlv.Get(pin); break; default: // Unsupported tag, ignore it. @@ -717,17 +700,21 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { - wasHandled = - emberAfDoorLockClusterClearHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(aCommandPath.mEndpointId, apCommandObj, logEntryId, + timestamp, eventType, source, eventIdOrAlarmCode, + userId, pin); } break; } - case Commands::ClearPinResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; + case Commands::GetPINCodeResponse::Id: { + expectArgumentCount = 4; + uint16_t userId; + uint8_t userStatus; + uint8_t userType; + chip::ByteSpan pin; + bool argExists[4]; memset(argExists, 0, sizeof argExists); @@ -740,7 +727,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 4) { if (argExists[currentDecodeTagId]) { @@ -757,7 +744,16 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(status); + TLVUnpackError = aDataTlv.Get(userId); + break; + case 1: + TLVUnpackError = aDataTlv.Get(userStatus); + break; + case 2: + TLVUnpackError = aDataTlv.Get(userType); + break; + case 3: + TLVUnpackError = aDataTlv.Get(pin); break; default: // Unsupported tag, ignore it. @@ -776,16 +772,20 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { - wasHandled = emberAfDoorLockClusterClearPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetPINCodeResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, + userStatus, userType, pin); } break; } - case Commands::ClearRfidResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; + case Commands::GetRFIDCodeResponse::Id: { + expectArgumentCount = 4; + uint16_t userId; + uint8_t userStatus; + uint8_t userType; + chip::ByteSpan rfidCode; + bool argExists[4]; memset(argExists, 0, sizeof argExists); @@ -798,7 +798,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 4) { if (argExists[currentDecodeTagId]) { @@ -815,7 +815,16 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(status); + TLVUnpackError = aDataTlv.Get(userId); + break; + case 1: + TLVUnpackError = aDataTlv.Get(userStatus); + break; + case 2: + TLVUnpackError = aDataTlv.Get(userType); + break; + case 3: + TLVUnpackError = aDataTlv.Get(rfidCode); break; default: // Unsupported tag, ignore it. @@ -834,16 +843,18 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { - wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetRFIDCodeResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, + userStatus, userType, rfidCode); } break; } - case Commands::ClearWeekdayScheduleResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; + case Commands::GetUserTypeResponse::Id: { + expectArgumentCount = 2; + uint16_t userId; + uint8_t userType; + bool argExists[2]; memset(argExists, 0, sizeof argExists); @@ -856,7 +867,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 2) { if (argExists[currentDecodeTagId]) { @@ -873,7 +884,10 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(status); + TLVUnpackError = aDataTlv.Get(userId); + break; + case 1: + TLVUnpackError = aDataTlv.Get(userType); break; default: // Unsupported tag, ignore it. @@ -892,17 +906,24 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { wasHandled = - emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + emberAfDoorLockClusterGetUserTypeResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, userType); } break; } - case Commands::ClearYeardayScheduleResponse::Id: { - expectArgumentCount = 1; + case Commands::GetWeekDayScheduleResponse::Id: { + expectArgumentCount = 8; + uint8_t weekDayIndex; + uint16_t userIndex; uint8_t status; - bool argExists[1]; + uint8_t daysMask; + uint8_t startHour; + uint8_t startMinute; + uint8_t endHour; + uint8_t endMinute; + bool argExists[8]; memset(argExists, 0, sizeof argExists); @@ -915,7 +936,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa continue; } currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) + if (currentDecodeTagId < 8) { if (argExists[currentDecodeTagId]) { @@ -932,8 +953,29 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: + TLVUnpackError = aDataTlv.Get(weekDayIndex); + break; + case 1: + TLVUnpackError = aDataTlv.Get(userIndex); + break; + case 2: TLVUnpackError = aDataTlv.Get(status); break; + case 3: + TLVUnpackError = aDataTlv.Get(daysMask); + break; + case 4: + TLVUnpackError = aDataTlv.Get(startHour); + break; + case 5: + TLVUnpackError = aDataTlv.Get(startMinute); + break; + case 6: + TLVUnpackError = aDataTlv.Get(endHour); + break; + case 7: + TLVUnpackError = aDataTlv.Get(endMinute); + break; default: // Unsupported tag, ignore it. ChipLogProgress(Zcl, "Unknown TLV tag during processing."); @@ -951,20 +993,21 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa TLVError = CHIP_NO_ERROR; } - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount) { - wasHandled = - emberAfDoorLockClusterClearYeardayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetWeekDayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, + weekDayIndex, userIndex, status, daysMask, + startHour, startMinute, endHour, endMinute); } break; } - case Commands::GetHolidayScheduleResponse::Id: { + case Commands::GetYearDayScheduleResponse::Id: { expectArgumentCount = 5; - uint8_t scheduleId; + uint8_t yearDayIndex; + uint16_t userIndex; uint8_t status; uint32_t localStartTime; uint32_t localEndTime; - uint8_t operatingModeDuringHoliday; bool argExists[5]; memset(argExists, 0, sizeof argExists); @@ -995,19 +1038,19 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(scheduleId); + TLVUnpackError = aDataTlv.Get(yearDayIndex); break; case 1: - TLVUnpackError = aDataTlv.Get(status); + TLVUnpackError = aDataTlv.Get(userIndex); break; case 2: - TLVUnpackError = aDataTlv.Get(localStartTime); + TLVUnpackError = aDataTlv.Get(status); break; case 3: - TLVUnpackError = aDataTlv.Get(localEndTime); + TLVUnpackError = aDataTlv.Get(localStartTime); break; case 4: - TLVUnpackError = aDataTlv.Get(operatingModeDuringHoliday); + TLVUnpackError = aDataTlv.Get(localEndTime); break; default: // Unsupported tag, ignore it. @@ -1028,987 +1071,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { - wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, - scheduleId, status, localStartTime, - localEndTime, operatingModeDuringHoliday); - } - break; - } - case Commands::GetLogRecordResponse::Id: { - expectArgumentCount = 7; - uint16_t logEntryId; - uint32_t timestamp; - uint8_t eventType; - uint8_t source; - uint8_t eventIdOrAlarmCode; - uint16_t userId; - chip::ByteSpan pin; - bool argExists[7]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 7) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(logEntryId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(timestamp); - break; - case 2: - TLVUnpackError = aDataTlv.Get(eventType); - break; - case 3: - TLVUnpackError = aDataTlv.Get(source); - break; - case 4: - TLVUnpackError = aDataTlv.Get(eventIdOrAlarmCode); - break; - case 5: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 6: - TLVUnpackError = aDataTlv.Get(pin); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(aCommandPath.mEndpointId, apCommandObj, logEntryId, - timestamp, eventType, source, eventIdOrAlarmCode, - userId, pin); - } - break; - } - case Commands::GetPinResponse::Id: { - expectArgumentCount = 4; - uint16_t userId; - uint8_t userStatus; - uint8_t userType; - chip::ByteSpan pin; - bool argExists[4]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 4) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(userStatus); - break; - case 2: - TLVUnpackError = aDataTlv.Get(userType); - break; - case 3: - TLVUnpackError = aDataTlv.Get(pin); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterGetPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, - userStatus, userType, pin); - } - break; - } - case Commands::GetRfidResponse::Id: { - expectArgumentCount = 4; - uint16_t userId; - uint8_t userStatus; - uint8_t userType; - chip::ByteSpan rfid; - bool argExists[4]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 4) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(userStatus); - break; - case 2: - TLVUnpackError = aDataTlv.Get(userType); - break; - case 3: - TLVUnpackError = aDataTlv.Get(rfid); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, - userStatus, userType, rfid); - } - break; - } - case Commands::GetUserTypeResponse::Id: { - expectArgumentCount = 2; - uint16_t userId; - uint8_t userType; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(userType); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = - emberAfDoorLockClusterGetUserTypeResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, userType); - } - break; - } - case Commands::GetWeekdayScheduleResponse::Id: { - expectArgumentCount = 8; - uint8_t scheduleId; - uint16_t userId; - uint8_t status; - uint8_t daysMask; - uint8_t startHour; - uint8_t startMinute; - uint8_t endHour; - uint8_t endMinute; - bool argExists[8]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 8) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(scheduleId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 2: - TLVUnpackError = aDataTlv.Get(status); - break; - case 3: - TLVUnpackError = aDataTlv.Get(daysMask); - break; - case 4: - TLVUnpackError = aDataTlv.Get(startHour); - break; - case 5: - TLVUnpackError = aDataTlv.Get(startMinute); - break; - case 6: - TLVUnpackError = aDataTlv.Get(endHour); - break; - case 7: - TLVUnpackError = aDataTlv.Get(endMinute); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, - scheduleId, userId, status, daysMask, - startHour, startMinute, endHour, endMinute); - } - break; - } - case Commands::GetYeardayScheduleResponse::Id: { - expectArgumentCount = 5; - uint8_t scheduleId; - uint16_t userId; - uint8_t status; - uint32_t localStartTime; - uint32_t localEndTime; - bool argExists[5]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 5) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(scheduleId); - break; - case 1: - TLVUnpackError = aDataTlv.Get(userId); - break; - case 2: - TLVUnpackError = aDataTlv.Get(status); - break; - case 3: - TLVUnpackError = aDataTlv.Get(localStartTime); - break; - case 4: - TLVUnpackError = aDataTlv.Get(localEndTime); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback( - aCommandPath.mEndpointId, apCommandObj, scheduleId, userId, status, localStartTime, localEndTime); - } - break; - } - case Commands::LockDoorResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetHolidayScheduleResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = - emberAfDoorLockClusterSetHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetPinResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterSetPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetRfidResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetUserTypeResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetWeekdayScheduleResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = - emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::SetYeardayScheduleResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = - emberAfDoorLockClusterSetYeardayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::UnlockDoorResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - case Commands::UnlockWithTimeoutResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = - emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); + wasHandled = emberAfDoorLockClusterGetYearDayScheduleResponseCallback( + aCommandPath.mEndpointId, apCommandObj, yearDayIndex, userIndex, status, localStartTime, localEndTime); } break; } diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index 7bf8fdf7772c36..15f46f525258e3 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -422,21 +422,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ClearAllPins::Id: { - Commands::ClearAllPins::DecodableType commandData; + case Commands::ClearAllPINCodes::Id: { + Commands::ClearAllPINCodes::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearAllPinsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearAllPINCodesCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearAllRfids::Id: { - Commands::ClearAllRfids::DecodableType commandData; + case Commands::ClearAllRFIDCodes::Id: { + Commands::ClearAllRFIDCodes::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearAllRFIDCodesCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -449,39 +449,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::ClearPin::Id: { - Commands::ClearPin::DecodableType commandData; + case Commands::ClearPINCode::Id: { + Commands::ClearPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearRfid::Id: { - Commands::ClearRfid::DecodableType commandData; + case Commands::ClearRFIDCode::Id: { + Commands::ClearRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearWeekdaySchedule::Id: { - Commands::ClearWeekdaySchedule::DecodableType commandData; + case Commands::ClearWeekDaySchedule::Id: { + Commands::ClearWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ClearYeardaySchedule::Id: { - Commands::ClearYeardaySchedule::DecodableType commandData; + case Commands::ClearYearDaySchedule::Id: { + Commands::ClearYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterClearYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -503,21 +503,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetPin::Id: { - Commands::GetPin::DecodableType commandData; + case Commands::GetPINCode::Id: { + Commands::GetPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetRfid::Id: { - Commands::GetRfid::DecodableType commandData; + case Commands::GetRFIDCode::Id: { + Commands::GetRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -530,21 +530,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::GetWeekdaySchedule::Id: { - Commands::GetWeekdaySchedule::DecodableType commandData; + case Commands::GetWeekDaySchedule::Id: { + Commands::GetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::GetYeardaySchedule::Id: { - Commands::GetYeardaySchedule::DecodableType commandData; + case Commands::GetYearDaySchedule::Id: { + Commands::GetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterGetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -566,21 +566,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetPin::Id: { - Commands::SetPin::DecodableType commandData; + case Commands::SetPINCode::Id: { + Commands::SetPINCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetPinCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetPINCodeCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetRfid::Id: { - Commands::SetRfid::DecodableType commandData; + case Commands::SetRFIDCode::Id: { + Commands::SetRFIDCode::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetRfidCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetRFIDCodeCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -593,21 +593,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::SetWeekdaySchedule::Id: { - Commands::SetWeekdaySchedule::DecodableType commandData; + case Commands::SetWeekDaySchedule::Id: { + Commands::SetWeekDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetWeekDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SetYeardaySchedule::Id: { - Commands::SetYeardaySchedule::DecodableType commandData; + case Commands::SetYearDaySchedule::Id: { + Commands::SetYearDaySchedule::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfDoorLockClusterSetYearDayScheduleCallback(apCommandObj, aCommandPath, commandData); } break; } diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 96acd4539e760f..9780e631d50dcc 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -1078,7 +1078,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 388 +#define GENERATED_ATTRIBUTE_COUNT 389 #define GENERATED_ATTRIBUTES \ { \ \ @@ -1368,10 +1368,11 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ - { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* lock state */ \ - { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* lock type */ \ - { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* actuator enabled */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ + { 0x0000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(2) }, /* LockState */ \ + { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* LockType */ \ + { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* ActuatorEnabled */ \ + { 0x0010, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0) }, /* NumberOfLogRecordsSupported */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Type */ \ @@ -1747,94 +1748,94 @@ }, /* Endpoint: 1, Cluster: Fixed Label (server) */ \ { 0x0101, \ ZAP_ATTRIBUTE_INDEX(216), \ - 4, \ 5, \ + 7, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ { \ - 0x0102, ZAP_ATTRIBUTE_INDEX(220), 19, 31, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0102, ZAP_ATTRIBUTE_INDEX(221), 19, 31, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ { \ - 0x0103, ZAP_ATTRIBUTE_INDEX(239), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0103, ZAP_ATTRIBUTE_INDEX(240), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ { \ - 0x0201, ZAP_ATTRIBUTE_INDEX(244), 10, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0201, ZAP_ATTRIBUTE_INDEX(245), 10, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ { 0x0300, \ - ZAP_ATTRIBUTE_INDEX(254), \ + ZAP_ATTRIBUTE_INDEX(255), \ 51, \ 337, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ { \ - 0x0402, ZAP_ATTRIBUTE_INDEX(305), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0402, ZAP_ATTRIBUTE_INDEX(306), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ { \ - 0x0403, ZAP_ATTRIBUTE_INDEX(309), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0403, ZAP_ATTRIBUTE_INDEX(310), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ { \ - 0x0404, ZAP_ATTRIBUTE_INDEX(313), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0404, ZAP_ATTRIBUTE_INDEX(314), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(317), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0405, ZAP_ATTRIBUTE_INDEX(318), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ { 0x0500, \ - ZAP_ATTRIBUTE_INDEX(321), \ + ZAP_ATTRIBUTE_INDEX(322), \ 6, \ 16, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ { \ - 0x0503, ZAP_ATTRIBUTE_INDEX(327), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0503, ZAP_ATTRIBUTE_INDEX(328), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ { \ - 0x0504, ZAP_ATTRIBUTE_INDEX(329), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0504, ZAP_ATTRIBUTE_INDEX(330), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: TV Channel (server) */ \ { \ - 0x0505, ZAP_ATTRIBUTE_INDEX(333), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0505, ZAP_ATTRIBUTE_INDEX(334), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ { \ - 0x0506, ZAP_ATTRIBUTE_INDEX(335), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0506, ZAP_ATTRIBUTE_INDEX(336), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Playback (server) */ \ { \ - 0x0507, ZAP_ATTRIBUTE_INDEX(336), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0507, ZAP_ATTRIBUTE_INDEX(337), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Input (server) */ \ { \ - 0x0509, ZAP_ATTRIBUTE_INDEX(338), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0509, ZAP_ATTRIBUTE_INDEX(339), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(339), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(340), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ { \ - 0x050B, ZAP_ATTRIBUTE_INDEX(342), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050B, ZAP_ATTRIBUTE_INDEX(343), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Audio Output (server) */ \ { \ - 0x050C, ZAP_ATTRIBUTE_INDEX(344), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050C, ZAP_ATTRIBUTE_INDEX(345), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(346), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(347), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(354), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(355), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Account Login (server) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(355), 21, 1582, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(356), 21, 1582, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(376), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0xF000, ZAP_ATTRIBUTE_INDEX(377), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Binding (server) */ \ { 0x0006, \ - ZAP_ATTRIBUTE_INDEX(377), \ + ZAP_ATTRIBUTE_INDEX(378), \ 2, \ 3, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ { \ - 0x001D, ZAP_ATTRIBUTE_INDEX(379), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001D, ZAP_ATTRIBUTE_INDEX(380), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ { 0x0406, \ - ZAP_ATTRIBUTE_INDEX(384), \ + ZAP_ATTRIBUTE_INDEX(385), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -1846,7 +1847,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 16, 1900 }, { ZAP_CLUSTER_INDEX(16), 33, 4996 }, { ZAP_CLUSTER_INDEX(49), 3, 8 }, \ + { ZAP_CLUSTER_INDEX(0), 16, 1900 }, { ZAP_CLUSTER_INDEX(16), 33, 4998 }, { ZAP_CLUSTER_INDEX(49), 3, 8 }, \ } // Largest attribute size is needed for various buffers @@ -1856,7 +1857,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (1333) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (6904) +#define ATTRIBUTE_MAX_SIZE (6906) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3)