From c7ad3a4e76ffc851e74e338d2869eef08d51ac2a Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 3 May 2021 15:14:41 -0400 Subject: [PATCH] Regenerate generated files --- .../all-clusters-common/gen/callback-stub.cpp | 4 +- .../all-clusters-common/gen/callback.h | 125 +++++++------- .../bridge-common/gen/callback-stub.cpp | 4 +- .../bridge-app/bridge-common/gen/callback.h | 32 ++-- .../chip-tool/gen/CHIPClientCallbacks.cpp | 4 +- examples/chip-tool/gen/callback-stub.cpp | 4 +- examples/chip-tool/gen/callback.h | 155 ++++++++--------- .../lighting-common/gen/callback-stub.cpp | 4 +- .../lighting-common/gen/callback.h | 32 ++-- .../lock-common/gen/callback-stub.cpp | 4 +- examples/lock-app/lock-common/gen/callback.h | 28 +-- .../esp32/main/gen/callback-stub.cpp | 4 +- .../esp32/main/gen/callback.h | 29 ++-- .../tv-app/tv-common/gen/callback-stub.cpp | 4 +- examples/tv-app/tv-common/gen/callback.h | 92 +++++----- .../window-app/common/gen/callback-stub.cpp | 4 +- examples/window-app/common/gen/callback.h | 8 +- .../python/gen/CHIPClientCallbacks.cpp | 4 +- src/controller/python/gen/callback-stub.cpp | 4 +- src/controller/python/gen/callback.h | 159 +++++++++--------- .../CHIP/gen/CHIPClientCallbacks.cpp | 4 +- .../Framework/CHIP/gen/callback-stub.cpp | 4 +- src/darwin/Framework/CHIP/gen/callback.h | 111 ++++++------ 23 files changed, 419 insertions(+), 404 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp b/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp index 1bbe68114bb09c..515b48f6e1166e 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp @@ -519,8 +519,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } 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 dad543f3dde278..36408b008bd18e 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/callback.h +++ b/examples/all-clusters-app/all-clusters-common/gen/callback.h @@ -280,15 +280,15 @@ void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCal * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Basic Cluster Server Pre Attribute Changed * @@ -351,13 +351,13 @@ void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallb * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -421,13 +421,13 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Server Pre Attribute Changed @@ -490,13 +490,13 @@ void emberAfBindingClusterServerManufacturerSpecificAttributeChangedCallback(chi * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBindingClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBindingClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -560,13 +560,13 @@ void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -630,13 +630,13 @@ void emberAfDescriptorClusterServerManufacturerSpecificAttributeChangedCallback( * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDescriptorClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDescriptorClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -700,13 +700,13 @@ void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(ch * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -770,15 +770,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -841,15 +841,15 @@ void emberAfGroupKeyManagementClusterServerManufacturerSpecificAttributeChangedC * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupKeyManagementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGroupKeyManagementClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Group Key Management Cluster Server Pre Attribute Changed * @@ -912,13 +912,13 @@ void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -982,13 +982,13 @@ void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chi * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1052,13 +1052,13 @@ void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(ch * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1122,13 +1122,13 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1192,13 +1192,13 @@ void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(ch * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1262,15 +1262,15 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Server Pre Attribute Changed * @@ -1333,13 +1333,14 @@ void emberAfOtaSoftwareUpdateClientClusterServerManufacturerSpecificAttributeCha * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOtaSoftwareUpdateClientClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOtaSoftwareUpdateClientClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1404,13 +1405,14 @@ void emberAfOtaSoftwareUpdateServerClusterServerManufacturerSpecificAttributeCha * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOtaSoftwareUpdateServerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOtaSoftwareUpdateServerClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1474,13 +1476,13 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Server Pre Attribute Changed @@ -1543,13 +1545,14 @@ void emberAfOperationalCredentialsClusterServerManufacturerSpecificAttributeChan * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOperationalCredentialsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOperationalCredentialsClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1615,13 +1618,14 @@ void emberAfPumpConfigurationAndControlClusterServerManufacturerSpecificAttribut * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfPumpConfigurationAndControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfPumpConfigurationAndControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1686,13 +1690,13 @@ void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1756,13 +1760,13 @@ void emberAfSwitchClusterServerManufacturerSpecificAttributeChangedCallback(chip * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfSwitchClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfSwitchClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1826,13 +1830,14 @@ void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChan * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1897,13 +1902,13 @@ void emberAfTestClusterClusterServerManufacturerSpecificAttributeChangedCallback * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTestClusterClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTestClusterClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1967,13 +1972,13 @@ void emberAfThermostatClusterServerManufacturerSpecificAttributeChangedCallback( * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfThermostatClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfThermostatClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -3061,13 +3066,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/bridge-app/bridge-common/gen/callback-stub.cpp b/examples/bridge-app/bridge-common/gen/callback-stub.cpp index fbfb4a965efa56..f246082e4f9ef8 100644 --- a/examples/bridge-app/bridge-common/gen/callback-stub.cpp +++ b/examples/bridge-app/bridge-common/gen/callback-stub.cpp @@ -359,8 +359,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/bridge-app/bridge-common/gen/callback.h b/examples/bridge-app/bridge-common/gen/callback.h index ae79c2614e9d67..32c918560470f8 100644 --- a/examples/bridge-app/bridge-common/gen/callback.h +++ b/examples/bridge-app/bridge-common/gen/callback.h @@ -119,13 +119,13 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Server Pre Attribute Changed @@ -188,15 +188,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -259,13 +259,13 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -329,15 +329,15 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Server Pre Attribute Changed * @@ -399,13 +399,13 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Server Pre Attribute Changed @@ -885,13 +885,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/chip-tool/gen/CHIPClientCallbacks.cpp b/examples/chip-tool/gen/CHIPClientCallbacks.cpp index 84abd16b2426bb..e0804ffb6c9e17 100644 --- a/examples/chip-tool/gen/CHIPClientCallbacks.cpp +++ b/examples/chip-tool/gen/CHIPClientCallbacks.cpp @@ -61,7 +61,7 @@ using namespace ::chip; #define GET_RESPONSE_CALLBACKS(name) \ Callback::Cancelable * onSuccessCallback = nullptr; \ Callback::Cancelable * onFailureCallback = nullptr; \ - NodeId sourceId = emberAfCurrentCommand()->source; \ + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); \ uint8_t sequenceNumber = emberAfCurrentCommand()->seqNum; \ CHIP_ERROR err = gCallbacks.GetResponseCallback(sourceId, sequenceNumber, &onSuccessCallback, &onFailureCallback); \ \ @@ -2090,7 +2090,7 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - NodeId sourceId = emberAfCurrentCommand()->source; + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; diff --git a/examples/chip-tool/gen/callback-stub.cpp b/examples/chip-tool/gen/callback-stub.cpp index f37741eec41dcb..acdf6dfdcb2e7e 100644 --- a/examples/chip-tool/gen/callback-stub.cpp +++ b/examples/chip-tool/gen/callback-stub.cpp @@ -575,8 +575,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/chip-tool/gen/callback.h b/examples/chip-tool/gen/callback.h index 68ef71ef130dcc..a0b7de36bd633f 100644 --- a/examples/chip-tool/gen/callback.h +++ b/examples/chip-tool/gen/callback.h @@ -336,13 +336,13 @@ void emberAfAccountLoginClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAccountLoginClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAccountLoginClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -406,15 +406,15 @@ void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCal * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Basic Cluster Client Pre Attribute Changed * @@ -477,15 +477,15 @@ void emberAfApplicationLauncherClusterClientManufacturerSpecificAttributeChanged * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationLauncherClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationLauncherClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Launcher Cluster Client Pre Attribute Changed * @@ -548,13 +548,13 @@ void emberAfAudioOutputClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAudioOutputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAudioOutputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -618,13 +618,13 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -688,13 +688,13 @@ void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Client Pre Attribute Changed @@ -757,13 +757,13 @@ void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chi * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -827,13 +827,13 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -897,13 +897,13 @@ void emberAfContentLaunchClusterClientManufacturerSpecificAttributeChangedCallba * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfContentLaunchClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfContentLaunchClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -967,13 +967,13 @@ void emberAfDescriptorClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1037,13 +1037,13 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1107,15 +1107,15 @@ void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Client Pre Attribute Changed * @@ -1178,15 +1178,15 @@ void emberAfGroupKeyManagementClusterClientManufacturerSpecificAttributeChangedC * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Group Key Management Cluster Client Pre Attribute Changed * @@ -1249,13 +1249,13 @@ void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1319,13 +1319,13 @@ void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1389,13 +1389,13 @@ void emberAfKeypadInputClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfKeypadInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfKeypadInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1459,13 +1459,13 @@ void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1529,13 +1529,13 @@ void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1599,13 +1599,13 @@ void emberAfMediaInputClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1669,13 +1669,13 @@ void emberAfMediaPlaybackClusterClientManufacturerSpecificAttributeChangedCallba * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaPlaybackClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaPlaybackClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1739,15 +1739,15 @@ void emberAfNetworkCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Client Pre Attribute Changed * @@ -1809,13 +1809,13 @@ void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Client Pre Attribute Changed @@ -1878,13 +1878,14 @@ void emberAfOperationalCredentialsClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1950,13 +1951,14 @@ void emberAfPumpConfigurationAndControlClusterClientManufacturerSpecificAttribut * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2021,13 +2023,13 @@ void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2091,13 +2093,13 @@ void emberAfSwitchClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2161,13 +2163,13 @@ void emberAfTvChannelClusterClientManufacturerSpecificAttributeChangedCallback(c * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTvChannelClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTvChannelClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2231,13 +2233,13 @@ void emberAfTargetNavigatorClusterClientManufacturerSpecificAttributeChangedCall * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTargetNavigatorClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTargetNavigatorClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2302,13 +2304,14 @@ void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2373,13 +2376,13 @@ void emberAfTestClusterClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2443,13 +2446,13 @@ void emberAfThermostatClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2513,13 +2516,13 @@ void emberAfWakeOnLanClusterClientManufacturerSpecificAttributeChangedCallback(c * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfWakeOnLanClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfWakeOnLanClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -3372,13 +3375,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/lighting-app/lighting-common/gen/callback-stub.cpp b/examples/lighting-app/lighting-common/gen/callback-stub.cpp index fbfb4a965efa56..f246082e4f9ef8 100644 --- a/examples/lighting-app/lighting-common/gen/callback-stub.cpp +++ b/examples/lighting-app/lighting-common/gen/callback-stub.cpp @@ -359,8 +359,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/lighting-app/lighting-common/gen/callback.h b/examples/lighting-app/lighting-common/gen/callback.h index ae79c2614e9d67..32c918560470f8 100644 --- a/examples/lighting-app/lighting-common/gen/callback.h +++ b/examples/lighting-app/lighting-common/gen/callback.h @@ -119,13 +119,13 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Server Pre Attribute Changed @@ -188,15 +188,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -259,13 +259,13 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -329,15 +329,15 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Server Pre Attribute Changed * @@ -399,13 +399,13 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Server Pre Attribute Changed @@ -885,13 +885,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/lock-app/lock-common/gen/callback-stub.cpp b/examples/lock-app/lock-common/gen/callback-stub.cpp index 2377bbfdff0cc2..e1f7d62f243421 100644 --- a/examples/lock-app/lock-common/gen/callback-stub.cpp +++ b/examples/lock-app/lock-common/gen/callback-stub.cpp @@ -351,8 +351,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/lock-app/lock-common/gen/callback.h b/examples/lock-app/lock-common/gen/callback.h index 8d5f1c26b408c2..c2b5612512f60b 100644 --- a/examples/lock-app/lock-common/gen/callback.h +++ b/examples/lock-app/lock-common/gen/callback.h @@ -111,13 +111,13 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Server Pre Attribute Changed @@ -180,15 +180,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -251,15 +251,15 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Server Pre Attribute Changed * @@ -321,13 +321,13 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Server Pre Attribute Changed @@ -732,13 +732,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp b/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp index 516f3eb3cbfbd8..7e1040d84aea25 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp @@ -351,8 +351,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback.h b/examples/temperature-measurement-app/esp32/main/gen/callback.h index 82466588b77916..af3867f04b6bc8 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/callback.h +++ b/examples/temperature-measurement-app/esp32/main/gen/callback.h @@ -111,13 +111,13 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Server Pre Attribute Changed @@ -180,15 +180,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -251,15 +251,15 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Server Pre Attribute Changed * @@ -322,13 +322,14 @@ void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChan * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -717,13 +718,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/tv-app/tv-common/gen/callback-stub.cpp b/examples/tv-app/tv-common/gen/callback-stub.cpp index 952b0bd3dbed56..0272af3709d6fa 100644 --- a/examples/tv-app/tv-common/gen/callback-stub.cpp +++ b/examples/tv-app/tv-common/gen/callback-stub.cpp @@ -471,8 +471,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/tv-app/tv-common/gen/callback.h b/examples/tv-app/tv-common/gen/callback.h index b48e438e919777..89dc242420d991 100644 --- a/examples/tv-app/tv-common/gen/callback.h +++ b/examples/tv-app/tv-common/gen/callback.h @@ -232,13 +232,13 @@ void emberAfAccountLoginClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAccountLoginClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAccountLoginClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -302,15 +302,15 @@ void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCal * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Basic Cluster Server Pre Attribute Changed * @@ -373,15 +373,15 @@ void emberAfApplicationLauncherClusterServerManufacturerSpecificAttributeChanged * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationLauncherClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationLauncherClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Launcher Cluster Server Pre Attribute Changed * @@ -444,13 +444,13 @@ void emberAfAudioOutputClusterServerManufacturerSpecificAttributeChangedCallback * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAudioOutputClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAudioOutputClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -514,13 +514,13 @@ void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -584,13 +584,13 @@ void emberAfContentLaunchClusterServerManufacturerSpecificAttributeChangedCallba * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfContentLaunchClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfContentLaunchClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -654,15 +654,15 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Server Pre Attribute Changed * @@ -725,13 +725,13 @@ void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -795,13 +795,13 @@ void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(ch * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -865,13 +865,13 @@ void emberAfKeypadInputClusterServerManufacturerSpecificAttributeChangedCallback * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfKeypadInputClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfKeypadInputClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -935,13 +935,13 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1005,13 +1005,13 @@ void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(ch * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1075,13 +1075,13 @@ void emberAfMediaInputClusterServerManufacturerSpecificAttributeChangedCallback( * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaInputClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaInputClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1145,13 +1145,13 @@ void emberAfMediaPlaybackClusterServerManufacturerSpecificAttributeChangedCallba * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaPlaybackClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaPlaybackClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1214,13 +1214,13 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip: * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Server Pre Attribute Changed @@ -1283,13 +1283,13 @@ void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1353,13 +1353,13 @@ void emberAfTvChannelClusterServerManufacturerSpecificAttributeChangedCallback(c * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTvChannelClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTvChannelClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1423,13 +1423,13 @@ void emberAfTargetNavigatorClusterServerManufacturerSpecificAttributeChangedCall * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTargetNavigatorClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTargetNavigatorClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1494,13 +1494,13 @@ void emberAfWakeOnLanClusterServerManufacturerSpecificAttributeChangedCallback(c * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfWakeOnLanClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfWakeOnLanClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2009,13 +2009,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/examples/window-app/common/gen/callback-stub.cpp b/examples/window-app/common/gen/callback-stub.cpp index ca0fc68187729b..cc666398372874 100644 --- a/examples/window-app/common/gen/callback-stub.cpp +++ b/examples/window-app/common/gen/callback-stub.cpp @@ -327,8 +327,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/examples/window-app/common/gen/callback.h b/examples/window-app/common/gen/callback.h index 0619b2326e979e..6ca356f4993688 100644 --- a/examples/window-app/common/gen/callback.h +++ b/examples/window-app/common/gen/callback.h @@ -88,13 +88,13 @@ void emberAfWindowCoveringClusterServerManufacturerSpecificAttributeChangedCallb * Server Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfWindowCoveringClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfWindowCoveringClusterServerMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -412,13 +412,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/src/controller/python/gen/CHIPClientCallbacks.cpp b/src/controller/python/gen/CHIPClientCallbacks.cpp index 84abd16b2426bb..e0804ffb6c9e17 100644 --- a/src/controller/python/gen/CHIPClientCallbacks.cpp +++ b/src/controller/python/gen/CHIPClientCallbacks.cpp @@ -61,7 +61,7 @@ using namespace ::chip; #define GET_RESPONSE_CALLBACKS(name) \ Callback::Cancelable * onSuccessCallback = nullptr; \ Callback::Cancelable * onFailureCallback = nullptr; \ - NodeId sourceId = emberAfCurrentCommand()->source; \ + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); \ uint8_t sequenceNumber = emberAfCurrentCommand()->seqNum; \ CHIP_ERROR err = gCallbacks.GetResponseCallback(sourceId, sequenceNumber, &onSuccessCallback, &onFailureCallback); \ \ @@ -2090,7 +2090,7 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - NodeId sourceId = emberAfCurrentCommand()->source; + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; diff --git a/src/controller/python/gen/callback-stub.cpp b/src/controller/python/gen/callback-stub.cpp index 857fb342e54abf..f2eb134d879765 100644 --- a/src/controller/python/gen/callback-stub.cpp +++ b/src/controller/python/gen/callback-stub.cpp @@ -583,8 +583,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/src/controller/python/gen/callback.h b/src/controller/python/gen/callback.h index 5f3c5701391605..d76ce87a7daf56 100644 --- a/src/controller/python/gen/callback.h +++ b/src/controller/python/gen/callback.h @@ -344,13 +344,13 @@ void emberAfAccountLoginClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAccountLoginClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAccountLoginClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -414,15 +414,15 @@ void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCal * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Basic Cluster Client Pre Attribute Changed * @@ -485,15 +485,15 @@ void emberAfApplicationLauncherClusterClientManufacturerSpecificAttributeChanged * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationLauncherClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationLauncherClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Launcher Cluster Client Pre Attribute Changed * @@ -556,13 +556,13 @@ void emberAfAudioOutputClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfAudioOutputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfAudioOutputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -626,13 +626,13 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -696,13 +696,13 @@ void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Client Pre Attribute Changed @@ -765,13 +765,13 @@ void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chi * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -835,13 +835,13 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -905,13 +905,13 @@ void emberAfContentLaunchClusterClientManufacturerSpecificAttributeChangedCallba * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfContentLaunchClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfContentLaunchClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -975,13 +975,13 @@ void emberAfDescriptorClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1045,13 +1045,13 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1115,15 +1115,15 @@ void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Client Pre Attribute Changed * @@ -1186,15 +1186,15 @@ void emberAfGroupKeyManagementClusterClientManufacturerSpecificAttributeChangedC * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Group Key Management Cluster Client Pre Attribute Changed * @@ -1257,13 +1257,13 @@ void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1327,13 +1327,13 @@ void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1397,13 +1397,13 @@ void emberAfKeypadInputClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfKeypadInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfKeypadInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1467,13 +1467,13 @@ void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1537,13 +1537,13 @@ void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1607,13 +1607,13 @@ void emberAfMediaInputClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaInputClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1677,13 +1677,13 @@ void emberAfMediaPlaybackClusterClientManufacturerSpecificAttributeChangedCallba * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfMediaPlaybackClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfMediaPlaybackClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1747,15 +1747,15 @@ void emberAfNetworkCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Client Pre Attribute Changed * @@ -1817,13 +1817,13 @@ void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Client Pre Attribute Changed @@ -1886,13 +1886,14 @@ void emberAfOperationalCredentialsClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1958,13 +1959,14 @@ void emberAfPumpConfigurationAndControlClusterClientManufacturerSpecificAttribut * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2029,13 +2031,13 @@ void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2099,13 +2101,13 @@ void emberAfSwitchClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2169,13 +2171,13 @@ void emberAfTvChannelClusterClientManufacturerSpecificAttributeChangedCallback(c * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTvChannelClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTvChannelClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2239,13 +2241,13 @@ void emberAfTargetNavigatorClusterClientManufacturerSpecificAttributeChangedCall * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTargetNavigatorClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTargetNavigatorClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2310,13 +2312,14 @@ void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2381,13 +2384,13 @@ void emberAfTestClusterClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2451,13 +2454,13 @@ void emberAfThermostatClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2521,13 +2524,13 @@ void emberAfWakeOnLanClusterClientManufacturerSpecificAttributeChangedCallback(c * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfWakeOnLanClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfWakeOnLanClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2591,13 +2594,13 @@ void emberAfWindowCoveringClusterClientManufacturerSpecificAttributeChangedCallb * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfWindowCoveringClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfWindowCoveringClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -3425,13 +3428,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change diff --git a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp index 64caca3e311ade..25c847fc727aee 100644 --- a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp +++ b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp @@ -61,7 +61,7 @@ using namespace ::chip; #define GET_RESPONSE_CALLBACKS(name) \ Callback::Cancelable * onSuccessCallback = nullptr; \ Callback::Cancelable * onFailureCallback = nullptr; \ - NodeId sourceId = emberAfCurrentCommand()->source; \ + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); \ uint8_t sequenceNumber = emberAfCurrentCommand()->seqNum; \ CHIP_ERROR err = gCallbacks.GetResponseCallback(sourceId, sequenceNumber, &onSuccessCallback, &onFailureCallback); \ \ @@ -1823,7 +1823,7 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin ChipLogProgress(Zcl, "emberAfReportAttributeCallback:"); ChipLogProgress(Zcl, " ClusterId: 0x%04x", clusterId); - NodeId sourceId = emberAfCurrentCommand()->source; + NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); ChipLogProgress(Zcl, " Source NodeId: %" PRIu64, sourceId); EndpointId endpointId = emberAfCurrentCommand()->apsFrame->sourceEndpoint; diff --git a/src/darwin/Framework/CHIP/gen/callback-stub.cpp b/src/darwin/Framework/CHIP/gen/callback-stub.cpp index de7b7758bd5a8a..da2a66df85b974 100644 --- a/src/darwin/Framework/CHIP/gen/callback-stub.cpp +++ b/src/darwin/Framework/CHIP/gen/callback-stub.cpp @@ -495,8 +495,8 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * * @param status Ver.: always */ bool __attribute__((weak)) -emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, - uint8_t * message, EmberStatus status) +emberAfMessageSentCallback(EmberOutgoingMessageType type, MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status) { return false; } diff --git a/src/darwin/Framework/CHIP/gen/callback.h b/src/darwin/Framework/CHIP/gen/callback.h index a73a115fd733bf..f2eebf48864fc9 100644 --- a/src/darwin/Framework/CHIP/gen/callback.h +++ b/src/darwin/Framework/CHIP/gen/callback.h @@ -256,15 +256,15 @@ void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCal * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Application Basic Cluster Client Pre Attribute Changed * @@ -327,13 +327,13 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -397,13 +397,13 @@ void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Basic Cluster Client Pre Attribute Changed @@ -466,13 +466,13 @@ void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chi * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -536,13 +536,13 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -606,13 +606,13 @@ void emberAfDescriptorClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDescriptorClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -676,13 +676,13 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -746,15 +746,15 @@ void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief General Commissioning Cluster Client Pre Attribute Changed * @@ -817,15 +817,15 @@ void emberAfGroupKeyManagementClusterClientManufacturerSpecificAttributeChangedC * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfGroupKeyManagementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Group Key Management Cluster Client Pre Attribute Changed * @@ -888,13 +888,13 @@ void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -958,13 +958,13 @@ void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1028,13 +1028,13 @@ void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallbac * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1098,13 +1098,13 @@ void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(ch * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1168,15 +1168,15 @@ void emberAfNetworkCommissioningClusterClientManufacturerSpecificAttributeChange * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfNetworkCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Network Commissioning Cluster Client Pre Attribute Changed * @@ -1238,13 +1238,13 @@ void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip: * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief On/off Cluster Client Pre Attribute Changed @@ -1307,13 +1307,14 @@ void emberAfOperationalCredentialsClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfOperationalCredentialsClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1379,13 +1380,14 @@ void emberAfPumpConfigurationAndControlClusterClientManufacturerSpecificAttribut * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfPumpConfigurationAndControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1450,13 +1452,13 @@ void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1520,13 +1522,13 @@ void emberAfSwitchClusterClientManufacturerSpecificAttributeChangedCallback(chip * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfSwitchClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1590,13 +1592,14 @@ void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChan * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, + chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1661,13 +1664,13 @@ void emberAfTestClusterClusterClientManufacturerSpecificAttributeChangedCallback * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfTestClusterClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -1731,13 +1734,13 @@ void emberAfThermostatClusterClientManufacturerSpecificAttributeChangedCallback( * Client Message Sent * * @param type The type of message sent - * @param indexOrDestination The destination or address to which the message was sent + * @param destination The destination to which the message was sent * @param apsFrame The APS frame for the message * @param msgLen The length of the message * @param message The message that was sent * @param status The status of the sent message */ -void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, +void emberAfThermostatClusterClientMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); @@ -2429,13 +2432,13 @@ bool emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberSt * be handled by the application framework. * * @param type Ver.: always - * @param indexOrDestination Ver.: always + * @param destination Ver.: always * @param apsFrame Ver.: always * @param msgLen Ver.: always * @param message Ver.: always * @param status Ver.: always */ -bool emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, +bool emberAfMessageSentCallback(EmberOutgoingMessageType type, chip::MessageSendDestination destination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); /** @brief Pre Attribute Change