From bded0faab4ccbbe7e26caf83937ffe791ab1c7e9 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 11 Nov 2020 11:46:41 +0100 Subject: [PATCH] Move IAS Zone Client Plugin callbacks into src/app/ias-zone-client --- .../all-clusters-common/gen/clusters-callback-stubs.c | 6 ------ .../all-clusters-app/all-clusters-common/gen/gen_config.h | 2 -- .../esp32/main/gen/clusters-callback-stubs.c | 6 ------ src/app/clusters/ias-zone-client/ias-zone-client.cpp | 6 ++++++ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/gen/clusters-callback-stubs.c b/examples/all-clusters-app/all-clusters-common/gen/clusters-callback-stubs.c index a18ea2f9302483..abd560faf6ce9d 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/clusters-callback-stubs.c +++ b/examples/all-clusters-app/all-clusters-common/gen/clusters-callback-stubs.c @@ -73,9 +73,3 @@ EmberAfStatus emberAfPollControlClusterServerPreAttributeChangedCallback(uint8_t { return EMBER_ZCL_STATUS_SUCCESS; } - -void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length) {} - -void emberAfPluginIasZoneClientWriteAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} - -void emberAfPluginIasZoneClientReadAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} diff --git a/examples/all-clusters-app/all-clusters-common/gen/gen_config.h b/examples/all-clusters-app/all-clusters-common/gen/gen_config.h index 0913cdb450e013..f4e403cbd1334d 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/gen_config.h +++ b/examples/all-clusters-app/all-clusters-common/gen/gen_config.h @@ -349,8 +349,6 @@ // Use this macro to check if HAL Library plugin is included #define EMBER_AF_PLUGIN_HAL_LIBRARY -// Use this macro to check if IAS Zone Client plugin is included -#define EMBER_AF_PLUGIN_IAS_ZONE_CLIENT // User options for plugin IAS Zone Client #define EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES 10 diff --git a/examples/temperature-measurement-app/esp32/main/gen/clusters-callback-stubs.c b/examples/temperature-measurement-app/esp32/main/gen/clusters-callback-stubs.c index adf75ceeb89c97..0800515be8fcb2 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/clusters-callback-stubs.c +++ b/examples/temperature-measurement-app/esp32/main/gen/clusters-callback-stubs.c @@ -377,9 +377,3 @@ EmberAfStatus emberAfPollControlClusterServerPreAttributeChangedCallback(uint8_t { return EMBER_ZCL_STATUS_SUCCESS; } - -void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length) {} - -void emberAfPluginIasZoneClientWriteAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} - -void emberAfPluginIasZoneClientReadAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.cpp b/src/app/clusters/ias-zone-client/ias-zone-client.cpp index 34fe9860a08282..f0365b889f4db2 100644 --- a/src/app/clusters/ias-zone-client/ias-zone-client.cpp +++ b/src/app/clusters/ias-zone-client/ias-zone-client.cpp @@ -609,3 +609,9 @@ void emberAfPluginIasZoneClientReadAttributesResponseCallback(EmberAfClusterId c clearState(); } } + +void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length) {} + +void emberAfPluginIasZoneClientWriteAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} + +void emberAfPluginIasZoneClientReadAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {}