From 3179c42560fa339f5e8a1647ff2f838e8198e624 Mon Sep 17 00:00:00 2001 From: Song Guo Date: Wed, 14 Apr 2021 11:50:13 +0800 Subject: [PATCH] Run Codegen --- .../gen/IMClusterCommandHandler.cpp | 179 +++++++------- .../gen/call-command-handler.cpp | 191 +++++++------- .../all-clusters-common/gen/callback.h | 232 ++++++++++-------- .../all-clusters-common/gen/endpoint_config.h | 2 +- .../gen/IMClusterCommandHandler.cpp | 42 ++-- .../gen/call-command-handler.cpp | 45 ++-- .../bridge-app/bridge-common/gen/callback.h | 60 +++-- .../chip-tool/gen/CHIPClientCallbacks.cpp | 124 ++++++---- .../chip-tool/gen/IMClusterCommandHandler.cpp | 111 +++++---- .../chip-tool/gen/call-command-handler.cpp | 99 ++++---- examples/chip-tool/gen/callback.h | 124 ++++++---- .../gen/IMClusterCommandHandler.cpp | 42 ++-- .../gen/call-command-handler.cpp | 45 ++-- .../lighting-common/gen/callback.h | 60 +++-- .../gen/IMClusterCommandHandler.cpp | 25 +- .../lock-common/gen/call-command-handler.cpp | 28 ++- examples/lock-app/lock-common/gen/callback.h | 37 +-- .../main/gen/IMClusterCommandHandler.cpp | 19 +- .../esp32/main/gen/call-command-handler.cpp | 22 +- .../esp32/main/gen/callback.h | 31 ++- .../tv-common/gen/CHIPClientCallbacks.cpp | 5 +- .../tv-common/gen/IMClusterCommandHandler.cpp | 173 ++++++------- .../tv-common/gen/call-command-handler.cpp | 182 +++++++------- examples/tv-app/tv-common/gen/callback.h | 217 ++++++++-------- .../common/gen/IMClusterCommandHandler.cpp | 14 +- .../common/gen/call-command-handler.cpp | 14 +- examples/window-app/common/gen/callback.h | 17 +- .../python/gen/CHIPClientCallbacks.cpp | 100 ++++---- .../python/gen/IMClusterCommandHandler.cpp | 86 ++++--- .../python/gen/call-command-handler.cpp | 81 +++--- src/controller/python/gen/callback.h | 100 ++++---- .../CHIP/gen/CHIPClientCallbacks.cpp | 124 ++++++---- .../CHIP/gen/IMClusterCommandHandler.cpp | 111 +++++---- .../CHIP/gen/call-command-handler.cpp | 99 ++++---- src/darwin/Framework/CHIP/gen/callback.h | 124 ++++++---- 35 files changed, 1638 insertions(+), 1327 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp index 11076ed84e8b63..8e18d4cb8ad7c9 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp @@ -101,7 +101,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen); + emberAfBarrierControlClusterBarrierControlGoToPercentCallback(apCommandObj, percentOpen); } else { @@ -116,7 +116,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBarrierControlClusterBarrierControlStopCallback(); + emberAfBarrierControlClusterBarrierControlStopCallback(apCommandObj); break; } default: { @@ -262,7 +262,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId); + emberAfBindingClusterBindCallback(apCommandObj, nodeId, groupId, endpointId, clusterId); } else { @@ -377,7 +377,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId); + emberAfBindingClusterUnbindCallback(apCommandObj, nodeId, groupId, endpointId, clusterId); } else { @@ -512,7 +512,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride); + emberAfColorControlClusterMoveColorCallback(apCommandObj, rateX, rateY, optionsMask, optionsOverride); } else { @@ -659,7 +659,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, + emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); } else @@ -775,7 +775,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride); + emberAfColorControlClusterMoveHueCallback(apCommandObj, moveMode, rate, optionsMask, optionsOverride); } else { @@ -890,7 +890,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride); + emberAfColorControlClusterMoveSaturationCallback(apCommandObj, moveMode, rate, optionsMask, optionsOverride); } else { @@ -1021,7 +1021,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToColorCallback(apCommandObj, colorX, colorY, transitionTime, optionsMask, + optionsOverride); } else { @@ -1136,8 +1137,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, - optionsOverride); + emberAfColorControlClusterMoveToColorTemperatureCallback(apCommandObj, colorTemperature, transitionTime, + optionsMask, optionsOverride); } else { @@ -1268,7 +1269,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToHueCallback(apCommandObj, hue, direction, transitionTime, optionsMask, + optionsOverride); } else { @@ -1399,7 +1401,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, + emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, hue, saturation, transitionTime, optionsMask, optionsOverride); } else @@ -1515,7 +1517,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, saturation, transitionTime, optionsMask, + optionsOverride); } else { @@ -1646,7 +1649,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepColorCallback(apCommandObj, stepX, stepY, transitionTime, optionsMask, + optionsOverride); } else { @@ -1809,8 +1813,9 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, - colorTemperatureMaximum, optionsMask, optionsOverride); + emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, stepMode, stepSize, transitionTime, + colorTemperatureMinimum, colorTemperatureMaximum, + optionsMask, optionsOverride); } else { @@ -1941,7 +1946,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepHueCallback(apCommandObj, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); } else { @@ -2072,7 +2078,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepSaturationCallback(apCommandObj, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); } else { @@ -2155,7 +2162,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + emberAfColorControlClusterStopMoveStepCallback(apCommandObj, optionsMask, optionsOverride); } else { @@ -2190,13 +2197,13 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_CLEAR_ALL_PINS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllPinsCallback(); + emberAfDoorLockClusterClearAllPinsCallback(apCommandObj); break; } case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllRfidsCallback(); + emberAfDoorLockClusterClearAllRfidsCallback(apCommandObj); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -2254,7 +2261,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId); + emberAfDoorLockClusterClearHolidayScheduleCallback(apCommandObj, scheduleId); } else { @@ -2321,7 +2328,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearPinCallback(userId); + emberAfDoorLockClusterClearPinCallback(apCommandObj, userId); } else { @@ -2388,7 +2395,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearRfidCallback(userId); + emberAfDoorLockClusterClearRfidCallback(apCommandObj, userId); } else { @@ -2471,7 +2478,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterClearWeekdayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -2554,7 +2561,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterClearYeardayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -2621,7 +2628,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId); + emberAfDoorLockClusterGetHolidayScheduleCallback(apCommandObj, scheduleId); } else { @@ -2688,7 +2695,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetLogRecordCallback(logIndex); + emberAfDoorLockClusterGetLogRecordCallback(apCommandObj, logIndex); } else { @@ -2755,7 +2762,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetPinCallback(userId); + emberAfDoorLockClusterGetPinCallback(apCommandObj, userId); } else { @@ -2822,7 +2829,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetRfidCallback(userId); + emberAfDoorLockClusterGetRfidCallback(apCommandObj, userId); } else { @@ -2889,7 +2896,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetUserTypeCallback(userId); + emberAfDoorLockClusterGetUserTypeCallback(apCommandObj, userId); } else { @@ -2972,7 +2979,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterGetWeekdayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -3055,7 +3062,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterGetYeardayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -3123,7 +3130,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorCallback(const_cast(PIN)); + emberAfDoorLockClusterLockDoorCallback(apCommandObj, const_cast(PIN)); } else { @@ -3238,7 +3245,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, + emberAfDoorLockClusterSetHolidayScheduleCallback(apCommandObj, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday); } else @@ -3355,7 +3362,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast(pin)); + emberAfDoorLockClusterSetPinCallback(apCommandObj, userId, userStatus, userType, const_cast(pin)); } else { @@ -3471,7 +3478,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast(id)); + emberAfDoorLockClusterSetRfidCallback(apCommandObj, userId, userStatus, userType, const_cast(id)); } else { @@ -3554,7 +3561,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetUserTypeCallback(userId, userType); + emberAfDoorLockClusterSetUserTypeCallback(apCommandObj, userId, userType); } else { @@ -3717,8 +3724,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, - endMinute); + emberAfDoorLockClusterSetWeekdayScheduleCallback(apCommandObj, scheduleId, userId, daysMask, startHour, startMinute, + endHour, endMinute); } else { @@ -3833,7 +3840,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime); + emberAfDoorLockClusterSetYeardayScheduleCallback(apCommandObj, scheduleId, userId, localStartTime, localEndTime); } else { @@ -3901,7 +3908,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorCallback(const_cast(PIN)); + emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, const_cast(PIN)); } else { @@ -3985,7 +3992,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast(pin)); + emberAfDoorLockClusterUnlockWithTimeoutCallback(apCommandObj, timeoutInSeconds, const_cast(pin)); } else { @@ -4104,7 +4111,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs); + emberAfGeneralCommissioningClusterArmFailSafeCallback(apCommandObj, expiryLengthSeconds, breadcrumb, timeoutMs); } else { @@ -4119,7 +4126,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_COMMISSIONING_COMPLETE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); + emberAfGeneralCommissioningClusterCommissioningCompleteCallback(apCommandObj); break; } case ZCL_SET_FABRIC_COMMAND_ID: { @@ -4233,7 +4240,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs); + emberAfGeneralCommissioningClusterSetFabricCallback(apCommandObj, fabricId, fabricSecret, breadcrumb, timeoutMs); } else { @@ -4337,7 +4344,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupCallback(groupId, const_cast(groupName)); + emberAfGroupsClusterAddGroupCallback(apCommandObj, groupId, const_cast(groupName)); } else { @@ -4421,7 +4428,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast(groupName)); + emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, groupId, const_cast(groupName)); } else { @@ -4505,7 +4512,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList); + emberAfGroupsClusterGetGroupMembershipCallback(apCommandObj, groupCount, groupList); } else { @@ -4520,7 +4527,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveAllGroupsCallback(); + emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj); break; } case ZCL_REMOVE_GROUP_COMMAND_ID: { @@ -4578,7 +4585,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveGroupCallback(groupId); + emberAfGroupsClusterRemoveGroupCallback(apCommandObj, groupId); } else { @@ -4645,7 +4652,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterViewGroupCallback(groupId); + emberAfGroupsClusterViewGroupCallback(apCommandObj, groupId); } else { @@ -4748,7 +4755,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + emberAfIasZoneClusterZoneEnrollResponseCallback(apCommandObj, enrollResponseCode, zoneId); } else { @@ -4835,7 +4842,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyCallback(identifyTime); + emberAfIdentifyClusterIdentifyCallback(apCommandObj, identifyTime); } else { @@ -4850,7 +4857,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_IDENTIFY_QUERY_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyQueryCallback(); + emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj); break; } default: { @@ -4976,7 +4983,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + emberAfLevelControlClusterMoveCallback(apCommandObj, moveMode, rate, optionMask, optionOverride); } else { @@ -5091,7 +5098,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, level, transitionTime, optionMask, optionOverride); } else { @@ -5174,7 +5181,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, level, transitionTime); } else { @@ -5257,7 +5264,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, moveMode, rate); } else { @@ -5388,7 +5395,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterStepCallback(apCommandObj, stepMode, stepSize, transitionTime, optionMask, + optionOverride); } else { @@ -5487,7 +5495,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, stepMode, stepSize, transitionTime); } else { @@ -5570,7 +5578,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + emberAfLevelControlClusterStopCallback(apCommandObj, optionMask, optionOverride); } else { @@ -5585,7 +5593,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopWithOnOffCallback(); + emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj); break; } default: { @@ -5611,7 +5619,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_SLEEP_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLowPowerClusterSleepCallback(); + emberAfLowPowerClusterSleepCallback(apCommandObj); break; } default: { @@ -5725,7 +5733,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -5848,7 +5856,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -5951,7 +5959,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -6054,7 +6062,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -6121,7 +6129,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -6224,7 +6232,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -6327,7 +6335,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -6430,7 +6438,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -6553,7 +6562,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -6588,19 +6597,19 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOffCallback(); + emberAfOnOffClusterOffCallback(apCommandObj); break; } case ZCL_ON_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOnCallback(); + emberAfOnOffClusterOnCallback(apCommandObj); break; } case ZCL_TOGGLE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterToggleCallback(); + emberAfOnOffClusterToggleCallback(apCommandObj); break; } default: { @@ -6744,8 +6753,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast(sceneName), - extensionFieldSets); + emberAfScenesClusterAddSceneCallback(apCommandObj, groupId, sceneId, transitionTime, + const_cast(sceneName), extensionFieldSets); } else { @@ -6812,7 +6821,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterGetSceneMembershipCallback(groupId); + emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, groupId); } else { @@ -6911,7 +6920,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime); + emberAfScenesClusterRecallSceneCallback(apCommandObj, groupId, sceneId, transitionTime); } else { @@ -6978,7 +6987,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveAllScenesCallback(groupId); + emberAfScenesClusterRemoveAllScenesCallback(apCommandObj, groupId); } else { @@ -7061,7 +7070,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveSceneCallback(groupId, sceneId); + emberAfScenesClusterRemoveSceneCallback(apCommandObj, groupId, sceneId); } else { @@ -7144,7 +7153,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterStoreSceneCallback(groupId, sceneId); + emberAfScenesClusterStoreSceneCallback(apCommandObj, groupId, sceneId); } else { @@ -7227,7 +7236,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterViewSceneCallback(groupId, sceneId); + emberAfScenesClusterViewSceneCallback(apCommandObj, groupId, sceneId); } else { diff --git a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp index 24920f10f3c1a3..2e7215ee85c4c3 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp @@ -172,11 +172,11 @@ EmberAfStatus emberAfBarrierControlClusterServerCommandParse(EmberAfClusterComma } percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen); + wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(nullptr, percentOpen); break; } case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: { - wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(); + wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(nullptr); break; } default: { @@ -195,7 +195,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd) { if (cmd->mfgCode == 4098 && cmd->commandId == ZCL_MFG_SPECIFIC_PING_COMMAND_ID) { - wasHandled = emberAfBasicClusterMfgSpecificPingCallback(); + wasHandled = emberAfBasicClusterMfgSpecificPingCallback(nullptr); } } else @@ -249,7 +249,7 @@ EmberAfStatus emberAfBindingClusterServerCommandParse(EmberAfClusterCommand * cm } clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId); + wasHandled = emberAfBindingClusterBindCallback(nullptr, nodeId, groupId, endpointId, clusterId); break; } case ZCL_UNBIND_COMMAND_ID: { @@ -283,7 +283,7 @@ EmberAfStatus emberAfBindingClusterServerCommandParse(EmberAfClusterCommand * cm } clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId); + wasHandled = emberAfBindingClusterUnbindCallback(nullptr, nodeId, groupId, endpointId, clusterId); break; } default: { @@ -333,7 +333,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveColorCallback(nullptr, rateX, rateY, optionsMask, optionsOverride); break; } case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: { @@ -382,7 +382,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback( - moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); + nullptr, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); break; } case ZCL_MOVE_HUE_COMMAND_ID: { @@ -416,7 +416,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveHueCallback(nullptr, moveMode, rate, optionsMask, optionsOverride); break; } case ZCL_MOVE_SATURATION_COMMAND_ID: { @@ -450,7 +450,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveSaturationCallback(nullptr, moveMode, rate, optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_COLOR_COMMAND_ID: { @@ -491,8 +491,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveToColorCallback(nullptr, colorX, colorY, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: { @@ -526,8 +526,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, - optionsOverride); + wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(nullptr, colorTemperature, transitionTime, + optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_HUE_COMMAND_ID: { @@ -568,7 +568,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride); + wasHandled = + emberAfColorControlClusterMoveToHueCallback(nullptr, hue, direction, transitionTime, optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: { @@ -609,8 +610,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, - optionsOverride); + wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(nullptr, hue, saturation, transitionTime, + optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_SATURATION_COMMAND_ID: { @@ -644,8 +645,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveToSaturationCallback(nullptr, saturation, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STEP_COLOR_COMMAND_ID: { @@ -686,7 +687,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride); + wasHandled = + emberAfColorControlClusterStepColorCallback(nullptr, stepX, stepY, transitionTime, optionsMask, optionsOverride); break; } case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: { @@ -741,8 +743,9 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStepColorTemperatureCallback( - stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(nullptr, stepMode, stepSize, transitionTime, + colorTemperatureMinimum, colorTemperatureMaximum, + optionsMask, optionsOverride); break; } case ZCL_STEP_HUE_COMMAND_ID: { @@ -783,8 +786,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepHueCallback(nullptr, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STEP_SATURATION_COMMAND_ID: { @@ -825,8 +828,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepSaturationCallback(nullptr, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STOP_MOVE_STEP_COMMAND_ID: { @@ -846,7 +849,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(nullptr, optionsMask, optionsOverride); break; } default: { @@ -866,11 +869,11 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_CLEAR_ALL_PINS_COMMAND_ID: { - wasHandled = emberAfDoorLockClusterClearAllPinsCallback(); + wasHandled = emberAfDoorLockClusterClearAllPinsCallback(nullptr); break; } case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: { - wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(); + wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(nullptr); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -883,7 +886,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId); + wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(nullptr, scheduleId); break; } case ZCL_CLEAR_PIN_COMMAND_ID: { @@ -896,7 +899,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearPinCallback(userId); + wasHandled = emberAfDoorLockClusterClearPinCallback(nullptr, userId); break; } case ZCL_CLEAR_RFID_COMMAND_ID: { @@ -909,7 +912,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearRfidCallback(userId); + wasHandled = emberAfDoorLockClusterClearRfidCallback(nullptr, userId); break; } case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -929,7 +932,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -949,7 +952,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -962,7 +965,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(nullptr, scheduleId); break; } case ZCL_GET_LOG_RECORD_COMMAND_ID: { @@ -975,7 +978,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex); + wasHandled = emberAfDoorLockClusterGetLogRecordCallback(nullptr, logIndex); break; } case ZCL_GET_PIN_COMMAND_ID: { @@ -988,7 +991,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetPinCallback(userId); + wasHandled = emberAfDoorLockClusterGetPinCallback(nullptr, userId); break; } case ZCL_GET_RFID_COMMAND_ID: { @@ -1001,7 +1004,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetRfidCallback(userId); + wasHandled = emberAfDoorLockClusterGetRfidCallback(nullptr, userId); break; } case ZCL_GET_USER_TYPE_COMMAND_ID: { @@ -1014,7 +1017,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId); + wasHandled = emberAfDoorLockClusterGetUserTypeCallback(nullptr, userId); break; } case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -1034,7 +1037,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -1054,7 +1057,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_LOCK_DOOR_COMMAND_ID: { @@ -1067,7 +1070,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN); + wasHandled = emberAfDoorLockClusterLockDoorCallback(nullptr, PIN); break; } case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -1101,7 +1104,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, + wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(nullptr, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday); break; } @@ -1136,7 +1139,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin); + wasHandled = emberAfDoorLockClusterSetPinCallback(nullptr, userId, userStatus, userType, pin); break; } case ZCL_SET_RFID_COMMAND_ID: { @@ -1170,7 +1173,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id); + wasHandled = emberAfDoorLockClusterSetRfidCallback(nullptr, userId, userStatus, userType, id); break; } case ZCL_SET_USER_TYPE_COMMAND_ID: { @@ -1190,7 +1193,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType); + wasHandled = emberAfDoorLockClusterSetUserTypeCallback(nullptr, userId, userType); break; } case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -1245,8 +1248,8 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, - endHour, endMinute); + wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(nullptr, scheduleId, userId, daysMask, startHour, + startMinute, endHour, endMinute); break; } case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -1280,7 +1283,8 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime); + wasHandled = + emberAfDoorLockClusterSetYeardayScheduleCallback(nullptr, scheduleId, userId, localStartTime, localEndTime); break; } case ZCL_UNLOCK_DOOR_COMMAND_ID: { @@ -1293,7 +1297,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN); + wasHandled = emberAfDoorLockClusterUnlockDoorCallback(nullptr, PIN); break; } case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: { @@ -1313,7 +1317,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(nullptr, timeoutInSeconds, pin); break; } default: { @@ -1356,11 +1360,11 @@ EmberAfStatus emberAfGeneralCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs); + wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(nullptr, expiryLengthSeconds, breadcrumb, timeoutMs); break; } case ZCL_COMMISSIONING_COMPLETE_COMMAND_ID: { - wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); + wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(nullptr); break; } case ZCL_SET_FABRIC_COMMAND_ID: { @@ -1400,7 +1404,8 @@ EmberAfStatus emberAfGeneralCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs); + wasHandled = + emberAfGeneralCommissioningClusterSetFabricCallback(nullptr, fabricId, fabricSecret, breadcrumb, timeoutMs); break; } default: { @@ -1436,7 +1441,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName); + wasHandled = emberAfGroupsClusterAddGroupCallback(nullptr, groupId, groupName); break; } case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: { @@ -1456,7 +1461,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(nullptr, groupId, groupName); break; } case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: { @@ -1472,11 +1477,11 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + 1); groupList = cmd->buffer + payloadOffset; - wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList); + wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(nullptr, groupCount, groupList); break; } case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(nullptr); break; } case ZCL_REMOVE_GROUP_COMMAND_ID: { @@ -1489,7 +1494,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(nullptr, groupId); break; } case ZCL_VIEW_GROUP_COMMAND_ID: { @@ -1502,7 +1507,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupCallback(groupId); + wasHandled = emberAfGroupsClusterViewGroupCallback(nullptr, groupId); break; } default: { @@ -1538,7 +1543,7 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm } zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(nullptr, enrollResponseCode, zoneId); break; } default: { @@ -1567,11 +1572,11 @@ EmberAfStatus emberAfIdentifyClusterServerCommandParse(EmberAfClusterCommand * c } identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime); + wasHandled = emberAfIdentifyClusterIdentifyCallback(nullptr, identifyTime); break; } case ZCL_IDENTIFY_QUERY_COMMAND_ID: { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(); + wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(nullptr); break; } default: { @@ -1621,7 +1626,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveCallback(nullptr, moveMode, rate, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_COMMAND_ID: { @@ -1655,7 +1660,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(nullptr, level, transitionTime, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: { @@ -1675,7 +1680,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(nullptr, level, transitionTime); break; } case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: { @@ -1695,7 +1700,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(nullptr, moveMode, rate); break; } case ZCL_STEP_COMMAND_ID: { @@ -1736,7 +1741,8 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + wasHandled = + emberAfLevelControlClusterStepCallback(nullptr, stepMode, stepSize, transitionTime, optionMask, optionOverride); break; } case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: { @@ -1763,7 +1769,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(nullptr, stepMode, stepSize, transitionTime); break; } case ZCL_STOP_COMMAND_ID: { @@ -1783,11 +1789,11 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterStopCallback(nullptr, optionMask, optionOverride); break; } case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { - wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(); + wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(nullptr); break; } default: { @@ -1807,7 +1813,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_SLEEP_COMMAND_ID: { - wasHandled = emberAfLowPowerClusterSleepCallback(); + wasHandled = emberAfLowPowerClusterSleepCallback(nullptr); break; } default: { @@ -1853,7 +1859,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -1893,7 +1900,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -1923,7 +1931,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -1953,7 +1961,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -1966,7 +1974,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -1996,7 +2004,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -2026,7 +2034,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -2056,7 +2064,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -2096,7 +2105,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { @@ -2116,15 +2126,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd) switch (cmd->commandId) { case ZCL_OFF_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOffCallback(); + wasHandled = emberAfOnOffClusterOffCallback(nullptr); break; } case ZCL_ON_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOnCallback(); + wasHandled = emberAfOnOffClusterOnCallback(nullptr); break; } case ZCL_TOGGLE_COMMAND_ID: { - wasHandled = emberAfOnOffClusterToggleCallback(); + wasHandled = emberAfOnOffClusterToggleCallback(nullptr); break; } default: { @@ -2177,7 +2187,8 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + emberAfStringLength(sceneName) + 1u); extensionFieldSets = cmd->buffer + payloadOffset; - wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets); + wasHandled = + emberAfScenesClusterAddSceneCallback(nullptr, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: { @@ -2190,7 +2201,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(nullptr, groupId); break; } case ZCL_RECALL_SCENE_COMMAND_ID: { @@ -2217,7 +2228,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime); + wasHandled = emberAfScenesClusterRecallSceneCallback(nullptr, groupId, sceneId, transitionTime); break; } case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: { @@ -2230,7 +2241,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId); + wasHandled = emberAfScenesClusterRemoveAllScenesCallback(nullptr, groupId); break; } case ZCL_REMOVE_SCENE_COMMAND_ID: { @@ -2250,7 +2261,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterRemoveSceneCallback(nullptr, groupId, sceneId); break; } case ZCL_STORE_SCENE_COMMAND_ID: { @@ -2270,7 +2281,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterStoreSceneCallback(nullptr, groupId, sceneId); break; } case ZCL_VIEW_SCENE_COMMAND_ID: { @@ -2290,7 +2301,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterViewSceneCallback(nullptr, groupId, sceneId); break; } default: { diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback.h b/examples/all-clusters-app/all-clusters-common/gen/callback.h index b8af681d2922cd..f947bc5a5235d4 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/callback.h +++ b/examples/all-clusters-app/all-clusters-common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -1454,19 +1455,19 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end * @param percentOpen */ -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen); +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(chip::app::Command * apCommandObj, uint8_t percentOpen); /** * @brief Barrier Control Cluster BarrierControlStop Command callback */ -bool emberAfBarrierControlClusterBarrierControlStopCallback(); +bool emberAfBarrierControlClusterBarrierControlStopCallback(chip::app::Command * apCommandObj); /** * @brief Basic Cluster MfgSpecificPing Command callback */ -bool emberAfBasicClusterMfgSpecificPingCallback(); +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * apCommandObj); /** * @brief Binding Cluster Bind Command callback @@ -1476,8 +1477,8 @@ bool emberAfBasicClusterMfgSpecificPingCallback(); * @param clusterId */ -bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, - chip::ClusterId clusterId); +bool emberAfBindingClusterBindCallback(chip::app::Command * apCommandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Binding Cluster Unbind Command callback @@ -1487,8 +1488,8 @@ bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupI * @param clusterId */ -bool emberAfBindingClusterUnbindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, - chip::ClusterId clusterId); +bool emberAfBindingClusterUnbindCallback(chip::app::Command * apCommandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Color Control Cluster MoveColor Command callback @@ -1498,7 +1499,8 @@ bool emberAfBindingClusterUnbindCallback(chip::NodeId nodeId, chip::GroupId grou * @param optionsOverride */ -bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveColorCallback(chip::app::Command * apCommandObj, int16_t rateX, int16_t rateY, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveColorTemperature Command callback @@ -1510,9 +1512,9 @@ bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, u * @param optionsOverride */ -bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, - uint16_t colorTemperatureMaximum, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveColorTemperatureCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint16_t rate, + uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveHue Command callback @@ -1522,7 +1524,8 @@ bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, ui * @param optionsOverride */ -bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveHueCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveSaturation Command callback @@ -1532,7 +1535,8 @@ bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, u * @param optionsOverride */ -bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveSaturationCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColor Command callback @@ -1543,8 +1547,8 @@ bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToColorCallback(chip::app::Command * apCommandObj, uint16_t colorX, uint16_t colorY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColorTemperature Command callback @@ -1554,8 +1558,9 @@ bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t col * @param optionsOverride */ -bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToColorTemperatureCallback(chip::app::Command * apCommandObj, uint16_t colorTemperature, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHue Command callback @@ -1566,8 +1571,8 @@ bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemp * @param optionsOverride */ -bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToHueCallback(chip::app::Command * apCommandObj, uint8_t hue, uint8_t direction, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHueAndSaturation Command callback @@ -1578,8 +1583,9 @@ bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, * @param optionsOverride */ -bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToHueAndSaturationCallback(chip::app::Command * apCommandObj, uint8_t hue, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToSaturation Command callback @@ -1589,8 +1595,8 @@ bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8 * @param optionsOverride */ -bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToSaturationCallback(chip::app::Command * apCommandObj, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColor Command callback @@ -1601,8 +1607,8 @@ bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint * @param optionsOverride */ -bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterStepColorCallback(chip::app::Command * apCommandObj, int16_t stepX, int16_t stepY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColorTemperature Command callback @@ -1615,9 +1621,10 @@ bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, u * @param optionsOverride */ -bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, - uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStepColorTemperatureCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint16_t stepSize, + uint16_t transitionTime, uint16_t colorTemperatureMinimum, + uint16_t colorTemperatureMaximum, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster StepHue Command callback @@ -1628,8 +1635,8 @@ bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, ui * @param optionsOverride */ -bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterStepHueCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepSaturation Command callback @@ -1640,8 +1647,8 @@ bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSiz * @param optionsOverride */ -bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStepSaturationCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StopMoveStep Command callback @@ -1649,40 +1656,41 @@ bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStopMoveStepCallback(chip::app::Command * apCommandObj, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Door Lock Cluster ClearAllPins Command callback */ -bool emberAfDoorLockClusterClearAllPinsCallback(); +bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::Command * apCommandObj); /** * @brief Door Lock Cluster ClearAllRfids Command callback */ -bool emberAfDoorLockClusterClearAllRfidsCallback(); +bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::Command * apCommandObj); /** * @brief Door Lock Cluster ClearHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterClearHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster ClearPin Command callback * @param userId */ -bool emberAfDoorLockClusterClearPinCallback(uint16_t userId); +bool emberAfDoorLockClusterClearPinCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearRfid Command callback * @param userId */ -bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterClearRfidCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearWeekdaySchedule Command callback @@ -1690,7 +1698,7 @@ bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster ClearYeardaySchedule Command callback @@ -1698,42 +1706,42 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint * @param userId */ -bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterGetHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster GetLogRecord Command callback * @param logIndex */ -bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex); +bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::Command * apCommandObj, uint16_t logIndex); /** * @brief Door Lock Cluster GetPin Command callback * @param userId */ -bool emberAfDoorLockClusterGetPinCallback(uint16_t userId); +bool emberAfDoorLockClusterGetPinCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetRfid Command callback * @param userId */ -bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterGetRfidCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetUserType Command callback * @param userId */ -bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); +bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetWeekdaySchedule Command callback @@ -1741,7 +1749,7 @@ bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetYeardaySchedule Command callback @@ -1749,14 +1757,14 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param userId */ -bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster LockDoor Command callback * @param pin */ -bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); +bool emberAfDoorLockClusterLockDoorCallback(chip::app::Command * apCommandObj, uint8_t * PIN); /** * @brief Door Lock Cluster SetHolidaySchedule Command callback @@ -1766,7 +1774,8 @@ bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, +bool emberAfDoorLockClusterSetHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday); /** @@ -1777,7 +1786,8 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32 * @param pin */ -bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin); +bool emberAfDoorLockClusterSetPinCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * pin); /** * @brief Door Lock Cluster SetRfid Command callback @@ -1787,7 +1797,8 @@ bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, u * @param id */ -bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * id); +bool emberAfDoorLockClusterSetRfidCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * id); /** * @brief Door Lock Cluster SetUserType Command callback @@ -1795,7 +1806,7 @@ bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, * @param userType */ -bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster SetWeekdaySchedule Command callback @@ -1808,8 +1819,9 @@ bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType * @param endMinute */ -bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, - uint8_t startMinute, uint8_t endHour, uint8_t endMinute); +bool emberAfDoorLockClusterSetWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId, + uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, + uint8_t endMinute); /** * @brief Door Lock Cluster SetYeardaySchedule Command callback @@ -1819,15 +1831,15 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param localEndTime */ -bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, - uint32_t localEndTime); +bool emberAfDoorLockClusterSetYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId, + uint32_t localStartTime, uint32_t localEndTime); /** * @brief Door Lock Cluster UnlockDoor Command callback * @param pin */ -bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); +bool emberAfDoorLockClusterUnlockDoorCallback(chip::app::Command * apCommandObj, uint8_t * PIN); /** * @brief Door Lock Cluster UnlockWithTimeout Command callback @@ -1835,7 +1847,7 @@ bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); * @param pin */ -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin); +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(chip::app::Command * apCommandObj, uint16_t timeoutInSeconds, uint8_t * pin); /** * @brief General Commissioning Cluster ArmFailSafe Command callback @@ -1844,13 +1856,14 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterArmFailSafeCallback(uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterArmFailSafeCallback(chip::app::Command * apCommandObj, uint16_t expiryLengthSeconds, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief General Commissioning Cluster CommissioningComplete Command callback */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); +bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(chip::app::Command * apCommandObj); /** * @brief General Commissioning Cluster SetFabric Command callback @@ -1860,8 +1873,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::app::Command * apCommandObj, chip::ByteSpan fabricId, + chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Groups Cluster AddGroup Command callback @@ -1869,7 +1882,7 @@ bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId * @param groupName */ -bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster AddGroupIfIdentifying Command callback @@ -1877,7 +1890,7 @@ bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName) * @param groupName */ -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster GetGroupMembership Command callback @@ -1885,28 +1898,28 @@ bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipCallback(chip::app::Command * apCommandObj, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** * @brief Groups Cluster RemoveAllGroups Command callback */ -bool emberAfGroupsClusterRemoveAllGroupsCallback(); +bool emberAfGroupsClusterRemoveAllGroupsCallback(chip::app::Command * apCommandObj); /** * @brief Groups Cluster RemoveGroup Command callback * @param groupId */ -bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Groups Cluster ViewGroup Command callback * @param groupId */ -bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterViewGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief IAS Zone Cluster ZoneEnrollResponse Command callback @@ -1914,20 +1927,20 @@ bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); * @param zoneId */ -bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId); +bool emberAfIasZoneClusterZoneEnrollResponseCallback(chip::app::Command * apCommandObj, uint8_t enrollResponseCode, uint8_t zoneId); /** * @brief Identify Cluster Identify Command callback * @param identifyTime */ -bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime); +bool emberAfIdentifyClusterIdentifyCallback(chip::app::Command * apCommandObj, uint16_t identifyTime); /** * @brief Identify Cluster IdentifyQuery Command callback */ -bool emberAfIdentifyClusterIdentifyQueryCallback(); +bool emberAfIdentifyClusterIdentifyQueryCallback(chip::app::Command * apCommandObj); /** * @brief Level Control Cluster Move Command callback @@ -1937,7 +1950,8 @@ bool emberAfIdentifyClusterIdentifyQueryCallback(); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -1947,8 +1961,8 @@ bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint * @param optionOverride */ -bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterMoveToLevelCallback(chip::app::Command * apCommandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -1956,7 +1970,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -1964,7 +1979,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -1975,8 +1990,8 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t r * @param optionOverride */ -bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterStepCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -1985,7 +2000,8 @@ bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, * @param transitionTime */ -bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime); +bool emberAfLevelControlClusterStepWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -1993,19 +2009,19 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * apCommandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * apCommandObj); /** * @brief Low Power Cluster Sleep Command callback */ -bool emberAfLowPowerClusterSleepCallback(); +bool emberAfLowPowerClusterSleepCallback(chip::app::Command * apCommandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -2014,7 +2030,8 @@ bool emberAfLowPowerClusterSleepCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -2025,8 +2042,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -2035,7 +2052,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -2044,14 +2062,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -2060,7 +2080,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -2069,7 +2090,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -2078,7 +2100,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -2089,26 +2112,27 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * apCommandObj); /** * @brief Scenes Cluster AddScene Command callback @@ -2119,7 +2143,8 @@ bool emberAfOnOffClusterToggleCallback(); * @param extensionFieldSets */ -bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, +bool emberAfScenesClusterAddSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); /** @@ -2127,7 +2152,7 @@ bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uin * @param groupId */ -bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); +bool emberAfScenesClusterGetSceneMembershipCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Scenes Cluster RecallScene Command callback @@ -2136,14 +2161,15 @@ bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); * @param transitionTime */ -bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime); +bool emberAfScenesClusterRecallSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime); /** * @brief Scenes Cluster RemoveAllScenes Command callback * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Scenes Cluster RemoveScene Command callback @@ -2151,7 +2177,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); * @param sceneId */ -bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster StoreScene Command callback @@ -2159,7 +2185,7 @@ bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster ViewScene Command callback @@ -2167,7 +2193,7 @@ bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterViewSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); // // Non-Cluster Related Callbacks diff --git a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h b/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h index c2dfa1414f0e3c..37a1151c6c688a 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h +++ b/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h @@ -468,8 +468,8 @@ { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(0) }, /* Descriptor (server): device list */ \ { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(254) }, /* Descriptor (server): server list */ \ { 0x0002, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(508) }, /* Descriptor (server): client list */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Descriptor (server): cluster revision */ \ { 0x0003, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(762) }, /* Descriptor (server): parts list */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Descriptor (server): cluster revision */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \ ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \ diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp index 517ede632664ad..8d5eeda20e208e 100644 --- a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp +++ b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp @@ -149,7 +149,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + emberAfLevelControlClusterMoveCallback(apCommandObj, moveMode, rate, optionMask, optionOverride); } else { @@ -264,7 +264,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, level, transitionTime, optionMask, optionOverride); } else { @@ -347,7 +347,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, level, transitionTime); } else { @@ -430,7 +430,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, moveMode, rate); } else { @@ -561,7 +561,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterStepCallback(apCommandObj, stepMode, stepSize, transitionTime, optionMask, + optionOverride); } else { @@ -660,7 +661,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, stepMode, stepSize, transitionTime); } else { @@ -743,7 +744,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + emberAfLevelControlClusterStopCallback(apCommandObj, optionMask, optionOverride); } else { @@ -758,7 +759,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopWithOnOffCallback(); + emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj); break; } default: { @@ -872,7 +873,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -995,7 +996,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -1098,7 +1099,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -1201,7 +1202,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -1268,7 +1269,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -1371,7 +1372,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -1474,7 +1475,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -1577,7 +1578,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -1700,7 +1702,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -1735,19 +1737,19 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOffCallback(); + emberAfOnOffClusterOffCallback(apCommandObj); break; } case ZCL_ON_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOnCallback(); + emberAfOnOffClusterOnCallback(apCommandObj); break; } case ZCL_TOGGLE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterToggleCallback(); + emberAfOnOffClusterToggleCallback(apCommandObj); break; } default: { diff --git a/examples/bridge-app/bridge-common/gen/call-command-handler.cpp b/examples/bridge-app/bridge-common/gen/call-command-handler.cpp index 7367eb75cbe371..6f5bb101f5c737 100644 --- a/examples/bridge-app/bridge-common/gen/call-command-handler.cpp +++ b/examples/bridge-app/bridge-common/gen/call-command-handler.cpp @@ -134,7 +134,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveCallback(nullptr, moveMode, rate, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_COMMAND_ID: { @@ -168,7 +168,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(nullptr, level, transitionTime, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: { @@ -188,7 +188,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(nullptr, level, transitionTime); break; } case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: { @@ -208,7 +208,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(nullptr, moveMode, rate); break; } case ZCL_STEP_COMMAND_ID: { @@ -249,7 +249,8 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + wasHandled = + emberAfLevelControlClusterStepCallback(nullptr, stepMode, stepSize, transitionTime, optionMask, optionOverride); break; } case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: { @@ -276,7 +277,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(nullptr, stepMode, stepSize, transitionTime); break; } case ZCL_STOP_COMMAND_ID: { @@ -296,11 +297,11 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterStopCallback(nullptr, optionMask, optionOverride); break; } case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { - wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(); + wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(nullptr); break; } default: { @@ -346,7 +347,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -386,7 +388,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -416,7 +419,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -446,7 +449,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -459,7 +462,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -489,7 +492,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -519,7 +522,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -549,7 +552,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -589,7 +593,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { @@ -609,15 +614,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd) switch (cmd->commandId) { case ZCL_OFF_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOffCallback(); + wasHandled = emberAfOnOffClusterOffCallback(nullptr); break; } case ZCL_ON_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOnCallback(); + wasHandled = emberAfOnOffClusterOnCallback(nullptr); break; } case ZCL_TOGGLE_COMMAND_ID: { - wasHandled = emberAfOnOffClusterToggleCallback(); + wasHandled = emberAfOnOffClusterToggleCallback(nullptr); break; } default: { diff --git a/examples/bridge-app/bridge-common/gen/callback.h b/examples/bridge-app/bridge-common/gen/callback.h index b47ae316a9a3e6..088dc546af5e0c 100644 --- a/examples/bridge-app/bridge-common/gen/callback.h +++ b/examples/bridge-app/bridge-common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -360,7 +361,8 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -370,8 +372,8 @@ bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint * @param optionOverride */ -bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterMoveToLevelCallback(chip::app::Command * apCommandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -379,7 +381,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -387,7 +390,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -398,8 +401,8 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t r * @param optionOverride */ -bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterStepCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -408,7 +411,8 @@ bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, * @param transitionTime */ -bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime); +bool emberAfLevelControlClusterStepWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -416,13 +420,13 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * apCommandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * apCommandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -431,7 +435,8 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -442,8 +447,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -452,7 +457,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -461,14 +467,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -477,7 +485,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -486,7 +495,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -495,7 +505,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -506,26 +517,27 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * apCommandObj); // // Non-Cluster Related Callbacks diff --git a/examples/chip-tool/gen/CHIPClientCallbacks.cpp b/examples/chip-tool/gen/CHIPClientCallbacks.cpp index ed9e0758a0a463..8f06fc8fa2bb30 100644 --- a/examples/chip-tool/gen/CHIPClientCallbacks.cpp +++ b/examples/chip-tool/gen/CHIPClientCallbacks.cpp @@ -20,6 +20,7 @@ #include "gen/CHIPClientCallbacks.h" #include "gen/enums.h" +#include #include #include #include @@ -817,7 +818,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -838,7 +839,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -859,7 +860,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -880,7 +881,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -901,7 +902,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -922,7 +923,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -943,7 +944,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -964,8 +965,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday) +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -990,8 +992,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin) +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin) { ChipLogProgress(Zcl, "GetLogRecordResponse:"); ChipLogProgress(Zcl, " logEntryId: %" PRIu16 "", logEntryId); @@ -1010,7 +1013,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin return true; } -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin) +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1026,7 +1030,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS return true; } -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid) +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1042,7 +1047,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1056,9 +1061,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, 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); @@ -1086,8 +1091,9 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime) +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1112,7 +1118,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1133,7 +1139,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1154,7 +1160,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1175,7 +1181,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1196,7 +1202,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1217,7 +1223,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1238,7 +1244,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1259,7 +1265,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1280,7 +1286,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1301,7 +1307,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1315,7 +1322,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1329,7 +1337,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1343,7 +1352,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1365,7 +1374,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1381,7 +1390,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1403,7 +1412,8 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName) +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1426,7 +1436,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1439,7 +1449,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1453,7 +1464,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1467,7 +1479,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "DisableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1481,7 +1494,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "EnableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1495,7 +1509,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err return true; } -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "RemoveNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1510,7 +1525,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t err } bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( - uint8_t errorCode, uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, + chip::app::Command * apCommandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults) { ChipLogProgress(Zcl, "ScanNetworksResponse:"); @@ -1527,7 +1543,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( return true; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1541,7 +1558,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 return true; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1555,7 +1573,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1578,7 +1597,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1604,7 +1624,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1626,7 +1646,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ return true; } -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1649,7 +1670,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1672,8 +1694,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro return true; } -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets) { ChipLogProgress(Zcl, "ViewSceneResponse:"); diff --git a/examples/chip-tool/gen/IMClusterCommandHandler.cpp b/examples/chip-tool/gen/IMClusterCommandHandler.cpp index 96a8be3f1c5de1..4816d999d75322 100644 --- a/examples/chip-tool/gen/IMClusterCommandHandler.cpp +++ b/examples/chip-tool/gen/IMClusterCommandHandler.cpp @@ -101,7 +101,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllPinsResponseCallback(status); + emberAfDoorLockClusterClearAllPinsResponseCallback(apCommandObj, status); } else { @@ -168,7 +168,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + emberAfDoorLockClusterClearAllRfidsResponseCallback(apCommandObj, status); } else { @@ -235,7 +235,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterClearHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -302,7 +302,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearPinResponseCallback(status); + emberAfDoorLockClusterClearPinResponseCallback(apCommandObj, status); } else { @@ -369,7 +369,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearRfidResponseCallback(status); + emberAfDoorLockClusterClearRfidResponseCallback(apCommandObj, status); } else { @@ -436,7 +436,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -503,7 +503,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterClearYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -634,8 +634,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + emberAfDoorLockClusterGetHolidayScheduleResponseCallback(apCommandObj, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); } else { @@ -799,8 +799,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, - userId, const_cast(pin)); + emberAfDoorLockClusterGetLogRecordResponseCallback(apCommandObj, logEntryId, timestamp, eventType, source, + eventIdOrAlarmCode, userId, const_cast(pin)); } else { @@ -916,7 +916,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast(pin)); + emberAfDoorLockClusterGetPinResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(pin)); } else { @@ -1032,7 +1033,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast(rfid)); + emberAfDoorLockClusterGetRfidResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(rfid)); } else { @@ -1115,7 +1117,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + emberAfDoorLockClusterGetUserTypeResponseCallback(apCommandObj, userId, userType); } else { @@ -1294,8 +1296,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); } else { @@ -1426,7 +1428,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + emberAfDoorLockClusterGetYeardayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, localStartTime, + localEndTime); } else { @@ -1493,7 +1496,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorResponseCallback(status); + emberAfDoorLockClusterLockDoorResponseCallback(apCommandObj, status); } else { @@ -1560,7 +1563,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterSetHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -1627,7 +1630,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetPinResponseCallback(status); + emberAfDoorLockClusterSetPinResponseCallback(apCommandObj, status); } else { @@ -1694,7 +1697,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetRfidResponseCallback(status); + emberAfDoorLockClusterSetRfidResponseCallback(apCommandObj, status); } else { @@ -1761,7 +1764,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetUserTypeResponseCallback(status); + emberAfDoorLockClusterSetUserTypeResponseCallback(apCommandObj, status); } else { @@ -1828,7 +1831,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -1895,7 +1898,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterSetYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -1962,7 +1965,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorResponseCallback(status); + emberAfDoorLockClusterUnlockDoorResponseCallback(apCommandObj, status); } else { @@ -2029,7 +2032,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(apCommandObj, status); } else { @@ -2133,7 +2136,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2217,7 +2221,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, + emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(apCommandObj, errorCode, const_cast(debugText)); } else @@ -2302,7 +2306,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterSetFabricResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2405,7 +2410,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + emberAfGroupsClusterAddGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2505,7 +2510,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + emberAfGroupsClusterGetGroupMembershipResponseCallback(apCommandObj, capacity, groupCount, groupList); } else { @@ -2588,7 +2593,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + emberAfGroupsClusterRemoveGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2688,7 +2693,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast(groupName)); + emberAfGroupsClusterViewGroupResponseCallback(apCommandObj, status, groupId, const_cast(groupName)); } else { @@ -2775,7 +2780,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + emberAfIdentifyClusterIdentifyQueryResponseCallback(apCommandObj, timeout); } else { @@ -2879,7 +2884,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2963,7 +2969,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3047,7 +3054,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3131,7 +3139,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3215,7 +3224,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3333,8 +3343,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksResponseCallback(errorCode, const_cast(debugText), - wifiScanResults, threadScanResults); + emberAfNetworkCommissioningClusterScanNetworksResponseCallback( + apCommandObj, errorCode, const_cast(debugText), wifiScanResults, threadScanResults); } else { @@ -3418,7 +3428,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3502,7 +3513,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3621,7 +3633,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterAddSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -3753,7 +3765,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + emberAfScenesClusterGetSceneMembershipResponseCallback(apCommandObj, status, capacity, groupId, sceneCount, + sceneList); } else { @@ -3836,7 +3849,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + emberAfScenesClusterRemoveAllScenesResponseCallback(apCommandObj, status, groupId); } else { @@ -3935,7 +3948,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterRemoveSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -4034,7 +4047,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterStoreSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -4183,7 +4196,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, + emberAfScenesClusterViewSceneResponseCallback(apCommandObj, status, groupId, sceneId, transitionTime, const_cast(sceneName), extensionFieldSets); } else diff --git a/examples/chip-tool/gen/call-command-handler.cpp b/examples/chip-tool/gen/call-command-handler.cpp index 377448a7a84919..245ff1e5df3888 100644 --- a/examples/chip-tool/gen/call-command-handler.cpp +++ b/examples/chip-tool/gen/call-command-handler.cpp @@ -175,7 +175,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: { @@ -188,7 +188,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -201,7 +201,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: { @@ -214,7 +214,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearPinResponseCallback(nullptr, status); break; } case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: { @@ -227,7 +227,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(nullptr, status); break; } case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -240,7 +240,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -253,7 +253,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -294,8 +294,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(nullptr, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); break; } case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: { @@ -350,7 +350,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, + wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(nullptr, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin); break; } @@ -385,7 +385,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin); + wasHandled = emberAfDoorLockClusterGetPinResponseCallback(nullptr, userId, userStatus, userType, pin); break; } case ZCL_GET_RFID_RESPONSE_COMMAND_ID: { @@ -419,7 +419,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid); + wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(nullptr, userId, userStatus, userType, rfid); break; } case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -439,7 +439,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(nullptr, userId, userType); break; } case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -501,8 +501,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(nullptr, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); break; } case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -543,8 +543,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(nullptr, scheduleId, userId, status, + localStartTime, localEndTime); break; } case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -557,7 +557,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(nullptr, status); break; } case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -570,7 +570,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_PIN_RESPONSE_COMMAND_ID: { @@ -583,7 +583,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetPinResponseCallback(nullptr, status); break; } case ZCL_SET_RFID_RESPONSE_COMMAND_ID: { @@ -596,7 +596,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(nullptr, status); break; } case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -609,7 +609,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(nullptr, status); break; } case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -622,7 +622,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -635,7 +635,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -648,7 +648,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: { @@ -661,7 +661,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(nullptr, status); break; } default: { @@ -697,7 +697,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: { @@ -717,7 +717,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: { @@ -737,7 +737,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -773,7 +773,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterAddGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -796,7 +796,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + 1); groupList = cmd->buffer + payloadOffset; - wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(nullptr, capacity, groupCount, groupList); break; } case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: { @@ -816,7 +816,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: { @@ -843,7 +843,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName); + wasHandled = emberAfGroupsClusterViewGroupResponseCallback(nullptr, status, groupId, groupName); break; } default: { @@ -872,7 +872,7 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c } timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(nullptr, timeout); break; } default: { @@ -908,7 +908,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID: { @@ -928,7 +928,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID: { @@ -948,7 +948,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID: { @@ -968,7 +968,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID: { @@ -988,7 +988,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID: { @@ -1013,8 +1013,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste wifiScanResults = cmd->buffer + payloadOffset; threadScanResults = cmd->buffer + payloadOffset; - wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(errorCode, debugText, wifiScanResults, - threadScanResults); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(nullptr, errorCode, debugText, + wifiScanResults, threadScanResults); break; } case ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID: { @@ -1034,7 +1034,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID: { @@ -1054,7 +1054,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -1097,7 +1097,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterAddSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -1148,7 +1148,8 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd sceneList = NULL; } - wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + wasHandled = + emberAfScenesClusterGetSceneMembershipResponseCallback(nullptr, status, capacity, groupId, sceneCount, sceneList); break; } case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: { @@ -1168,7 +1169,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(nullptr, status, groupId); break; } case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: { @@ -1195,7 +1196,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: { @@ -1222,7 +1223,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterStoreSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: { @@ -1287,7 +1288,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd extensionFieldSets = NULL; } - wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, + wasHandled = emberAfScenesClusterViewSceneResponseCallback(nullptr, status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } diff --git a/examples/chip-tool/gen/callback.h b/examples/chip-tool/gen/callback.h index 4623cdec559034..5cd68784cae713 100644 --- a/examples/chip-tool/gen/callback.h +++ b/examples/chip-tool/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -1376,49 +1377,49 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end * @param status */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback @@ -1429,8 +1430,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday); +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster GetLogRecordResponse Command callback @@ -1443,8 +1445,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId * @param pin */ -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin); +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin); /** * @brief Door Lock Cluster GetPinResponse Command callback @@ -1454,7 +1457,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin * @param pin */ -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin); +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin); /** * @brief Door Lock Cluster GetRfidResponse Command callback @@ -1464,7 +1468,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS * @param rfid */ -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid); +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid); /** * @brief Door Lock Cluster GetUserTypeResponse Command callback @@ -1472,7 +1477,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user * @param userType */ -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback @@ -1486,9 +1491,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t * @param endMinute */ -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1499,71 +1504,72 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId * @param localEndTime */ -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime); +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime); /** * @brief Door Lock Cluster LockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1571,7 +1577,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1579,7 +1586,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1587,7 +1595,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1595,7 +1604,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1604,7 +1613,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1613,7 +1622,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1622,14 +1631,15 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr * @param groupName */ -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName); /** * @brief Identify Cluster IdentifyQueryResponse Command callback * @param timeout */ -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout); /** * @brief Network Commissioning Cluster AddThreadNetworkResponse Command callback @@ -1637,7 +1647,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param debugText */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster AddWiFiNetworkResponse Command callback @@ -1645,7 +1656,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t * @param debugText */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster DisableNetworkResponse Command callback @@ -1653,7 +1665,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster EnableNetworkResponse Command callback @@ -1661,7 +1674,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster RemoveNetworkResponse Command callback @@ -1669,7 +1683,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err * @param debugText */ -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster ScanNetworksResponse Command callback @@ -1680,7 +1695,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t err */ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( - uint8_t errorCode, uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, + chip::app::Command * apCommandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults); /** @@ -1689,7 +1705,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster UpdateWiFiNetworkResponse Command callback @@ -1697,7 +1714,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1706,7 +1724,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1717,7 +1736,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group * @param sceneList */ -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1726,7 +1746,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1735,7 +1755,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ * @param sceneId */ -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1744,7 +1765,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr * @param sceneId */ -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1756,8 +1778,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro * @param extensionFieldSets */ -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); // diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp index 517ede632664ad..8d5eeda20e208e 100644 --- a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp @@ -149,7 +149,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + emberAfLevelControlClusterMoveCallback(apCommandObj, moveMode, rate, optionMask, optionOverride); } else { @@ -264,7 +264,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, level, transitionTime, optionMask, optionOverride); } else { @@ -347,7 +347,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, level, transitionTime); } else { @@ -430,7 +430,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, moveMode, rate); } else { @@ -561,7 +561,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterStepCallback(apCommandObj, stepMode, stepSize, transitionTime, optionMask, + optionOverride); } else { @@ -660,7 +661,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, stepMode, stepSize, transitionTime); } else { @@ -743,7 +744,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + emberAfLevelControlClusterStopCallback(apCommandObj, optionMask, optionOverride); } else { @@ -758,7 +759,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopWithOnOffCallback(); + emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj); break; } default: { @@ -872,7 +873,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -995,7 +996,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -1098,7 +1099,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -1201,7 +1202,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -1268,7 +1269,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -1371,7 +1372,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -1474,7 +1475,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -1577,7 +1578,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -1700,7 +1702,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -1735,19 +1737,19 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOffCallback(); + emberAfOnOffClusterOffCallback(apCommandObj); break; } case ZCL_ON_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOnCallback(); + emberAfOnOffClusterOnCallback(apCommandObj); break; } case ZCL_TOGGLE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterToggleCallback(); + emberAfOnOffClusterToggleCallback(apCommandObj); break; } default: { diff --git a/examples/lighting-app/lighting-common/gen/call-command-handler.cpp b/examples/lighting-app/lighting-common/gen/call-command-handler.cpp index 7367eb75cbe371..6f5bb101f5c737 100644 --- a/examples/lighting-app/lighting-common/gen/call-command-handler.cpp +++ b/examples/lighting-app/lighting-common/gen/call-command-handler.cpp @@ -134,7 +134,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveCallback(nullptr, moveMode, rate, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_COMMAND_ID: { @@ -168,7 +168,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(nullptr, level, transitionTime, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: { @@ -188,7 +188,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(nullptr, level, transitionTime); break; } case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: { @@ -208,7 +208,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(nullptr, moveMode, rate); break; } case ZCL_STEP_COMMAND_ID: { @@ -249,7 +249,8 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + wasHandled = + emberAfLevelControlClusterStepCallback(nullptr, stepMode, stepSize, transitionTime, optionMask, optionOverride); break; } case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: { @@ -276,7 +277,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(nullptr, stepMode, stepSize, transitionTime); break; } case ZCL_STOP_COMMAND_ID: { @@ -296,11 +297,11 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterStopCallback(nullptr, optionMask, optionOverride); break; } case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { - wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(); + wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(nullptr); break; } default: { @@ -346,7 +347,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -386,7 +388,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -416,7 +419,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -446,7 +449,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -459,7 +462,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -489,7 +492,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -519,7 +522,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -549,7 +552,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -589,7 +593,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { @@ -609,15 +614,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd) switch (cmd->commandId) { case ZCL_OFF_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOffCallback(); + wasHandled = emberAfOnOffClusterOffCallback(nullptr); break; } case ZCL_ON_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOnCallback(); + wasHandled = emberAfOnOffClusterOnCallback(nullptr); break; } case ZCL_TOGGLE_COMMAND_ID: { - wasHandled = emberAfOnOffClusterToggleCallback(); + wasHandled = emberAfOnOffClusterToggleCallback(nullptr); break; } default: { diff --git a/examples/lighting-app/lighting-common/gen/callback.h b/examples/lighting-app/lighting-common/gen/callback.h index b47ae316a9a3e6..088dc546af5e0c 100644 --- a/examples/lighting-app/lighting-common/gen/callback.h +++ b/examples/lighting-app/lighting-common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -360,7 +361,8 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -370,8 +372,8 @@ bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint * @param optionOverride */ -bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterMoveToLevelCallback(chip::app::Command * apCommandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -379,7 +381,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -387,7 +390,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -398,8 +401,8 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t r * @param optionOverride */ -bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterStepCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -408,7 +411,8 @@ bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, * @param transitionTime */ -bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime); +bool emberAfLevelControlClusterStepWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -416,13 +420,13 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * apCommandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * apCommandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -431,7 +435,8 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -442,8 +447,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -452,7 +457,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -461,14 +467,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -477,7 +485,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -486,7 +495,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -495,7 +505,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -506,26 +517,27 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * apCommandObj); // // Non-Cluster Related Callbacks diff --git a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp index e8cc481cfb81d5..ad5a8b67fcf6b8 100644 --- a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp @@ -137,7 +137,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -260,7 +260,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -363,7 +363,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -466,7 +466,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -533,7 +533,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -636,7 +636,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -739,7 +739,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -842,7 +842,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -965,7 +966,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -1000,19 +1001,19 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOffCallback(); + emberAfOnOffClusterOffCallback(apCommandObj); break; } case ZCL_ON_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOnCallback(); + emberAfOnOffClusterOnCallback(apCommandObj); break; } case ZCL_TOGGLE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterToggleCallback(); + emberAfOnOffClusterToggleCallback(apCommandObj); break; } default: { diff --git a/examples/lock-app/lock-common/gen/call-command-handler.cpp b/examples/lock-app/lock-common/gen/call-command-handler.cpp index f28cd0e98b63e9..ee8ec9305d7f44 100644 --- a/examples/lock-app/lock-common/gen/call-command-handler.cpp +++ b/examples/lock-app/lock-common/gen/call-command-handler.cpp @@ -126,7 +126,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -166,7 +167,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -196,7 +198,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -226,7 +228,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -239,7 +241,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -269,7 +271,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -299,7 +301,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -329,7 +331,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -369,7 +372,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { @@ -389,15 +393,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd) switch (cmd->commandId) { case ZCL_OFF_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOffCallback(); + wasHandled = emberAfOnOffClusterOffCallback(nullptr); break; } case ZCL_ON_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOnCallback(); + wasHandled = emberAfOnOffClusterOnCallback(nullptr); break; } case ZCL_TOGGLE_COMMAND_ID: { - wasHandled = emberAfOnOffClusterToggleCallback(); + wasHandled = emberAfOnOffClusterToggleCallback(nullptr); break; } default: { diff --git a/examples/lock-app/lock-common/gen/callback.h b/examples/lock-app/lock-common/gen/callback.h index cdc77b3a6450bf..15aa67e1ce030e 100644 --- a/examples/lock-app/lock-common/gen/callback.h +++ b/examples/lock-app/lock-common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -281,7 +282,8 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -292,8 +294,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -302,7 +304,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -311,14 +314,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -327,7 +332,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -336,7 +342,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -345,7 +352,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -356,26 +364,27 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * apCommandObj); // // Non-Cluster Related Callbacks diff --git a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp index ae9c40556bf518..d28ac54d0195d9 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp @@ -137,7 +137,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -260,7 +260,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -363,7 +363,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -466,7 +466,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -533,7 +533,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -636,7 +636,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -739,7 +739,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -842,7 +842,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -965,7 +966,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { diff --git a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp index 39d558dceb842e..eeaf37ce924c03 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp @@ -127,7 +127,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -167,7 +168,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -197,7 +199,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -227,7 +229,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -240,7 +242,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -270,7 +272,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -300,7 +302,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -330,7 +332,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -370,7 +373,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback.h b/examples/temperature-measurement-app/esp32/main/gen/callback.h index 50f828f9ff3177..91c628a149409d 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/callback.h +++ b/examples/temperature-measurement-app/esp32/main/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -284,7 +285,8 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -295,8 +297,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -305,7 +307,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -314,14 +317,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -330,7 +335,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -339,7 +345,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -348,7 +355,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -359,8 +367,9 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); // // Non-Cluster Related Callbacks diff --git a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp index 98450403c13300..ed0c71ae72d9e5 100644 --- a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp +++ b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp @@ -20,6 +20,7 @@ #include "gen/CHIPClientCallbacks.h" #include "gen/enums.h" +#include #include #include #include @@ -696,7 +697,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -717,7 +718,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp index 75ef4d072187c1..199d6db286e068 100644 --- a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp +++ b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp @@ -101,7 +101,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen); + emberAfBarrierControlClusterBarrierControlGoToPercentCallback(apCommandObj, percentOpen); } else { @@ -116,7 +116,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfBarrierControlClusterBarrierControlStopCallback(); + emberAfBarrierControlClusterBarrierControlStopCallback(apCommandObj); break; } default: { @@ -242,7 +242,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride); + emberAfColorControlClusterMoveColorCallback(apCommandObj, rateX, rateY, optionsMask, optionsOverride); } else { @@ -389,7 +389,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, + emberAfColorControlClusterMoveColorTemperatureCallback(apCommandObj, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); } else @@ -505,7 +505,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride); + emberAfColorControlClusterMoveHueCallback(apCommandObj, moveMode, rate, optionsMask, optionsOverride); } else { @@ -620,7 +620,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride); + emberAfColorControlClusterMoveSaturationCallback(apCommandObj, moveMode, rate, optionsMask, optionsOverride); } else { @@ -751,7 +751,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToColorCallback(apCommandObj, colorX, colorY, transitionTime, optionsMask, + optionsOverride); } else { @@ -866,8 +867,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, - optionsOverride); + emberAfColorControlClusterMoveToColorTemperatureCallback(apCommandObj, colorTemperature, transitionTime, + optionsMask, optionsOverride); } else { @@ -998,7 +999,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToHueCallback(apCommandObj, hue, direction, transitionTime, optionsMask, + optionsOverride); } else { @@ -1129,7 +1131,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, + emberAfColorControlClusterMoveToHueAndSaturationCallback(apCommandObj, hue, saturation, transitionTime, optionsMask, optionsOverride); } else @@ -1245,7 +1247,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterMoveToSaturationCallback(apCommandObj, saturation, transitionTime, optionsMask, + optionsOverride); } else { @@ -1376,7 +1379,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepColorCallback(apCommandObj, stepX, stepY, transitionTime, optionsMask, + optionsOverride); } else { @@ -1539,8 +1543,9 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, - colorTemperatureMaximum, optionsMask, optionsOverride); + emberAfColorControlClusterStepColorTemperatureCallback(apCommandObj, stepMode, stepSize, transitionTime, + colorTemperatureMinimum, colorTemperatureMaximum, + optionsMask, optionsOverride); } else { @@ -1671,7 +1676,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepHueCallback(apCommandObj, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); } else { @@ -1802,7 +1808,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + emberAfColorControlClusterStepSaturationCallback(apCommandObj, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); } else { @@ -1885,7 +1892,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + emberAfColorControlClusterStopMoveStepCallback(apCommandObj, optionsMask, optionsOverride); } else { @@ -1972,7 +1979,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorResponseCallback(status); + emberAfDoorLockClusterLockDoorResponseCallback(apCommandObj, status); } else { @@ -2039,7 +2046,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorResponseCallback(status); + emberAfDoorLockClusterUnlockDoorResponseCallback(apCommandObj, status); } else { @@ -2074,13 +2081,13 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_CLEAR_ALL_PINS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllPinsCallback(); + emberAfDoorLockClusterClearAllPinsCallback(apCommandObj); break; } case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllRfidsCallback(); + emberAfDoorLockClusterClearAllRfidsCallback(apCommandObj); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -2138,7 +2145,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId); + emberAfDoorLockClusterClearHolidayScheduleCallback(apCommandObj, scheduleId); } else { @@ -2205,7 +2212,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearPinCallback(userId); + emberAfDoorLockClusterClearPinCallback(apCommandObj, userId); } else { @@ -2272,7 +2279,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearRfidCallback(userId); + emberAfDoorLockClusterClearRfidCallback(apCommandObj, userId); } else { @@ -2355,7 +2362,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterClearWeekdayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -2438,7 +2445,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterClearYeardayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -2505,7 +2512,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId); + emberAfDoorLockClusterGetHolidayScheduleCallback(apCommandObj, scheduleId); } else { @@ -2572,7 +2579,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetLogRecordCallback(logIndex); + emberAfDoorLockClusterGetLogRecordCallback(apCommandObj, logIndex); } else { @@ -2639,7 +2646,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetPinCallback(userId); + emberAfDoorLockClusterGetPinCallback(apCommandObj, userId); } else { @@ -2706,7 +2713,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetRfidCallback(userId); + emberAfDoorLockClusterGetRfidCallback(apCommandObj, userId); } else { @@ -2773,7 +2780,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetUserTypeCallback(userId); + emberAfDoorLockClusterGetUserTypeCallback(apCommandObj, userId); } else { @@ -2856,7 +2863,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterGetWeekdayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -2939,7 +2946,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId); + emberAfDoorLockClusterGetYeardayScheduleCallback(apCommandObj, scheduleId, userId); } else { @@ -3007,7 +3014,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorCallback(const_cast(PIN)); + emberAfDoorLockClusterLockDoorCallback(apCommandObj, const_cast(PIN)); } else { @@ -3122,7 +3129,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, + emberAfDoorLockClusterSetHolidayScheduleCallback(apCommandObj, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday); } else @@ -3239,7 +3246,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast(pin)); + emberAfDoorLockClusterSetPinCallback(apCommandObj, userId, userStatus, userType, const_cast(pin)); } else { @@ -3355,7 +3362,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast(id)); + emberAfDoorLockClusterSetRfidCallback(apCommandObj, userId, userStatus, userType, const_cast(id)); } else { @@ -3438,7 +3445,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetUserTypeCallback(userId, userType); + emberAfDoorLockClusterSetUserTypeCallback(apCommandObj, userId, userType); } else { @@ -3601,8 +3608,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, - endMinute); + emberAfDoorLockClusterSetWeekdayScheduleCallback(apCommandObj, scheduleId, userId, daysMask, startHour, startMinute, + endHour, endMinute); } else { @@ -3717,7 +3724,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime); + emberAfDoorLockClusterSetYeardayScheduleCallback(apCommandObj, scheduleId, userId, localStartTime, localEndTime); } else { @@ -3785,7 +3792,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorCallback(const_cast(PIN)); + emberAfDoorLockClusterUnlockDoorCallback(apCommandObj, const_cast(PIN)); } else { @@ -3869,7 +3876,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast(pin)); + emberAfDoorLockClusterUnlockWithTimeoutCallback(apCommandObj, timeoutInSeconds, const_cast(pin)); } else { @@ -3973,7 +3980,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupCallback(groupId, const_cast(groupName)); + emberAfGroupsClusterAddGroupCallback(apCommandObj, groupId, const_cast(groupName)); } else { @@ -4057,7 +4064,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast(groupName)); + emberAfGroupsClusterAddGroupIfIdentifyingCallback(apCommandObj, groupId, const_cast(groupName)); } else { @@ -4141,7 +4148,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList); + emberAfGroupsClusterGetGroupMembershipCallback(apCommandObj, groupCount, groupList); } else { @@ -4156,7 +4163,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveAllGroupsCallback(); + emberAfGroupsClusterRemoveAllGroupsCallback(apCommandObj); break; } case ZCL_REMOVE_GROUP_COMMAND_ID: { @@ -4214,7 +4221,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveGroupCallback(groupId); + emberAfGroupsClusterRemoveGroupCallback(apCommandObj, groupId); } else { @@ -4281,7 +4288,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterViewGroupCallback(groupId); + emberAfGroupsClusterViewGroupCallback(apCommandObj, groupId); } else { @@ -4384,7 +4391,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + emberAfIasZoneClusterZoneEnrollResponseCallback(apCommandObj, enrollResponseCode, zoneId); } else { @@ -4471,7 +4478,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyCallback(identifyTime); + emberAfIdentifyClusterIdentifyCallback(apCommandObj, identifyTime); } else { @@ -4486,7 +4493,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_IDENTIFY_QUERY_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyQueryCallback(); + emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj); break; } default: { @@ -4612,7 +4619,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + emberAfLevelControlClusterMoveCallback(apCommandObj, moveMode, rate, optionMask, optionOverride); } else { @@ -4727,7 +4734,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterMoveToLevelCallback(apCommandObj, level, transitionTime, optionMask, optionOverride); } else { @@ -4810,7 +4817,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + emberAfLevelControlClusterMoveToLevelWithOnOffCallback(apCommandObj, level, transitionTime); } else { @@ -4893,7 +4900,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + emberAfLevelControlClusterMoveWithOnOffCallback(apCommandObj, moveMode, rate); } else { @@ -5024,7 +5031,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + emberAfLevelControlClusterStepCallback(apCommandObj, stepMode, stepSize, transitionTime, optionMask, + optionOverride); } else { @@ -5123,7 +5131,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + emberAfLevelControlClusterStepWithOnOffCallback(apCommandObj, stepMode, stepSize, transitionTime); } else { @@ -5206,7 +5214,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + emberAfLevelControlClusterStopCallback(apCommandObj, optionMask, optionOverride); } else { @@ -5221,7 +5229,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLevelControlClusterStopWithOnOffCallback(); + emberAfLevelControlClusterStopWithOnOffCallback(apCommandObj); break; } default: { @@ -5247,7 +5255,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_SLEEP_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfLowPowerClusterSleepCallback(); + emberAfLowPowerClusterSleepCallback(apCommandObj); break; } default: { @@ -5361,7 +5369,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, timeoutMs); } else { @@ -5484,7 +5492,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -5587,7 +5595,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterDisableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -5690,7 +5698,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterEnableNetworkCallback(apCommandObj, networkID, breadcrumb, timeoutMs); } else { @@ -5757,7 +5765,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(apCommandObj, timeoutMs); } else { @@ -5860,7 +5868,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + emberAfNetworkCommissioningClusterRemoveNetworkCallback(apCommandObj, NetworkID, Breadcrumb, TimeoutMs); } else { @@ -5963,7 +5971,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterScanNetworksCallback(apCommandObj, ssid, breadcrumb, timeoutMs); } else { @@ -6066,7 +6074,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(apCommandObj, operationalDataset, breadcrumb, + timeoutMs); } else { @@ -6189,7 +6198,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(apCommandObj, ssid, credentials, breadcrumb, timeoutMs); } else { @@ -6224,19 +6233,19 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_OFF_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOffCallback(); + emberAfOnOffClusterOffCallback(apCommandObj); break; } case ZCL_ON_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterOnCallback(); + emberAfOnOffClusterOnCallback(apCommandObj); break; } case ZCL_TOGGLE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOnOffClusterToggleCallback(); + emberAfOnOffClusterToggleCallback(apCommandObj); break; } default: { @@ -6380,8 +6389,8 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast(sceneName), - extensionFieldSets); + emberAfScenesClusterAddSceneCallback(apCommandObj, groupId, sceneId, transitionTime, + const_cast(sceneName), extensionFieldSets); } else { @@ -6448,7 +6457,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterGetSceneMembershipCallback(groupId); + emberAfScenesClusterGetSceneMembershipCallback(apCommandObj, groupId); } else { @@ -6547,7 +6556,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime); + emberAfScenesClusterRecallSceneCallback(apCommandObj, groupId, sceneId, transitionTime); } else { @@ -6614,7 +6623,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveAllScenesCallback(groupId); + emberAfScenesClusterRemoveAllScenesCallback(apCommandObj, groupId); } else { @@ -6697,7 +6706,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveSceneCallback(groupId, sceneId); + emberAfScenesClusterRemoveSceneCallback(apCommandObj, groupId, sceneId); } else { @@ -6780,7 +6789,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterStoreSceneCallback(groupId, sceneId); + emberAfScenesClusterStoreSceneCallback(apCommandObj, groupId, sceneId); } else { @@ -6863,7 +6872,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterViewSceneCallback(groupId, sceneId); + emberAfScenesClusterViewSceneCallback(apCommandObj, groupId, sceneId); } else { diff --git a/examples/tv-app/tv-common/gen/call-command-handler.cpp b/examples/tv-app/tv-common/gen/call-command-handler.cpp index ed2bbd6f958b38..61728b10314159 100644 --- a/examples/tv-app/tv-common/gen/call-command-handler.cpp +++ b/examples/tv-app/tv-common/gen/call-command-handler.cpp @@ -169,11 +169,11 @@ EmberAfStatus emberAfBarrierControlClusterServerCommandParse(EmberAfClusterComma } percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen); + wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(nullptr, percentOpen); break; } case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: { - wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(); + wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(nullptr); break; } default: { @@ -223,7 +223,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveColorCallback(nullptr, rateX, rateY, optionsMask, optionsOverride); break; } case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: { @@ -272,7 +272,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback( - moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); + nullptr, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); break; } case ZCL_MOVE_HUE_COMMAND_ID: { @@ -306,7 +306,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveHueCallback(nullptr, moveMode, rate, optionsMask, optionsOverride); break; } case ZCL_MOVE_SATURATION_COMMAND_ID: { @@ -340,7 +340,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveSaturationCallback(nullptr, moveMode, rate, optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_COLOR_COMMAND_ID: { @@ -381,8 +381,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveToColorCallback(nullptr, colorX, colorY, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: { @@ -416,8 +416,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, - optionsOverride); + wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(nullptr, colorTemperature, transitionTime, + optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_HUE_COMMAND_ID: { @@ -458,7 +458,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride); + wasHandled = + emberAfColorControlClusterMoveToHueCallback(nullptr, hue, direction, transitionTime, optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: { @@ -499,8 +500,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, - optionsOverride); + wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(nullptr, hue, saturation, transitionTime, + optionsMask, optionsOverride); break; } case ZCL_MOVE_TO_SATURATION_COMMAND_ID: { @@ -534,8 +535,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterMoveToSaturationCallback(nullptr, saturation, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STEP_COLOR_COMMAND_ID: { @@ -576,7 +577,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride); + wasHandled = + emberAfColorControlClusterStepColorCallback(nullptr, stepX, stepY, transitionTime, optionsMask, optionsOverride); break; } case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: { @@ -631,8 +633,9 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStepColorTemperatureCallback( - stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(nullptr, stepMode, stepSize, transitionTime, + colorTemperatureMinimum, colorTemperatureMaximum, + optionsMask, optionsOverride); break; } case ZCL_STEP_HUE_COMMAND_ID: { @@ -673,8 +676,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepHueCallback(nullptr, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STEP_SATURATION_COMMAND_ID: { @@ -715,8 +718,8 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStepSaturationCallback(nullptr, stepMode, stepSize, transitionTime, optionsMask, + optionsOverride); break; } case ZCL_STOP_MOVE_STEP_COMMAND_ID: { @@ -736,7 +739,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(nullptr, optionsMask, optionsOverride); break; } default: { @@ -765,7 +768,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -778,7 +781,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(nullptr, status); break; } default: { @@ -798,11 +801,11 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_CLEAR_ALL_PINS_COMMAND_ID: { - wasHandled = emberAfDoorLockClusterClearAllPinsCallback(); + wasHandled = emberAfDoorLockClusterClearAllPinsCallback(nullptr); break; } case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: { - wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(); + wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(nullptr); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -815,7 +818,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId); + wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(nullptr, scheduleId); break; } case ZCL_CLEAR_PIN_COMMAND_ID: { @@ -828,7 +831,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearPinCallback(userId); + wasHandled = emberAfDoorLockClusterClearPinCallback(nullptr, userId); break; } case ZCL_CLEAR_RFID_COMMAND_ID: { @@ -841,7 +844,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearRfidCallback(userId); + wasHandled = emberAfDoorLockClusterClearRfidCallback(nullptr, userId); break; } case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -861,7 +864,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -881,7 +884,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -894,7 +897,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(nullptr, scheduleId); break; } case ZCL_GET_LOG_RECORD_COMMAND_ID: { @@ -907,7 +910,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex); + wasHandled = emberAfDoorLockClusterGetLogRecordCallback(nullptr, logIndex); break; } case ZCL_GET_PIN_COMMAND_ID: { @@ -920,7 +923,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetPinCallback(userId); + wasHandled = emberAfDoorLockClusterGetPinCallback(nullptr, userId); break; } case ZCL_GET_RFID_COMMAND_ID: { @@ -933,7 +936,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetRfidCallback(userId); + wasHandled = emberAfDoorLockClusterGetRfidCallback(nullptr, userId); break; } case ZCL_GET_USER_TYPE_COMMAND_ID: { @@ -946,7 +949,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId); + wasHandled = emberAfDoorLockClusterGetUserTypeCallback(nullptr, userId); break; } case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -966,7 +969,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -986,7 +989,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId); + wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(nullptr, scheduleId, userId); break; } case ZCL_LOCK_DOOR_COMMAND_ID: { @@ -999,7 +1002,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN); + wasHandled = emberAfDoorLockClusterLockDoorCallback(nullptr, PIN); break; } case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: { @@ -1033,7 +1036,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, + wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(nullptr, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday); break; } @@ -1068,7 +1071,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin); + wasHandled = emberAfDoorLockClusterSetPinCallback(nullptr, userId, userStatus, userType, pin); break; } case ZCL_SET_RFID_COMMAND_ID: { @@ -1102,7 +1105,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id); + wasHandled = emberAfDoorLockClusterSetRfidCallback(nullptr, userId, userStatus, userType, id); break; } case ZCL_SET_USER_TYPE_COMMAND_ID: { @@ -1122,7 +1125,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType); + wasHandled = emberAfDoorLockClusterSetUserTypeCallback(nullptr, userId, userType); break; } case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: { @@ -1177,8 +1180,8 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, - endHour, endMinute); + wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(nullptr, scheduleId, userId, daysMask, startHour, + startMinute, endHour, endMinute); break; } case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: { @@ -1212,7 +1215,8 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime); + wasHandled = + emberAfDoorLockClusterSetYeardayScheduleCallback(nullptr, scheduleId, userId, localStartTime, localEndTime); break; } case ZCL_UNLOCK_DOOR_COMMAND_ID: { @@ -1225,7 +1229,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN); + wasHandled = emberAfDoorLockClusterUnlockDoorCallback(nullptr, PIN); break; } case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: { @@ -1245,7 +1249,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(nullptr, timeoutInSeconds, pin); break; } default: { @@ -1281,7 +1285,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName); + wasHandled = emberAfGroupsClusterAddGroupCallback(nullptr, groupId, groupName); break; } case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: { @@ -1301,7 +1305,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName); + wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(nullptr, groupId, groupName); break; } case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: { @@ -1317,11 +1321,11 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + 1); groupList = cmd->buffer + payloadOffset; - wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList); + wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(nullptr, groupCount, groupList); break; } case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: { - wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(); + wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(nullptr); break; } case ZCL_REMOVE_GROUP_COMMAND_ID: { @@ -1334,7 +1338,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId); + wasHandled = emberAfGroupsClusterRemoveGroupCallback(nullptr, groupId); break; } case ZCL_VIEW_GROUP_COMMAND_ID: { @@ -1347,7 +1351,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupCallback(groupId); + wasHandled = emberAfGroupsClusterViewGroupCallback(nullptr, groupId); break; } default: { @@ -1383,7 +1387,7 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm } zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(nullptr, enrollResponseCode, zoneId); break; } default: { @@ -1412,11 +1416,11 @@ EmberAfStatus emberAfIdentifyClusterServerCommandParse(EmberAfClusterCommand * c } identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime); + wasHandled = emberAfIdentifyClusterIdentifyCallback(nullptr, identifyTime); break; } case ZCL_IDENTIFY_QUERY_COMMAND_ID: { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(); + wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(nullptr); break; } default: { @@ -1466,7 +1470,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveCallback(nullptr, moveMode, rate, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_COMMAND_ID: { @@ -1500,7 +1504,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterMoveToLevelCallback(nullptr, level, transitionTime, optionMask, optionOverride); break; } case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: { @@ -1520,7 +1524,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime); + wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(nullptr, level, transitionTime); break; } case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: { @@ -1540,7 +1544,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate); + wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(nullptr, moveMode, rate); break; } case ZCL_STEP_COMMAND_ID: { @@ -1581,7 +1585,8 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride); + wasHandled = + emberAfLevelControlClusterStepCallback(nullptr, stepMode, stepSize, transitionTime, optionMask, optionOverride); break; } case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: { @@ -1608,7 +1613,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime); + wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(nullptr, stepMode, stepSize, transitionTime); break; } case ZCL_STOP_COMMAND_ID: { @@ -1628,11 +1633,11 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand } optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride); + wasHandled = emberAfLevelControlClusterStopCallback(nullptr, optionMask, optionOverride); break; } case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: { - wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(); + wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(nullptr); break; } default: { @@ -1652,7 +1657,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_SLEEP_COMMAND_ID: { - wasHandled = emberAfLowPowerClusterSleepCallback(); + wasHandled = emberAfLowPowerClusterSleepCallback(nullptr); break; } default: { @@ -1698,7 +1703,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: { @@ -1738,7 +1744,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } case ZCL_DISABLE_NETWORK_COMMAND_ID: { @@ -1768,7 +1775,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_ENABLE_NETWORK_COMMAND_ID: { @@ -1798,7 +1805,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(nullptr, networkID, breadcrumb, timeoutMs); break; } case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: { @@ -1811,7 +1818,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(nullptr, timeoutMs); break; } case ZCL_REMOVE_NETWORK_COMMAND_ID: { @@ -1841,7 +1848,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(nullptr, NetworkID, Breadcrumb, TimeoutMs); break; } case ZCL_SCAN_NETWORKS_COMMAND_ID: { @@ -1871,7 +1878,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: { @@ -1901,7 +1908,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(nullptr, operationalDataset, breadcrumb, timeoutMs); break; } case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: { @@ -1941,7 +1949,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs); + wasHandled = + emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(nullptr, ssid, credentials, breadcrumb, timeoutMs); break; } default: { @@ -1961,15 +1970,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd) switch (cmd->commandId) { case ZCL_OFF_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOffCallback(); + wasHandled = emberAfOnOffClusterOffCallback(nullptr); break; } case ZCL_ON_COMMAND_ID: { - wasHandled = emberAfOnOffClusterOnCallback(); + wasHandled = emberAfOnOffClusterOnCallback(nullptr); break; } case ZCL_TOGGLE_COMMAND_ID: { - wasHandled = emberAfOnOffClusterToggleCallback(); + wasHandled = emberAfOnOffClusterToggleCallback(nullptr); break; } default: { @@ -2022,7 +2031,8 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + emberAfStringLength(sceneName) + 1u); extensionFieldSets = cmd->buffer + payloadOffset; - wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets); + wasHandled = + emberAfScenesClusterAddSceneCallback(nullptr, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: { @@ -2035,7 +2045,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId); + wasHandled = emberAfScenesClusterGetSceneMembershipCallback(nullptr, groupId); break; } case ZCL_RECALL_SCENE_COMMAND_ID: { @@ -2062,7 +2072,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime); + wasHandled = emberAfScenesClusterRecallSceneCallback(nullptr, groupId, sceneId, transitionTime); break; } case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: { @@ -2075,7 +2085,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId); + wasHandled = emberAfScenesClusterRemoveAllScenesCallback(nullptr, groupId); break; } case ZCL_REMOVE_SCENE_COMMAND_ID: { @@ -2095,7 +2105,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterRemoveSceneCallback(nullptr, groupId, sceneId); break; } case ZCL_STORE_SCENE_COMMAND_ID: { @@ -2115,7 +2125,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterStoreSceneCallback(nullptr, groupId, sceneId); break; } case ZCL_VIEW_SCENE_COMMAND_ID: { @@ -2135,7 +2145,7 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId); + wasHandled = emberAfScenesClusterViewSceneCallback(nullptr, groupId, sceneId); break; } default: { diff --git a/examples/tv-app/tv-common/gen/callback.h b/examples/tv-app/tv-common/gen/callback.h index f086c1baafc3fc..6cc75567386e05 100644 --- a/examples/tv-app/tv-common/gen/callback.h +++ b/examples/tv-app/tv-common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -1351,13 +1352,13 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end * @param percentOpen */ -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen); +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(chip::app::Command * apCommandObj, uint8_t percentOpen); /** * @brief Barrier Control Cluster BarrierControlStop Command callback */ -bool emberAfBarrierControlClusterBarrierControlStopCallback(); +bool emberAfBarrierControlClusterBarrierControlStopCallback(chip::app::Command * apCommandObj); /** * @brief Color Control Cluster MoveColor Command callback @@ -1367,7 +1368,8 @@ bool emberAfBarrierControlClusterBarrierControlStopCallback(); * @param optionsOverride */ -bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveColorCallback(chip::app::Command * apCommandObj, int16_t rateX, int16_t rateY, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveColorTemperature Command callback @@ -1379,9 +1381,9 @@ bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, u * @param optionsOverride */ -bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, - uint16_t colorTemperatureMaximum, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveColorTemperatureCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint16_t rate, + uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveHue Command callback @@ -1391,7 +1393,8 @@ bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, ui * @param optionsOverride */ -bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveHueCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveSaturation Command callback @@ -1401,7 +1404,8 @@ bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, u * @param optionsOverride */ -bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveSaturationCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColor Command callback @@ -1412,8 +1416,8 @@ bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToColorCallback(chip::app::Command * apCommandObj, uint16_t colorX, uint16_t colorY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColorTemperature Command callback @@ -1423,8 +1427,9 @@ bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t col * @param optionsOverride */ -bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToColorTemperatureCallback(chip::app::Command * apCommandObj, uint16_t colorTemperature, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHue Command callback @@ -1435,8 +1440,8 @@ bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemp * @param optionsOverride */ -bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToHueCallback(chip::app::Command * apCommandObj, uint8_t hue, uint8_t direction, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHueAndSaturation Command callback @@ -1447,8 +1452,9 @@ bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, * @param optionsOverride */ -bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToHueAndSaturationCallback(chip::app::Command * apCommandObj, uint8_t hue, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToSaturation Command callback @@ -1458,8 +1464,8 @@ bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8 * @param optionsOverride */ -bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterMoveToSaturationCallback(chip::app::Command * apCommandObj, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColor Command callback @@ -1470,8 +1476,8 @@ bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint * @param optionsOverride */ -bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterStepColorCallback(chip::app::Command * apCommandObj, int16_t stepX, int16_t stepY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColorTemperature Command callback @@ -1484,9 +1490,10 @@ bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, u * @param optionsOverride */ -bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, - uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStepColorTemperatureCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint16_t stepSize, + uint16_t transitionTime, uint16_t colorTemperatureMinimum, + uint16_t colorTemperatureMaximum, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster StepHue Command callback @@ -1497,8 +1504,8 @@ bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, ui * @param optionsOverride */ -bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride); +bool emberAfColorControlClusterStepHueCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepSaturation Command callback @@ -1509,8 +1516,8 @@ bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSiz * @param optionsOverride */ -bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStepSaturationCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StopMoveStep Command callback @@ -1518,54 +1525,55 @@ bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStopMoveStepCallback(chip::app::Command * apCommandObj, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Door Lock Cluster LockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllPins Command callback */ -bool emberAfDoorLockClusterClearAllPinsCallback(); +bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::Command * apCommandObj); /** * @brief Door Lock Cluster ClearAllRfids Command callback */ -bool emberAfDoorLockClusterClearAllRfidsCallback(); +bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::Command * apCommandObj); /** * @brief Door Lock Cluster ClearHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterClearHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster ClearPin Command callback * @param userId */ -bool emberAfDoorLockClusterClearPinCallback(uint16_t userId); +bool emberAfDoorLockClusterClearPinCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearRfid Command callback * @param userId */ -bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterClearRfidCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearWeekdaySchedule Command callback @@ -1573,7 +1581,7 @@ bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster ClearYeardaySchedule Command callback @@ -1581,42 +1589,42 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint * @param userId */ -bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterGetHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster GetLogRecord Command callback * @param logIndex */ -bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex); +bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::Command * apCommandObj, uint16_t logIndex); /** * @brief Door Lock Cluster GetPin Command callback * @param userId */ -bool emberAfDoorLockClusterGetPinCallback(uint16_t userId); +bool emberAfDoorLockClusterGetPinCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetRfid Command callback * @param userId */ -bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterGetRfidCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetUserType Command callback * @param userId */ -bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); +bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::Command * apCommandObj, uint16_t userId); /** * @brief Door Lock Cluster GetWeekdaySchedule Command callback @@ -1624,7 +1632,7 @@ bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetYeardaySchedule Command callback @@ -1632,14 +1640,14 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param userId */ -bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster LockDoor Command callback * @param pin */ -bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); +bool emberAfDoorLockClusterLockDoorCallback(chip::app::Command * apCommandObj, uint8_t * PIN); /** * @brief Door Lock Cluster SetHolidaySchedule Command callback @@ -1649,7 +1657,8 @@ bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, +bool emberAfDoorLockClusterSetHolidayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday); /** @@ -1660,7 +1669,8 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32 * @param pin */ -bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin); +bool emberAfDoorLockClusterSetPinCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * pin); /** * @brief Door Lock Cluster SetRfid Command callback @@ -1670,7 +1680,8 @@ bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, u * @param id */ -bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * id); +bool emberAfDoorLockClusterSetRfidCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * id); /** * @brief Door Lock Cluster SetUserType Command callback @@ -1678,7 +1689,7 @@ bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, * @param userType */ -bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster SetWeekdaySchedule Command callback @@ -1691,8 +1702,9 @@ bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType * @param endMinute */ -bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, - uint8_t startMinute, uint8_t endHour, uint8_t endMinute); +bool emberAfDoorLockClusterSetWeekdayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId, + uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, + uint8_t endMinute); /** * @brief Door Lock Cluster SetYeardaySchedule Command callback @@ -1702,15 +1714,15 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param localEndTime */ -bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, - uint32_t localEndTime); +bool emberAfDoorLockClusterSetYeardayScheduleCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint16_t userId, + uint32_t localStartTime, uint32_t localEndTime); /** * @brief Door Lock Cluster UnlockDoor Command callback * @param pin */ -bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); +bool emberAfDoorLockClusterUnlockDoorCallback(chip::app::Command * apCommandObj, uint8_t * PIN); /** * @brief Door Lock Cluster UnlockWithTimeout Command callback @@ -1718,7 +1730,7 @@ bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); * @param pin */ -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin); +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(chip::app::Command * apCommandObj, uint16_t timeoutInSeconds, uint8_t * pin); /** * @brief Groups Cluster AddGroup Command callback @@ -1726,7 +1738,7 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, * @param groupName */ -bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster AddGroupIfIdentifying Command callback @@ -1734,7 +1746,7 @@ bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName) * @param groupName */ -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster GetGroupMembership Command callback @@ -1742,28 +1754,28 @@ bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipCallback(chip::app::Command * apCommandObj, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** * @brief Groups Cluster RemoveAllGroups Command callback */ -bool emberAfGroupsClusterRemoveAllGroupsCallback(); +bool emberAfGroupsClusterRemoveAllGroupsCallback(chip::app::Command * apCommandObj); /** * @brief Groups Cluster RemoveGroup Command callback * @param groupId */ -bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Groups Cluster ViewGroup Command callback * @param groupId */ -bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterViewGroupCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief IAS Zone Cluster ZoneEnrollResponse Command callback @@ -1771,20 +1783,20 @@ bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); * @param zoneId */ -bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId); +bool emberAfIasZoneClusterZoneEnrollResponseCallback(chip::app::Command * apCommandObj, uint8_t enrollResponseCode, uint8_t zoneId); /** * @brief Identify Cluster Identify Command callback * @param identifyTime */ -bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime); +bool emberAfIdentifyClusterIdentifyCallback(chip::app::Command * apCommandObj, uint16_t identifyTime); /** * @brief Identify Cluster IdentifyQuery Command callback */ -bool emberAfIdentifyClusterIdentifyQueryCallback(); +bool emberAfIdentifyClusterIdentifyQueryCallback(chip::app::Command * apCommandObj); /** * @brief Level Control Cluster Move Command callback @@ -1794,7 +1806,8 @@ bool emberAfIdentifyClusterIdentifyQueryCallback(); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -1804,8 +1817,8 @@ bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint * @param optionOverride */ -bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterMoveToLevelCallback(chip::app::Command * apCommandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -1813,7 +1826,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -1821,7 +1835,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -1832,8 +1846,8 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t r * @param optionOverride */ -bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride); +bool emberAfLevelControlClusterStepCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -1842,7 +1856,8 @@ bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, * @param transitionTime */ -bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime); +bool emberAfLevelControlClusterStepWithOnOffCallback(chip::app::Command * apCommandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -1850,19 +1865,19 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * apCommandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * apCommandObj); /** * @brief Low Power Cluster Sleep Command callback */ -bool emberAfLowPowerClusterSleepCallback(); +bool emberAfLowPowerClusterSleepCallback(chip::app::Command * apCommandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -1871,7 +1886,8 @@ bool emberAfLowPowerClusterSleepCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -1882,8 +1898,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan o * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -1892,7 +1908,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -1901,14 +1918,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * apCommandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -1917,7 +1936,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -1926,7 +1946,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -1935,7 +1956,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * apCommandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -1946,26 +1968,27 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpa * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, - uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * apCommandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * apCommandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * apCommandObj); /** * @brief Scenes Cluster AddScene Command callback @@ -1976,7 +1999,8 @@ bool emberAfOnOffClusterToggleCallback(); * @param extensionFieldSets */ -bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, +bool emberAfScenesClusterAddSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); /** @@ -1984,7 +2008,7 @@ bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uin * @param groupId */ -bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); +bool emberAfScenesClusterGetSceneMembershipCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Scenes Cluster RecallScene Command callback @@ -1993,14 +2017,15 @@ bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); * @param transitionTime */ -bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime); +bool emberAfScenesClusterRecallSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime); /** * @brief Scenes Cluster RemoveAllScenes Command callback * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesCallback(chip::app::Command * apCommandObj, uint16_t groupId); /** * @brief Scenes Cluster RemoveScene Command callback @@ -2008,7 +2033,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); * @param sceneId */ -bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster StoreScene Command callback @@ -2016,7 +2041,7 @@ bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster ViewScene Command callback @@ -2024,7 +2049,7 @@ bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterViewSceneCallback(chip::app::Command * apCommandObj, uint16_t groupId, uint8_t sceneId); // // Non-Cluster Related Callbacks diff --git a/examples/window-app/common/gen/IMClusterCommandHandler.cpp b/examples/window-app/common/gen/IMClusterCommandHandler.cpp index c94cbd2bc8be59..30fa623fc5ef05 100644 --- a/examples/window-app/common/gen/IMClusterCommandHandler.cpp +++ b/examples/window-app/common/gen/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(); + emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(apCommandObj); break; } case ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID: { @@ -107,7 +107,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(percentageLiftValue); + emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(apCommandObj, percentageLiftValue); } else { @@ -174,7 +174,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(liftValue); + emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(apCommandObj, liftValue); } else { @@ -241,7 +241,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(percentageTiltValue); + emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(apCommandObj, percentageTiltValue); } else { @@ -308,7 +308,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(tiltValue); + emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(apCommandObj, tiltValue); } else { @@ -323,13 +323,13 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_WINDOW_COVERING_STOP_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringStopCallback(); + emberAfWindowCoveringClusterWindowCoveringStopCallback(apCommandObj); break; } case ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(); + emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(apCommandObj); break; } default: { diff --git a/examples/window-app/common/gen/call-command-handler.cpp b/examples/window-app/common/gen/call-command-handler.cpp index d143ef99968197..a75472470659cf 100644 --- a/examples/window-app/common/gen/call-command-handler.cpp +++ b/examples/window-app/common/gen/call-command-handler.cpp @@ -91,7 +91,7 @@ EmberAfStatus emberAfWindowCoveringClusterServerCommandParse(EmberAfClusterComma switch (cmd->commandId) { case ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID: { - wasHandled = emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(); + wasHandled = emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(nullptr); break; } case ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID: { @@ -104,7 +104,7 @@ EmberAfStatus emberAfWindowCoveringClusterServerCommandParse(EmberAfClusterComma } percentageLiftValue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(percentageLiftValue); + wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(nullptr, percentageLiftValue); break; } case ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID: { @@ -117,7 +117,7 @@ EmberAfStatus emberAfWindowCoveringClusterServerCommandParse(EmberAfClusterComma } liftValue = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(liftValue); + wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(nullptr, liftValue); break; } case ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID: { @@ -130,7 +130,7 @@ EmberAfStatus emberAfWindowCoveringClusterServerCommandParse(EmberAfClusterComma } percentageTiltValue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(percentageTiltValue); + wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(nullptr, percentageTiltValue); break; } case ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID: { @@ -143,15 +143,15 @@ EmberAfStatus emberAfWindowCoveringClusterServerCommandParse(EmberAfClusterComma } tiltValue = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(tiltValue); + wasHandled = emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(nullptr, tiltValue); break; } case ZCL_WINDOW_COVERING_STOP_COMMAND_ID: { - wasHandled = emberAfWindowCoveringClusterWindowCoveringStopCallback(); + wasHandled = emberAfWindowCoveringClusterWindowCoveringStopCallback(nullptr); break; } case ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID: { - wasHandled = emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(); + wasHandled = emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(nullptr); break; } default: { diff --git a/examples/window-app/common/gen/callback.h b/examples/window-app/common/gen/callback.h index 06228ce0b5eeaa..ef137558af71b7 100644 --- a/examples/window-app/common/gen/callback.h +++ b/examples/window-app/common/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -126,47 +127,49 @@ void emberAfWindowCoveringClusterServerTickCallback(chip::EndpointId endpoint); * @brief Window Covering Cluster WindowCoveringDownClose Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(); +bool emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(chip::app::Command * apCommandObj); /** * @brief Window Covering Cluster WindowCoveringGoToLiftPercentage Command callback * @param percentageLiftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(uint8_t percentageLiftValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(chip::app::Command * apCommandObj, + uint8_t percentageLiftValue); /** * @brief Window Covering Cluster WindowCoveringGoToLiftValue Command callback * @param liftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(uint16_t liftValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(chip::app::Command * apCommandObj, uint16_t liftValue); /** * @brief Window Covering Cluster WindowCoveringGoToTiltPercentage Command callback * @param percentageTiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(uint8_t percentageTiltValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(chip::app::Command * apCommandObj, + uint8_t percentageTiltValue); /** * @brief Window Covering Cluster WindowCoveringGoToTiltValue Command callback * @param tiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(uint16_t tiltValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(chip::app::Command * apCommandObj, uint16_t tiltValue); /** * @brief Window Covering Cluster WindowCoveringStop Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringStopCallback(); +bool emberAfWindowCoveringClusterWindowCoveringStopCallback(chip::app::Command * apCommandObj); /** * @brief Window Covering Cluster WindowCoveringUpOpen Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(); +bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(chip::app::Command * apCommandObj); // // Non-Cluster Related Callbacks diff --git a/src/controller/python/gen/CHIPClientCallbacks.cpp b/src/controller/python/gen/CHIPClientCallbacks.cpp index 9d1e5b6078d804..68c07d8ca81ff3 100644 --- a/src/controller/python/gen/CHIPClientCallbacks.cpp +++ b/src/controller/python/gen/CHIPClientCallbacks.cpp @@ -20,6 +20,7 @@ #include "gen/CHIPClientCallbacks.h" #include "gen/enums.h" +#include #include #include #include @@ -696,7 +697,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -717,7 +718,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -738,7 +739,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -759,7 +760,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -780,7 +781,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -801,7 +802,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -822,7 +823,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -843,8 +844,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday) +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -869,8 +871,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin) +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin) { ChipLogProgress(Zcl, "GetLogRecordResponse:"); ChipLogProgress(Zcl, " logEntryId: %" PRIu16 "", logEntryId); @@ -889,7 +892,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin return true; } -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin) +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -905,7 +909,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS return true; } -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid) +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -921,7 +926,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -935,9 +940,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, 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); @@ -965,8 +970,9 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime) +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -991,7 +997,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1012,7 +1018,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1033,7 +1039,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1054,7 +1060,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1075,7 +1081,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1096,7 +1102,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1117,7 +1123,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1138,7 +1144,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1159,7 +1165,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1180,7 +1186,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1194,7 +1201,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1208,7 +1216,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1222,7 +1231,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1244,7 +1253,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1260,7 +1269,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1282,7 +1291,8 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName) +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1305,7 +1315,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1318,7 +1328,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1341,7 +1352,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1367,7 +1379,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1389,7 +1401,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ return true; } -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1412,7 +1425,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1435,8 +1449,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro return true; } -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets) { ChipLogProgress(Zcl, "ViewSceneResponse:"); diff --git a/src/controller/python/gen/IMClusterCommandHandler.cpp b/src/controller/python/gen/IMClusterCommandHandler.cpp index 574aeb84b0d42f..b386abe9dc95af 100644 --- a/src/controller/python/gen/IMClusterCommandHandler.cpp +++ b/src/controller/python/gen/IMClusterCommandHandler.cpp @@ -101,7 +101,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllPinsResponseCallback(status); + emberAfDoorLockClusterClearAllPinsResponseCallback(apCommandObj, status); } else { @@ -168,7 +168,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + emberAfDoorLockClusterClearAllRfidsResponseCallback(apCommandObj, status); } else { @@ -235,7 +235,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterClearHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -302,7 +302,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearPinResponseCallback(status); + emberAfDoorLockClusterClearPinResponseCallback(apCommandObj, status); } else { @@ -369,7 +369,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearRfidResponseCallback(status); + emberAfDoorLockClusterClearRfidResponseCallback(apCommandObj, status); } else { @@ -436,7 +436,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -503,7 +503,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterClearYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -634,8 +634,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + emberAfDoorLockClusterGetHolidayScheduleResponseCallback(apCommandObj, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); } else { @@ -799,8 +799,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, - userId, const_cast(pin)); + emberAfDoorLockClusterGetLogRecordResponseCallback(apCommandObj, logEntryId, timestamp, eventType, source, + eventIdOrAlarmCode, userId, const_cast(pin)); } else { @@ -916,7 +916,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast(pin)); + emberAfDoorLockClusterGetPinResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(pin)); } else { @@ -1032,7 +1033,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast(rfid)); + emberAfDoorLockClusterGetRfidResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(rfid)); } else { @@ -1115,7 +1117,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + emberAfDoorLockClusterGetUserTypeResponseCallback(apCommandObj, userId, userType); } else { @@ -1294,8 +1296,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); } else { @@ -1426,7 +1428,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + emberAfDoorLockClusterGetYeardayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, localStartTime, + localEndTime); } else { @@ -1493,7 +1496,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorResponseCallback(status); + emberAfDoorLockClusterLockDoorResponseCallback(apCommandObj, status); } else { @@ -1560,7 +1563,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterSetHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -1627,7 +1630,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetPinResponseCallback(status); + emberAfDoorLockClusterSetPinResponseCallback(apCommandObj, status); } else { @@ -1694,7 +1697,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetRfidResponseCallback(status); + emberAfDoorLockClusterSetRfidResponseCallback(apCommandObj, status); } else { @@ -1761,7 +1764,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetUserTypeResponseCallback(status); + emberAfDoorLockClusterSetUserTypeResponseCallback(apCommandObj, status); } else { @@ -1828,7 +1831,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -1895,7 +1898,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterSetYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -1962,7 +1965,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorResponseCallback(status); + emberAfDoorLockClusterUnlockDoorResponseCallback(apCommandObj, status); } else { @@ -2029,7 +2032,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(apCommandObj, status); } else { @@ -2133,7 +2136,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2217,7 +2221,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, + emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(apCommandObj, errorCode, const_cast(debugText)); } else @@ -2302,7 +2306,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterSetFabricResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2405,7 +2410,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + emberAfGroupsClusterAddGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2505,7 +2510,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + emberAfGroupsClusterGetGroupMembershipResponseCallback(apCommandObj, capacity, groupCount, groupList); } else { @@ -2588,7 +2593,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + emberAfGroupsClusterRemoveGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2688,7 +2693,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast(groupName)); + emberAfGroupsClusterViewGroupResponseCallback(apCommandObj, status, groupId, const_cast(groupName)); } else { @@ -2775,7 +2780,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + emberAfIdentifyClusterIdentifyQueryResponseCallback(apCommandObj, timeout); } else { @@ -2894,7 +2899,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterAddSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -3026,7 +3031,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + emberAfScenesClusterGetSceneMembershipResponseCallback(apCommandObj, status, capacity, groupId, sceneCount, + sceneList); } else { @@ -3109,7 +3115,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + emberAfScenesClusterRemoveAllScenesResponseCallback(apCommandObj, status, groupId); } else { @@ -3208,7 +3214,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterRemoveSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -3307,7 +3313,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterStoreSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -3456,7 +3462,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, + emberAfScenesClusterViewSceneResponseCallback(apCommandObj, status, groupId, sceneId, transitionTime, const_cast(sceneName), extensionFieldSets); } else diff --git a/src/controller/python/gen/call-command-handler.cpp b/src/controller/python/gen/call-command-handler.cpp index 66538a88f18d42..ba3f49402f9fed 100644 --- a/src/controller/python/gen/call-command-handler.cpp +++ b/src/controller/python/gen/call-command-handler.cpp @@ -161,7 +161,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: { @@ -174,7 +174,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -187,7 +187,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: { @@ -200,7 +200,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearPinResponseCallback(nullptr, status); break; } case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: { @@ -213,7 +213,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(nullptr, status); break; } case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -226,7 +226,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -239,7 +239,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -280,8 +280,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(nullptr, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); break; } case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: { @@ -336,7 +336,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, + wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(nullptr, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin); break; } @@ -371,7 +371,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin); + wasHandled = emberAfDoorLockClusterGetPinResponseCallback(nullptr, userId, userStatus, userType, pin); break; } case ZCL_GET_RFID_RESPONSE_COMMAND_ID: { @@ -405,7 +405,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid); + wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(nullptr, userId, userStatus, userType, rfid); break; } case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -425,7 +425,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(nullptr, userId, userType); break; } case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -487,8 +487,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(nullptr, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); break; } case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -529,8 +529,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(nullptr, scheduleId, userId, status, + localStartTime, localEndTime); break; } case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -543,7 +543,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(nullptr, status); break; } case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -556,7 +556,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_PIN_RESPONSE_COMMAND_ID: { @@ -569,7 +569,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetPinResponseCallback(nullptr, status); break; } case ZCL_SET_RFID_RESPONSE_COMMAND_ID: { @@ -582,7 +582,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(nullptr, status); break; } case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -595,7 +595,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(nullptr, status); break; } case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -608,7 +608,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -621,7 +621,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -634,7 +634,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: { @@ -647,7 +647,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(nullptr, status); break; } default: { @@ -683,7 +683,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: { @@ -703,7 +703,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: { @@ -723,7 +723,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -759,7 +759,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterAddGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -782,7 +782,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + 1); groupList = cmd->buffer + payloadOffset; - wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(nullptr, capacity, groupCount, groupList); break; } case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: { @@ -802,7 +802,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: { @@ -829,7 +829,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName); + wasHandled = emberAfGroupsClusterViewGroupResponseCallback(nullptr, status, groupId, groupName); break; } default: { @@ -858,7 +858,7 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c } timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(nullptr, timeout); break; } default: { @@ -901,7 +901,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterAddSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -952,7 +952,8 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd sceneList = NULL; } - wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + wasHandled = + emberAfScenesClusterGetSceneMembershipResponseCallback(nullptr, status, capacity, groupId, sceneCount, sceneList); break; } case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: { @@ -972,7 +973,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(nullptr, status, groupId); break; } case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: { @@ -999,7 +1000,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: { @@ -1026,7 +1027,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterStoreSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: { @@ -1091,7 +1092,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd extensionFieldSets = NULL; } - wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, + wasHandled = emberAfScenesClusterViewSceneResponseCallback(nullptr, status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } diff --git a/src/controller/python/gen/callback.h b/src/controller/python/gen/callback.h index 0de9f0dd4cae33..28f21a2362c74a 100644 --- a/src/controller/python/gen/callback.h +++ b/src/controller/python/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -1140,49 +1141,49 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end * @param status */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback @@ -1193,8 +1194,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday); +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster GetLogRecordResponse Command callback @@ -1207,8 +1209,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId * @param pin */ -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin); +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin); /** * @brief Door Lock Cluster GetPinResponse Command callback @@ -1218,7 +1221,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin * @param pin */ -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin); +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin); /** * @brief Door Lock Cluster GetRfidResponse Command callback @@ -1228,7 +1232,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS * @param rfid */ -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid); +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid); /** * @brief Door Lock Cluster GetUserTypeResponse Command callback @@ -1236,7 +1241,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user * @param userType */ -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback @@ -1250,9 +1255,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t * @param endMinute */ -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1263,71 +1268,72 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId * @param localEndTime */ -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime); +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime); /** * @brief Door Lock Cluster LockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1335,7 +1341,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1343,7 +1350,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1351,7 +1359,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1359,7 +1368,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1368,7 +1377,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1377,7 +1386,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1386,14 +1395,15 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr * @param groupName */ -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName); /** * @brief Identify Cluster IdentifyQueryResponse Command callback * @param timeout */ -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1402,7 +1412,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1413,7 +1424,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group * @param sceneList */ -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1422,7 +1434,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1431,7 +1443,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ * @param sceneId */ -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1440,7 +1453,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr * @param sceneId */ -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1452,8 +1466,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro * @param extensionFieldSets */ -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); // diff --git a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp index ed9e0758a0a463..8f06fc8fa2bb30 100644 --- a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp +++ b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp @@ -20,6 +20,7 @@ #include "gen/CHIPClientCallbacks.h" #include "gen/enums.h" +#include #include #include #include @@ -817,7 +818,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -838,7 +839,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -859,7 +860,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -880,7 +881,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -901,7 +902,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -922,7 +923,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -943,7 +944,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -964,8 +965,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday) +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -990,8 +992,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin) +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin) { ChipLogProgress(Zcl, "GetLogRecordResponse:"); ChipLogProgress(Zcl, " logEntryId: %" PRIu16 "", logEntryId); @@ -1010,7 +1013,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin return true; } -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin) +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1026,7 +1030,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS return true; } -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid) +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1042,7 +1047,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1056,9 +1061,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, 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); @@ -1086,8 +1091,9 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime) +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1112,7 +1118,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1133,7 +1139,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1154,7 +1160,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1175,7 +1181,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1196,7 +1202,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1217,7 +1223,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1238,7 +1244,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1259,7 +1265,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1280,7 +1286,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1301,7 +1307,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1315,7 +1322,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1329,7 +1337,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1343,7 +1352,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1365,7 +1374,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1381,7 +1390,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1403,7 +1412,8 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName) +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1426,7 +1436,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1439,7 +1449,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1453,7 +1464,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1467,7 +1479,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "DisableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1481,7 +1494,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "EnableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1495,7 +1509,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err return true; } -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "RemoveNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1510,7 +1525,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t err } bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( - uint8_t errorCode, uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, + chip::app::Command * apCommandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults) { ChipLogProgress(Zcl, "ScanNetworksResponse:"); @@ -1527,7 +1543,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( return true; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1541,7 +1558,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 return true; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1555,7 +1573,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1578,7 +1597,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1604,7 +1624,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1626,7 +1646,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ return true; } -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1649,7 +1670,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr return true; } -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1672,8 +1694,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro return true; } -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets) { ChipLogProgress(Zcl, "ViewSceneResponse:"); diff --git a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp index 96a8be3f1c5de1..4816d999d75322 100644 --- a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp +++ b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp @@ -101,7 +101,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllPinsResponseCallback(status); + emberAfDoorLockClusterClearAllPinsResponseCallback(apCommandObj, status); } else { @@ -168,7 +168,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + emberAfDoorLockClusterClearAllRfidsResponseCallback(apCommandObj, status); } else { @@ -235,7 +235,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterClearHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -302,7 +302,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearPinResponseCallback(status); + emberAfDoorLockClusterClearPinResponseCallback(apCommandObj, status); } else { @@ -369,7 +369,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearRfidResponseCallback(status); + emberAfDoorLockClusterClearRfidResponseCallback(apCommandObj, status); } else { @@ -436,7 +436,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -503,7 +503,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterClearYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -634,8 +634,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + emberAfDoorLockClusterGetHolidayScheduleResponseCallback(apCommandObj, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); } else { @@ -799,8 +799,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, - userId, const_cast(pin)); + emberAfDoorLockClusterGetLogRecordResponseCallback(apCommandObj, logEntryId, timestamp, eventType, source, + eventIdOrAlarmCode, userId, const_cast(pin)); } else { @@ -916,7 +916,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast(pin)); + emberAfDoorLockClusterGetPinResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(pin)); } else { @@ -1032,7 +1033,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast(rfid)); + emberAfDoorLockClusterGetRfidResponseCallback(apCommandObj, userId, userStatus, userType, + const_cast(rfid)); } else { @@ -1115,7 +1117,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + emberAfDoorLockClusterGetUserTypeResponseCallback(apCommandObj, userId, userType); } else { @@ -1294,8 +1296,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); } else { @@ -1426,7 +1428,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + emberAfDoorLockClusterGetYeardayScheduleResponseCallback(apCommandObj, scheduleId, userId, status, localStartTime, + localEndTime); } else { @@ -1493,7 +1496,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterLockDoorResponseCallback(status); + emberAfDoorLockClusterLockDoorResponseCallback(apCommandObj, status); } else { @@ -1560,7 +1563,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + emberAfDoorLockClusterSetHolidayScheduleResponseCallback(apCommandObj, status); } else { @@ -1627,7 +1630,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetPinResponseCallback(status); + emberAfDoorLockClusterSetPinResponseCallback(apCommandObj, status); } else { @@ -1694,7 +1697,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetRfidResponseCallback(status); + emberAfDoorLockClusterSetRfidResponseCallback(apCommandObj, status); } else { @@ -1761,7 +1764,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetUserTypeResponseCallback(status); + emberAfDoorLockClusterSetUserTypeResponseCallback(apCommandObj, status); } else { @@ -1828,7 +1831,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(apCommandObj, status); } else { @@ -1895,7 +1898,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + emberAfDoorLockClusterSetYeardayScheduleResponseCallback(apCommandObj, status); } else { @@ -1962,7 +1965,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockDoorResponseCallback(status); + emberAfDoorLockClusterUnlockDoorResponseCallback(apCommandObj, status); } else { @@ -2029,7 +2032,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(apCommandObj, status); } else { @@ -2133,7 +2136,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2217,7 +2221,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, + emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(apCommandObj, errorCode, const_cast(debugText)); } else @@ -2302,7 +2306,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast(debugText)); + emberAfGeneralCommissioningClusterSetFabricResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2405,7 +2410,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + emberAfGroupsClusterAddGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2505,7 +2510,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + emberAfGroupsClusterGetGroupMembershipResponseCallback(apCommandObj, capacity, groupCount, groupList); } else { @@ -2588,7 +2593,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + emberAfGroupsClusterRemoveGroupResponseCallback(apCommandObj, status, groupId); } else { @@ -2688,7 +2693,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast(groupName)); + emberAfGroupsClusterViewGroupResponseCallback(apCommandObj, status, groupId, const_cast(groupName)); } else { @@ -2775,7 +2780,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + emberAfIdentifyClusterIdentifyQueryResponseCallback(apCommandObj, timeout); } else { @@ -2879,7 +2884,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -2963,7 +2969,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3047,7 +3054,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3131,7 +3139,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3215,7 +3224,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3333,8 +3343,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterScanNetworksResponseCallback(errorCode, const_cast(debugText), - wifiScanResults, threadScanResults); + emberAfNetworkCommissioningClusterScanNetworksResponseCallback( + apCommandObj, errorCode, const_cast(debugText), wifiScanResults, threadScanResults); } else { @@ -3418,7 +3428,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3502,7 +3513,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, const_cast(debugText)); + emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(apCommandObj, errorCode, + const_cast(debugText)); } else { @@ -3621,7 +3633,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterAddSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -3753,7 +3765,8 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + emberAfScenesClusterGetSceneMembershipResponseCallback(apCommandObj, status, capacity, groupId, sceneCount, + sceneList); } else { @@ -3836,7 +3849,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + emberAfScenesClusterRemoveAllScenesResponseCallback(apCommandObj, status, groupId); } else { @@ -3935,7 +3948,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterRemoveSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -4034,7 +4047,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + emberAfScenesClusterStoreSceneResponseCallback(apCommandObj, status, groupId, sceneId); } else { @@ -4183,7 +4196,7 @@ void DispatchClientCommand(app::Command * apCommandObj, CommandId aCommandId, En if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, + emberAfScenesClusterViewSceneResponseCallback(apCommandObj, status, groupId, sceneId, transitionTime, const_cast(sceneName), extensionFieldSets); } else diff --git a/src/darwin/Framework/CHIP/gen/call-command-handler.cpp b/src/darwin/Framework/CHIP/gen/call-command-handler.cpp index 377448a7a84919..245ff1e5df3888 100644 --- a/src/darwin/Framework/CHIP/gen/call-command-handler.cpp +++ b/src/darwin/Framework/CHIP/gen/call-command-handler.cpp @@ -175,7 +175,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: { @@ -188,7 +188,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(nullptr, status); break; } case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -201,7 +201,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: { @@ -214,7 +214,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearPinResponseCallback(nullptr, status); break; } case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: { @@ -227,7 +227,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(nullptr, status); break; } case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -240,7 +240,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -253,7 +253,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -294,8 +294,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, - operatingModeDuringHoliday); + wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(nullptr, scheduleId, status, localStartTime, + localEndTime, operatingModeDuringHoliday); break; } case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: { @@ -350,7 +350,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, + wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(nullptr, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin); break; } @@ -385,7 +385,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin); + wasHandled = emberAfDoorLockClusterGetPinResponseCallback(nullptr, userId, userStatus, userType, pin); break; } case ZCL_GET_RFID_RESPONSE_COMMAND_ID: { @@ -419,7 +419,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid); + wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(nullptr, userId, userStatus, userType, rfid); break; } case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -439,7 +439,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType); + wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(nullptr, userId, userType); break; } case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -501,8 +501,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, - startMinute, endHour, endMinute); + wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(nullptr, scheduleId, userId, status, daysMask, + startHour, startMinute, endHour, endMinute); break; } case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -543,8 +543,8 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = - emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime); + wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(nullptr, scheduleId, userId, status, + localStartTime, localEndTime); break; } case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -557,7 +557,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(nullptr, status); break; } case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -570,7 +570,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_PIN_RESPONSE_COMMAND_ID: { @@ -583,7 +583,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetPinResponseCallback(nullptr, status); break; } case ZCL_SET_RFID_RESPONSE_COMMAND_ID: { @@ -596,7 +596,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(nullptr, status); break; } case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: { @@ -609,7 +609,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(nullptr, status); break; } case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -622,7 +622,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(nullptr, status); break; } case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: { @@ -635,7 +635,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status); + wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: { @@ -648,7 +648,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(nullptr, status); break; } case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: { @@ -661,7 +661,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(nullptr, status); break; } default: { @@ -697,7 +697,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: { @@ -717,7 +717,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: { @@ -737,7 +737,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -773,7 +773,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterAddGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -796,7 +796,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd payloadOffset = static_cast(payloadOffset + 1); groupList = cmd->buffer + payloadOffset; - wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList); + wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(nullptr, capacity, groupCount, groupList); break; } case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: { @@ -816,7 +816,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId); + wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(nullptr, status, groupId); break; } case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: { @@ -843,7 +843,7 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd } groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName); + wasHandled = emberAfGroupsClusterViewGroupResponseCallback(nullptr, status, groupId, groupName); break; } default: { @@ -872,7 +872,7 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c } timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(nullptr, timeout); break; } default: { @@ -908,7 +908,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID: { @@ -928,7 +928,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID: { @@ -948,7 +948,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID: { @@ -968,7 +968,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID: { @@ -988,7 +988,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID: { @@ -1013,8 +1013,8 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste wifiScanResults = cmd->buffer + payloadOffset; threadScanResults = cmd->buffer + payloadOffset; - wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(errorCode, debugText, wifiScanResults, - threadScanResults); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(nullptr, errorCode, debugText, + wifiScanResults, threadScanResults); break; } case ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID: { @@ -1034,7 +1034,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(nullptr, errorCode, debugText); break; } case ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID: { @@ -1054,7 +1054,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -1097,7 +1097,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterAddSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: { @@ -1148,7 +1148,8 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd sceneList = NULL; } - wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList); + wasHandled = + emberAfScenesClusterGetSceneMembershipResponseCallback(nullptr, status, capacity, groupId, sceneCount, sceneList); break; } case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: { @@ -1168,7 +1169,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId); + wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(nullptr, status, groupId); break; } case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: { @@ -1195,7 +1196,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: { @@ -1222,7 +1223,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd } sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId); + wasHandled = emberAfScenesClusterStoreSceneResponseCallback(nullptr, status, groupId, sceneId); break; } case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: { @@ -1287,7 +1288,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd extensionFieldSets = NULL; } - wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, + wasHandled = emberAfScenesClusterViewSceneResponseCallback(nullptr, status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } diff --git a/src/darwin/Framework/CHIP/gen/callback.h b/src/darwin/Framework/CHIP/gen/callback.h index 4623cdec559034..5cd68784cae713 100644 --- a/src/darwin/Framework/CHIP/gen/callback.h +++ b/src/darwin/Framework/CHIP/gen/callback.h @@ -24,6 +24,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -1376,49 +1377,49 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end * @param status */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback @@ -1429,8 +1430,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, - uint32_t localEndTime, uint8_t operatingModeDuringHoliday); +bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster GetLogRecordResponse Command callback @@ -1443,8 +1445,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId * @param pin */ -bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, - uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin); +bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::app::Command * apCommandObj, uint16_t logEntryId, uint32_t timestamp, + uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, + uint16_t userId, uint8_t * pin); /** * @brief Door Lock Cluster GetPinResponse Command callback @@ -1454,7 +1457,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin * @param pin */ -bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin); +bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin); /** * @brief Door Lock Cluster GetRfidResponse Command callback @@ -1464,7 +1468,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS * @param rfid */ -bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid); +bool emberAfDoorLockClusterGetRfidResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid); /** * @brief Door Lock Cluster GetUserTypeResponse Command callback @@ -1472,7 +1477,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user * @param userType */ -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback @@ -1486,9 +1491,9 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t * @param endMinute */ -bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(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::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1499,71 +1504,72 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId * @param localEndTime */ -bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, - uint32_t localStartTime, uint32_t localEndTime); +bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t scheduleId, + uint16_t userId, uint8_t status, uint32_t localStartTime, + uint32_t localEndTime); /** * @brief Door Lock Cluster LockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * apCommandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1571,7 +1577,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1579,7 +1586,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1587,7 +1595,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1595,7 +1604,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1604,7 +1613,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1613,7 +1622,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1622,14 +1631,15 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr * @param groupName */ -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName); /** * @brief Identify Cluster IdentifyQueryResponse Command callback * @param timeout */ -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * apCommandObj, uint16_t timeout); /** * @brief Network Commissioning Cluster AddThreadNetworkResponse Command callback @@ -1637,7 +1647,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param debugText */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster AddWiFiNetworkResponse Command callback @@ -1645,7 +1656,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t * @param debugText */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster DisableNetworkResponse Command callback @@ -1653,7 +1665,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster EnableNetworkResponse Command callback @@ -1661,7 +1674,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster RemoveNetworkResponse Command callback @@ -1669,7 +1683,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err * @param debugText */ -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster ScanNetworksResponse Command callback @@ -1680,7 +1695,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t err */ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( - uint8_t errorCode, uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, + chip::app::Command * apCommandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults); /** @@ -1689,7 +1705,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster UpdateWiFiNetworkResponse Command callback @@ -1697,7 +1714,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * apCommandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1706,7 +1724,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1717,7 +1736,8 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group * @param sceneList */ -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1726,7 +1746,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1735,7 +1755,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_ * @param sceneId */ -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1744,7 +1765,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr * @param sceneId */ -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1756,8 +1778,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro * @param extensionFieldSets */ -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * apCommandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); //