From 60b896d558fa42801b2fd71930fe3569f81c193a Mon Sep 17 00:00:00 2001 From: Song Guo Date: Thu, 22 Apr 2021 00:56:05 +0800 Subject: [PATCH] [im] Add command obj to all cluster callbacks (#5994) * [im] Add command object to ZCL callbacks * apCommandIbj -> commandObj * Fix new added clusters * Run Codegen * Fix dirty merge --- .../gen/IMClusterCommandHandler.cpp | 191 ++++++------ .../gen/call-command-handler.cpp | 207 +++++++------ .../all-clusters-common/gen/callback.h | 252 ++++++++------- .../esp32/main/DeviceCallbacks.cpp | 3 +- examples/all-clusters-app/linux/main.cpp | 3 +- .../gen/IMClusterCommandHandler.cpp | 42 +-- .../gen/call-command-handler.cpp | 45 +-- .../bridge-app/bridge-common/gen/callback.h | 61 ++-- .../chip-tool/gen/CHIPClientCallbacks.cpp | 125 ++++---- .../chip-tool/gen/IMClusterCommandHandler.cpp | 121 ++++---- .../chip-tool/gen/call-command-handler.cpp | 107 +++---- examples/chip-tool/gen/callback.h | 134 ++++---- .../gen/IMClusterCommandHandler.cpp | 42 +-- .../gen/call-command-handler.cpp | 45 +-- .../lighting-common/gen/callback.h | 61 ++-- .../gen/IMClusterCommandHandler.cpp | 25 +- .../lock-common/gen/call-command-handler.cpp | 28 +- examples/lock-app/lock-common/gen/callback.h | 38 ++- .../main/gen/IMClusterCommandHandler.cpp | 19 +- .../esp32/main/gen/call-command-handler.cpp | 22 +- .../esp32/main/gen/callback.h | 32 +- examples/tv-app/linux/main.cpp | 3 +- .../tv-common/gen/IMClusterCommandHandler.cpp | 194 ++++++------ .../tv-common/gen/call-command-handler.cpp | 203 ++++++------ examples/tv-app/tv-common/gen/callback.h | 241 ++++++++------- .../common/gen/IMClusterCommandHandler.cpp | 14 +- .../common/gen/call-command-handler.cpp | 14 +- examples/window-app/common/gen/callback.h | 17 +- .../window-app/efr32/src/ZclCallbacks.cpp | 15 +- .../account-login-server.cpp | 5 +- .../application-launcher-server.cpp | 3 +- .../audio-output-server.cpp | 5 +- .../barrier-control-server.cpp | 5 +- src/app/clusters/bindings/bindings.cpp | 7 +- .../color-control-server.cpp | 57 ++-- .../content-launch-server.cpp | 5 +- .../door-lock-client/door-lock-client.cpp | 5 +- .../door-lock-server-logging.cpp | 3 +- .../door-lock-server-schedule.cpp | 26 +- .../door-lock-server-user.cpp | 29 +- .../general-commissioning-server.cpp | 10 +- .../clusters/groups-client/groups-client.cpp | 11 +- .../clusters/groups-server/groups-server.cpp | 13 +- .../ias-zone-client/ias-zone-client.cpp | 7 +- .../ias-zone-server/ias-zone-server.cpp | 3 +- .../identify-client/identify-client.cpp | 3 +- src/app/clusters/identify/identify.cpp | 5 +- .../keypad-input-server.cpp | 3 +- .../clusters/level-control/level-control.cpp | 23 +- .../low-power-server/low-power-server.cpp | 3 +- .../media-input-server/media-input-server.cpp | 9 +- .../media-playback-client.cpp | 3 +- .../media-playback-server.cpp | 21 +- .../messaging-client/messaging-client.cpp | 7 +- .../messaging-server/messaging-server.cpp | 11 +- .../network-commissioning-ember.cpp | 32 +- .../clusters/on-off-server/on-off-server.cpp | 7 +- src/app/clusters/on-off-server/on-off.cpp | 292 ------------------ src/app/clusters/on-off-server/on-off.h | 53 ---- .../operational-credentials.cpp | 8 +- src/app/clusters/ota-server/ota-server.cpp | 10 +- .../clusters/scenes-client/scenes-client.cpp | 20 +- src/app/clusters/scenes/scenes.cpp | 18 +- .../target-navigator-server.cpp | 3 +- .../thermostat-client/thermostat-client.cpp | 6 +- .../tv-channel-server/tv-channel-server.cpp | 7 +- .../zll-identify-server/zll-identify-server.c | 3 +- .../zll-on-off-server/zll-on-off-server.c | 8 +- .../zll-scenes-client/zll-scenes-client.c | 11 +- .../zll-scenes-server/zll-scenes-server.c | 11 +- .../command_handler_cluster_commands.zapt | 2 +- .../im_command_handler_cluster_commands.zapt | 2 +- .../app/CHIPClientCallbacks-src.zapt | 3 +- .../zap-templates/templates/app/callback.zapt | 3 +- .../python/gen/CHIPClientCallbacks.cpp | 99 +++--- .../python/gen/IMClusterCommandHandler.cpp | 86 +++--- .../python/gen/call-command-handler.cpp | 81 ++--- src/controller/python/gen/callback.h | 99 +++--- .../CHIP/gen/CHIPClientCallbacks.cpp | 125 ++++---- .../CHIP/gen/IMClusterCommandHandler.cpp | 113 ++++--- .../CHIP/gen/call-command-handler.cpp | 101 +++--- src/darwin/Framework/CHIP/gen/callback.h | 125 ++++---- 82 files changed, 1971 insertions(+), 1943 deletions(-) delete mode 100644 src/app/clusters/on-off-server/on-off.cpp delete mode 100644 src/app/clusters/on-off-server/on-off.h 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 e2835027403fad..a82bfbf212c51e 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 { @@ -6660,7 +6669,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. - emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(updateToken, newVersion); + emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(apCommandObj, updateToken, newVersion); } else { @@ -6747,7 +6756,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. - emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(updateToken, currentVersion); + emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(apCommandObj, updateToken, currentVersion); } else { @@ -6949,7 +6958,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. emberAfOtaSoftwareUpdateServerClusterQueryImageCallback( - vendorId, productId, imageType, hardwareVersion, currentVersion, protocolsSupported, + apCommandObj, vendorId, productId, imageType, hardwareVersion, currentVersion, protocolsSupported, const_cast(location), clientCanConsent, metadataForServer); } else @@ -6985,19 +6994,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: { @@ -7023,7 +7032,7 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_GET_FABRIC_ID_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfOperationalCredentialsClusterGetFabricIdCallback(); + emberAfOperationalCredentialsClusterGetFabricIdCallback(apCommandObj); break; } case ZCL_REMOVE_FABRIC_COMMAND_ID: { @@ -7113,7 +7122,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. - emberAfOperationalCredentialsClusterRemoveFabricCallback(FabricId, NodeId, VendorId); + emberAfOperationalCredentialsClusterRemoveFabricCallback(apCommandObj, FabricId, NodeId, VendorId); } else { @@ -7181,7 +7190,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. - emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(const_cast(Label)); + emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(apCommandObj, const_cast(Label)); } else { @@ -7335,8 +7344,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 { @@ -7403,7 +7412,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 { @@ -7502,7 +7511,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 { @@ -7569,7 +7578,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 { @@ -7652,7 +7661,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 { @@ -7735,7 +7744,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 { @@ -7818,7 +7827,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 0408ac4ae840c6..7fbb8bb5a0f183 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 @@ -190,11 +190,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: { @@ -213,7 +213,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd) { if (cmd->mfgCode == 4098 && cmd->commandId == ZCL_MFG_SPECIFIC_PING_COMMAND_ID) { - wasHandled = emberAfBasicClusterMfgSpecificPingCallback(); + wasHandled = emberAfBasicClusterMfgSpecificPingCallback(nullptr); } } else @@ -267,7 +267,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: { @@ -301,7 +301,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: { @@ -351,7 +351,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: { @@ -400,7 +400,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: { @@ -434,7 +434,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: { @@ -468,7 +468,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: { @@ -509,8 +509,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: { @@ -544,8 +544,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: { @@ -586,7 +586,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: { @@ -627,8 +628,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: { @@ -662,8 +663,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: { @@ -704,7 +705,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: { @@ -759,8 +761,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: { @@ -801,8 +804,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: { @@ -843,8 +846,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: { @@ -864,7 +867,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(nullptr, optionsMask, optionsOverride); break; } default: { @@ -884,11 +887,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: { @@ -901,7 +904,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: { @@ -914,7 +917,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: { @@ -927,7 +930,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: { @@ -947,7 +950,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: { @@ -967,7 +970,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: { @@ -980,7 +983,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: { @@ -993,7 +996,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: { @@ -1006,7 +1009,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: { @@ -1019,7 +1022,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: { @@ -1032,7 +1035,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: { @@ -1052,7 +1055,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: { @@ -1072,7 +1075,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: { @@ -1085,7 +1088,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: { @@ -1119,7 +1122,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; } @@ -1154,7 +1157,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: { @@ -1188,7 +1191,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: { @@ -1208,7 +1211,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: { @@ -1263,8 +1266,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: { @@ -1298,7 +1301,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: { @@ -1311,7 +1315,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: { @@ -1331,7 +1335,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(nullptr, timeoutInSeconds, pin); break; } default: { @@ -1374,11 +1378,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: { @@ -1418,7 +1422,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: { @@ -1454,7 +1459,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: { @@ -1474,7 +1479,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: { @@ -1490,11 +1495,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: { @@ -1507,7 +1512,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: { @@ -1520,7 +1525,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupCallback(groupId); + wasHandled = emberAfGroupsClusterViewGroupCallback(nullptr, groupId); break; } default: { @@ -1556,7 +1561,7 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm } zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(nullptr, enrollResponseCode, zoneId); break; } default: { @@ -1585,11 +1590,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: { @@ -1639,7 +1644,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: { @@ -1673,7 +1678,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: { @@ -1693,7 +1698,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: { @@ -1713,7 +1718,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: { @@ -1754,7 +1759,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: { @@ -1781,7 +1787,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: { @@ -1801,11 +1807,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: { @@ -1825,7 +1831,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_SLEEP_COMMAND_ID: { - wasHandled = emberAfLowPowerClusterSleepCallback(); + wasHandled = emberAfLowPowerClusterSleepCallback(nullptr); break; } default: { @@ -1871,7 +1877,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: { @@ -1911,7 +1918,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: { @@ -1941,7 +1949,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: { @@ -1971,7 +1979,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: { @@ -1984,7 +1992,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: { @@ -2014,7 +2022,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: { @@ -2044,7 +2052,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: { @@ -2074,7 +2082,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: { @@ -2114,7 +2123,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: { @@ -2153,7 +2163,7 @@ EmberAfStatus emberAfOtaSoftwareUpdateServerClusterServerCommandParse(EmberAfClu } newVersion = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(updateToken, newVersion); + wasHandled = emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(nullptr, updateToken, newVersion); break; } case ZCL_NOTIFY_UPDATE_APPLIED_COMMAND_ID: { @@ -2176,7 +2186,7 @@ EmberAfStatus emberAfOtaSoftwareUpdateServerClusterServerCommandParse(EmberAfClu } currentVersion = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(updateToken, currentVersion); + wasHandled = emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(nullptr, updateToken, currentVersion); break; } case ZCL_QUERY_IMAGE_COMMAND_ID: { @@ -2243,9 +2253,9 @@ EmberAfStatus emberAfOtaSoftwareUpdateServerClusterServerCommandParse(EmberAfClu metadataForServer = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData)); } - wasHandled = emberAfOtaSoftwareUpdateServerClusterQueryImageCallback(vendorId, productId, imageType, hardwareVersion, - currentVersion, protocolsSupported, location, - clientCanConsent, metadataForServer); + wasHandled = emberAfOtaSoftwareUpdateServerClusterQueryImageCallback( + nullptr, vendorId, productId, imageType, hardwareVersion, currentVersion, protocolsSupported, location, + clientCanConsent, metadataForServer); break; } default: { @@ -2265,15 +2275,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: { @@ -2293,7 +2303,7 @@ EmberAfStatus emberAfOperationalCredentialsClusterServerCommandParse(EmberAfClus switch (cmd->commandId) { case ZCL_GET_FABRIC_ID_COMMAND_ID: { - wasHandled = emberAfOperationalCredentialsClusterGetFabricIdCallback(); + wasHandled = emberAfOperationalCredentialsClusterGetFabricIdCallback(nullptr); break; } case ZCL_REMOVE_FABRIC_COMMAND_ID: { @@ -2320,7 +2330,7 @@ EmberAfStatus emberAfOperationalCredentialsClusterServerCommandParse(EmberAfClus } VendorId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(FabricId, NodeId, VendorId); + wasHandled = emberAfOperationalCredentialsClusterRemoveFabricCallback(nullptr, FabricId, NodeId, VendorId); break; } case ZCL_UPDATE_FABRIC_LABEL_COMMAND_ID: { @@ -2333,7 +2343,7 @@ EmberAfStatus emberAfOperationalCredentialsClusterServerCommandParse(EmberAfClus } Label = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(Label); + wasHandled = emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(nullptr, Label); break; } default: { @@ -2386,7 +2396,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: { @@ -2399,7 +2410,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: { @@ -2426,7 +2437,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: { @@ -2439,7 +2450,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: { @@ -2459,7 +2470,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: { @@ -2479,7 +2490,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: { @@ -2499,7 +2510,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 06fe431e460d9d..7f67113bddfc8b 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 @@ -1769,19 +1770,19 @@ void emberAfThermostatClusterServerTickCallback(chip::EndpointId endpoint); * @param percentOpen */ -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen); +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(chip::app::Command * commandObj, uint8_t percentOpen); /** * @brief Barrier Control Cluster BarrierControlStop Command callback */ -bool emberAfBarrierControlClusterBarrierControlStopCallback(); +bool emberAfBarrierControlClusterBarrierControlStopCallback(chip::app::Command * commandObj); /** * @brief Basic Cluster MfgSpecificPing Command callback */ -bool emberAfBasicClusterMfgSpecificPingCallback(); +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj); /** * @brief Binding Cluster Bind Command callback @@ -1791,8 +1792,8 @@ bool emberAfBasicClusterMfgSpecificPingCallback(); * @param clusterId */ -bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, - chip::ClusterId clusterId); +bool emberAfBindingClusterBindCallback(chip::app::Command * commandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Binding Cluster Unbind Command callback @@ -1802,8 +1803,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 * commandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Color Control Cluster MoveColor Command callback @@ -1813,7 +1814,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 * commandObj, int16_t rateX, int16_t rateY, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveColorTemperature Command callback @@ -1825,9 +1827,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 * commandObj, 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 @@ -1837,7 +1839,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 * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveSaturation Command callback @@ -1847,7 +1850,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 * commandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColor Command callback @@ -1858,8 +1862,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 * commandObj, uint16_t colorX, uint16_t colorY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColorTemperature Command callback @@ -1869,8 +1873,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 * commandObj, uint16_t colorTemperature, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHue Command callback @@ -1881,8 +1886,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 * commandObj, uint8_t hue, uint8_t direction, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHueAndSaturation Command callback @@ -1893,8 +1898,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 * commandObj, uint8_t hue, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToSaturation Command callback @@ -1904,8 +1910,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 * commandObj, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColor Command callback @@ -1916,8 +1922,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 * commandObj, int16_t stepX, int16_t stepY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColorTemperature Command callback @@ -1930,9 +1936,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 * commandObj, 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 @@ -1943,8 +1950,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepSaturation Command callback @@ -1955,8 +1962,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StopMoveStep Command callback @@ -1964,40 +1971,40 @@ bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStopMoveStepCallback(chip::app::Command * commandObj, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Door Lock Cluster ClearAllPins Command callback */ -bool emberAfDoorLockClusterClearAllPinsCallback(); +bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::Command * commandObj); /** * @brief Door Lock Cluster ClearAllRfids Command callback */ -bool emberAfDoorLockClusterClearAllRfidsCallback(); +bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::Command * commandObj); /** * @brief Door Lock Cluster ClearHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterClearHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster ClearPin Command callback * @param userId */ -bool emberAfDoorLockClusterClearPinCallback(uint16_t userId); +bool emberAfDoorLockClusterClearPinCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearRfid Command callback * @param userId */ -bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterClearRfidCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearWeekdaySchedule Command callback @@ -2005,7 +2012,7 @@ bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster ClearYeardaySchedule Command callback @@ -2013,42 +2020,42 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint * @param userId */ -bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearYeardayScheduleCallback(chip::app::Command * commandObj, 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 * commandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster GetLogRecord Command callback * @param logIndex */ -bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex); +bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::Command * commandObj, uint16_t logIndex); /** * @brief Door Lock Cluster GetPin Command callback * @param userId */ -bool emberAfDoorLockClusterGetPinCallback(uint16_t userId); +bool emberAfDoorLockClusterGetPinCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetRfid Command callback * @param userId */ -bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterGetRfidCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetUserType Command callback * @param userId */ -bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); +bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetWeekdaySchedule Command callback @@ -2056,7 +2063,7 @@ bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetYeardaySchedule Command callback @@ -2064,14 +2071,14 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param userId */ -bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetYeardayScheduleCallback(chip::app::Command * commandObj, 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 * commandObj, uint8_t * PIN); /** * @brief Door Lock Cluster SetHolidaySchedule Command callback @@ -2081,8 +2088,8 @@ bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday); +bool emberAfDoorLockClusterSetHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint32_t localStartTime, + uint32_t localEndTime, uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster SetPin Command callback @@ -2092,7 +2099,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 * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * pin); /** * @brief Door Lock Cluster SetRfid Command callback @@ -2102,7 +2110,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 * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * id); /** * @brief Door Lock Cluster SetUserType Command callback @@ -2110,7 +2119,7 @@ bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, * @param userType */ -bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster SetWeekdaySchedule Command callback @@ -2123,8 +2132,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 * commandObj, 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 @@ -2134,15 +2144,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 * commandObj, 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 * commandObj, uint8_t * PIN); /** * @brief Door Lock Cluster UnlockWithTimeout Command callback @@ -2150,7 +2160,7 @@ bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); * @param pin */ -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin); +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(chip::app::Command * commandObj, uint16_t timeoutInSeconds, uint8_t * pin); /** * @brief General Commissioning Cluster ArmFailSafe Command callback @@ -2159,13 +2169,14 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterArmFailSafeCallback(uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterArmFailSafeCallback(chip::app::Command * commandObj, uint16_t expiryLengthSeconds, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief General Commissioning Cluster CommissioningComplete Command callback */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); +bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(chip::app::Command * commandObj); /** * @brief General Commissioning Cluster SetFabric Command callback @@ -2175,8 +2186,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::app::Command * commandObj, chip::ByteSpan fabricId, + chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Groups Cluster AddGroup Command callback @@ -2184,7 +2195,7 @@ bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId * @param groupName */ -bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster AddGroupIfIdentifying Command callback @@ -2192,7 +2203,7 @@ bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName) * @param groupName */ -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster GetGroupMembership Command callback @@ -2200,28 +2211,28 @@ bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipCallback(chip::app::Command * commandObj, 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 * commandObj); /** * @brief Groups Cluster RemoveGroup Command callback * @param groupId */ -bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief Groups Cluster ViewGroup Command callback * @param groupId */ -bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterViewGroupCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief IAS Zone Cluster ZoneEnrollResponse Command callback @@ -2229,20 +2240,20 @@ bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); * @param zoneId */ -bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId); +bool emberAfIasZoneClusterZoneEnrollResponseCallback(chip::app::Command * commandObj, uint8_t enrollResponseCode, uint8_t zoneId); /** * @brief Identify Cluster Identify Command callback * @param identifyTime */ -bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime); +bool emberAfIdentifyClusterIdentifyCallback(chip::app::Command * commandObj, uint16_t identifyTime); /** * @brief Identify Cluster IdentifyQuery Command callback */ -bool emberAfIdentifyClusterIdentifyQueryCallback(); +bool emberAfIdentifyClusterIdentifyQueryCallback(chip::app::Command * commandObj); /** * @brief Level Control Cluster Move Command callback @@ -2252,7 +2263,8 @@ bool emberAfIdentifyClusterIdentifyQueryCallback(); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -2262,8 +2274,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 * commandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -2271,7 +2283,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * commandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -2279,7 +2292,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -2290,8 +2303,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -2300,7 +2313,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -2308,19 +2322,19 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * commandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * commandObj); /** * @brief Low Power Cluster Sleep Command callback */ -bool emberAfLowPowerClusterSleepCallback(); +bool emberAfLowPowerClusterSleepCallback(chip::app::Command * commandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -2329,8 +2343,8 @@ bool emberAfLowPowerClusterSleepCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster AddWiFiNetwork Command callback @@ -2340,8 +2354,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -2350,7 +2364,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -2359,14 +2374,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -2375,7 +2392,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -2384,7 +2402,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -2393,7 +2412,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -2404,8 +2424,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); /** * @brief OTA Software Update Server Cluster ApplyUpdateRequest Command callback @@ -2413,7 +2434,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan * @param newVersion */ -bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(chip::ByteSpan updateToken, uint32_t newVersion); +bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(chip::app::Command * commandObj, chip::ByteSpan updateToken, + uint32_t newVersion); /** * @brief OTA Software Update Server Cluster NotifyUpdateApplied Command callback @@ -2421,7 +2443,8 @@ bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(chip::ByteS * @param currentVersion */ -bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(chip::ByteSpan updateToken, uint32_t currentVersion); +bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(chip::app::Command * commandObj, chip::ByteSpan updateToken, + uint32_t currentVersion); /** * @brief OTA Software Update Server Cluster QueryImage Command callback @@ -2437,33 +2460,33 @@ bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(chip::Byte */ bool emberAfOtaSoftwareUpdateServerClusterQueryImageCallback( - uint16_t vendorId, uint16_t productId, uint16_t imageType, uint16_t hardwareVersion, uint32_t currentVersion, - /* TYPE WARNING: array array defaults to */ uint8_t * protocolsSupported, uint8_t * location, uint8_t clientCanConsent, - chip::ByteSpan metadataForServer); + chip::app::Command * commandObj, uint16_t vendorId, uint16_t productId, uint16_t imageType, uint16_t hardwareVersion, + uint32_t currentVersion, /* TYPE WARNING: array array defaults to */ uint8_t * protocolsSupported, uint8_t * location, + uint8_t clientCanConsent, chip::ByteSpan metadataForServer); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj); /** * @brief Operational Credentials Cluster GetFabricId Command callback */ -bool emberAfOperationalCredentialsClusterGetFabricIdCallback(); +bool emberAfOperationalCredentialsClusterGetFabricIdCallback(chip::app::Command * commandObj); /** * @brief Operational Credentials Cluster RemoveFabric Command callback @@ -2472,14 +2495,15 @@ bool emberAfOperationalCredentialsClusterGetFabricIdCallback(); * @param vendorId */ -bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::FabricId FabricId, chip::NodeId NodeId, uint16_t VendorId); +bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::app::Command * commandObj, chip::FabricId FabricId, + chip::NodeId NodeId, uint16_t VendorId); /** * @brief Operational Credentials Cluster UpdateFabricLabel Command callback * @param label */ -bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(uint8_t * Label); +bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(chip::app::Command * commandObj, uint8_t * Label); /** * @brief Scenes Cluster AddScene Command callback @@ -2490,7 +2514,8 @@ bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(uint8_t * Lab * @param extensionFieldSets */ -bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, +bool emberAfScenesClusterAddSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); /** @@ -2498,7 +2523,7 @@ bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uin * @param groupId */ -bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); +bool emberAfScenesClusterGetSceneMembershipCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief Scenes Cluster RecallScene Command callback @@ -2507,14 +2532,15 @@ bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); * @param transitionTime */ -bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime); +bool emberAfScenesClusterRecallSceneCallback(chip::app::Command * commandObj, 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 * commandObj, uint16_t groupId); /** * @brief Scenes Cluster RemoveScene Command callback @@ -2522,7 +2548,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); * @param sceneId */ -bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster StoreScene Command callback @@ -2530,7 +2556,7 @@ bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster ViewScene Command callback @@ -2538,7 +2564,7 @@ bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterViewSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId); // // Non-Cluster Related Callbacks diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp index 2ed32469031af7..3181015fe2de0f 100644 --- a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp @@ -32,6 +32,7 @@ #include "esp_log.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" +#include #include #include #include @@ -174,7 +175,7 @@ void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointI return; } -bool emberAfBasicClusterMfgSpecificPingCallback(void) +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj) { emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS); return true; diff --git a/examples/all-clusters-app/linux/main.cpp b/examples/all-clusters-app/linux/main.cpp index 9c6f6a5d70f881..6728110c0c0748 100644 --- a/examples/all-clusters-app/linux/main.cpp +++ b/examples/all-clusters-app/linux/main.cpp @@ -22,6 +22,7 @@ #include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" +#include #include #include #include @@ -45,7 +46,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) {} -bool emberAfBasicClusterMfgSpecificPingCallback(void) +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj) { emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS); return true; diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp index 7f05185ca03577..bf69d2f264eb24 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..bb193b5696d8e5 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * commandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -431,8 +435,8 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster AddWiFiNetwork Command callback @@ -442,8 +446,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -452,7 +456,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -461,14 +466,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -477,7 +484,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -486,7 +494,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -495,7 +504,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -506,26 +516,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 * commandObj, 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 * commandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj); // // Non-Cluster Related Callbacks diff --git a/examples/chip-tool/gen/CHIPClientCallbacks.cpp b/examples/chip-tool/gen/CHIPClientCallbacks.cpp index 434c58a00e416c..d3267af3ca5848 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 @@ -868,7 +869,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -889,7 +890,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -910,7 +911,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -931,7 +932,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -952,7 +953,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -973,7 +974,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -994,7 +995,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -1015,8 +1016,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 * commandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1041,8 +1043,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 * commandObj, 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); @@ -1061,7 +1064,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1077,7 +1081,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1093,7 +1098,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1107,9 +1112,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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1137,8 +1142,8 @@ 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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint32_t localStartTime, uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1163,7 +1168,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1184,7 +1189,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1205,7 +1210,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1226,7 +1231,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1247,7 +1252,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1268,7 +1273,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1289,7 +1294,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1310,7 +1315,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1331,7 +1336,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1352,7 +1357,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1366,7 +1372,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1380,7 +1387,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1394,7 +1402,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1416,7 +1424,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1432,7 +1440,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1454,7 +1462,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1477,7 +1486,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * commandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1490,7 +1499,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1504,7 +1514,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1518,7 +1529,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "DisableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1532,7 +1544,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "EnableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1546,7 +1559,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err return true; } -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "RemoveNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1561,7 +1575,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 * commandObj, 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:"); @@ -1578,7 +1593,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( return true; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1592,7 +1608,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 return true; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1606,7 +1623,7 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t return true; } -bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::FabricId FabricId) +bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::app::Command * commandObj, chip::FabricId FabricId) { ChipLogProgress(Zcl, "GetFabricIdResponse:"); ChipLogProgress(Zcl, " FabricId: %" PRIu64 "", FabricId); @@ -1619,7 +1636,8 @@ bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::Fabri return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1642,7 +1660,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1668,7 +1687,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1690,7 +1709,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1713,7 +1733,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1736,8 +1757,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 * commandObj, 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 d86b8b2f54d077..9f87ac294ad8c6 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 { @@ -3589,7 +3601,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. - emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(FabricId); + emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(apCommandObj, FabricId); } else { @@ -3709,7 +3721,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 { @@ -3841,7 +3853,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 { @@ -3924,7 +3937,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 { @@ -4023,7 +4036,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 { @@ -4122,7 +4135,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 { @@ -4271,7 +4284,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 @@ -4408,8 +4421,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. - emberAfThermostatClusterCurrentWeeklyScheduleCallback(numberOfTransitionsForSequence, dayOfWeekForSequence, - modeForSequence, payload); + emberAfThermostatClusterCurrentWeeklyScheduleCallback(apCommandObj, numberOfTransitionsForSequence, + dayOfWeekForSequence, modeForSequence, payload); } else { @@ -4556,8 +4569,8 @@ 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. - emberAfThermostatClusterRelayStatusLogCallback(timeOfDay, relayStatus, localTemperature, humidityInPercentage, - setpoint, unreadEntries); + emberAfThermostatClusterRelayStatusLogCallback(apCommandObj, timeOfDay, relayStatus, localTemperature, + humidityInPercentage, setpoint, unreadEntries); } else { diff --git a/examples/chip-tool/gen/call-command-handler.cpp b/examples/chip-tool/gen/call-command-handler.cpp index 10c0f2baf569be..02ba43908b8751 100644 --- a/examples/chip-tool/gen/call-command-handler.cpp +++ b/examples/chip-tool/gen/call-command-handler.cpp @@ -183,7 +183,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: { @@ -196,7 +196,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: { @@ -209,7 +209,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: { @@ -222,7 +222,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: { @@ -235,7 +235,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: { @@ -248,7 +248,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: { @@ -261,7 +261,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: { @@ -302,8 +302,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: { @@ -358,7 +358,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; } @@ -393,7 +393,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: { @@ -427,7 +427,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: { @@ -447,7 +447,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: { @@ -509,8 +509,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: { @@ -551,8 +551,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: { @@ -565,7 +565,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: { @@ -578,7 +578,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: { @@ -591,7 +591,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: { @@ -604,7 +604,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: { @@ -617,7 +617,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: { @@ -630,7 +630,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: { @@ -643,7 +643,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: { @@ -656,7 +656,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: { @@ -669,7 +669,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(nullptr, status); break; } default: { @@ -705,7 +705,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: { @@ -725,7 +725,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: { @@ -745,7 +745,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -781,7 +781,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: { @@ -804,7 +804,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: { @@ -824,7 +824,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: { @@ -851,7 +851,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: { @@ -880,7 +880,7 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c } timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(nullptr, timeout); break; } default: { @@ -916,7 +916,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: { @@ -936,7 +936,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: { @@ -956,7 +956,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: { @@ -976,7 +976,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: { @@ -996,7 +996,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: { @@ -1021,8 +1021,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: { @@ -1042,7 +1042,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: { @@ -1062,7 +1062,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -1091,7 +1091,7 @@ EmberAfStatus emberAfOperationalCredentialsClusterClientCommandParse(EmberAfClus } FabricId = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(FabricId); + wasHandled = emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(nullptr, FabricId); break; } default: { @@ -1134,7 +1134,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: { @@ -1185,7 +1185,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: { @@ -1205,7 +1206,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: { @@ -1232,7 +1233,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: { @@ -1259,7 +1260,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: { @@ -1324,7 +1325,7 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd extensionFieldSets = NULL; } - wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, + wasHandled = emberAfScenesClusterViewSceneResponseCallback(nullptr, status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); break; } @@ -1371,8 +1372,8 @@ EmberAfStatus emberAfThermostatClusterClientCommandParse(EmberAfClusterCommand * payloadOffset = static_cast(payloadOffset + 1); payload = cmd->buffer + payloadOffset; - wasHandled = emberAfThermostatClusterCurrentWeeklyScheduleCallback(numberOfTransitionsForSequence, dayOfWeekForSequence, - modeForSequence, payload); + wasHandled = emberAfThermostatClusterCurrentWeeklyScheduleCallback(nullptr, numberOfTransitionsForSequence, + dayOfWeekForSequence, modeForSequence, payload); break; } case ZCL_RELAY_STATUS_LOG_COMMAND_ID: { @@ -1420,7 +1421,7 @@ EmberAfStatus emberAfThermostatClusterClientCommandParse(EmberAfClusterCommand * } unreadEntries = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfThermostatClusterRelayStatusLogCallback(timeOfDay, relayStatus, localTemperature, + wasHandled = emberAfThermostatClusterRelayStatusLogCallback(nullptr, timeOfDay, relayStatus, localTemperature, humidityInPercentage, setpoint, unreadEntries); break; } diff --git a/examples/chip-tool/gen/callback.h b/examples/chip-tool/gen/callback.h index ff58f5cc365abe..5867978a600106 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 @@ -1533,49 +1534,49 @@ void emberAfThermostatClusterClientTickCallback(chip::EndpointId endpoint); * @param status */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback @@ -1586,8 +1587,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 * commandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster GetLogRecordResponse Command callback @@ -1600,8 +1602,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 * commandObj, 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 @@ -1611,7 +1614,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin); /** * @brief Door Lock Cluster GetRfidResponse Command callback @@ -1621,7 +1625,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid); /** * @brief Door Lock Cluster GetUserTypeResponse Command callback @@ -1629,7 +1634,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user * @param userType */ -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback @@ -1643,9 +1648,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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1656,71 +1661,71 @@ 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 * commandObj, 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 * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1728,7 +1733,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1736,7 +1742,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1744,7 +1751,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1752,7 +1760,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1761,7 +1769,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1770,7 +1778,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1779,14 +1787,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 * commandObj, 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 * commandObj, uint16_t timeout); /** * @brief Network Commissioning Cluster AddThreadNetworkResponse Command callback @@ -1794,7 +1803,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param debugText */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster AddWiFiNetworkResponse Command callback @@ -1802,7 +1812,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t * @param debugText */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster DisableNetworkResponse Command callback @@ -1810,7 +1821,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster EnableNetworkResponse Command callback @@ -1818,7 +1830,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster RemoveNetworkResponse Command callback @@ -1826,7 +1839,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err * @param debugText */ -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster ScanNetworksResponse Command callback @@ -1837,7 +1851,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 * commandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults); /** @@ -1846,7 +1861,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster UpdateWiFiNetworkResponse Command callback @@ -1854,14 +1870,15 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Operational Credentials Cluster GetFabricIdResponse Command callback * @param fabricId */ -bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::FabricId FabricId); +bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::app::Command * commandObj, chip::FabricId FabricId); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1870,7 +1887,8 @@ bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::Fabri * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1881,7 +1899,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1890,7 +1909,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1899,7 +1918,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1908,7 +1928,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1920,8 +1941,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); /** @@ -1932,8 +1953,8 @@ bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t grou * @param payload */ -bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, - uint8_t modeForSequence, +bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(chip::app::Command * commandObj, uint8_t numberOfTransitionsForSequence, + uint8_t dayOfWeekForSequence, uint8_t modeForSequence, /* TYPE WARNING: array array defaults to */ uint8_t * payload); /** @@ -1946,8 +1967,9 @@ bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(uint8_t numberOfTrans * @param unreadEntries */ -bool emberAfThermostatClusterRelayStatusLogCallback(uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, - uint8_t humidityInPercentage, int16_t setpoint, uint16_t unreadEntries); +bool emberAfThermostatClusterRelayStatusLogCallback(chip::app::Command * commandObj, uint16_t timeOfDay, uint16_t relayStatus, + int16_t localTemperature, uint8_t humidityInPercentage, int16_t setpoint, + uint16_t unreadEntries); // // Non-Cluster Related Callbacks diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp index 7f05185ca03577..bf69d2f264eb24 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..bb193b5696d8e5 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * commandObj); /** * @brief Network Commissioning Cluster AddThreadNetwork Command callback @@ -431,8 +435,8 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster AddWiFiNetwork Command callback @@ -442,8 +446,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -452,7 +456,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -461,14 +466,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -477,7 +484,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -486,7 +494,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -495,7 +504,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -506,26 +516,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 * commandObj, 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 * commandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj); // // 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 37abf4728b12be..b6186b1515d4c8 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..da4cb5dec95f4e 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,8 +282,8 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster AddWiFiNetwork Command callback @@ -292,8 +293,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -302,7 +303,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -311,14 +313,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -327,7 +331,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -336,7 +341,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -345,7 +351,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -356,26 +363,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 * commandObj, 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 * commandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj); // // 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 7a33d53c25e967..60b72b8221e7e5 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..9eb5fe89583f31 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,8 +285,8 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster AddWiFiNetwork Command callback @@ -295,8 +296,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -305,7 +306,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssi * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -314,14 +316,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -330,7 +334,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -339,7 +344,8 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback @@ -348,7 +354,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, + chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs); /** @@ -359,8 +366,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 * commandObj, chip::ByteSpan ssid, + chip::ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs); // // Non-Cluster Related Callbacks diff --git a/examples/tv-app/linux/main.cpp b/examples/tv-app/linux/main.cpp index 0f3c402d287e14..0ac5d791abfa95 100644 --- a/examples/tv-app/linux/main.cpp +++ b/examples/tv-app/linux/main.cpp @@ -24,6 +24,7 @@ #include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" +#include #include #include #include @@ -48,7 +49,7 @@ void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) {} -bool emberAfBasicClusterMfgSpecificPingCallback(void) +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj) { emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS); return true; diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp index bccccf96e6eb24..cce588b308aa1f 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: { @@ -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_LAUNCH_CONTENT_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfContentLaunchClusterLaunchContentCallback(); + emberAfContentLaunchClusterLaunchContentCallback(apCommandObj); break; } case ZCL_LAUNCH_URL_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfContentLaunchClusterLaunchURLCallback(); + emberAfContentLaunchClusterLaunchURLCallback(apCommandObj); break; } default: { @@ -2222,13 +2229,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: { @@ -2286,7 +2293,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 { @@ -2353,7 +2360,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 { @@ -2420,7 +2427,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 { @@ -2503,7 +2510,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 { @@ -2586,7 +2593,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 { @@ -2653,7 +2660,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 { @@ -2720,7 +2727,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 { @@ -2787,7 +2794,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 { @@ -2854,7 +2861,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 { @@ -2921,7 +2928,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 { @@ -3004,7 +3011,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 { @@ -3087,7 +3094,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 { @@ -3155,7 +3162,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 { @@ -3270,7 +3277,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 @@ -3387,7 +3394,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 { @@ -3503,7 +3510,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 { @@ -3586,7 +3593,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 { @@ -3749,8 +3756,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 { @@ -3865,7 +3872,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 { @@ -3933,7 +3940,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 { @@ -4017,7 +4024,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 { @@ -4136,7 +4143,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 { @@ -4151,7 +4158,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: { @@ -4265,7 +4272,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 { @@ -4369,7 +4376,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 { @@ -4453,7 +4460,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 { @@ -4537,7 +4544,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 { @@ -4552,7 +4559,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: { @@ -4610,7 +4617,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 { @@ -4677,7 +4684,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 { @@ -4780,7 +4787,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 { @@ -4867,7 +4874,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 { @@ -4882,7 +4889,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: { @@ -5008,7 +5015,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 { @@ -5123,7 +5130,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 { @@ -5206,7 +5213,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 { @@ -5289,7 +5296,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 { @@ -5420,7 +5427,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 { @@ -5519,7 +5527,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 { @@ -5602,7 +5610,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 { @@ -5617,7 +5625,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: { @@ -5643,7 +5651,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: { @@ -5669,61 +5677,61 @@ void DispatchServerCommand(app::Command * apCommandObj, CommandId aCommandId, En case ZCL_FAST_FORWARD_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterFastForwardRequestCallback(); + emberAfMediaPlaybackClusterFastForwardRequestCallback(apCommandObj); break; } case ZCL_NEXT_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterNextRequestCallback(); + emberAfMediaPlaybackClusterNextRequestCallback(apCommandObj); break; } case ZCL_PAUSE_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterPauseRequestCallback(); + emberAfMediaPlaybackClusterPauseRequestCallback(apCommandObj); break; } case ZCL_PLAY_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterPlayRequestCallback(); + emberAfMediaPlaybackClusterPlayRequestCallback(apCommandObj); break; } case ZCL_PREVIOUS_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterPreviousRequestCallback(); + emberAfMediaPlaybackClusterPreviousRequestCallback(apCommandObj); break; } case ZCL_REWIND_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterRewindRequestCallback(); + emberAfMediaPlaybackClusterRewindRequestCallback(apCommandObj); break; } case ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterSkipBackwardRequestCallback(); + emberAfMediaPlaybackClusterSkipBackwardRequestCallback(apCommandObj); break; } case ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterSkipForwardRequestCallback(); + emberAfMediaPlaybackClusterSkipForwardRequestCallback(apCommandObj); break; } case ZCL_START_OVER_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterStartOverRequestCallback(); + emberAfMediaPlaybackClusterStartOverRequestCallback(apCommandObj); break; } case ZCL_STOP_REQUEST_COMMAND_ID: { // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. - emberAfMediaPlaybackClusterStopRequestCallback(); + emberAfMediaPlaybackClusterStopRequestCallback(apCommandObj); break; } default: { @@ -5837,7 +5845,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 { @@ -5940,7 +5948,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 { @@ -6007,7 +6015,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 { @@ -6110,7 +6118,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 { @@ -6213,7 +6221,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 { @@ -6248,19 +6256,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: { @@ -6404,8 +6412,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 { @@ -6472,7 +6480,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 { @@ -6571,7 +6579,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 { @@ -6638,7 +6646,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 { @@ -6721,7 +6729,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 { @@ -6804,7 +6812,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 { @@ -6887,7 +6895,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 0ec227343ecbe9..da1933b4517b1b 100644 --- a/examples/tv-app/tv-common/gen/call-command-handler.cpp +++ b/examples/tv-app/tv-common/gen/call-command-handler.cpp @@ -175,11 +175,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: { @@ -198,7 +198,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd) { if (cmd->mfgCode == 4098 && cmd->commandId == ZCL_MFG_SPECIFIC_PING_COMMAND_ID) { - wasHandled = emberAfBasicClusterMfgSpecificPingCallback(); + wasHandled = emberAfBasicClusterMfgSpecificPingCallback(nullptr); } } else @@ -252,7 +252,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: { @@ -286,7 +286,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: { @@ -336,7 +336,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: { @@ -385,7 +385,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: { @@ -419,7 +419,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: { @@ -453,7 +453,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: { @@ -494,8 +494,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: { @@ -529,8 +529,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: { @@ -571,7 +571,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: { @@ -612,8 +613,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: { @@ -647,8 +648,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: { @@ -689,7 +690,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: { @@ -744,8 +746,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: { @@ -786,8 +789,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: { @@ -828,8 +831,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: { @@ -849,7 +852,7 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand } optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride); + wasHandled = emberAfColorControlClusterStopMoveStepCallback(nullptr, optionsMask, optionsOverride); break; } default: { @@ -869,11 +872,11 @@ EmberAfStatus emberAfContentLaunchClusterServerCommandParse(EmberAfClusterComman switch (cmd->commandId) { case ZCL_LAUNCH_CONTENT_COMMAND_ID: { - wasHandled = emberAfContentLaunchClusterLaunchContentCallback(); + wasHandled = emberAfContentLaunchClusterLaunchContentCallback(nullptr); break; } case ZCL_LAUNCH_URL_COMMAND_ID: { - wasHandled = emberAfContentLaunchClusterLaunchURLCallback(); + wasHandled = emberAfContentLaunchClusterLaunchURLCallback(nullptr); break; } default: { @@ -893,11 +896,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: { @@ -910,7 +913,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: { @@ -923,7 +926,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: { @@ -936,7 +939,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: { @@ -956,7 +959,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: { @@ -976,7 +979,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: { @@ -989,7 +992,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: { @@ -1002,7 +1005,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: { @@ -1015,7 +1018,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: { @@ -1028,7 +1031,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: { @@ -1041,7 +1044,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: { @@ -1061,7 +1064,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: { @@ -1081,7 +1084,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: { @@ -1094,7 +1097,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: { @@ -1128,7 +1131,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; } @@ -1163,7 +1166,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: { @@ -1197,7 +1200,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: { @@ -1217,7 +1220,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: { @@ -1272,8 +1275,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: { @@ -1307,7 +1310,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: { @@ -1320,7 +1324,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: { @@ -1340,7 +1344,7 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c } pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(nullptr, timeoutInSeconds, pin); break; } default: { @@ -1383,11 +1387,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: { @@ -1427,7 +1431,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: { @@ -1463,7 +1468,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: { @@ -1483,7 +1488,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: { @@ -1499,11 +1504,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: { @@ -1516,7 +1521,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: { @@ -1529,7 +1534,7 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd } groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGroupsClusterViewGroupCallback(groupId); + wasHandled = emberAfGroupsClusterViewGroupCallback(nullptr, groupId); break; } default: { @@ -1565,7 +1570,7 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm } zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId); + wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(nullptr, enrollResponseCode, zoneId); break; } default: { @@ -1594,11 +1599,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: { @@ -1648,7 +1653,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: { @@ -1682,7 +1687,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: { @@ -1702,7 +1707,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: { @@ -1722,7 +1727,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: { @@ -1763,7 +1768,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: { @@ -1790,7 +1796,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: { @@ -1810,11 +1816,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: { @@ -1834,7 +1840,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c switch (cmd->commandId) { case ZCL_SLEEP_COMMAND_ID: { - wasHandled = emberAfLowPowerClusterSleepCallback(); + wasHandled = emberAfLowPowerClusterSleepCallback(nullptr); break; } default: { @@ -1854,43 +1860,43 @@ EmberAfStatus emberAfMediaPlaybackClusterServerCommandParse(EmberAfClusterComman switch (cmd->commandId) { case ZCL_FAST_FORWARD_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterFastForwardRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterFastForwardRequestCallback(nullptr); break; } case ZCL_NEXT_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterNextRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterNextRequestCallback(nullptr); break; } case ZCL_PAUSE_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterPauseRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterPauseRequestCallback(nullptr); break; } case ZCL_PLAY_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterPlayRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterPlayRequestCallback(nullptr); break; } case ZCL_PREVIOUS_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterPreviousRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterPreviousRequestCallback(nullptr); break; } case ZCL_REWIND_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterRewindRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterRewindRequestCallback(nullptr); break; } case ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterSkipBackwardRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterSkipBackwardRequestCallback(nullptr); break; } case ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterSkipForwardRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterSkipForwardRequestCallback(nullptr); break; } case ZCL_START_OVER_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterStartOverRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterStartOverRequestCallback(nullptr); break; } case ZCL_STOP_REQUEST_COMMAND_ID: { - wasHandled = emberAfMediaPlaybackClusterStopRequestCallback(); + wasHandled = emberAfMediaPlaybackClusterStopRequestCallback(nullptr); break; } default: { @@ -1936,7 +1942,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: { @@ -1966,7 +1972,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: { @@ -1979,7 +1985,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: { @@ -2009,7 +2015,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: { @@ -2039,7 +2045,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste } timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs); + wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(nullptr, ssid, breadcrumb, timeoutMs); break; } default: { @@ -2059,15 +2065,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: { @@ -2120,7 +2126,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: { @@ -2133,7 +2140,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: { @@ -2160,7 +2167,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: { @@ -2173,7 +2180,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: { @@ -2193,7 +2200,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: { @@ -2213,7 +2220,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: { @@ -2233,7 +2240,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 de8d677a7626c8..76108729b3c564 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 @@ -1532,19 +1533,19 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end * @param percentOpen */ -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen); +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(chip::app::Command * commandObj, uint8_t percentOpen); /** * @brief Barrier Control Cluster BarrierControlStop Command callback */ -bool emberAfBarrierControlClusterBarrierControlStopCallback(); +bool emberAfBarrierControlClusterBarrierControlStopCallback(chip::app::Command * commandObj); /** * @brief Basic Cluster MfgSpecificPing Command callback */ -bool emberAfBasicClusterMfgSpecificPingCallback(); +bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj); /** * @brief Binding Cluster Bind Command callback @@ -1554,8 +1555,8 @@ bool emberAfBasicClusterMfgSpecificPingCallback(); * @param clusterId */ -bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, - chip::ClusterId clusterId); +bool emberAfBindingClusterBindCallback(chip::app::Command * commandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Binding Cluster Unbind Command callback @@ -1565,8 +1566,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 * commandObj, chip::NodeId nodeId, chip::GroupId groupId, + chip::EndpointId endpointId, chip::ClusterId clusterId); /** * @brief Color Control Cluster MoveColor Command callback @@ -1576,7 +1577,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 * commandObj, int16_t rateX, int16_t rateY, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveColorTemperature Command callback @@ -1588,9 +1590,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 * commandObj, 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 @@ -1600,7 +1602,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 * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveSaturation Command callback @@ -1610,7 +1613,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 * commandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColor Command callback @@ -1621,8 +1625,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 * commandObj, uint16_t colorX, uint16_t colorY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToColorTemperature Command callback @@ -1632,8 +1636,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 * commandObj, uint16_t colorTemperature, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHue Command callback @@ -1644,8 +1649,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 * commandObj, uint8_t hue, uint8_t direction, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToHueAndSaturation Command callback @@ -1656,8 +1661,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 * commandObj, uint8_t hue, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride); /** * @brief Color Control Cluster MoveToSaturation Command callback @@ -1667,8 +1673,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 * commandObj, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColor Command callback @@ -1679,8 +1685,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 * commandObj, int16_t stepX, int16_t stepY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepColorTemperature Command callback @@ -1693,9 +1699,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 * commandObj, 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 @@ -1706,8 +1713,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StepSaturation Command callback @@ -1718,8 +1725,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Color Control Cluster StopMoveStep Command callback @@ -1727,52 +1734,52 @@ bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t * @param optionsOverride */ -bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride); +bool emberAfColorControlClusterStopMoveStepCallback(chip::app::Command * commandObj, uint8_t optionsMask, uint8_t optionsOverride); /** * @brief Content Launch Cluster LaunchContent Command callback */ -bool emberAfContentLaunchClusterLaunchContentCallback(); +bool emberAfContentLaunchClusterLaunchContentCallback(chip::app::Command * commandObj); /** * @brief Content Launch Cluster LaunchURL Command callback */ -bool emberAfContentLaunchClusterLaunchURLCallback(); +bool emberAfContentLaunchClusterLaunchURLCallback(chip::app::Command * commandObj); /** * @brief Door Lock Cluster ClearAllPins Command callback */ -bool emberAfDoorLockClusterClearAllPinsCallback(); +bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::Command * commandObj); /** * @brief Door Lock Cluster ClearAllRfids Command callback */ -bool emberAfDoorLockClusterClearAllRfidsCallback(); +bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::Command * commandObj); /** * @brief Door Lock Cluster ClearHolidaySchedule Command callback * @param scheduleId */ -bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId); +bool emberAfDoorLockClusterClearHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster ClearPin Command callback * @param userId */ -bool emberAfDoorLockClusterClearPinCallback(uint16_t userId); +bool emberAfDoorLockClusterClearPinCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearRfid Command callback * @param userId */ -bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterClearRfidCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster ClearWeekdaySchedule Command callback @@ -1780,7 +1787,7 @@ bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster ClearYeardaySchedule Command callback @@ -1788,42 +1795,42 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint * @param userId */ -bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterClearYeardayScheduleCallback(chip::app::Command * commandObj, 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 * commandObj, uint8_t scheduleId); /** * @brief Door Lock Cluster GetLogRecord Command callback * @param logIndex */ -bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex); +bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::Command * commandObj, uint16_t logIndex); /** * @brief Door Lock Cluster GetPin Command callback * @param userId */ -bool emberAfDoorLockClusterGetPinCallback(uint16_t userId); +bool emberAfDoorLockClusterGetPinCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetRfid Command callback * @param userId */ -bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId); +bool emberAfDoorLockClusterGetRfidCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetUserType Command callback * @param userId */ -bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); +bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId); /** * @brief Door Lock Cluster GetWeekdaySchedule Command callback @@ -1831,7 +1838,7 @@ bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId); * @param userId */ -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId); /** * @brief Door Lock Cluster GetYeardaySchedule Command callback @@ -1839,14 +1846,14 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16 * @param userId */ -bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId); +bool emberAfDoorLockClusterGetYeardayScheduleCallback(chip::app::Command * commandObj, 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 * commandObj, uint8_t * PIN); /** * @brief Door Lock Cluster SetHolidaySchedule Command callback @@ -1856,8 +1863,8 @@ bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN); * @param operatingModeDuringHoliday */ -bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday); +bool emberAfDoorLockClusterSetHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint32_t localStartTime, + uint32_t localEndTime, uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster SetPin Command callback @@ -1867,7 +1874,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 * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * pin); /** * @brief Door Lock Cluster SetRfid Command callback @@ -1877,7 +1885,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 * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * id); /** * @brief Door Lock Cluster SetUserType Command callback @@ -1885,7 +1894,7 @@ bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, * @param userType */ -bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster SetWeekdaySchedule Command callback @@ -1898,8 +1907,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 * commandObj, 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 @@ -1909,15 +1919,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 * commandObj, 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 * commandObj, uint8_t * PIN); /** * @brief Door Lock Cluster UnlockWithTimeout Command callback @@ -1925,7 +1935,7 @@ bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN); * @param pin */ -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin); +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(chip::app::Command * commandObj, uint16_t timeoutInSeconds, uint8_t * pin); /** * @brief General Commissioning Cluster ArmFailSafe Command callback @@ -1934,13 +1944,14 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterArmFailSafeCallback(uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterArmFailSafeCallback(chip::app::Command * commandObj, uint16_t expiryLengthSeconds, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief General Commissioning Cluster CommissioningComplete Command callback */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); +bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(chip::app::Command * commandObj); /** * @brief General Commissioning Cluster SetFabric Command callback @@ -1950,8 +1961,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(); * @param timeoutMs */ -bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, - uint32_t timeoutMs); +bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::app::Command * commandObj, chip::ByteSpan fabricId, + chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Groups Cluster AddGroup Command callback @@ -1959,7 +1970,7 @@ bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId * @param groupName */ -bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster AddGroupIfIdentifying Command callback @@ -1967,7 +1978,7 @@ bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName) * @param groupName */ -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName); +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t * groupName); /** * @brief Groups Cluster GetGroupMembership Command callback @@ -1975,28 +1986,28 @@ bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipCallback(chip::app::Command * commandObj, 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 * commandObj); /** * @brief Groups Cluster RemoveGroup Command callback * @param groupId */ -bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief Groups Cluster ViewGroup Command callback * @param groupId */ -bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); +bool emberAfGroupsClusterViewGroupCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief IAS Zone Cluster ZoneEnrollResponse Command callback @@ -2004,20 +2015,20 @@ bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId); * @param zoneId */ -bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId); +bool emberAfIasZoneClusterZoneEnrollResponseCallback(chip::app::Command * commandObj, uint8_t enrollResponseCode, uint8_t zoneId); /** * @brief Identify Cluster Identify Command callback * @param identifyTime */ -bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime); +bool emberAfIdentifyClusterIdentifyCallback(chip::app::Command * commandObj, uint16_t identifyTime); /** * @brief Identify Cluster IdentifyQuery Command callback */ -bool emberAfIdentifyClusterIdentifyQueryCallback(); +bool emberAfIdentifyClusterIdentifyQueryCallback(chip::app::Command * commandObj); /** * @brief Level Control Cluster Move Command callback @@ -2027,7 +2038,8 @@ bool emberAfIdentifyClusterIdentifyQueryCallback(); * @param optionOverride */ -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevel Command callback @@ -2037,8 +2049,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 * commandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster MoveToLevelWithOnOff Command callback @@ -2046,7 +2058,8 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans * @param transitionTime */ -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime); +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * commandObj, uint8_t level, + uint16_t transitionTime); /** * @brief Level Control Cluster MoveWithOnOff Command callback @@ -2054,7 +2067,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 * @param rate */ -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate); +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate); /** * @brief Level Control Cluster Step Command callback @@ -2065,8 +2078,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StepWithOnOff Command callback @@ -2075,7 +2088,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 * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime); /** * @brief Level Control Cluster Stop Command callback @@ -2083,79 +2097,79 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t s * @param optionOverride */ -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride); +bool emberAfLevelControlClusterStopCallback(chip::app::Command * commandObj, uint8_t optionMask, uint8_t optionOverride); /** * @brief Level Control Cluster StopWithOnOff Command callback */ -bool emberAfLevelControlClusterStopWithOnOffCallback(); +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * commandObj); /** * @brief Low Power Cluster Sleep Command callback */ -bool emberAfLowPowerClusterSleepCallback(); +bool emberAfLowPowerClusterSleepCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster FastForwardRequest Command callback */ -bool emberAfMediaPlaybackClusterFastForwardRequestCallback(); +bool emberAfMediaPlaybackClusterFastForwardRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster NextRequest Command callback */ -bool emberAfMediaPlaybackClusterNextRequestCallback(); +bool emberAfMediaPlaybackClusterNextRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster PauseRequest Command callback */ -bool emberAfMediaPlaybackClusterPauseRequestCallback(); +bool emberAfMediaPlaybackClusterPauseRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster PlayRequest Command callback */ -bool emberAfMediaPlaybackClusterPlayRequestCallback(); +bool emberAfMediaPlaybackClusterPlayRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster PreviousRequest Command callback */ -bool emberAfMediaPlaybackClusterPreviousRequestCallback(); +bool emberAfMediaPlaybackClusterPreviousRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster RewindRequest Command callback */ -bool emberAfMediaPlaybackClusterRewindRequestCallback(); +bool emberAfMediaPlaybackClusterRewindRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster SkipBackwardRequest Command callback */ -bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback(); +bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster SkipForwardRequest Command callback */ -bool emberAfMediaPlaybackClusterSkipForwardRequestCallback(); +bool emberAfMediaPlaybackClusterSkipForwardRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster StartOverRequest Command callback */ -bool emberAfMediaPlaybackClusterStartOverRequestCallback(); +bool emberAfMediaPlaybackClusterStartOverRequestCallback(chip::app::Command * commandObj); /** * @brief Media Playback Cluster StopRequest Command callback */ -bool emberAfMediaPlaybackClusterStopRequestCallback(); +bool emberAfMediaPlaybackClusterStopRequestCallback(chip::app::Command * commandObj); /** * @brief Network Commissioning Cluster DisableNetwork Command callback @@ -2164,7 +2178,8 @@ bool emberAfMediaPlaybackClusterStopRequestCallback(); * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief Network Commissioning Cluster EnableNetwork Command callback @@ -2173,14 +2188,16 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan net * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, 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 * commandObj, + uint32_t timeoutMs); /** * @brief Network Commissioning Cluster RemoveNetwork Command callback @@ -2189,7 +2206,8 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs); +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, chip::ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs); /** * @brief Network Commissioning Cluster ScanNetworks Command callback @@ -2198,25 +2216,26 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan Netw * @param timeoutMs */ -bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs); +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, chip::ByteSpan ssid, + uint64_t breadcrumb, uint32_t timeoutMs); /** * @brief On/off Cluster Off Command callback */ -bool emberAfOnOffClusterOffCallback(); +bool emberAfOnOffClusterOffCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster On Command callback */ -bool emberAfOnOffClusterOnCallback(); +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj); /** * @brief On/off Cluster Toggle Command callback */ -bool emberAfOnOffClusterToggleCallback(); +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj); /** * @brief Scenes Cluster AddScene Command callback @@ -2227,7 +2246,8 @@ bool emberAfOnOffClusterToggleCallback(); * @param extensionFieldSets */ -bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, +bool emberAfScenesClusterAddSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); /** @@ -2235,7 +2255,7 @@ bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uin * @param groupId */ -bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); +bool emberAfScenesClusterGetSceneMembershipCallback(chip::app::Command * commandObj, uint16_t groupId); /** * @brief Scenes Cluster RecallScene Command callback @@ -2244,14 +2264,15 @@ bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId); * @param transitionTime */ -bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime); +bool emberAfScenesClusterRecallSceneCallback(chip::app::Command * commandObj, 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 * commandObj, uint16_t groupId); /** * @brief Scenes Cluster RemoveScene Command callback @@ -2259,7 +2280,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId); * @param sceneId */ -bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterRemoveSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster StoreScene Command callback @@ -2267,7 +2288,7 @@ bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterStoreSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId); /** * @brief Scenes Cluster ViewScene Command callback @@ -2275,7 +2296,7 @@ bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId); * @param sceneId */ -bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterViewSceneCallback(chip::app::Command * commandObj, 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 1d3de1ea616a9a..fc023835a863d8 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..5efda807424cce 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 * commandObj); /** * @brief Window Covering Cluster WindowCoveringGoToLiftPercentage Command callback * @param percentageLiftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(uint8_t percentageLiftValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(chip::app::Command * commandObj, + uint8_t percentageLiftValue); /** * @brief Window Covering Cluster WindowCoveringGoToLiftValue Command callback * @param liftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(uint16_t liftValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(chip::app::Command * commandObj, uint16_t liftValue); /** * @brief Window Covering Cluster WindowCoveringGoToTiltPercentage Command callback * @param percentageTiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(uint8_t percentageTiltValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(chip::app::Command * commandObj, + uint8_t percentageTiltValue); /** * @brief Window Covering Cluster WindowCoveringGoToTiltValue Command callback * @param tiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(uint16_t tiltValue); +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(chip::app::Command * commandObj, uint16_t tiltValue); /** * @brief Window Covering Cluster WindowCoveringStop Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringStopCallback(); +bool emberAfWindowCoveringClusterWindowCoveringStopCallback(chip::app::Command * commandObj); /** * @brief Window Covering Cluster WindowCoveringUpOpen Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(); +bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(chip::app::Command * commandObj); // // Non-Cluster Related Callbacks diff --git a/examples/window-app/efr32/src/ZclCallbacks.cpp b/examples/window-app/efr32/src/ZclCallbacks.cpp index 6814408c8e5ac0..765121df182891 100644 --- a/examples/window-app/efr32/src/ZclCallbacks.cpp +++ b/examples/window-app/efr32/src/ZclCallbacks.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -53,7 +54,7 @@ void emberAfWindowCoveringClusterInitCallback(chip::EndpointId endpoint) * @brief Window Covering Cluster WindowCoveringUpOpen Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback() +bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback(chip::app::Command *) { EFR32_LOG("Window Up Open command received"); AppTask::Instance().Cover().Open(); @@ -64,7 +65,7 @@ bool emberAfWindowCoveringClusterWindowCoveringUpOpenCallback() * @brief Window Covering Cluster WindowCoveringDownClose Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringDownCloseCallback() +bool emberAfWindowCoveringClusterWindowCoveringDownCloseCallback(chip::app::Command *) { EFR32_LOG("Window Down Close command received"); AppTask::Instance().Cover().Close(); @@ -76,7 +77,7 @@ bool emberAfWindowCoveringClusterWindowCoveringDownCloseCallback() * @param percentageLiftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(uint8_t percentageLiftValue) +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(chip::app::Command *, uint8_t percentageLiftValue) { EFR32_LOG("Window Go To Lift Percentage command received"); AppTask::Instance().Cover().LiftGotoPercent(percentageLiftValue); @@ -88,7 +89,7 @@ bool emberAfWindowCoveringClusterWindowCoveringGoToLiftPercentageCallback(uint8_ * @param liftValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(uint16_t liftValue) +bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(chip::app::Command *, uint16_t liftValue) { EFR32_LOG("Window Go To Lift Value command received"); AppTask::Instance().Cover().LiftGotoValue(liftValue); @@ -100,7 +101,7 @@ bool emberAfWindowCoveringClusterWindowCoveringGoToLiftValueCallback(uint16_t li * @param percentageTiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(uint8_t percentageTiltValue) +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(chip::app::Command *, uint8_t percentageTiltValue) { EFR32_LOG("Window Go To Tilt Percentage command received"); AppTask::Instance().Cover().TiltGotoPercent(percentageTiltValue); @@ -112,7 +113,7 @@ bool emberAfWindowCoveringClusterWindowCoveringGoToTiltPercentageCallback(uint8_ * @param tiltValue */ -bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(uint16_t tiltValue) +bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(chip::app::Command *, uint16_t tiltValue) { EFR32_LOG("Window Go To Tilt Value command received"); AppTask::Instance().Cover().TiltGotoValue(tiltValue); @@ -123,7 +124,7 @@ bool emberAfWindowCoveringClusterWindowCoveringGoToTiltValueCallback(uint16_t ti * @brief Window Covering Cluster WindowCoveringStop Command callback */ -bool emberAfWindowCoveringClusterWindowCoveringStopCallback() +bool emberAfWindowCoveringClusterWindowCoveringStopCallback(chip::app::Command *) { EFR32_LOG("Window Stop command received"); AppTask::Instance().Cover().Stop(); diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp index 13dd87a692f0cd..aec075453ea79b 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -38,16 +38,17 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfAccountLoginClusterGetSetupPINCallback(unsigned char *) +bool emberAfAccountLoginClusterGetSetupPINCallback(chip::app::Command * commandObj, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfAccountLoginClusterLoginCallback(unsigned char *, unsigned char *) +bool emberAfAccountLoginClusterLoginCallback(chip::app::Command * commandObj, unsigned char *, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp index d2eb4e5ec5c04d..e5a1d804f7009a 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -38,9 +38,10 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfApplicationLauncherClusterLaunchAppCallback(unsigned char *, unsigned char *) +bool emberAfApplicationLauncherClusterLaunchAppCallback(chip::app::Command * commandObj, unsigned char *, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp index 98770bcd0affad..f402937d001662 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -38,16 +38,17 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfAudioOutputClusterRenameOutputCallback(unsigned char, unsigned char *) +bool emberAfAudioOutputClusterRenameOutputCallback(chip::app::Command * commandObj, unsigned char, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfAudioOutputClusterSelectOutputCallback(unsigned char) +bool emberAfAudioOutputClusterSelectOutputCallback(chip::app::Command * commandObj, unsigned char) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp index f8ca89253fad14..c221a2f2ecb8e6 100644 --- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp +++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp @@ -39,6 +39,7 @@ ******************************************************************************/ #include "barrier-control-server.h" +#include #include #include "gen/af-structs.h" @@ -284,7 +285,7 @@ static void sendDefaultResponse(EmberAfStatus status) } } -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen) +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(chip::app::Command * commandObj, uint8_t percentOpen) { EndpointId endpoint = emberAfCurrentCommand()->apsFrame->destinationEndpoint; EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; @@ -326,7 +327,7 @@ bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t perce return true; } -bool emberAfBarrierControlClusterBarrierControlStopCallback(void) +bool emberAfBarrierControlClusterBarrierControlStopCallback(chip::app::Command * commandObj) { EndpointId endpoint = emberAfCurrentCommand()->apsFrame->destinationEndpoint; emberAfDeactivateServerTick(endpoint, ZCL_BARRIER_CONTROL_CLUSTER_ID); diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp index b54242bbd0d3df..2238198ec15d6e 100644 --- a/src/app/clusters/bindings/bindings.cpp +++ b/src/app/clusters/bindings/bindings.cpp @@ -22,6 +22,7 @@ #include "af.h" +#include #include #include @@ -87,7 +88,8 @@ EmberStatus getUnusedBindingIndex(uint8_t * bindingIndex) return EMBER_NOT_FOUND; } -bool emberAfBindingClusterBindCallback(NodeId nodeId, GroupId groupId, EndpointId endpointId, ClusterId clusterId) +bool emberAfBindingClusterBindCallback(chip::app::Command * commandObj, NodeId nodeId, GroupId groupId, EndpointId endpointId, + ClusterId clusterId) { ChipLogDetail(Zcl, "RX: BindCallback"); @@ -116,7 +118,8 @@ bool emberAfBindingClusterBindCallback(NodeId nodeId, GroupId groupId, EndpointI return true; } -bool emberAfBindingClusterUnbindCallback(NodeId nodeId, GroupId groupId, EndpointId endpointId, ClusterId clusterId) +bool emberAfBindingClusterUnbindCallback(chip::app::Command * commandObj, NodeId nodeId, GroupId groupId, EndpointId endpointId, + ClusterId clusterId) { ChipLogDetail(Zcl, "RX: UnbindCallback"); diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp index 8a305b1ada1a2c..4c682e6104887f 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -41,6 +41,7 @@ #include +#include #include #include #include @@ -350,8 +351,8 @@ static void writeColorTemperature(EndpointId endpoint, uint16_t colorTemperature * @param saturation Ver.: always * @param transitionTime Ver.: always */ -bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToHueAndSaturationCallback(chip::app::Command * commandObj, uint8_t hue, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); uint8_t currentHue = readHue(endpoint); @@ -422,7 +423,8 @@ bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8 return true; } -bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveHueCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, + uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -481,7 +483,8 @@ bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, u return true; } -bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveSaturationCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate, + uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -538,8 +541,8 @@ bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t return true; } -bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t hueMoveMode, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToHueCallback(chip::app::Command * commandObj, uint8_t hue, uint8_t hueMoveMode, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -631,8 +634,8 @@ bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t hueMoveMod return true; } -bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToSaturationCallback(chip::app::Command * commandObj, uint8_t saturation, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -684,8 +687,8 @@ bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint return true; } -bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStepHueCallback(chip::app::Command * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -746,8 +749,8 @@ bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSiz return true; } -bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterStepSaturationCallback(chip::app::Command * commandObj, uint8_t stepMode, uint8_t stepSize, + uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -878,8 +881,8 @@ static uint8_t readSaturation(EndpointId endpoint) #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY -bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToColorCallback(chip::app::Command * commandObj, uint16_t colorX, uint16_t colorY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -928,7 +931,8 @@ bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t col return true; } -bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveColorCallback(chip::app::Command * commandObj, int16_t rateX, int16_t rateY, uint8_t optionsMask, + uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -1008,8 +1012,8 @@ bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, u return true; } -bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStepColorCallback(chip::app::Command * commandObj, int16_t stepX, int16_t stepY, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -1156,8 +1160,8 @@ static void moveToColorTemp(EndpointId endpoint, uint16_t colorTemperature, uint emberEventControlSetDelayMS(&COLOR_TEMP_CONTROL, UPDATE_TIME_MS); } -bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToColorTemperatureCallback(chip::app::Command * commandObj, uint16_t colorTemperature, + uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -1173,9 +1177,9 @@ bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemp return true; } -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 * commandObj, uint8_t moveMode, uint16_t rate, + uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, + uint8_t optionsMask, uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -1257,9 +1261,10 @@ bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, ui return true; } -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 * commandObj, uint8_t stepMode, uint16_t stepSize, + uint16_t transitionTime, uint16_t colorTemperatureMinimum, + uint16_t colorTemperatureMaximum, uint8_t optionsMask, + uint8_t optionsOverride) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -1394,7 +1399,7 @@ void emberAfPluginLevelControlCoupledColorTempChangeCallback(EndpointId endpoint #endif //#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterStopMoveStepCallback(chip::app::Command * commandObj, uint8_t optionsMask, uint8_t optionsOverride) { // Received a stop command. This is all we need to do. EndpointId endpoint = emberAfCurrentEndpoint(); diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp index d2b67022e4b0c1..427b157340a2ca 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -38,16 +38,17 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfContentLaunchClusterLaunchContentCallback() +bool emberAfContentLaunchClusterLaunchContentCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfContentLaunchClusterLaunchURLCallback() +bool emberAfContentLaunchClusterLaunchURLCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/door-lock-client/door-lock-client.cpp b/src/app/clusters/door-lock-client/door-lock-client.cpp index 7892ef031f0b7e..90f6e52736d70b 100644 --- a/src/app/clusters/door-lock-client/door-lock-client.cpp +++ b/src/app/clusters/door-lock-client/door-lock-client.cpp @@ -22,18 +22,19 @@ ******************************************************************************* ******************************************************************************/ +#include #include using namespace chip; -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { emberAfDoorLockClusterPrintln("RX: LockDoorResponse 0x%x", status); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { emberAfDoorLockClusterPrintln("RX: UnlockDoorResponse 0x%x", status); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); diff --git a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp index 47449220da60b9..6d31a5cbb97f44 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp @@ -47,6 +47,7 @@ #include "gen/cluster-id.h" #include "gen/command-id.h" +#include #include using namespace chip; @@ -117,7 +118,7 @@ bool emberAfPluginDoorLockServerGetLogEntry(uint16_t * entryId, EmberAfPluginDoo return true; } -bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t entryId) +bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::Command * commandObj, uint16_t entryId) { EmberStatus status; EmberAfPluginDoorLockServerLogEntry entry; diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp index ce82441880f95f..99ae92dc2ccf49 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp @@ -44,6 +44,8 @@ #include "gen/cluster-id.h" #include "gen/command-id.h" +#include + static EmberAfPluginDoorLockServerWeekdayScheduleEntry weekdayScheduleTable[EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE]; static EmberAfPluginDoorLockServerYeardayScheduleEntry @@ -125,8 +127,9 @@ static void sendResponse(const char * responseName) } } -bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, - uint8_t startMinute, uint8_t stopHour, uint8_t stopMinute) +bool emberAfDoorLockClusterSetWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t stopHour, + uint8_t stopMinute) { uint8_t status = 0x00; uint8_t userPin = 0x00; @@ -169,7 +172,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16 return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId) +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId) { EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD @@ -191,7 +194,7 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16 return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId) +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId) { EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD @@ -210,8 +213,8 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint return true; } -bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, - uint32_t localEndTime) +bool emberAfDoorLockClusterSetYeardayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId, + uint32_t localStartTime, uint32_t localEndTime) { uint8_t status; if (scheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) @@ -234,7 +237,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16 return true; } -bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId) +bool emberAfDoorLockClusterGetYeardayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId) { EmberAfPluginDoorLockServerYeardayScheduleEntry * entry = &yeardayScheduleTable[0]; EmberAfStatus zclStatus; @@ -265,7 +268,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16 return true; } -bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId) +bool emberAfDoorLockClusterClearYeardayScheduleCallback(chip::app::Command * commandObj, uint8_t scheduleId, uint16_t userId) { uint8_t status; if (scheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) @@ -286,7 +289,8 @@ bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint return true; } -bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t holidayScheduleId, uint32_t localStartTime, uint32_t localEndTime, +bool emberAfDoorLockClusterSetHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t holidayScheduleId, + uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday) { uint8_t status; @@ -312,7 +316,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t holidayScheduleId, return true; } -bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t holidayScheduleId) +bool emberAfDoorLockClusterGetHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t holidayScheduleId) { EmberAfPluginDoorLockServerHolidayScheduleEntry * entry = &holidayScheduleTable[0]; EmberAfStatus zclStatus; @@ -342,7 +346,7 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t holidayScheduleId) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t holidayScheduleId) +bool emberAfDoorLockClusterClearHolidayScheduleCallback(chip::app::Command * commandObj, uint8_t holidayScheduleId) { uint8_t status; if (holidayScheduleId >= EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_YEARDAY_SCHEDULE_TABLE_SIZE) diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp index ed24501efb3264..fdd6e25cf0c40c 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp @@ -48,6 +48,7 @@ #include "gen/cluster-id.h" #include "gen/command-id.h" +#include #include using namespace chip; @@ -220,7 +221,7 @@ static uint8_t clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUs return (success ? 0x00 : 0x01); // See 7.3.2.17.8 and 7.3.2.17.25). } -bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId) +bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId) { if (emAfPluginDoorLockServerCheckForSufficientSpace(userId, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE)) { @@ -236,7 +237,7 @@ bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId) return true; } -bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType) { // TODO: Need to validate userType. https://github.com/project-chip/connectedhomeip/issues/3580 uint8_t status = (emAfPluginDoorLockServerSetPinUserType(userId, static_cast(userType)) @@ -269,7 +270,8 @@ bool emAfPluginDoorLockServerSetPinUserType(uint16_t userId, EmberAfDoorLockUser // ------------------------------------------------------------------------------ // PIN handling -bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin) +bool emberAfDoorLockClusterSetPinCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * pin) { // send response uint8_t status = setUser(userId, userStatus, userType, pin, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); @@ -308,7 +310,7 @@ static bool getSendPinOverTheAir(void) return sendPinOverTheAir; } -bool emberAfDoorLockClusterGetPinCallback(uint16_t userId) +bool emberAfDoorLockClusterGetPinCallback(chip::app::Command * commandObj, uint16_t userId) { EmberAfPluginDoorLockServerUser user; EmberStatus status; @@ -333,7 +335,7 @@ bool emberAfDoorLockClusterGetPinCallback(uint16_t userId) return true; } -bool emberAfDoorLockClusterClearPinCallback(uint16_t userId) +bool emberAfDoorLockClusterClearPinCallback(chip::app::Command * commandObj, uint16_t userId) { uint8_t status = clearUserPinOrRfid(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_DOOR_LOCK_CLUSTER_ID, @@ -368,7 +370,7 @@ bool emberAfDoorLockClusterClearPinCallback(uint16_t userId) return true; } -bool emberAfDoorLockClusterClearAllPinsCallback(void) +bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::Command * commandObj) { uint8_t i; for (i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE; i++) @@ -390,7 +392,8 @@ bool emberAfDoorLockClusterClearAllPinsCallback(void) // ------------------------------------------------------------------------------ // RFID handling -bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid) +bool emberAfDoorLockClusterSetRfidCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * rfid) { uint8_t status = setUser(userId, userStatus, userType, rfid, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); @@ -405,7 +408,7 @@ bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, return true; } -bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId) +bool emberAfDoorLockClusterGetRfidCallback(chip::app::Command * commandObj, uint16_t userId) { EmberAfPluginDoorLockServerUser user; EmberStatus status; @@ -428,7 +431,7 @@ bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId) return true; } -bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId) +bool emberAfDoorLockClusterClearRfidCallback(chip::app::Command * commandObj, uint16_t userId) { uint8_t status = clearUserPinOrRfid(userId, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_DOOR_LOCK_CLUSTER_ID, @@ -442,7 +445,7 @@ bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId) return true; } -bool emberAfDoorLockClusterClearAllRfidsCallback(void) +bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::Command * commandObj) { for (uint8_t i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE; i++) { @@ -515,7 +518,7 @@ static bool verifyPin(uint8_t * pin, uint8_t * userId) return false; } -bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN) +bool emberAfDoorLockClusterLockDoorCallback(chip::app::Command * commandObj, uint8_t * PIN) { uint8_t userId = 0; bool pinVerified = verifyPin(PIN, &userId); @@ -569,7 +572,7 @@ bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN) return true; } -bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * pin) +bool emberAfDoorLockClusterUnlockDoorCallback(chip::app::Command * commandObj, uint8_t * pin) { uint8_t userId = 0; bool pinVerified = verifyPin(pin, &userId); @@ -747,7 +750,7 @@ void emberAfDoorLockClusterServerAttributeChangedCallback(EndpointId endpoint, A } } -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutS, uint8_t * pin) +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(chip::app::Command * commandObj, uint16_t timeoutS, uint8_t * pin) { uint8_t userId; uint8_t status; diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp index 603364b36e50d2..b31583cdf95ccf 100644 --- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp +++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp @@ -21,27 +21,29 @@ ******************************************************************************* ******************************************************************************/ +#include #include #include using namespace chip; -bool emberAfGeneralCommissioningClusterArmFailSafeCallback(uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfGeneralCommissioningClusterArmFailSafeCallback(chip::app::Command * commandObj, uint16_t expiryLengthSeconds, + uint64_t breadcrumb, uint32_t timeoutMs) { EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback() +bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfGeneralCommissioningClusterSetFabricCallback(ByteSpan fabricId, ByteSpan fabricSecret, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::app::Command * commandObj, ByteSpan fabricId, ByteSpan fabricSecret, + uint64_t breadcrumb, uint32_t timeoutMs) { EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/groups-client/groups-client.cpp b/src/app/clusters/groups-client/groups-client.cpp index 879911d68382e2..0a4ed5588f7ab7 100644 --- a/src/app/clusters/groups-client/groups-client.cpp +++ b/src/app/clusters/groups-client/groups-client.cpp @@ -45,18 +45,20 @@ // * Copyright 2010 by Ember Corporation. All rights reserved. *80* // ******************************************************************* +#include #include using namespace chip; -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, GroupId groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId) { emberAfGroupsClusterPrintln("RX: AddGroupResponse 0x%x, 0x%2x", status, groupId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; } -bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, GroupId groupId, uint8_t * groupName) +bool emberAfGroupsClusterViewGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId, + uint8_t * groupName) { emberAfGroupsClusterPrint("RX: ViewGroupResponse 0x%x, 0x%2x, \"", status, groupId); emberAfGroupsClusterPrintString(groupName); @@ -65,7 +67,8 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, GroupId group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, uint8_t * groupList) +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, + uint8_t * groupList) { uint8_t i; emberAfGroupsClusterPrint("RX: GetGroupMembershipResponse 0x%x, 0x%x,", capacity, groupCount); @@ -78,7 +81,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, GroupId groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId) { emberAfGroupsClusterPrintln("RX: RemoveGroupResponse 0x%x, 0x%2x", status, groupId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index 1e1db3cb40730f..f1332808270d60 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -46,6 +46,7 @@ // ******************************************************************* #include "groups-server.h" +#include #include #include @@ -151,7 +152,7 @@ static EmberAfStatus removeEntryFromGroupTable(EndpointId endpoint, GroupId grou return EMBER_ZCL_STATUS_NOT_FOUND; } -bool emberAfGroupsClusterAddGroupCallback(GroupId groupId, uint8_t * groupName) +bool emberAfGroupsClusterAddGroupCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t * groupName) { EmberAfStatus status; @@ -173,7 +174,7 @@ bool emberAfGroupsClusterAddGroupCallback(GroupId groupId, uint8_t * groupName) return true; } -bool emberAfGroupsClusterViewGroupCallback(GroupId groupId) +bool emberAfGroupsClusterViewGroupCallback(chip::app::Command * commandObj, GroupId groupId) { EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND; EmberStatus sendStatus; @@ -206,7 +207,7 @@ bool emberAfGroupsClusterViewGroupCallback(GroupId groupId) return true; } -bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, uint8_t * groupList) +bool emberAfGroupsClusterGetGroupMembershipCallback(chip::app::Command * commandObj, uint8_t groupCount, uint8_t * groupList) { EmberStatus status; uint8_t i, j; @@ -288,7 +289,7 @@ bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, uint8_t return true; } -bool emberAfGroupsClusterRemoveGroupCallback(GroupId groupId) +bool emberAfGroupsClusterRemoveGroupCallback(chip::app::Command * commandObj, GroupId groupId) { EmberAfStatus status; EmberStatus sendStatus; @@ -319,7 +320,7 @@ bool emberAfGroupsClusterRemoveGroupCallback(GroupId groupId) return true; } -bool emberAfGroupsClusterRemoveAllGroupsCallback(void) +bool emberAfGroupsClusterRemoveAllGroupsCallback(chip::app::Command * commandObj) { EmberStatus sendStatus; uint8_t i; @@ -367,7 +368,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(void) return true; } -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(GroupId groupId, uint8_t * groupName) +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t * groupName) { EmberAfStatus status; EmberStatus sendStatus; diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.cpp b/src/app/clusters/ias-zone-client/ias-zone-client.cpp index bda02c2785c258..66e065044f3d5b 100644 --- a/src/app/clusters/ias-zone-client/ias-zone-client.cpp +++ b/src/app/clusters/ias-zone-client/ias-zone-client.cpp @@ -80,6 +80,7 @@ #include "ias-zone-client.h" #include "af.h" +#include //----------------------------------------------------------------------------- // Globals @@ -306,8 +307,8 @@ static uint8_t findIasZoneServerByNodeId(EmberNodeId nodeId) return i; } -bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(uint16_t zoneStatus, uint8_t extendedStatus, uint8_t zoneId, - uint16_t delay) +bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(chip::app::Command * commandObj, uint16_t zoneStatus, + uint8_t extendedStatus, uint8_t zoneId, uint16_t delay) { uint8_t serverIndex = findIasZoneServerByNodeId(emberAfCurrentCommand()->source); uint8_t status = EMBER_ZCL_STATUS_NOT_FOUND; @@ -327,7 +328,7 @@ bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(uint16_t zoneStat return true; } -bool emberAfIasZoneClusterZoneEnrollRequestCallback(uint16_t zoneType, uint16_t manufacturerCode) +bool emberAfIasZoneClusterZoneEnrollRequestCallback(chip::app::Command * commandObj, uint16_t zoneType, uint16_t manufacturerCode) { EmberAfIasEnrollResponseCode responseCode = EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT; uint8_t zoneId = UNKNOWN_ZONE_ID; diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp index b2f45f14a31a36..8cbf8d4b518743 100644 --- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp +++ b/src/app/clusters/ias-zone-server/ias-zone-server.cpp @@ -51,6 +51,7 @@ // ***************************************************************************** #include "ias-zone-server.h" +#include #include #include #include @@ -348,7 +349,7 @@ static void updateEnrollState(EndpointId endpoint, bool enrolled) emberAfIasZoneClusterPrintln("IAS Zone Server State: %pEnrolled", (enrolled ? "" : "NOT ")); } -bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId) +bool emberAfIasZoneClusterZoneEnrollResponseCallback(chip::app::Command * commandObj, uint8_t enrollResponseCode, uint8_t zoneId) { EndpointId endpoint; uint8_t epZoneId; diff --git a/src/app/clusters/identify-client/identify-client.cpp b/src/app/clusters/identify-client/identify-client.cpp index 3b29816de98602..f28b4f12b828c3 100644 --- a/src/app/clusters/identify-client/identify-client.cpp +++ b/src/app/clusters/identify-client/identify-client.cpp @@ -22,11 +22,12 @@ ******************************************************************************* ******************************************************************************/ +#include #include using namespace chip; -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * commandObj, uint16_t timeout) { emberAfIdentifyClusterPrintln("RX: IdentifyQueryResponse 0x%4x", timeout); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); diff --git a/src/app/clusters/identify/identify.cpp b/src/app/clusters/identify/identify.cpp index 58d1b1aac339b8..9d0d1d5a855383 100644 --- a/src/app/clusters/identify/identify.cpp +++ b/src/app/clusters/identify/identify.cpp @@ -47,6 +47,7 @@ #include "identify.h" // this file contains all the common includes for clusters in the util +#include #include #include @@ -102,7 +103,7 @@ void emberAfIdentifyClusterServerAttributeChangedCallback(EndpointId endpoint, A } } -bool emberAfIdentifyClusterIdentifyCallback(uint16_t time) +bool emberAfIdentifyClusterIdentifyCallback(chip::app::Command * commandObj, uint16_t time) { EmberStatus sendStatus; // This Identify callback writes the new attribute, which will trigger the @@ -119,7 +120,7 @@ bool emberAfIdentifyClusterIdentifyCallback(uint16_t time) return true; } -bool emberAfIdentifyClusterIdentifyQueryCallback(void) +bool emberAfIdentifyClusterIdentifyQueryCallback(chip::app::Command * commandObj) { EmberAfStatus status; EmberStatus sendStatus; diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp index c8f92a44ba58a7..628ae1028d487a 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -38,9 +38,10 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfKeypadInputClusterSendKeyCallback(unsigned char) +bool emberAfKeypadInputClusterSendKeyCallback(chip::app::Command * commandObj, unsigned char) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index df43112f1158bf..f640c278464497 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -42,6 +42,7 @@ #include "level-control.h" // this file contains all the common includes for clusters in the util +#include #include #include "gen/af-structs.h" @@ -406,8 +407,8 @@ static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t #endif } -bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride) +bool emberAfLevelControlClusterMoveToLevelCallback(chip::app::Command * commandObj, uint8_t level, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride) { emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL %x %2x %x %x", "RX level-control:", level, transitionTime, optionMask, optionOverride); @@ -416,7 +417,7 @@ bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t trans return true; } -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime) +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(chip::app::Command * commandObj, uint8_t level, uint16_t transitionTime) { emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL_WITH_ON_OFF %x %2x", "RX level-control:", level, transitionTime); moveToLevelHandler(ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, level, transitionTime, 0xFF, 0xFF, @@ -424,43 +425,45 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint1 return true; } -bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride) +bool emberAfLevelControlClusterMoveCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride) { emberAfLevelControlClusterPrintln("%pMOVE %x %x", "RX level-control:", moveMode, rate); moveHandler(ZCL_MOVE_COMMAND_ID, moveMode, rate, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate) +bool emberAfLevelControlClusterMoveWithOnOffCallback(chip::app::Command * commandObj, uint8_t moveMode, uint8_t rate) { emberAfLevelControlClusterPrintln("%pMOVE_WITH_ON_OFF %x %x", "RX level-control:", moveMode, rate); moveHandler(ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, moveMode, rate, 0xFF, 0xFF); return true; } -bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, - uint8_t optionOverride) +bool emberAfLevelControlClusterStepCallback(chip::app::Command * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride) { emberAfLevelControlClusterPrintln("%pSTEP %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); stepHandler(ZCL_STEP_COMMAND_ID, stepMode, stepSize, transitionTime, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime) +bool emberAfLevelControlClusterStepWithOnOffCallback(chip::app::Command * commandObj, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime) { emberAfLevelControlClusterPrintln("%pSTEP_WITH_ON_OFF %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); stepHandler(ZCL_STEP_WITH_ON_OFF_COMMAND_ID, stepMode, stepSize, transitionTime, 0xFF, 0xFF); return true; } -bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride) +bool emberAfLevelControlClusterStopCallback(chip::app::Command * commandObj, uint8_t optionMask, uint8_t optionOverride) { emberAfLevelControlClusterPrintln("%pSTOP", "RX level-control:"); stopHandler(ZCL_STOP_COMMAND_ID, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterStopWithOnOffCallback(void) +bool emberAfLevelControlClusterStopWithOnOffCallback(chip::app::Command * commandObj) { emberAfLevelControlClusterPrintln("%pSTOP_WITH_ON_OFF", "RX level-control:"); stopHandler(ZCL_STOP_WITH_ON_OFF_COMMAND_ID, 0xFF, 0xFF); diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp index c363d649db7287..71342477c76146 100644 --- a/src/app/clusters/low-power-server/low-power-server.cpp +++ b/src/app/clusters/low-power-server/low-power-server.cpp @@ -38,9 +38,10 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfLowPowerClusterSleepCallback() +bool emberAfLowPowerClusterSleepCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp index 65f33486d70347..eab681a12d3d2d 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -38,29 +38,30 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfMediaInputClusterSelectInputCallback(unsigned char) +bool emberAfMediaInputClusterSelectInputCallback(chip::app::Command * commandObj, unsigned char) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaInputClusterHideInputStatusCallback() +bool emberAfMediaInputClusterHideInputStatusCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaInputClusterRenameInputCallback(unsigned char, unsigned char *) +bool emberAfMediaInputClusterRenameInputCallback(chip::app::Command * commandObj, unsigned char, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaInputClusterShowInputStatusCallback() +bool emberAfMediaInputClusterShowInputStatusCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/media-playback-client/media-playback-client.cpp b/src/app/clusters/media-playback-client/media-playback-client.cpp index 9c9def00c2594c..7d151481fa0ee3 100644 --- a/src/app/clusters/media-playback-client/media-playback-client.cpp +++ b/src/app/clusters/media-playback-client/media-playback-client.cpp @@ -38,9 +38,10 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfMediaPlaybackClusterPlaybackCallback() +bool emberAfMediaPlaybackClusterPlaybackCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp index 4502fe4572e823..9119960f83d54a 100644 --- a/src/app/clusters/media-playback-server/media-playback-server.cpp +++ b/src/app/clusters/media-playback-server/media-playback-server.cpp @@ -38,72 +38,73 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfMediaPlaybackClusterFastForwardRequestCallback() +bool emberAfMediaPlaybackClusterFastForwardRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterNextRequestCallback() +bool emberAfMediaPlaybackClusterNextRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterPauseRequestCallback() +bool emberAfMediaPlaybackClusterPauseRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterPlayRequestCallback() +bool emberAfMediaPlaybackClusterPlayRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterPreviousRequestCallback() +bool emberAfMediaPlaybackClusterPreviousRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterRewindRequestCallback() +bool emberAfMediaPlaybackClusterRewindRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterStopRequestCallback() +bool emberAfMediaPlaybackClusterStopRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback() +bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterStartOverRequestCallback() +bool emberAfMediaPlaybackClusterStartOverRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfMediaPlaybackClusterSkipForwardRequestCallback() +bool emberAfMediaPlaybackClusterSkipForwardRequestCallback(chip::app::Command * commandObj) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/messaging-client/messaging-client.cpp b/src/app/clusters/messaging-client/messaging-client.cpp index bb1d7253784aef..504b1168b76580 100644 --- a/src/app/clusters/messaging-client/messaging-client.cpp +++ b/src/app/clusters/messaging-client/messaging-client.cpp @@ -45,6 +45,7 @@ #include "../../util/common.h" #include "app/framework/plugin/esi-management/esi-management.h" +#include static EmberAfPluginMessagingClientMessage messageTable[EMBER_AF_MESSAGING_CLUSTER_CLIENT_ENDPOINT_COUNT]; @@ -120,8 +121,8 @@ void emberAfMessagingClusterClientTickCallback(EndpointId endpoint) } } -bool emberAfMessagingClusterDisplayMessageCallback(uint32_t messageId, uint8_t messageControl, uint32_t startTime, - uint16_t durationInMinutes, uint8_t * msg, +bool emberAfMessagingClusterDisplayMessageCallback(chip::app::Command * commandObj, uint32_t messageId, uint8_t messageControl, + uint32_t startTime, uint16_t durationInMinutes, uint8_t * msg, uint8_t optionalExtendedMessageControl) { EndpointId endpoint = emberAfCurrentEndpoint(); @@ -241,7 +242,7 @@ bool emberAfMessagingClusterDisplayMessageCallback(uint32_t messageId, uint8_t m return true; } -bool emberAfMessagingClusterCancelMessageCallback(uint32_t messageId, uint8_t messageControl) +bool emberAfMessagingClusterCancelMessageCallback(chip::app::Command * commandObj, uint32_t messageId, uint8_t messageControl) { EndpointId endpoint = emberAfCurrentEndpoint(); uint8_t ep = emberAfFindClusterClientEndpointIndex(endpoint, ZCL_MESSAGING_CLUSTER_ID); diff --git a/src/app/clusters/messaging-server/messaging-server.cpp b/src/app/clusters/messaging-server/messaging-server.cpp index 5771a5299e3136..e5ad2086aa59b6 100644 --- a/src/app/clusters/messaging-server/messaging-server.cpp +++ b/src/app/clusters/messaging-server/messaging-server.cpp @@ -41,6 +41,7 @@ #include "messaging-server.h" #include "../../include/af.h" +#include using namespace chip; @@ -85,7 +86,7 @@ void emberAfMessagingClusterServerInitCallback(EndpointId endpoint) msgTable[ep].messageStatusControl &= ~VALID; } -bool emberAfMessagingClusterGetLastMessageCallback(void) +bool emberAfMessagingClusterGetLastMessageCallback(chip::app::Command * commandObj) { EndpointId endpoint = emberAfCurrentEndpoint(); EmberAfPluginMessagingServerMessage message; @@ -108,10 +109,12 @@ bool emberAfMessagingClusterGetLastMessageCallback(void) #if defined(EMBER_AF_HAS_SPEC_VERSIONS_SE_1_0) || defined(EMBER_AF_HAS_SPEC_VERSIONS_SE_1_1B) || \ defined(EMBER_AF_HAS_SPEC_VERSIONS_SE_1_0) || defined(EMBER_AF_HAS_SPEC_VERSIONS_SE_1_1) || \ defined(EMBER_AF_HAS_SPEC_VERSIONS_SE_1_1A) -bool emberAfMessagingClusterMessageConfirmationCallback(uint32_t messageId, uint32_t confirmationTime) +bool emberAfMessagingClusterMessageConfirmationCallback(chip::app::Command * commandObj, uint32_t messageId, + uint32_t confirmationTime) #else -bool emberAfMessagingClusterMessageConfirmationCallback(uint32_t messageId, uint32_t confirmationTime, - uint8_t messageConfirmationControl, uint8_t * messageResponse) +bool emberAfMessagingClusterMessageConfirmationCallback(chip::app::Command * commandObj, uint32_t messageId, + uint32_t confirmationTime, uint8_t messageConfirmationControl, + uint8_t * messageResponse) #endif { emberAfMessagingClusterPrintln("RX: MessageConfirmation 0x%4x, 0x%4x", messageId, confirmationTime); diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp index 9af51af37a1dab..ac03d8f3702059 100644 --- a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp @@ -20,6 +20,7 @@ #include +#include #include #include #include @@ -31,8 +32,8 @@ using namespace chip; -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::app::Command * commandObj, ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs) { EmberAfNetworkCommissioningError err = chip::app::clusters::NetworkCommissioning::OnAddThreadNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), operationalDataset, breadcrumb, timeoutMs); @@ -41,8 +42,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(ByteSpan operati return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::app::Command * commandObj, ByteSpan ssid, ByteSpan credentials, + uint64_t breadcrumb, uint32_t timeoutMs) { EmberAfNetworkCommissioningError err = chip::app::clusters::NetworkCommissioning::OnAddWiFiNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), ssid, credentials, breadcrumb, timeoutMs); @@ -51,7 +52,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ByteSpan ssid, Byt return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::app::Command * commandObj, ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs) { EmberAfNetworkCommissioningError err = chip::app::clusters::NetworkCommissioning::OnEnableNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), networkID, breadcrumb, timeoutMs); @@ -63,33 +65,37 @@ bool emberAfNetworkCommissioningClusterEnableNetworkCallback(ByteSpan networkID, // TODO: The following commands needed to be implemented. // These commands are not implemented thus not handled yet, return false so ember will return a error. -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::app::Command * commandObj, ByteSpan networkID, + uint64_t breadcrumb, uint32_t timeoutMs) { return false; } -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(chip::app::Command * commandObj, + uint32_t timeoutMs) { return false; } -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs) +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::app::Command * commandObj, ByteSpan NetworkID, + uint64_t Breadcrumb, uint32_t TimeoutMs) { return false; } -bool emberAfNetworkCommissioningClusterScanNetworksCallback(ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::app::Command * commandObj, ByteSpan ssid, uint64_t breadcrumb, + uint32_t timeoutMs) { return false; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::app::Command * commandObj, ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs) { return false; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::app::Command * commandObj, ByteSpan ssid, + ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs) { return false; } diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index 3ab529d73d85b5..dfc7ff8ba49b3b 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -48,6 +48,7 @@ #include "gen/cluster-id.h" #include "gen/command-id.h" +#include #include #ifdef EMBER_AF_PLUGIN_SCENES @@ -165,7 +166,7 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(EndpointId endpoint, uint8_t c return EMBER_ZCL_STATUS_SUCCESS; } -bool emberAfOnOffClusterOffCallback(void) +bool emberAfOnOffClusterOffCallback(chip::app::Command * commandObj) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_OFF_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER @@ -178,7 +179,7 @@ bool emberAfOnOffClusterOffCallback(void) return true; } -bool emberAfOnOffClusterOnCallback(void) +bool emberAfOnOffClusterOnCallback(chip::app::Command * commandObj) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_ON_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER @@ -191,7 +192,7 @@ bool emberAfOnOffClusterOnCallback(void) return true; } -bool emberAfOnOffClusterToggleCallback(void) +bool emberAfOnOffClusterToggleCallback(chip::app::Command * commandObj) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_TOGGLE_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER diff --git a/src/app/clusters/on-off-server/on-off.cpp b/src/app/clusters/on-off-server/on-off.cpp deleted file mode 100644 index ade2784ffeb703..00000000000000 --- a/src/app/clusters/on-off-server/on-off.cpp +++ /dev/null @@ -1,292 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * Copyright (c) 2020 Silicon Labs - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/***************************************************************************/ -/** - * @file - * @brief Routines for the On-Off plugin, which - *implements the On-Off server cluster. - ******************************************************************************* - ******************************************************************************/ -#include "on-off.h" - -#include "af.h" - -#include "gen/att-storage.h" -#include "gen/attribute-id.h" -#include "gen/attribute-type.h" -#include "gen/cluster-id.h" -#include "gen/command-id.h" - -#include - -#ifdef EMBER_AF_PLUGIN_SCENES -#include -#endif // EMBER_AF_PLUGIN_SCENES - -#ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER -#include "../zll-on-off-server/zll-on-off-server.h" -#endif - -#ifdef EMBER_AF_PLUGIN_ZLL_LEVEL_CONTROL_SERVER -#include "../zll-level-control-server/zll-level-control-server.h" -#endif - -using namespace chip; - -#ifdef ZCL_USING_ON_OFF_CLUSTER_START_UP_ON_OFF_ATTRIBUTE -static bool areStartUpOnOffServerAttributesTokenized(EndpointId endpoint); -#endif - -EmberAfStatus emberAfOnOffClusterSetValueCallback(EndpointId endpoint, uint8_t command, bool initiatedByLevelChange) -{ - EmberAfStatus status; - bool currentValue, newValue; - - emberAfOnOffClusterPrintln("On/Off set value: %x %x", endpoint, command); - - // read current on/off value - status = emberAfReadAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) ¤tValue, sizeof(currentValue), - NULL); // data type - if (status != EMBER_ZCL_STATUS_SUCCESS) - { - emberAfOnOffClusterPrintln("ERR: reading on/off %x", status); - return status; - } - - // if the value is already what we want to set it to then do nothing - if ((!currentValue && command == ZCL_OFF_COMMAND_ID) || (currentValue && command == ZCL_ON_COMMAND_ID)) - { - emberAfOnOffClusterPrintln("On/off already set to new value"); - return EMBER_ZCL_STATUS_SUCCESS; - } - - // we either got a toggle, or an on when off, or an off when on, - // so we need to swap the value - newValue = !currentValue; - emberAfOnOffClusterPrintln("Toggle on/off from %x to %x", currentValue, newValue); - - // the sequence of updating on/off attribute and kick off level change effect should - // be depend on whether we are turning on or off. If we are turning on the light, we - // should update the on/off attribute before kicking off level change, if we are - // turning off the light, we should do the opposite, that is kick off level change - // before updating the on/off attribute. - if (newValue) - { - // write the new on/off value - status = emberAfWriteAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); - if (status != EMBER_ZCL_STATUS_SUCCESS) - { - emberAfOnOffClusterPrintln("ERR: writing on/off %x", status); - return status; - } - -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL - // If initiatedByLevelChange is false, then we assume that the level change - // ZCL stuff has not happened and we do it here - if (!initiatedByLevelChange && emberAfContainsServer(endpoint, ZCL_LEVEL_CONTROL_CLUSTER_ID)) - { - emberAfOnOffClusterLevelControlEffectCallback(endpoint, newValue); - } -#endif // EMBER_AF_PLUGIN_LEVEL_CONTROL - } - else - { -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL - // If initiatedByLevelChange is false, then we assume that the level change - // ZCL stuff has not happened and we do it here - if (!initiatedByLevelChange && emberAfContainsServer(endpoint, ZCL_LEVEL_CONTROL_CLUSTER_ID)) - { - emberAfOnOffClusterLevelControlEffectCallback(endpoint, newValue); - } -#endif // EMBER_AF_PLUGIN_LEVEL_CONTROL - - // write the new on/off value - status = emberAfWriteAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); - if (status != EMBER_ZCL_STATUS_SUCCESS) - { - emberAfOnOffClusterPrintln("ERR: writing on/off %x", status); - return status; - } - } - -#ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER - if (initiatedByLevelChange) - { - emberAfPluginZllOnOffServerLevelControlZllExtensions(endpoint); - } -#endif - -#ifdef EMBER_AF_PLUGIN_SCENES - // the scene has been changed (the value of on/off has changed) so - // the current scene as descibed in the attribute table is invalid, - // so mark it as invalid (just writes the valid/invalid attribute) - if (emberAfContainsServer(endpoint, ZCL_SCENES_CLUSTER_ID)) - { - emberAfScenesClusterMakeInvalidCallback(endpoint); - } -#endif // EMBER_AF_PLUGIN_SCENES - - // The returned status is based solely on the On/Off cluster. Errors in the - // Level Control and/or Scenes cluster are ignored. - return EMBER_ZCL_STATUS_SUCCESS; -} - -bool emberAfOnOffClusterOffCallback(void) -{ - EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_OFF_COMMAND_ID, false); -#ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - emberAfPluginZllOnOffServerOffZllExtensions(emberAfCurrentCommand()); - } -#endif - emberAfSendImmediateDefaultResponse(status); - return true; -} - -bool emberAfOnOffClusterOnCallback(void) -{ - EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_ON_COMMAND_ID, false); -#ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - emberAfPluginZllOnOffServerOnZllExtensions(emberAfCurrentCommand()); - } -#endif - emberAfSendImmediateDefaultResponse(status); - return true; -} - -bool emberAfOnOffClusterToggleCallback(void) -{ - EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_TOGGLE_COMMAND_ID, false); -#ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - emberAfPluginZllOnOffServerToggleZllExtensions(emberAfCurrentCommand()); - } -#endif - emberAfSendImmediateDefaultResponse(status); - return true; -} - -void emberAfOnOffClusterServerInitCallback(EndpointId endpoint) -{ -#ifdef ZCL_USING_ON_OFF_CLUSTER_START_UP_ON_OFF_ATTRIBUTE - // StartUp behavior relies on OnOff and StartUpOnOff attributes being tokenized. - if (areStartUpOnOffServerAttributesTokenized(endpoint)) - { - // Read the StartUpOnOff attribute and set the OnOff attribute as per - // following from zcl 7 14-0127-20i-zcl-ch-3-general.doc. - // 3.8.2.2.5 StartUpOnOff Attribute - // The StartUpOnOff attribute SHALL define the desired startup behavior of a - // lamp device when it is supplied with power and this state SHALL be - // reflected in the OnOff attribute. The values of the StartUpOnOff - // attribute are listed below. - // Table 3 46. Values of the StartUpOnOff Attribute - // Value Action on power up - // 0x00 Set the OnOff attribute to 0 (off). - // 0x01 Set the OnOff attribute to 1 (on). - // 0x02 If the previous value of the OnOff attribute is equal to 0, - // set the OnOff attribute to 1.If the previous value of the OnOff - // attribute is equal to 1, set the OnOff attribute to 0 (toggle). - // 0x03-0xfe These values are reserved. No action. - // 0xff Set the OnOff attribute to its previous value. - - // Initialize startUpOnOff to No action value 0xFE - uint8_t startUpOnOff = 0xFE; - EmberAfStatus status = emberAfReadAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_START_UP_ON_OFF_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, (uint8_t *) &startUpOnOff, sizeof(startUpOnOff), NULL); - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - // Initialise updated value to 0 - bool updatedOnOff = 0; - status = emberAfReadAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &updatedOnOff, sizeof(updatedOnOff), NULL); - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - switch (startUpOnOff) - { - case EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF: - updatedOnOff = 0; // Off - break; - case EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON: - updatedOnOff = 1; // On - break; - case EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE: - updatedOnOff = !updatedOnOff; - break; - case EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS: - default: - // All other values 0x03- 0xFE are reserved - no action. - // When value is 0xFF - update with last value - that is as good as - // no action. - break; - } - status = emberAfWriteAttribute(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &updatedOnOff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); - } - } - } -#endif - emberAfPluginOnOffClusterServerPostInitCallback(endpoint); -} - -#ifdef ZCL_USING_ON_OFF_CLUSTER_START_UP_ON_OFF_ATTRIBUTE -static bool areStartUpOnOffServerAttributesTokenized(EndpointId endpoint) -{ - EmberAfAttributeMetadata * metadata; - - metadata = emberAfLocateAttributeMetadata(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - EMBER_AF_NULL_MANUFACTURER_CODE); - if (!emberAfAttributeIsTokenized(metadata)) - { - return false; - } - - metadata = emberAfLocateAttributeMetadata(endpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_START_UP_ON_OFF_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, EMBER_AF_NULL_MANUFACTURER_CODE); - if (!emberAfAttributeIsTokenized(metadata)) - { - return false; - } - - return true; -} -#endif - -void emberAfPluginOnOffClusterServerPostInitCallback(EndpointId endpoint) {} diff --git a/src/app/clusters/on-off-server/on-off.h b/src/app/clusters/on-off-server/on-off.h deleted file mode 100644 index b9eab9eaf4c89b..00000000000000 --- a/src/app/clusters/on-off-server/on-off.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include - -/** @brief On/off Cluster Set Value - * - * This function is called when the on/off value needs to be set, either through - * normal channels or as a result of a level change. - * - * @param endpoint Ver.: always - * @param command Ver.: always - * @param initiatedByLevelChange Ver.: always - */ -EmberAfStatus emberAfOnOffClusterSetValueCallback(chip::EndpointId endpoint, uint8_t command, bool initiatedByLevelChange); - -/** @brief On/off Cluster Level Control Effect - * - * This is called by the framework when the on/off cluster initiates a command - * that must effect a level control change. The implementation assumes that the - * client will handle any effect on the On/Off Cluster. - * - * @param endpoint Ver.: always - * @param newValue Ver.: always - */ -void emberAfOnOffClusterLevelControlEffectCallback(chip::EndpointId endpoint, bool newValue); - -/** @brief On/off Cluster Server Post Init - * - * Following resolution of the On/Off state at startup for this endpoint, - * perform any additional initialization needed; e.g., synchronize hardware - * state. - * - * @param endpoint Endpoint that is being initialized Ver.: always - */ -void emberAfPluginOnOffClusterServerPostInitCallback(chip::EndpointId endpoint); diff --git a/src/app/clusters/operational-credentials/operational-credentials.cpp b/src/app/clusters/operational-credentials/operational-credentials.cpp index 515b63c4957665..afe49140be6804 100644 --- a/src/app/clusters/operational-credentials/operational-credentials.cpp +++ b/src/app/clusters/operational-credentials/operational-credentials.cpp @@ -21,6 +21,7 @@ ***************************************************************************/ #include "af.h" +#include #include #include #include @@ -33,7 +34,8 @@ using namespace chip; -bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::FabricId fabricId, chip::NodeId nodeId, uint16_t vendorId) +bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::app::Command * commandObj, chip::FabricId fabricId, + chip::NodeId nodeId, uint16_t vendorId) { // Go through admin pairing table and remove the element // Then fetch the attribute list and find the right element (or maybe just use the admin pairing table index) @@ -44,7 +46,7 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::FabricId fab return true; } -bool emberAfOperationalCredentialsClusterGetFabricIdCallback() +bool emberAfOperationalCredentialsClusterGetFabricIdCallback(chip::app::Command * commandObj) { emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: GetFabricId"); EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; @@ -52,7 +54,7 @@ bool emberAfOperationalCredentialsClusterGetFabricIdCallback() return true; } -bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(uint8_t * Label) +bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(chip::app::Command * commandObj, uint8_t * Label) { emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: UpdateFabricLabel"); // Go look at admin table using fabricId + update the label diff --git a/src/app/clusters/ota-server/ota-server.cpp b/src/app/clusters/ota-server/ota-server.cpp index 38c9d43fa8c8ce..c3d39a22569a00 100644 --- a/src/app/clusters/ota-server/ota-server.cpp +++ b/src/app/clusters/ota-server/ota-server.cpp @@ -16,6 +16,7 @@ * limitations under the License. */ +#include #include #include #include @@ -38,7 +39,8 @@ using namespace chip; * @param newVersion The SoftwareVersion value of the new Software Image that the client is ready to apply. */ -bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(chip::ByteSpan updateToken, uint32_t newVersion) +bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(app::Command * commandObj, chip::ByteSpan updateToken, + uint32_t newVersion) { return false; } @@ -51,7 +53,8 @@ bool emberAfOtaSoftwareUpdateServerClusterApplyUpdateRequestCallback(chip::ByteS * OTA Client's Basic Information Cluster. */ -bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(chip::ByteSpan updateToken, uint32_t currentVersion) +bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(app::Command * commandObj, chip::ByteSpan updateToken, + uint32_t currentVersion) { return false; } @@ -74,7 +77,8 @@ bool emberAfOtaSoftwareUpdateServerClusterNotifyUpdateAppliedCallback(chip::Byte */ bool emberAfOtaSoftwareUpdateServerClusterQueryImageCallback( - uint16_t vendorId, uint16_t productId, uint16_t imageType, uint16_t hardwareVersion, uint32_t currentVersion, + app::Command * commandObj, uint16_t vendorId, uint16_t productId, uint16_t imageType, uint16_t hardwareVersion, + uint32_t currentVersion, /* TYPE WARNING: array array defaults to */ uint8_t * protocolsSupported, uint8_t * location, uint8_t clientCanConsent, chip::ByteSpan metadataForServer) { diff --git a/src/app/clusters/scenes-client/scenes-client.cpp b/src/app/clusters/scenes-client/scenes-client.cpp index 8775b596d94ffb..697150a27c8b99 100644 --- a/src/app/clusters/scenes-client/scenes-client.cpp +++ b/src/app/clusters/scenes-client/scenes-client.cpp @@ -39,47 +39,51 @@ ******************************************************************************/ #include "scenes-client.h" +#include #include #include "gen/command-id.h" using namespace chip; -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId, uint8_t sceneId) { return emberAfPluginScenesClientParseAddSceneResponse(emberAfCurrentCommand(), status, groupId, sceneId); } -bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, GroupId groupId, uint8_t sceneId, uint16_t transitionTime, - uint8_t * sceneName, uint8_t * extensionFieldSets) +bool emberAfScenesClusterViewSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, + uint8_t * extensionFieldSets) { return emberAfPluginScenesClientParseViewSceneResponse(emberAfCurrentCommand(), status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); } -bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId, + uint8_t sceneId) { emberAfScenesClusterPrintln("RX: RemoveSceneResponse 0x%x, 0x%2x, 0x%x", status, groupId, sceneId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, GroupId groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId) { emberAfScenesClusterPrintln("RX: RemoveAllScenesResponse 0x%x, 0x%2x", status, groupId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; } -bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, GroupId groupId, + uint8_t sceneId) { emberAfScenesClusterPrintln("RX: StoreSceneResponse 0x%x, 0x%2x, 0x%x", status, groupId, sceneId); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; } -bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, GroupId groupId, uint8_t sceneCount, - uint8_t * sceneList) +bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::app::Command * commandObj, uint8_t status, uint8_t capacity, + GroupId groupId, uint8_t sceneCount, uint8_t * sceneList) { emberAfScenesClusterPrint("RX: GetSceneMembershipResponse 0x%x, 0x%x, 0x%2x", status, capacity, groupId); diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp index aab77dcfb6505a..fc8e881dc8b8c5 100644 --- a/src/app/clusters/scenes/scenes.cpp +++ b/src/app/clusters/scenes/scenes.cpp @@ -40,6 +40,7 @@ #include "scenes.h" #include "app/util/common.h" +#include #include #include "gen/attribute-id.h" @@ -213,19 +214,19 @@ void emAfPluginScenesServerPrintInfo(void) } } -bool emberAfScenesClusterAddSceneCallback(GroupId groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, - uint8_t * extensionFieldSets) +bool emberAfScenesClusterAddSceneCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, uint8_t * extensionFieldSets) { return emberAfPluginScenesServerParseAddScene(emberAfCurrentCommand(), groupId, sceneId, transitionTime, sceneName, extensionFieldSets); } -bool emberAfScenesClusterViewSceneCallback(GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterViewSceneCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t sceneId) { return emberAfPluginScenesServerParseViewScene(emberAfCurrentCommand(), groupId, sceneId); } -bool emberAfScenesClusterRemoveSceneCallback(GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t sceneId) { EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND; EmberStatus sendStatus; @@ -270,7 +271,7 @@ bool emberAfScenesClusterRemoveSceneCallback(GroupId groupId, uint8_t sceneId) return true; } -bool emberAfScenesClusterRemoveAllScenesCallback(GroupId groupId) +bool emberAfScenesClusterRemoveAllScenesCallback(chip::app::Command * commandObj, GroupId groupId) { EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_FIELD; EmberStatus sendStatus; @@ -311,7 +312,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(GroupId groupId) return true; } -bool emberAfScenesClusterStoreSceneCallback(GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t sceneId) { EmberAfStatus status; EmberStatus sendStatus; @@ -333,7 +334,8 @@ bool emberAfScenesClusterStoreSceneCallback(GroupId groupId, uint8_t sceneId) return true; } -bool emberAfScenesClusterRecallSceneCallback(GroupId groupId, uint8_t sceneId, uint16_t transitionTime) +bool emberAfScenesClusterRecallSceneCallback(chip::app::Command * commandObj, GroupId groupId, uint8_t sceneId, + uint16_t transitionTime) { // NOTE: TransitionTime field in the RecallScene command is currently // ignored. Per Zigbee Alliance ZCL 7 (07-5123-07): @@ -366,7 +368,7 @@ bool emberAfScenesClusterRecallSceneCallback(GroupId groupId, uint8_t sceneId, u return true; } -bool emberAfScenesClusterGetSceneMembershipCallback(GroupId groupId) +bool emberAfScenesClusterGetSceneMembershipCallback(chip::app::Command * commandObj, GroupId groupId) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; EmberStatus sendStatus; diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index 5d99271b5102fb..dbc5f23b2ab8df 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -38,9 +38,10 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfTargetNavigatorClusterNavigateTargetCallback(unsigned char, unsigned char *) +bool emberAfTargetNavigatorClusterNavigateTargetCallback(chip::app::Command * commandObj, unsigned char, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/thermostat-client/thermostat-client.cpp b/src/app/clusters/thermostat-client/thermostat-client.cpp index 95d553f2d2afd2..7b7351d9cae478 100644 --- a/src/app/clusters/thermostat-client/thermostat-client.cpp +++ b/src/app/clusters/thermostat-client/thermostat-client.cpp @@ -17,6 +17,7 @@ #include +#include #include #include @@ -30,13 +31,14 @@ void emberAfThermostatClusterClientInitCallback(void) { // TODO } -bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(uint8_t, uint8_t, uint8_t, uint8_t *) +bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(app::Command * commandObj, uint8_t, uint8_t, uint8_t, uint8_t *) { // TODO return false; } -bool emberAfThermostatClusterRelayStatusLogCallback(uint16_t, uint16_t, int16_t, uint8_t, int16_t, uint16_t) +bool emberAfThermostatClusterRelayStatusLogCallback(app::Command * commandObj, uint16_t, uint16_t, int16_t, uint8_t, int16_t, + uint16_t) { // TODO return false; diff --git a/src/app/clusters/tv-channel-server/tv-channel-server.cpp b/src/app/clusters/tv-channel-server/tv-channel-server.cpp index 52805ecfe3c3ad..664d5ad275c6e2 100644 --- a/src/app/clusters/tv-channel-server/tv-channel-server.cpp +++ b/src/app/clusters/tv-channel-server/tv-channel-server.cpp @@ -38,22 +38,23 @@ ******************************************************************************* ******************************************************************************/ +#include #include -bool emberAfTvChannelClusterChangeChannelCallback(unsigned char *) +bool emberAfTvChannelClusterChangeChannelCallback(chip::app::Command * commandObj, unsigned char *) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfTvChannelClusterChangeChannelByNumberCallback(unsigned short, unsigned short) +bool emberAfTvChannelClusterChangeChannelByNumberCallback(chip::app::Command * commandObj, unsigned short, unsigned short) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); return true; } -bool emberAfTvChannelClusterSkipChannelCallback(unsigned short) +bool emberAfTvChannelClusterSkipChannelCallback(chip::app::Command * commandObj, unsigned short) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/zll-identify-server/zll-identify-server.c b/src/app/clusters/zll-identify-server/zll-identify-server.c index e76abf6ea8c1ff..87d723148182b9 100644 --- a/src/app/clusters/zll-identify-server/zll-identify-server.c +++ b/src/app/clusters/zll-identify-server/zll-identify-server.c @@ -56,6 +56,7 @@ // this file contains all the common includes for clusters in the util #include "app/framework/include/af.h" #include "app/framework/util/common.h" +#include #ifndef EZSP_HOST #include "hal/hal.h" @@ -148,7 +149,7 @@ void emberAfPluginZllIdentifyServerTriggerEffectEndpointEventHandler(uint8_t end } } -bool emberAfIdentifyClusterTriggerEffectCallback(uint8_t effectId, uint8_t effectVariant) +bool emberAfIdentifyClusterTriggerEffectCallback(chip::app::Command * commandObj, uint8_t effectId, uint8_t effectVariant) { uint8_t endpoint = emberAfCurrentEndpoint(); EmAfZllIdentifyState * state = getZllIdentifyState(endpoint); diff --git a/src/app/clusters/zll-on-off-server/zll-on-off-server.c b/src/app/clusters/zll-on-off-server/zll-on-off-server.c index 92c34fa3ab768a..a13d4a6bd76481 100644 --- a/src/app/clusters/zll-on-off-server/zll-on-off-server.c +++ b/src/app/clusters/zll-on-off-server/zll-on-off-server.c @@ -54,6 +54,7 @@ #include "zll-on-off-server.h" #include "../../include/af.h" +#include #define ZLL_ON_OFF_CLUSTER_ON_OFF_CONTROL_ACCEPT_ONLY_WHEN_ON_MASK EMBER_BIT(0) @@ -166,7 +167,7 @@ void emberAfOnOffClusterServerTickCallback(uint8_t endpoint) emberAfScheduleServerTick(endpoint, ZCL_ON_OFF_CLUSTER_ID, MILLISECOND_TICKS_PER_SECOND / 10); } -bool emberAfOnOffClusterOffWithEffectCallback(uint8_t effectId, uint8_t effectVariant) +bool emberAfOnOffClusterOffWithEffectCallback(chip::app::Command * commandObj, uint8_t effectId, uint8_t effectVariant) { EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_VALUE; bool globalSceneControl; @@ -227,7 +228,7 @@ bool emberAfOnOffClusterOffWithEffectCallback(uint8_t effectId, uint8_t effectVa return true; } -bool emberAfOnOffClusterOnWithRecallGlobalSceneCallback(void) +bool emberAfOnOffClusterOnWithRecallGlobalSceneCallback(chip::app::Command * commandObj) { EmberAfStatus status; bool globalSceneControl; @@ -278,7 +279,8 @@ bool emberAfOnOffClusterOnWithRecallGlobalSceneCallback(void) return true; } -bool emberAfOnOffClusterOnWithTimedOffCallback(uint8_t onOffControl, uint16_t onTime, uint16_t offWaitTime) +bool emberAfOnOffClusterOnWithTimedOffCallback(chip::app::Command * commandObj, uint8_t onOffControl, uint16_t onTime, + uint16_t offWaitTime) { EmberAfStatus status; uint16_t onTimeAttribute, offWaitTimeAttribute; diff --git a/src/app/clusters/zll-scenes-client/zll-scenes-client.c b/src/app/clusters/zll-scenes-client/zll-scenes-client.c index f521a41544e687..06d56c68747423 100644 --- a/src/app/clusters/zll-scenes-client/zll-scenes-client.c +++ b/src/app/clusters/zll-scenes-client/zll-scenes-client.c @@ -54,21 +54,24 @@ #include "../../include/af.h" #include "../scenes-client/scenes-client.h" +#include -bool emberAfScenesClusterEnhancedAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterEnhancedAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { return emberAfPluginScenesClientParseAddSceneResponse(emberAfCurrentCommand(), status, groupId, sceneId); } -bool emberAfScenesClusterEnhancedViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, - uint16_t transitionTime, uint8_t * sceneName, +bool emberAfScenesClusterEnhancedViewSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, uint8_t * extensionFieldSets) { return emberAfPluginScenesClientParseViewSceneResponse(emberAfCurrentCommand(), status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets); } -bool emberAfScenesClusterCopySceneResponseCallback(uint8_t status, uint16_t groupIdFrom, uint8_t sceneIdFrom) +bool emberAfScenesClusterCopySceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupIdFrom, + uint8_t sceneIdFrom) { emberAfScenesClusterPrintln("RX: CopySceneResponse 0x%x, 0x%2x, 0x%x", status, groupIdFrom, sceneIdFrom); emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); diff --git a/src/app/clusters/zll-scenes-server/zll-scenes-server.c b/src/app/clusters/zll-scenes-server/zll-scenes-server.c index 235fe054a616fe..a1fd935f2f2293 100644 --- a/src/app/clusters/zll-scenes-server/zll-scenes-server.c +++ b/src/app/clusters/zll-scenes-server/zll-scenes-server.c @@ -54,23 +54,24 @@ #include "../../include/af.h" #include "../scenes/scenes.h" +#include #define ZCL_SCENES_CLUSTER_MODE_COPY_ALL_SCENES_MASK EMBER_BIT(0) -bool emberAfScenesClusterEnhancedAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, - uint8_t * extensionFieldSets) +bool emberAfScenesClusterEnhancedAddSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId, + uint16_t transitionTime, uint8_t * sceneName, uint8_t * extensionFieldSets) { return emberAfPluginScenesServerParseAddScene(emberAfCurrentCommand(), groupId, sceneId, transitionTime, sceneName, extensionFieldSets); } -bool emberAfScenesClusterEnhancedViewSceneCallback(uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterEnhancedViewSceneCallback(chip::app::Command * commandObj, uint16_t groupId, uint8_t sceneId) { return emberAfPluginScenesServerParseViewScene(emberAfCurrentCommand(), groupId, sceneId); } -bool emberAfScenesClusterCopySceneCallback(uint8_t mode, uint16_t groupIdFrom, uint8_t sceneIdFrom, uint16_t groupIdTo, - uint8_t sceneIdTo) +bool emberAfScenesClusterCopySceneCallback(chip::app::Command * commandObj, uint8_t mode, uint16_t groupIdFrom, uint8_t sceneIdFrom, + uint16_t groupIdTo, uint8_t sceneIdTo) { EmberStatus sendStatus; EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_FIELD; diff --git a/src/app/zap-templates/partials/command_handler_cluster_commands.zapt b/src/app/zap-templates/partials/command_handler_cluster_commands.zapt index af50b648f8d561..b2d11d4736dcb3 100644 --- a/src/app/zap-templates/partials/command_handler_cluster_commands.zapt +++ b/src/app/zap-templates/partials/command_handler_cluster_commands.zapt @@ -50,4 +50,4 @@ else {{/zcl_command_arguments}} {{/if}} -wasHandled = emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback({{#zcl_command_arguments}}{{asSymbol label}}{{#unless (isLastElement index count)}}, {{/unless}}{{/zcl_command_arguments}}); +wasHandled = emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback(nullptr{{#zcl_command_arguments}}, {{asSymbol label}}{{/zcl_command_arguments}}); diff --git a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt index a306216ad35d61..8ffd099caeeba1 100644 --- a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt +++ b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt @@ -79,7 +79,7 @@ if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && {{zcl_comman { {{/if}} // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks. -emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback({{#zcl_command_arguments}}{{#if (isCharString type)}}const_cast({{asSymbol label}}){{else}}{{asSymbol label}}{{/if}}{{#unless (isLastElement index count)}}, {{/unless}}{{/zcl_command_arguments}}); +emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback(apCommandObj{{#zcl_command_arguments}}, {{#if (isCharString type)}}const_cast({{asSymbol label}}){{else}}{{asSymbol label}}{{/if}}{{/zcl_command_arguments}}); {{#if (zcl_command_arguments_count this.id)}} } else diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt index e213b1bb31320f..614b3288175e69 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt @@ -4,6 +4,7 @@ #include "gen/CHIPClientCallbacks.h" #include "gen/enums.h" +#include #include #include #include @@ -721,7 +722,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 {{#if (isStrEqual clusterName parent.name)}} {{#if (isCommandAvailable parent.side incoming outgoing commandSource name)}} {{#if (isStrEndsWith name "Response")}} -bool emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback({{#zcl_command_arguments}}{{asUnderlyingZclType type}} {{asSymbol label}}{{#unless (isLastElement index count)}}, {{/unless}}{{/zcl_command_arguments}}) +bool emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback(chip::app::Command * commandObj{{#zcl_command_arguments}}, {{asUnderlyingZclType type}} {{asSymbol label}}{{/zcl_command_arguments}}) { ChipLogProgress(Zcl, "{{asCamelCased name false}}:"); {{#zcl_command_arguments}} diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt index bf354bc1e5bb35..4b19c8afc82156 100644 --- a/src/app/zap-templates/templates/app/callback.zapt +++ b/src/app/zap-templates/templates/app/callback.zapt @@ -7,6 +7,7 @@ #include "af-types.h" #include "basic-types.h" +#include #include /** @brief Cluster Init @@ -119,7 +120,7 @@ void emberAf{{asCamelCased name false}}Cluster{{asCamelCased side false}}TickCal {{/if}} */ -bool emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback({{#zcl_command_arguments}}{{#if (isOctetString type)}}chip::ByteSpan{{else}}{{asUnderlyingZclType type}}{{/if}} {{asSymbol label}}{{#unless (isLastElement index count)}}, {{/unless}}{{/zcl_command_arguments}}); +bool emberAf{{asCamelCased parent.name false}}Cluster{{asCamelCased name false}}Callback(chip::app::Command * commandObj{{#zcl_command_arguments}}, {{#if (isOctetString type)}}chip::ByteSpan{{else}}{{asUnderlyingZclType type}}{{/if}} {{asSymbol label}}{{/zcl_command_arguments}}); {{/if}} {{/if}} diff --git a/src/controller/python/gen/CHIPClientCallbacks.cpp b/src/controller/python/gen/CHIPClientCallbacks.cpp index 12c515b06b6c79..c59917c8afde46 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 @@ -717,7 +718,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -738,7 +739,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -759,7 +760,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -780,7 +781,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -801,7 +802,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -822,7 +823,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -843,7 +844,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -864,8 +865,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 * commandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -890,8 +892,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 * commandObj, 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); @@ -910,7 +913,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -926,7 +930,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -942,7 +947,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -956,9 +961,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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -986,8 +991,8 @@ 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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint32_t localStartTime, uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1012,7 +1017,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1033,7 +1038,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1054,7 +1059,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1075,7 +1080,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1096,7 +1101,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1117,7 +1122,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1138,7 +1143,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1159,7 +1164,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1180,7 +1185,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1201,7 +1206,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1215,7 +1221,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1229,7 +1236,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1243,7 +1251,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1265,7 +1273,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1281,7 +1289,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1303,7 +1311,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1326,7 +1335,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * commandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1339,7 +1348,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1362,7 +1372,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1388,7 +1399,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1410,7 +1421,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1433,7 +1445,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1456,8 +1469,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 * commandObj, 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 8715b564b1031f..40329d2784b0c7 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..7b9b9d0dc3249a 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 * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, 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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1263,71 +1268,71 @@ 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 * commandObj, 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 * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1335,7 +1340,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1343,7 +1349,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1351,7 +1358,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1359,7 +1367,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1368,7 +1376,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1377,7 +1385,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1386,14 +1394,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 * commandObj, 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 * commandObj, uint16_t timeout); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1402,7 +1411,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1413,7 +1423,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1422,7 +1433,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1431,7 +1442,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1440,7 +1452,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1452,8 +1465,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 * commandObj, 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 434c58a00e416c..d3267af3ca5848 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 @@ -868,7 +869,7 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16 return true; } -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllPinsResponse:"); LogStatus(status); @@ -889,7 +890,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearAllRfidsResponse:"); LogStatus(status); @@ -910,7 +911,7 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:"); LogStatus(status); @@ -931,7 +932,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearPinResponse:"); LogStatus(status); @@ -952,7 +953,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearRfidResponse:"); LogStatus(status); @@ -973,7 +974,7 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:"); LogStatus(status); @@ -994,7 +995,7 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:"); LogStatus(status); @@ -1015,8 +1016,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 * commandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday) { ChipLogProgress(Zcl, "GetHolidayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1041,8 +1043,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 * commandObj, 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); @@ -1061,7 +1064,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin) { ChipLogProgress(Zcl, "GetPinResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1077,7 +1081,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid) { ChipLogProgress(Zcl, "GetRfidResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1093,7 +1098,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user return true; } -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType) +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType) { ChipLogProgress(Zcl, "GetUserTypeResponse:"); ChipLogProgress(Zcl, " userId: %" PRIu16 "", userId); @@ -1107,9 +1112,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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute) { ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1137,8 +1142,8 @@ 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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint32_t localStartTime, uint32_t localEndTime) { ChipLogProgress(Zcl, "GetYeardayScheduleResponse:"); ChipLogProgress(Zcl, " scheduleId: %" PRIu8 "", scheduleId); @@ -1163,7 +1168,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId return true; } -bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterLockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "LockDoorResponse:"); LogStatus(status); @@ -1184,7 +1189,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetHolidayScheduleResponse:"); LogStatus(status); @@ -1205,7 +1210,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetPinResponse:"); LogStatus(status); @@ -1226,7 +1231,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetRfidResponse:"); LogStatus(status); @@ -1247,7 +1252,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetUserTypeResponse:"); LogStatus(status); @@ -1268,7 +1273,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:"); LogStatus(status); @@ -1289,7 +1294,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "SetYeardayScheduleResponse:"); LogStatus(status); @@ -1310,7 +1315,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockDoorResponse:"); LogStatus(status); @@ -1331,7 +1336,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status) return true; } -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status) { ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:"); LogStatus(status); @@ -1352,7 +1357,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status) return true; } -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "ArmFailSafeResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1366,7 +1372,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "CommissioningCompleteResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1380,7 +1387,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin return true; } -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "SetFabricResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1394,7 +1402,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo return true; } -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "AddGroupResponse:"); LogStatus(status); @@ -1416,7 +1424,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group return true; } -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList) { ChipLogProgress(Zcl, "GetGroupMembershipResponse:"); @@ -1432,7 +1440,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui return true; } -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveGroupResponse:"); LogStatus(status); @@ -1454,7 +1462,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t * groupName) { ChipLogProgress(Zcl, "ViewGroupResponse:"); LogStatus(status); @@ -1477,7 +1486,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou return true; } -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) +bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::app::Command * commandObj, uint16_t timeout) { ChipLogProgress(Zcl, "IdentifyQueryResponse:"); ChipLogProgress(Zcl, " timeout: %" PRIu16 "", timeout); @@ -1490,7 +1499,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout) return true; } -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1504,7 +1514,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "AddWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1518,7 +1529,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "DisableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1532,7 +1544,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "EnableNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1546,7 +1559,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err return true; } -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "RemoveNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1561,7 +1575,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 * commandObj, 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:"); @@ -1578,7 +1593,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( return true; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1592,7 +1608,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 return true; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText) +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText) { ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:"); ChipLogProgress(Zcl, " errorCode: %" PRIu8 "", errorCode); @@ -1606,7 +1623,7 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t return true; } -bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::FabricId FabricId) +bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::app::Command * commandObj, chip::FabricId FabricId) { ChipLogProgress(Zcl, "GetFabricIdResponse:"); ChipLogProgress(Zcl, " FabricId: %" PRIu64 "", FabricId); @@ -1619,7 +1636,8 @@ bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::Fabri return true; } -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId) +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "AddSceneResponse:"); LogStatus(status); @@ -1642,7 +1660,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList) { ChipLogProgress(Zcl, "GetSceneMembershipResponse:"); @@ -1668,7 +1687,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint return true; } -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId) +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId) { ChipLogProgress(Zcl, "RemoveAllScenesResponse:"); LogStatus(status); @@ -1690,7 +1709,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "RemoveSceneResponse:"); LogStatus(status); @@ -1713,7 +1733,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId) { ChipLogProgress(Zcl, "StoreSceneResponse:"); LogStatus(status); @@ -1736,8 +1757,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 * commandObj, 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 2c0f6a56aeaa86..ec123d9f45a1da 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 { @@ -3589,7 +3601,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. - emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(FabricId); + emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(apCommandObj, FabricId); } else { @@ -3709,7 +3721,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 { @@ -3841,7 +3853,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 { @@ -3924,7 +3937,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 { @@ -4023,7 +4036,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 { @@ -4122,7 +4135,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 { @@ -4271,7 +4284,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 299b632181fdfc..d4305aecd6b78b 100644 --- a/src/darwin/Framework/CHIP/gen/call-command-handler.cpp +++ b/src/darwin/Framework/CHIP/gen/call-command-handler.cpp @@ -179,7 +179,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: { @@ -192,7 +192,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: { @@ -205,7 +205,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: { @@ -218,7 +218,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: { @@ -231,7 +231,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: { @@ -244,7 +244,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: { @@ -257,7 +257,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: { @@ -298,8 +298,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: { @@ -354,7 +354,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; } @@ -389,7 +389,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: { @@ -423,7 +423,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: { @@ -443,7 +443,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: { @@ -505,8 +505,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: { @@ -547,8 +547,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: { @@ -561,7 +561,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: { @@ -574,7 +574,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: { @@ -587,7 +587,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: { @@ -600,7 +600,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: { @@ -613,7 +613,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: { @@ -626,7 +626,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: { @@ -639,7 +639,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: { @@ -652,7 +652,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: { @@ -665,7 +665,7 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c } status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status); + wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(nullptr, status); break; } default: { @@ -701,7 +701,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: { @@ -721,7 +721,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: { @@ -741,7 +741,7 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText); + wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -777,7 +777,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: { @@ -800,7 +800,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: { @@ -820,7 +820,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: { @@ -847,7 +847,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: { @@ -876,7 +876,7 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c } timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout); + wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(nullptr, timeout); break; } default: { @@ -912,7 +912,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: { @@ -932,7 +932,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: { @@ -952,7 +952,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: { @@ -972,7 +972,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: { @@ -992,7 +992,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: { @@ -1017,8 +1017,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: { @@ -1038,7 +1038,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: { @@ -1058,7 +1058,7 @@ EmberAfStatus emberAfNetworkCommissioningClusterClientCommandParse(EmberAfCluste } debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(errorCode, debugText); + wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(nullptr, errorCode, debugText); break; } default: { @@ -1087,7 +1087,7 @@ EmberAfStatus emberAfOperationalCredentialsClusterClientCommandParse(EmberAfClus } FabricId = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen); - wasHandled = emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(FabricId); + wasHandled = emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(nullptr, FabricId); break; } default: { @@ -1130,7 +1130,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: { @@ -1181,7 +1181,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: { @@ -1201,7 +1202,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: { @@ -1228,7 +1229,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: { @@ -1255,7 +1256,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: { @@ -1320,7 +1321,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 f971c6e069610e..3714722b0c3945 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 @@ -1455,49 +1456,49 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end * @param status */ -bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearAllRfidsResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback @@ -1508,8 +1509,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 * commandObj, uint8_t scheduleId, uint8_t status, + uint32_t localStartTime, uint32_t localEndTime, + uint8_t operatingModeDuringHoliday); /** * @brief Door Lock Cluster GetLogRecordResponse Command callback @@ -1522,8 +1524,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 * commandObj, 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 @@ -1533,7 +1536,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * pin); /** * @brief Door Lock Cluster GetRfidResponse Command callback @@ -1543,7 +1547,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 * commandObj, uint16_t userId, uint8_t userStatus, + uint8_t userType, uint8_t * rfid); /** * @brief Door Lock Cluster GetUserTypeResponse Command callback @@ -1551,7 +1556,7 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user * @param userType */ -bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType); +bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::app::Command * commandObj, uint16_t userId, uint8_t userType); /** * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback @@ -1565,9 +1570,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 * commandObj, uint8_t scheduleId, uint16_t userId, + uint8_t status, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t endHour, uint8_t endMinute); /** * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback @@ -1578,71 +1583,71 @@ 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 * commandObj, 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 * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetPinResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetRfidResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetRfidResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetUserTypeResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback * @param status */ -bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status); +bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockDoorResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback * @param status */ -bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); +bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::app::Command * commandObj, uint8_t status); /** * @brief General Commissioning Cluster ArmFailSafeResponse Command callback @@ -1650,7 +1655,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status); * @param debugText */ -bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback @@ -1658,7 +1664,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error * @param debugText */ -bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief General Commissioning Cluster SetFabricResponse Command callback @@ -1666,7 +1673,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin * @param debugText */ -bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Groups Cluster AddGroupResponse Command callback @@ -1674,7 +1682,7 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo * @param groupId */ -bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster GetGroupMembershipResponse Command callback @@ -1683,7 +1691,7 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group * @param groupList */ -bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, +bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::app::Command * commandObj, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList); /** @@ -1692,7 +1700,7 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui * @param groupId */ -bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Groups Cluster ViewGroupResponse Command callback @@ -1701,14 +1709,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 * commandObj, 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 * commandObj, uint16_t timeout); /** * @brief Network Commissioning Cluster AddThreadNetworkResponse Command callback @@ -1716,7 +1725,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout); * @param debugText */ -bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster AddWiFiNetworkResponse Command callback @@ -1724,7 +1734,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(uint8_t * @param debugText */ -bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster DisableNetworkResponse Command callback @@ -1732,7 +1743,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster EnableNetworkResponse Command callback @@ -1740,7 +1752,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(uint8_t er * @param debugText */ -bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster RemoveNetworkResponse Command callback @@ -1748,7 +1761,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(uint8_t err * @param debugText */ -bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster ScanNetworksResponse Command callback @@ -1759,7 +1773,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 * commandObj, uint8_t errorCode, uint8_t * debugText, + /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults); /** @@ -1768,7 +1783,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback( * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Network Commissioning Cluster UpdateWiFiNetworkResponse Command callback @@ -1776,14 +1792,15 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(uint8 * @param debugText */ -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(uint8_t errorCode, uint8_t * debugText); +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::app::Command * commandObj, uint8_t errorCode, + uint8_t * debugText); /** * @brief Operational Credentials Cluster GetFabricIdResponse Command callback * @param fabricId */ -bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::FabricId FabricId); +bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::app::Command * commandObj, chip::FabricId FabricId); /** * @brief Scenes Cluster AddSceneResponse Command callback @@ -1792,7 +1809,8 @@ bool emberAfOperationalCredentialsClusterGetFabricIdResponseCallback(chip::Fabri * @param sceneId */ -bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId); +bool emberAfScenesClusterAddSceneResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster GetSceneMembershipResponse Command callback @@ -1803,7 +1821,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 * commandObj, uint8_t status, uint8_t capacity, + uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList); /** @@ -1812,7 +1831,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint * @param groupId */ -bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId); +bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::app::Command * commandObj, uint8_t status, uint16_t groupId); /** * @brief Scenes Cluster RemoveSceneResponse Command callback @@ -1821,7 +1840,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster StoreSceneResponse Command callback @@ -1830,7 +1850,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId); /** * @brief Scenes Cluster ViewSceneResponse Command callback @@ -1842,8 +1863,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 * commandObj, uint8_t status, uint16_t groupId, + uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets); //