From 7ff4c37c054540f67495573a885dbad3ceec232d Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 16 Feb 2023 17:54:37 -0500 Subject: [PATCH] Remove unused definitions from types_stub.h. Some of these were used but only by dead code, so some dead code is removed too. --- src/app/clusters/scenes/scenes.h | 6 +- src/app/util/af-types.h | 47 - src/app/util/af.h | 6 - src/app/util/config.h | 11 - src/app/util/debug-printing.h | 1204 +++++----------------- src/app/util/types_stub.h | 1599 ++---------------------------- src/app/util/util.cpp | 127 --- src/app/util/util.h | 64 -- 8 files changed, 312 insertions(+), 2752 deletions(-) diff --git a/src/app/clusters/scenes/scenes.h b/src/app/clusters/scenes/scenes.h index 90b32b00e4e62c..166d7859cb3db3 100644 --- a/src/app/clusters/scenes/scenes.h +++ b/src/app/clusters/scenes/scenes.h @@ -34,9 +34,9 @@ void emAfPluginScenesServerPrintInfo(void); extern uint8_t emberAfPluginScenesServerEntriesInUse; #if defined(EMBER_AF_PLUGIN_SCENES_USE_TOKENS) && !defined(EZSP_HOST) -// In this case, we use token storage -#define emberAfPluginScenesServerRetrieveSceneEntry(entry, i) halCommonGetIndexedToken(&entry, TOKEN_SCENES_TABLE, i) -#define emberAfPluginScenesServerSaveSceneEntry(entry, i) halCommonSetIndexedToken(TOKEN_SCENES_TABLE, i, &entry) +// TODO: Make the storage bits actually work +#define emberAfPluginScenesServerRetrieveSceneEntry(entry, i) +#define emberAfPluginScenesServerSaveSceneEntry(entry, i) #define emberAfPluginScenesServerNumSceneEntriesInUse() \ (halCommonGetToken(&emberAfPluginScenesServerEntriesInUse, TOKEN_SCENES_NUM_ENTRIES), emberAfPluginScenesServerEntriesInUse) #define emberAfPluginScenesServerSetNumSceneEntriesInUse(x) \ diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h index d284d93961dd0d..157aef07275a9a 100644 --- a/src/app/util/af-types.h +++ b/src/app/util/af-types.h @@ -344,22 +344,6 @@ typedef struct uint16_t endpointSize; } EmberAfEndpointType; -#ifdef EZSP_HOST -typedef EzspDecisionId EmberAfTcLinkKeyRequestPolicy; -typedef EzspDecisionId EmberAfAppLinkKeyRequestPolicy; -#define EMBER_AF_ALLOW_TC_KEY_REQUESTS EZSP_ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY -#define EMBER_AF_DENY_TC_KEY_REQUESTS EZSP_DENY_TC_KEY_REQUESTS -#define EMBER_AF_ALLOW_APP_KEY_REQUESTS EZSP_ALLOW_APP_KEY_REQUESTS -#define EMBER_AF_DENY_APP_KEY_REQUESTS EZSP_DENY_APP_KEY_REQUESTS -#else -typedef EmberTcLinkKeyRequestPolicy EmberAfTcLinkKeyRequestPolicy; -typedef EmberAppLinkKeyRequestPolicy EmberAfAppLinkKeyRequestPolicy; -#define EMBER_AF_ALLOW_TC_KEY_REQUESTS EMBER_ALLOW_TC_LINK_KEY_REQUEST_AND_SEND_CURRENT_KEY -#define EMBER_AF_DENY_TC_KEY_REQUESTS EMBER_DENY_TC_LINK_KEY_REQUESTS -#define EMBER_AF_ALLOW_APP_KEY_REQUESTS EMBER_ALLOW_APP_LINK_KEY_REQUEST -#define EMBER_AF_DENY_APP_KEY_REQUESTS EMBER_DENY_APP_LINK_KEY_REQUESTS -#endif - #ifdef DOXYGEN_SHOULD_SKIP_THIS enum EmberAfEndpointBitmask; #else @@ -1143,37 +1127,6 @@ typedef struct bool broadcast; } EmberAfMessageStruct; -/** - * @brief A data struct for a link key backup. - * - * Each entry notes the EUI64 of the device it is paired to and the key data. - * This key may be hashed and not the actual link key currently in use. - */ - -typedef struct -{ - EmberEUI64 deviceId; - EmberKeyData key; -} EmberAfLinkKeyBackupData; - -/** - * @brief A data struct for all the trust center backup data. - * - * The 'keyList' pointer must point to an array and 'maxKeyListLength' - * must be populated with the maximum number of entries the array can hold. - * - * Functions that modify this data structure will populate 'keyListLength' - * indicating how many keys were actually written into 'keyList'. - */ - -typedef struct -{ - EmberEUI64 extendedPanId; - uint8_t keyListLength; - uint8_t maxKeyListLength; - EmberAfLinkKeyBackupData * keyList; -} EmberAfTrustCenterBackupData; - /** * @brief The length of the hardware tag in the Ember Bootloader Query * Response. diff --git a/src/app/util/af.h b/src/app/util/af.h index ce28d9f2246b03..4b14f706ee8cb7 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -355,12 +355,6 @@ void emberAfGetEui64(EmberEUI64 returnEui64); */ EmberNodeId emberAfGetNodeId(void); -/** - * @brief Returns the current network state. This call caches the results - * on the host to prevent frequent EZSP transactions. - */ -EmberNetworkStatus emberAfNetworkState(void); - /** @} END Miscellaneous */ /** @name Sleep Control */ diff --git a/src/app/util/config.h b/src/app/util/config.h index bb85dcc6b30949..d490c1d8107b56 100644 --- a/src/app/util/config.h +++ b/src/app/util/config.h @@ -43,17 +43,6 @@ #define ZA_END_DEVICE 3 #define ZA_SLEEPY_END_DEVICE 4 -// A subtle distniction: -// EMBER_AF_MANUFACTURER_CODE is the MFG code set by AppBuilder -// for use in the App Framework (AF). If not set by AppBuilder we default -// it to 0x0000. The customer should be setting this value. -// EMBER_COMPANY_MANUFACTURER_CODE is the Ember Corporation's Manufacturer -// ID allocated by the Zigbee alliance. This shall not change. -#define EMBER_COMPANY_MANUFACTURER_CODE 0x1002 -#ifndef EMBER_AF_MANUFACTURER_CODE -#define EMBER_AF_MANUFACTURER_CODE 0x0000 -#endif - // This file determines the security profile used, and from that various // other security parameters. // #include "app/framework/security/security-config.h" diff --git a/src/app/util/debug-printing.h b/src/app/util/debug-printing.h index 65ccb96743ea50..bea705c170bfc9 100644 --- a/src/app/util/debug-printing.h +++ b/src/app/util/debug-printing.h @@ -28,20 +28,14 @@ #define emberAfBasicClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BASIC_CLUSTER, __VA_ARGS__) #define emberAfBasicClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BASIC_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBasicClusterFlush() -#define emberAfBasicClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BASIC_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBasicClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BASIC_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBasicClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_BASIC_CLUSTER, (buffer)) #else #define emberAfBasicClusterPrint(...) #define emberAfBasicClusterPrintln(...) -#define emberAfBasicClusterFlush() -#define emberAfBasicClusterDebugExec(x) + #define emberAfBasicClusterPrintBuffer(buffer, len, withSpace) #define emberAfBasicClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BASIC_CLUSTER) @@ -51,20 +45,14 @@ #define emberAfPowerConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER, __VA_ARGS__) #define emberAfPowerConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPowerConfigClusterFlush() -#define emberAfPowerConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPowerConfigClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPowerConfigClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER, (buffer)) #else #define emberAfPowerConfigClusterPrint(...) #define emberAfPowerConfigClusterPrintln(...) -#define emberAfPowerConfigClusterFlush() -#define emberAfPowerConfigClusterDebugExec(x) + #define emberAfPowerConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfPowerConfigClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_POWER_CONFIG_CLUSTER) @@ -74,20 +62,14 @@ #define emberAfDeviceTempClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER, __VA_ARGS__) #define emberAfDeviceTempClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDeviceTempClusterFlush() -#define emberAfDeviceTempClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDeviceTempClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDeviceTempClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER, (buffer)) #else #define emberAfDeviceTempClusterPrint(...) #define emberAfDeviceTempClusterPrintln(...) -#define emberAfDeviceTempClusterFlush() -#define emberAfDeviceTempClusterDebugExec(x) + #define emberAfDeviceTempClusterPrintBuffer(buffer, len, withSpace) #define emberAfDeviceTempClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEVICE_TEMP_CLUSTER) @@ -97,20 +79,14 @@ #define emberAfIdentifyClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_IDENTIFY_CLUSTER, __VA_ARGS__) #define emberAfIdentifyClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_IDENTIFY_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfIdentifyClusterFlush() -#define emberAfIdentifyClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_IDENTIFY_CLUSTER)) \ - { \ - x; \ - } + #define emberAfIdentifyClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_IDENTIFY_CLUSTER, (buffer), (len), (withSpace)) #define emberAfIdentifyClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_IDENTIFY_CLUSTER, (buffer)) #else #define emberAfIdentifyClusterPrint(...) #define emberAfIdentifyClusterPrintln(...) -#define emberAfIdentifyClusterFlush() -#define emberAfIdentifyClusterDebugExec(x) + #define emberAfIdentifyClusterPrintBuffer(buffer, len, withSpace) #define emberAfIdentifyClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_IDENTIFY_CLUSTER) @@ -120,20 +96,14 @@ #define emberAfGroupsClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_GROUPS_CLUSTER, __VA_ARGS__) #define emberAfGroupsClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_GROUPS_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfGroupsClusterFlush() -#define emberAfGroupsClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_GROUPS_CLUSTER)) \ - { \ - x; \ - } + #define emberAfGroupsClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_GROUPS_CLUSTER, (buffer), (len), (withSpace)) #define emberAfGroupsClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_GROUPS_CLUSTER, (buffer)) #else #define emberAfGroupsClusterPrint(...) #define emberAfGroupsClusterPrintln(...) -#define emberAfGroupsClusterFlush() -#define emberAfGroupsClusterDebugExec(x) + #define emberAfGroupsClusterPrintBuffer(buffer, len, withSpace) #define emberAfGroupsClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_GROUPS_CLUSTER) @@ -143,20 +113,14 @@ #define emberAfScenesClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SCENES_CLUSTER, __VA_ARGS__) #define emberAfScenesClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SCENES_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfScenesClusterFlush() -#define emberAfScenesClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SCENES_CLUSTER)) \ - { \ - x; \ - } + #define emberAfScenesClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SCENES_CLUSTER, (buffer), (len), (withSpace)) #define emberAfScenesClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SCENES_CLUSTER, (buffer)) #else #define emberAfScenesClusterPrint(...) #define emberAfScenesClusterPrintln(...) -#define emberAfScenesClusterFlush() -#define emberAfScenesClusterDebugExec(x) + #define emberAfScenesClusterPrintBuffer(buffer, len, withSpace) #define emberAfScenesClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SCENES_CLUSTER) @@ -166,20 +130,14 @@ #define emberAfOnOffClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ON_OFF_CLUSTER, __VA_ARGS__) #define emberAfOnOffClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ON_OFF_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOnOffClusterFlush() -#define emberAfOnOffClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ON_OFF_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOnOffClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ON_OFF_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOnOffClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ON_OFF_CLUSTER, (buffer)) #else #define emberAfOnOffClusterPrint(...) #define emberAfOnOffClusterPrintln(...) -#define emberAfOnOffClusterFlush() -#define emberAfOnOffClusterDebugExec(x) + #define emberAfOnOffClusterPrintBuffer(buffer, len, withSpace) #define emberAfOnOffClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_CLUSTER) @@ -189,12 +147,7 @@ #define emberAfOnOffSwitchConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, __VA_ARGS__) #define emberAfOnOffSwitchConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOnOffSwitchConfigClusterFlush() -#define emberAfOnOffSwitchConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOnOffSwitchConfigClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOnOffSwitchConfigClusterPrintString(buffer) \ @@ -202,8 +155,7 @@ #else #define emberAfOnOffSwitchConfigClusterPrint(...) #define emberAfOnOffSwitchConfigClusterPrintln(...) -#define emberAfOnOffSwitchConfigClusterFlush() -#define emberAfOnOffSwitchConfigClusterDebugExec(x) + #define emberAfOnOffSwitchConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfOnOffSwitchConfigClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER) @@ -213,20 +165,14 @@ #define emberAfLevelControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfLevelControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfLevelControlClusterFlush() -#define emberAfLevelControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfLevelControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfLevelControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER, (buffer)) #else #define emberAfLevelControlClusterPrint(...) #define emberAfLevelControlClusterPrintln(...) -#define emberAfLevelControlClusterFlush() -#define emberAfLevelControlClusterDebugExec(x) + #define emberAfLevelControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfLevelControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER) @@ -236,20 +182,14 @@ #define emberAfAlarmClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ALARM_CLUSTER, __VA_ARGS__) #define emberAfAlarmClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ALARM_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfAlarmClusterFlush() -#define emberAfAlarmClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ALARM_CLUSTER)) \ - { \ - x; \ - } + #define emberAfAlarmClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ALARM_CLUSTER, (buffer), (len), (withSpace)) #define emberAfAlarmClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ALARM_CLUSTER, (buffer)) #else #define emberAfAlarmClusterPrint(...) #define emberAfAlarmClusterPrintln(...) -#define emberAfAlarmClusterFlush() -#define emberAfAlarmClusterDebugExec(x) + #define emberAfAlarmClusterPrintBuffer(buffer, len, withSpace) #define emberAfAlarmClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ALARM_CLUSTER) @@ -259,20 +199,14 @@ #define emberAfTimeClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TIME_CLUSTER, __VA_ARGS__) #define emberAfTimeClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TIME_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTimeClusterFlush() -#define emberAfTimeClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TIME_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTimeClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TIME_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTimeClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_TIME_CLUSTER, (buffer)) #else #define emberAfTimeClusterPrint(...) #define emberAfTimeClusterPrintln(...) -#define emberAfTimeClusterFlush() -#define emberAfTimeClusterDebugExec(x) + #define emberAfTimeClusterPrintBuffer(buffer, len, withSpace) #define emberAfTimeClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TIME_CLUSTER) @@ -282,20 +216,14 @@ #define emberAfRssiLocationClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER, __VA_ARGS__) #define emberAfRssiLocationClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfRssiLocationClusterFlush() -#define emberAfRssiLocationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfRssiLocationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfRssiLocationClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER, (buffer)) #else #define emberAfRssiLocationClusterPrint(...) #define emberAfRssiLocationClusterPrintln(...) -#define emberAfRssiLocationClusterFlush() -#define emberAfRssiLocationClusterDebugExec(x) + #define emberAfRssiLocationClusterPrintBuffer(buffer, len, withSpace) #define emberAfRssiLocationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_RSSI_LOCATION_CLUSTER) @@ -305,20 +233,14 @@ #define emberAfBinaryInputBasicClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER, __VA_ARGS__) #define emberAfBinaryInputBasicClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBinaryInputBasicClusterFlush() -#define emberAfBinaryInputBasicClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBinaryInputBasicClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBinaryInputBasicClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER, (buffer)) #else #define emberAfBinaryInputBasicClusterPrint(...) #define emberAfBinaryInputBasicClusterPrintln(...) -#define emberAfBinaryInputBasicClusterFlush() -#define emberAfBinaryInputBasicClusterDebugExec(x) + #define emberAfBinaryInputBasicClusterPrintBuffer(buffer, len, withSpace) #define emberAfBinaryInputBasicClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BINARY_INPUT_BASIC_CLUSTER) @@ -328,20 +250,14 @@ #define emberAfCommissioningClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_COMMISSIONING_CLUSTER, __VA_ARGS__) #define emberAfCommissioningClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_COMMISSIONING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfCommissioningClusterFlush() -#define emberAfCommissioningClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_COMMISSIONING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfCommissioningClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_COMMISSIONING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfCommissioningClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_COMMISSIONING_CLUSTER, (buffer)) #else #define emberAfCommissioningClusterPrint(...) #define emberAfCommissioningClusterPrintln(...) -#define emberAfCommissioningClusterFlush() -#define emberAfCommissioningClusterDebugExec(x) + #define emberAfCommissioningClusterPrintBuffer(buffer, len, withSpace) #define emberAfCommissioningClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_COMMISSIONING_CLUSTER) @@ -351,20 +267,14 @@ #define emberAfPartitionClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PARTITION_CLUSTER, __VA_ARGS__) #define emberAfPartitionClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PARTITION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPartitionClusterFlush() -#define emberAfPartitionClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PARTITION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPartitionClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PARTITION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPartitionClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_PARTITION_CLUSTER, (buffer)) #else #define emberAfPartitionClusterPrint(...) #define emberAfPartitionClusterPrintln(...) -#define emberAfPartitionClusterFlush() -#define emberAfPartitionClusterDebugExec(x) + #define emberAfPartitionClusterPrintBuffer(buffer, len, withSpace) #define emberAfPartitionClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PARTITION_CLUSTER) @@ -374,20 +284,14 @@ #define emberAfOtaBootloadClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER, __VA_ARGS__) #define emberAfOtaBootloadClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOtaBootloadClusterFlush() -#define emberAfOtaBootloadClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOtaBootloadClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOtaBootloadClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER, (buffer)) #else #define emberAfOtaBootloadClusterPrint(...) #define emberAfOtaBootloadClusterPrintln(...) -#define emberAfOtaBootloadClusterFlush() -#define emberAfOtaBootloadClusterDebugExec(x) + #define emberAfOtaBootloadClusterPrintBuffer(buffer, len, withSpace) #define emberAfOtaBootloadClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_OTA_BOOTLOAD_CLUSTER) @@ -397,20 +301,14 @@ #define emberAfPowerProfileClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER, __VA_ARGS__) #define emberAfPowerProfileClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPowerProfileClusterFlush() -#define emberAfPowerProfileClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPowerProfileClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPowerProfileClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER, (buffer)) #else #define emberAfPowerProfileClusterPrint(...) #define emberAfPowerProfileClusterPrintln(...) -#define emberAfPowerProfileClusterFlush() -#define emberAfPowerProfileClusterDebugExec(x) + #define emberAfPowerProfileClusterPrintBuffer(buffer, len, withSpace) #define emberAfPowerProfileClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_POWER_PROFILE_CLUSTER) @@ -420,20 +318,14 @@ #define emberAfApplianceControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfApplianceControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplianceControlClusterFlush() -#define emberAfApplianceControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplianceControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplianceControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER, (buffer)) #else #define emberAfApplianceControlClusterPrint(...) #define emberAfApplianceControlClusterPrintln(...) -#define emberAfApplianceControlClusterFlush() -#define emberAfApplianceControlClusterDebugExec(x) + #define emberAfApplianceControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplianceControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLIANCE_CONTROL_CLUSTER) @@ -443,20 +335,14 @@ #define emberAfPollControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfPollControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPollControlClusterFlush() -#define emberAfPollControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPollControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPollControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER, (buffer)) #else #define emberAfPollControlClusterPrint(...) #define emberAfPollControlClusterPrintln(...) -#define emberAfPollControlClusterFlush() -#define emberAfPollControlClusterDebugExec(x) + #define emberAfPollControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfPollControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_POLL_CONTROL_CLUSTER) @@ -466,20 +352,14 @@ #define emberAfGreenPowerClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_GREEN_POWER_CLUSTER, __VA_ARGS__) #define emberAfGreenPowerClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_GREEN_POWER_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfGreenPowerClusterFlush() -#define emberAfGreenPowerClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_GREEN_POWER_CLUSTER)) \ - { \ - x; \ - } + #define emberAfGreenPowerClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_GREEN_POWER_CLUSTER, (buffer), (len), (withSpace)) #define emberAfGreenPowerClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_GREEN_POWER_CLUSTER, (buffer)) #else #define emberAfGreenPowerClusterPrint(...) #define emberAfGreenPowerClusterPrintln(...) -#define emberAfGreenPowerClusterFlush() -#define emberAfGreenPowerClusterDebugExec(x) + #define emberAfGreenPowerClusterPrintBuffer(buffer, len, withSpace) #define emberAfGreenPowerClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_GREEN_POWER_CLUSTER) @@ -489,20 +369,14 @@ #define emberAfKeepaliveClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_KEEPALIVE_CLUSTER, __VA_ARGS__) #define emberAfKeepaliveClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_KEEPALIVE_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfKeepaliveClusterFlush() -#define emberAfKeepaliveClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_KEEPALIVE_CLUSTER)) \ - { \ - x; \ - } + #define emberAfKeepaliveClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_KEEPALIVE_CLUSTER, (buffer), (len), (withSpace)) #define emberAfKeepaliveClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_KEEPALIVE_CLUSTER, (buffer)) #else #define emberAfKeepaliveClusterPrint(...) #define emberAfKeepaliveClusterPrintln(...) -#define emberAfKeepaliveClusterFlush() -#define emberAfKeepaliveClusterDebugExec(x) + #define emberAfKeepaliveClusterPrintBuffer(buffer, len, withSpace) #define emberAfKeepaliveClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_KEEPALIVE_CLUSTER) @@ -512,20 +386,14 @@ #define emberAfShadeConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER, __VA_ARGS__) #define emberAfShadeConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfShadeConfigClusterFlush() -#define emberAfShadeConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER)) \ - { \ - x; \ - } + #define emberAfShadeConfigClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER, (buffer), (len), (withSpace)) #define emberAfShadeConfigClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER, (buffer)) #else #define emberAfShadeConfigClusterPrint(...) #define emberAfShadeConfigClusterPrintln(...) -#define emberAfShadeConfigClusterFlush() -#define emberAfShadeConfigClusterDebugExec(x) + #define emberAfShadeConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfShadeConfigClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SHADE_CONFIG_CLUSTER) @@ -535,20 +403,14 @@ #define emberAfDoorLockClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER, __VA_ARGS__) #define emberAfDoorLockClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDoorLockClusterFlush() -#define emberAfDoorLockClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDoorLockClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDoorLockClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER, (buffer)) #else #define emberAfDoorLockClusterPrint(...) #define emberAfDoorLockClusterPrintln(...) -#define emberAfDoorLockClusterFlush() -#define emberAfDoorLockClusterDebugExec(x) + #define emberAfDoorLockClusterPrintBuffer(buffer, len, withSpace) #define emberAfDoorLockClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DOOR_LOCK_CLUSTER) @@ -558,20 +420,14 @@ #define emberAfWindowCoveringClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER, __VA_ARGS__) #define emberAfWindowCoveringClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfWindowCoveringClusterFlush() -#define emberAfWindowCoveringClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfWindowCoveringClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfWindowCoveringClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER, (buffer)) #else #define emberAfWindowCoveringClusterPrint(...) #define emberAfWindowCoveringClusterPrintln(...) -#define emberAfWindowCoveringClusterFlush() -#define emberAfWindowCoveringClusterDebugExec(x) + #define emberAfWindowCoveringClusterPrintBuffer(buffer, len, withSpace) #define emberAfWindowCoveringClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER) @@ -581,20 +437,14 @@ #define emberAfBarrierControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfBarrierControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBarrierControlClusterFlush() -#define emberAfBarrierControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBarrierControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBarrierControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER, (buffer)) #else #define emberAfBarrierControlClusterPrint(...) #define emberAfBarrierControlClusterPrintln(...) -#define emberAfBarrierControlClusterFlush() -#define emberAfBarrierControlClusterDebugExec(x) + #define emberAfBarrierControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfBarrierControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER) @@ -605,12 +455,7 @@ #define emberAfPumpConfigControlClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPumpConfigControlClusterFlush() -#define emberAfPumpConfigControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPumpConfigControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPumpConfigControlClusterPrintString(buffer) \ @@ -618,8 +463,7 @@ #else #define emberAfPumpConfigControlClusterPrint(...) #define emberAfPumpConfigControlClusterPrintln(...) -#define emberAfPumpConfigControlClusterFlush() -#define emberAfPumpConfigControlClusterDebugExec(x) + #define emberAfPumpConfigControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfPumpConfigControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER) @@ -629,20 +473,14 @@ #define emberAfThermostatClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_THERMOSTAT_CLUSTER, __VA_ARGS__) #define emberAfThermostatClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_THERMOSTAT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfThermostatClusterFlush() -#define emberAfThermostatClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_THERMOSTAT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfThermostatClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_THERMOSTAT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfThermostatClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_THERMOSTAT_CLUSTER, (buffer)) #else #define emberAfThermostatClusterPrint(...) #define emberAfThermostatClusterPrintln(...) -#define emberAfThermostatClusterFlush() -#define emberAfThermostatClusterDebugExec(x) + #define emberAfThermostatClusterPrintBuffer(buffer, len, withSpace) #define emberAfThermostatClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_CLUSTER) @@ -652,20 +490,14 @@ #define emberAfFanControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfFanControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfFanControlClusterFlush() -#define emberAfFanControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfFanControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfFanControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER, (buffer)) #else #define emberAfFanControlClusterPrint(...) #define emberAfFanControlClusterPrintln(...) -#define emberAfFanControlClusterFlush() -#define emberAfFanControlClusterDebugExec(x) + #define emberAfFanControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfFanControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_FAN_CONTROL_CLUSTER) @@ -675,20 +507,14 @@ #define emberAfDehumidControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfDehumidControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDehumidControlClusterFlush() -#define emberAfDehumidControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDehumidControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDehumidControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER, (buffer)) #else #define emberAfDehumidControlClusterPrint(...) #define emberAfDehumidControlClusterPrintln(...) -#define emberAfDehumidControlClusterFlush() -#define emberAfDehumidControlClusterDebugExec(x) + #define emberAfDehumidControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfDehumidControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER) @@ -700,12 +526,7 @@ #define emberAfThermostatUiConfigClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfThermostatUiConfigClusterFlush() -#define emberAfThermostatUiConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfThermostatUiConfigClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfThermostatUiConfigClusterPrintString(buffer) \ @@ -713,8 +534,7 @@ #else #define emberAfThermostatUiConfigClusterPrint(...) #define emberAfThermostatUiConfigClusterPrintln(...) -#define emberAfThermostatUiConfigClusterFlush() -#define emberAfThermostatUiConfigClusterDebugExec(x) + #define emberAfThermostatUiConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfThermostatUiConfigClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER) @@ -724,20 +544,14 @@ #define emberAfColorControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfColorControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfColorControlClusterFlush() -#define emberAfColorControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfColorControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfColorControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER, (buffer)) #else #define emberAfColorControlClusterPrint(...) #define emberAfColorControlClusterPrintln(...) -#define emberAfColorControlClusterFlush() -#define emberAfColorControlClusterDebugExec(x) + #define emberAfColorControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfColorControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER) @@ -747,12 +561,7 @@ #define emberAfBallastConfigurationClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER, __VA_ARGS__) #define emberAfBallastConfigurationClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBallastConfigurationClusterFlush() -#define emberAfBallastConfigurationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBallastConfigurationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBallastConfigurationClusterPrintString(buffer) \ @@ -760,8 +569,7 @@ #else #define emberAfBallastConfigurationClusterPrint(...) #define emberAfBallastConfigurationClusterPrintln(...) -#define emberAfBallastConfigurationClusterFlush() -#define emberAfBallastConfigurationClusterDebugExec(x) + #define emberAfBallastConfigurationClusterPrintBuffer(buffer, len, withSpace) #define emberAfBallastConfigurationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER) @@ -771,20 +579,14 @@ #define emberAfIllumMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER, __VA_ARGS__) #define emberAfIllumMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfIllumMeasurementClusterFlush() -#define emberAfIllumMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfIllumMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfIllumMeasurementClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER, (buffer)) #else #define emberAfIllumMeasurementClusterPrint(...) #define emberAfIllumMeasurementClusterPrintln(...) -#define emberAfIllumMeasurementClusterFlush() -#define emberAfIllumMeasurementClusterDebugExec(x) + #define emberAfIllumMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfIllumMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER) @@ -794,20 +596,14 @@ #define emberAfIllumLevelSensingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER, __VA_ARGS__) #define emberAfIllumLevelSensingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfIllumLevelSensingClusterFlush() -#define emberAfIllumLevelSensingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfIllumLevelSensingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfIllumLevelSensingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER, (buffer)) #else #define emberAfIllumLevelSensingClusterPrint(...) #define emberAfIllumLevelSensingClusterPrintln(...) -#define emberAfIllumLevelSensingClusterFlush() -#define emberAfIllumLevelSensingClusterDebugExec(x) + #define emberAfIllumLevelSensingClusterPrintBuffer(buffer, len, withSpace) #define emberAfIllumLevelSensingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER) @@ -817,12 +613,7 @@ #define emberAfTempMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, __VA_ARGS__) #define emberAfTempMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTempMeasurementClusterFlush() -#define emberAfTempMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTempMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTempMeasurementClusterPrintString(buffer) \ @@ -830,8 +621,7 @@ #else #define emberAfTempMeasurementClusterPrint(...) #define emberAfTempMeasurementClusterPrintln(...) -#define emberAfTempMeasurementClusterFlush() -#define emberAfTempMeasurementClusterDebugExec(x) + #define emberAfTempMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfTempMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER) @@ -841,12 +631,7 @@ #define emberAfPressureMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER, __VA_ARGS__) #define emberAfPressureMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPressureMeasurementClusterFlush() -#define emberAfPressureMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPressureMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPressureMeasurementClusterPrintString(buffer) \ @@ -854,8 +639,7 @@ #else #define emberAfPressureMeasurementClusterPrint(...) #define emberAfPressureMeasurementClusterPrintln(...) -#define emberAfPressureMeasurementClusterFlush() -#define emberAfPressureMeasurementClusterDebugExec(x) + #define emberAfPressureMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfPressureMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER) @@ -865,20 +649,14 @@ #define emberAfFlowMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER, __VA_ARGS__) #define emberAfFlowMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfFlowMeasurementClusterFlush() -#define emberAfFlowMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfFlowMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfFlowMeasurementClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER, (buffer)) #else #define emberAfFlowMeasurementClusterPrint(...) #define emberAfFlowMeasurementClusterPrintln(...) -#define emberAfFlowMeasurementClusterFlush() -#define emberAfFlowMeasurementClusterDebugExec(x) + #define emberAfFlowMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfFlowMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER) @@ -890,12 +668,7 @@ #define emberAfRelativeHumidityMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfRelativeHumidityMeasurementClusterFlush() -#define emberAfRelativeHumidityMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfRelativeHumidityMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfRelativeHumidityMeasurementClusterPrintString(buffer) \ @@ -903,8 +676,7 @@ #else #define emberAfRelativeHumidityMeasurementClusterPrint(...) #define emberAfRelativeHumidityMeasurementClusterPrintln(...) -#define emberAfRelativeHumidityMeasurementClusterFlush() -#define emberAfRelativeHumidityMeasurementClusterDebugExec(x) + #define emberAfRelativeHumidityMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfRelativeHumidityMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER) @@ -914,20 +686,14 @@ #define emberAfOccupancySensingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER, __VA_ARGS__) #define emberAfOccupancySensingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOccupancySensingClusterFlush() -#define emberAfOccupancySensingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOccupancySensingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOccupancySensingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER, (buffer)) #else #define emberAfOccupancySensingClusterPrint(...) #define emberAfOccupancySensingClusterPrintln(...) -#define emberAfOccupancySensingClusterFlush() -#define emberAfOccupancySensingClusterDebugExec(x) + #define emberAfOccupancySensingClusterPrintBuffer(buffer, len, withSpace) #define emberAfOccupancySensingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_OCCUPANCY_SENSING_CLUSTER) @@ -939,12 +705,7 @@ #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfCarbonMonoxideConcentrationMeasurementClusterFlush() -#define emberAfCarbonMonoxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -952,8 +713,7 @@ #else #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrint(...) #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintln(...) -#define emberAfCarbonMonoxideConcentrationMeasurementClusterFlush() -#define emberAfCarbonMonoxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfCarbonMonoxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -965,12 +725,7 @@ #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfCarbonDioxideConcentrationMeasurementClusterFlush() -#define emberAfCarbonDioxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -978,8 +733,7 @@ #else #define emberAfCarbonDioxideConcentrationMeasurementClusterPrint(...) #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintln(...) -#define emberAfCarbonDioxideConcentrationMeasurementClusterFlush() -#define emberAfCarbonDioxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfCarbonDioxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -991,12 +745,7 @@ #define emberAfEthyleneConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfEthyleneConcentrationMeasurementClusterFlush() -#define emberAfEthyleneConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfEthyleneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfEthyleneConcentrationMeasurementClusterPrintString(buffer) \ @@ -1004,8 +753,7 @@ #else #define emberAfEthyleneConcentrationMeasurementClusterPrint(...) #define emberAfEthyleneConcentrationMeasurementClusterPrintln(...) -#define emberAfEthyleneConcentrationMeasurementClusterFlush() -#define emberAfEthyleneConcentrationMeasurementClusterDebugExec(x) + #define emberAfEthyleneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfEthyleneConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1017,12 +765,7 @@ #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfEthyleneOxideConcentrationMeasurementClusterFlush() -#define emberAfEthyleneOxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1030,8 +773,7 @@ #else #define emberAfEthyleneOxideConcentrationMeasurementClusterPrint(...) #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintln(...) -#define emberAfEthyleneOxideConcentrationMeasurementClusterFlush() -#define emberAfEthyleneOxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfEthyleneOxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1043,12 +785,7 @@ #define emberAfHydrogenConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfHydrogenConcentrationMeasurementClusterFlush() -#define emberAfHydrogenConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfHydrogenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfHydrogenConcentrationMeasurementClusterPrintString(buffer) \ @@ -1056,8 +793,7 @@ #else #define emberAfHydrogenConcentrationMeasurementClusterPrint(...) #define emberAfHydrogenConcentrationMeasurementClusterPrintln(...) -#define emberAfHydrogenConcentrationMeasurementClusterFlush() -#define emberAfHydrogenConcentrationMeasurementClusterDebugExec(x) + #define emberAfHydrogenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfHydrogenConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1069,12 +805,7 @@ #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfHydrogenSulphideConcentrationMeasurementClusterFlush() -#define emberAfHydrogenSulphideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1082,8 +813,7 @@ #else #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrint(...) #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintln(...) -#define emberAfHydrogenSulphideConcentrationMeasurementClusterFlush() -#define emberAfHydrogenSulphideConcentrationMeasurementClusterDebugExec(x) + #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfHydrogenSulphideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1095,12 +825,7 @@ #define emberAfNitricOxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfNitricOxideConcentrationMeasurementClusterFlush() -#define emberAfNitricOxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfNitricOxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfNitricOxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1108,8 +833,7 @@ #else #define emberAfNitricOxideConcentrationMeasurementClusterPrint(...) #define emberAfNitricOxideConcentrationMeasurementClusterPrintln(...) -#define emberAfNitricOxideConcentrationMeasurementClusterFlush() -#define emberAfNitricOxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfNitricOxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfNitricOxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1121,12 +845,7 @@ #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfNitrogenDioxideConcentrationMeasurementClusterFlush() -#define emberAfNitrogenDioxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1134,8 +853,7 @@ #else #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrint(...) #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintln(...) -#define emberAfNitrogenDioxideConcentrationMeasurementClusterFlush() -#define emberAfNitrogenDioxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfNitrogenDioxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1147,12 +865,7 @@ #define emberAfOxygenConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOxygenConcentrationMeasurementClusterFlush() -#define emberAfOxygenConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOxygenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOxygenConcentrationMeasurementClusterPrintString(buffer) \ @@ -1160,8 +873,7 @@ #else #define emberAfOxygenConcentrationMeasurementClusterPrint(...) #define emberAfOxygenConcentrationMeasurementClusterPrintln(...) -#define emberAfOxygenConcentrationMeasurementClusterFlush() -#define emberAfOxygenConcentrationMeasurementClusterDebugExec(x) + #define emberAfOxygenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfOxygenConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1173,12 +885,7 @@ #define emberAfOzoneConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOzoneConcentrationMeasurementClusterFlush() -#define emberAfOzoneConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOzoneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOzoneConcentrationMeasurementClusterPrintString(buffer) \ @@ -1186,8 +893,7 @@ #else #define emberAfOzoneConcentrationMeasurementClusterPrint(...) #define emberAfOzoneConcentrationMeasurementClusterPrintln(...) -#define emberAfOzoneConcentrationMeasurementClusterFlush() -#define emberAfOzoneConcentrationMeasurementClusterDebugExec(x) + #define emberAfOzoneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfOzoneConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1199,12 +905,7 @@ #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSulfurDioxideConcentrationMeasurementClusterFlush() -#define emberAfSulfurDioxideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1212,8 +913,7 @@ #else #define emberAfSulfurDioxideConcentrationMeasurementClusterPrint(...) #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintln(...) -#define emberAfSulfurDioxideConcentrationMeasurementClusterFlush() -#define emberAfSulfurDioxideConcentrationMeasurementClusterDebugExec(x) + #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfSulfurDioxideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1225,12 +925,7 @@ #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDissolvedOxygenConcentrationMeasurementClusterFlush() -#define emberAfDissolvedOxygenConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintString(buffer) \ @@ -1238,8 +933,7 @@ #else #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrint(...) #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintln(...) -#define emberAfDissolvedOxygenConcentrationMeasurementClusterFlush() -#define emberAfDissolvedOxygenConcentrationMeasurementClusterDebugExec(x) + #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfDissolvedOxygenConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1251,12 +945,7 @@ #define emberAfBromateConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBromateConcentrationMeasurementClusterFlush() -#define emberAfBromateConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBromateConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBromateConcentrationMeasurementClusterPrintString(buffer) \ @@ -1264,8 +953,7 @@ #else #define emberAfBromateConcentrationMeasurementClusterPrint(...) #define emberAfBromateConcentrationMeasurementClusterPrintln(...) -#define emberAfBromateConcentrationMeasurementClusterFlush() -#define emberAfBromateConcentrationMeasurementClusterDebugExec(x) + #define emberAfBromateConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfBromateConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1277,12 +965,7 @@ #define emberAfChloraminesConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfChloraminesConcentrationMeasurementClusterFlush() -#define emberAfChloraminesConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfChloraminesConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfChloraminesConcentrationMeasurementClusterPrintString(buffer) \ @@ -1290,8 +973,7 @@ #else #define emberAfChloraminesConcentrationMeasurementClusterPrint(...) #define emberAfChloraminesConcentrationMeasurementClusterPrintln(...) -#define emberAfChloraminesConcentrationMeasurementClusterFlush() -#define emberAfChloraminesConcentrationMeasurementClusterDebugExec(x) + #define emberAfChloraminesConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfChloraminesConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1303,12 +985,7 @@ #define emberAfChlorineConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfChlorineConcentrationMeasurementClusterFlush() -#define emberAfChlorineConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfChlorineConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfChlorineConcentrationMeasurementClusterPrintString(buffer) \ @@ -1316,8 +993,7 @@ #else #define emberAfChlorineConcentrationMeasurementClusterPrint(...) #define emberAfChlorineConcentrationMeasurementClusterPrintln(...) -#define emberAfChlorineConcentrationMeasurementClusterFlush() -#define emberAfChlorineConcentrationMeasurementClusterDebugExec(x) + #define emberAfChlorineConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfChlorineConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1329,12 +1005,7 @@ #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfFecalColiformAndEColiConcentrationMeasurementClusterFlush() -#define emberAfFecalColiformAndEColiConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintString(buffer) \ @@ -1342,8 +1013,7 @@ #else #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrint(...) #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintln(...) -#define emberAfFecalColiformAndEColiConcentrationMeasurementClusterFlush() -#define emberAfFecalColiformAndEColiConcentrationMeasurementClusterDebugExec(x) + #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfFecalColiformAndEColiConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1355,12 +1025,7 @@ #define emberAfFluorideConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfFluorideConcentrationMeasurementClusterFlush() -#define emberAfFluorideConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfFluorideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfFluorideConcentrationMeasurementClusterPrintString(buffer) \ @@ -1368,8 +1033,7 @@ #else #define emberAfFluorideConcentrationMeasurementClusterPrint(...) #define emberAfFluorideConcentrationMeasurementClusterPrintln(...) -#define emberAfFluorideConcentrationMeasurementClusterFlush() -#define emberAfFluorideConcentrationMeasurementClusterDebugExec(x) + #define emberAfFluorideConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfFluorideConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1381,12 +1045,7 @@ #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfHaloaceticAcidsConcentrationMeasurementClusterFlush() -#define emberAfHaloaceticAcidsConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintString(buffer) \ @@ -1394,8 +1053,7 @@ #else #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrint(...) #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintln(...) -#define emberAfHaloaceticAcidsConcentrationMeasurementClusterFlush() -#define emberAfHaloaceticAcidsConcentrationMeasurementClusterDebugExec(x) + #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfHaloaceticAcidsConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1407,12 +1065,7 @@ #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTotalTrihalomethanesConcentrationMeasurementClusterFlush() -#define emberAfTotalTrihalomethanesConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintString(buffer) \ @@ -1420,8 +1073,7 @@ #else #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrint(...) #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintln(...) -#define emberAfTotalTrihalomethanesConcentrationMeasurementClusterFlush() -#define emberAfTotalTrihalomethanesConcentrationMeasurementClusterDebugExec(x) + #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfTotalTrihalomethanesConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1433,12 +1085,7 @@ #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTotalColiformBacteriaConcentrationMeasurementClusterFlush() -#define emberAfTotalColiformBacteriaConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintString(buffer) \ @@ -1446,8 +1093,7 @@ #else #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrint(...) #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintln(...) -#define emberAfTotalColiformBacteriaConcentrationMeasurementClusterFlush() -#define emberAfTotalColiformBacteriaConcentrationMeasurementClusterDebugExec(x) + #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfTotalColiformBacteriaConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1459,12 +1105,7 @@ #define emberAfTurbidityConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTurbidityConcentrationMeasurementClusterFlush() -#define emberAfTurbidityConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTurbidityConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTurbidityConcentrationMeasurementClusterPrintString(buffer) \ @@ -1472,8 +1113,7 @@ #else #define emberAfTurbidityConcentrationMeasurementClusterPrint(...) #define emberAfTurbidityConcentrationMeasurementClusterPrintln(...) -#define emberAfTurbidityConcentrationMeasurementClusterFlush() -#define emberAfTurbidityConcentrationMeasurementClusterDebugExec(x) + #define emberAfTurbidityConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfTurbidityConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1485,12 +1125,7 @@ #define emberAfCopperConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfCopperConcentrationMeasurementClusterFlush() -#define emberAfCopperConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfCopperConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfCopperConcentrationMeasurementClusterPrintString(buffer) \ @@ -1498,8 +1133,7 @@ #else #define emberAfCopperConcentrationMeasurementClusterPrint(...) #define emberAfCopperConcentrationMeasurementClusterPrintln(...) -#define emberAfCopperConcentrationMeasurementClusterFlush() -#define emberAfCopperConcentrationMeasurementClusterDebugExec(x) + #define emberAfCopperConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfCopperConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1511,12 +1145,7 @@ #define emberAfLeadConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfLeadConcentrationMeasurementClusterFlush() -#define emberAfLeadConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfLeadConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfLeadConcentrationMeasurementClusterPrintString(buffer) \ @@ -1524,8 +1153,7 @@ #else #define emberAfLeadConcentrationMeasurementClusterPrint(...) #define emberAfLeadConcentrationMeasurementClusterPrintln(...) -#define emberAfLeadConcentrationMeasurementClusterFlush() -#define emberAfLeadConcentrationMeasurementClusterDebugExec(x) + #define emberAfLeadConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfLeadConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1537,12 +1165,7 @@ #define emberAfManganeseConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfManganeseConcentrationMeasurementClusterFlush() -#define emberAfManganeseConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfManganeseConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfManganeseConcentrationMeasurementClusterPrintString(buffer) \ @@ -1550,8 +1173,7 @@ #else #define emberAfManganeseConcentrationMeasurementClusterPrint(...) #define emberAfManganeseConcentrationMeasurementClusterPrintln(...) -#define emberAfManganeseConcentrationMeasurementClusterFlush() -#define emberAfManganeseConcentrationMeasurementClusterDebugExec(x) + #define emberAfManganeseConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfManganeseConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1563,12 +1185,7 @@ #define emberAfSulfateConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSulfateConcentrationMeasurementClusterFlush() -#define emberAfSulfateConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSulfateConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSulfateConcentrationMeasurementClusterPrintString(buffer) \ @@ -1576,8 +1193,7 @@ #else #define emberAfSulfateConcentrationMeasurementClusterPrint(...) #define emberAfSulfateConcentrationMeasurementClusterPrintln(...) -#define emberAfSulfateConcentrationMeasurementClusterFlush() -#define emberAfSulfateConcentrationMeasurementClusterDebugExec(x) + #define emberAfSulfateConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfSulfateConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1589,12 +1205,7 @@ #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBromodichloromethaneConcentrationMeasurementClusterFlush() -#define emberAfBromodichloromethaneConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintString(buffer) \ @@ -1602,8 +1213,7 @@ #else #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrint(...) #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintln(...) -#define emberAfBromodichloromethaneConcentrationMeasurementClusterFlush() -#define emberAfBromodichloromethaneConcentrationMeasurementClusterDebugExec(x) + #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfBromodichloromethaneConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1615,12 +1225,7 @@ #define emberAfBromoformConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBromoformConcentrationMeasurementClusterFlush() -#define emberAfBromoformConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBromoformConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBromoformConcentrationMeasurementClusterPrintString(buffer) \ @@ -1628,8 +1233,7 @@ #else #define emberAfBromoformConcentrationMeasurementClusterPrint(...) #define emberAfBromoformConcentrationMeasurementClusterPrintln(...) -#define emberAfBromoformConcentrationMeasurementClusterFlush() -#define emberAfBromoformConcentrationMeasurementClusterDebugExec(x) + #define emberAfBromoformConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfBromoformConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1641,12 +1245,7 @@ #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfChlorodibromomethaneConcentrationMeasurementClusterFlush() -#define emberAfChlorodibromomethaneConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintString(buffer) \ @@ -1654,8 +1253,7 @@ #else #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrint(...) #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintln(...) -#define emberAfChlorodibromomethaneConcentrationMeasurementClusterFlush() -#define emberAfChlorodibromomethaneConcentrationMeasurementClusterDebugExec(x) + #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfChlorodibromomethaneConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1667,12 +1265,7 @@ #define emberAfChloroformConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfChloroformConcentrationMeasurementClusterFlush() -#define emberAfChloroformConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfChloroformConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfChloroformConcentrationMeasurementClusterPrintString(buffer) \ @@ -1680,8 +1273,7 @@ #else #define emberAfChloroformConcentrationMeasurementClusterPrint(...) #define emberAfChloroformConcentrationMeasurementClusterPrintln(...) -#define emberAfChloroformConcentrationMeasurementClusterFlush() -#define emberAfChloroformConcentrationMeasurementClusterDebugExec(x) + #define emberAfChloroformConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfChloroformConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1693,12 +1285,7 @@ #define emberAfSodiumConcentrationMeasurementClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSodiumConcentrationMeasurementClusterFlush() -#define emberAfSodiumConcentrationMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSodiumConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSodiumConcentrationMeasurementClusterPrintString(buffer) \ @@ -1706,8 +1293,7 @@ #else #define emberAfSodiumConcentrationMeasurementClusterPrint(...) #define emberAfSodiumConcentrationMeasurementClusterPrintln(...) -#define emberAfSodiumConcentrationMeasurementClusterFlush() -#define emberAfSodiumConcentrationMeasurementClusterDebugExec(x) + #define emberAfSodiumConcentrationMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfSodiumConcentrationMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER) @@ -1717,20 +1303,14 @@ #define emberAfGenericTunnelClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER, __VA_ARGS__) #define emberAfGenericTunnelClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfGenericTunnelClusterFlush() -#define emberAfGenericTunnelClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfGenericTunnelClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfGenericTunnelClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER, (buffer)) #else #define emberAfGenericTunnelClusterPrint(...) #define emberAfGenericTunnelClusterPrintln(...) -#define emberAfGenericTunnelClusterFlush() -#define emberAfGenericTunnelClusterDebugExec(x) + #define emberAfGenericTunnelClusterPrintBuffer(buffer, len, withSpace) #define emberAfGenericTunnelClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_GENERIC_TUNNEL_CLUSTER) @@ -1740,12 +1320,7 @@ #define emberAfBacnetProtocolTunnelClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BACNET_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) #define emberAfBacnetProtocolTunnelClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BACNET_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBacnetProtocolTunnelClusterFlush() -#define emberAfBacnetProtocolTunnelClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BACNET_PROTOCOL_TUNNEL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBacnetProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BACNET_PROTOCOL_TUNNEL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBacnetProtocolTunnelClusterPrintString(buffer) \ @@ -1753,8 +1328,7 @@ #else #define emberAfBacnetProtocolTunnelClusterPrint(...) #define emberAfBacnetProtocolTunnelClusterPrintln(...) -#define emberAfBacnetProtocolTunnelClusterFlush() -#define emberAfBacnetProtocolTunnelClusterDebugExec(x) + #define emberAfBacnetProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) #define emberAfBacnetProtocolTunnelClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BACNET_PROTOCOL_TUNNEL_CLUSTER) @@ -1764,12 +1338,7 @@ #define emberAf11073ProtocolTunnelClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_11073_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) #define emberAf11073ProtocolTunnelClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_11073_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAf11073ProtocolTunnelClusterFlush() -#define emberAf11073ProtocolTunnelClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_11073_PROTOCOL_TUNNEL_CLUSTER)) \ - { \ - x; \ - } + #define emberAf11073ProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_11073_PROTOCOL_TUNNEL_CLUSTER, (buffer), (len), (withSpace)) #define emberAf11073ProtocolTunnelClusterPrintString(buffer) \ @@ -1777,8 +1346,7 @@ #else #define emberAf11073ProtocolTunnelClusterPrint(...) #define emberAf11073ProtocolTunnelClusterPrintln(...) -#define emberAf11073ProtocolTunnelClusterFlush() -#define emberAf11073ProtocolTunnelClusterDebugExec(x) + #define emberAf11073ProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) #define emberAf11073ProtocolTunnelClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_11073_PROTOCOL_TUNNEL_CLUSTER) @@ -1788,12 +1356,7 @@ #define emberAfIso7816ProtocolTunnelClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ISO7816_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) #define emberAfIso7816ProtocolTunnelClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ISO7816_PROTOCOL_TUNNEL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfIso7816ProtocolTunnelClusterFlush() -#define emberAfIso7816ProtocolTunnelClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ISO7816_PROTOCOL_TUNNEL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfIso7816ProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ISO7816_PROTOCOL_TUNNEL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfIso7816ProtocolTunnelClusterPrintString(buffer) \ @@ -1801,8 +1364,7 @@ #else #define emberAfIso7816ProtocolTunnelClusterPrint(...) #define emberAfIso7816ProtocolTunnelClusterPrintln(...) -#define emberAfIso7816ProtocolTunnelClusterFlush() -#define emberAfIso7816ProtocolTunnelClusterDebugExec(x) + #define emberAfIso7816ProtocolTunnelClusterPrintBuffer(buffer, len, withSpace) #define emberAfIso7816ProtocolTunnelClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ISO7816_PROTOCOL_TUNNEL_CLUSTER) @@ -1812,20 +1374,14 @@ #define emberAfPriceClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PRICE_CLUSTER, __VA_ARGS__) #define emberAfPriceClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PRICE_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPriceClusterFlush() -#define emberAfPriceClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PRICE_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPriceClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PRICE_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPriceClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_PRICE_CLUSTER, (buffer)) #else #define emberAfPriceClusterPrint(...) #define emberAfPriceClusterPrintln(...) -#define emberAfPriceClusterFlush() -#define emberAfPriceClusterDebugExec(x) + #define emberAfPriceClusterPrintBuffer(buffer, len, withSpace) #define emberAfPriceClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PRICE_CLUSTER) @@ -1837,12 +1393,7 @@ #define emberAfDemandResponseLoadControlClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDemandResponseLoadControlClusterFlush() -#define emberAfDemandResponseLoadControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDemandResponseLoadControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDemandResponseLoadControlClusterPrintString(buffer) \ @@ -1850,8 +1401,7 @@ #else #define emberAfDemandResponseLoadControlClusterPrint(...) #define emberAfDemandResponseLoadControlClusterPrintln(...) -#define emberAfDemandResponseLoadControlClusterFlush() -#define emberAfDemandResponseLoadControlClusterDebugExec(x) + #define emberAfDemandResponseLoadControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfDemandResponseLoadControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER) @@ -1861,20 +1411,14 @@ #define emberAfSimpleMeteringClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER, __VA_ARGS__) #define emberAfSimpleMeteringClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSimpleMeteringClusterFlush() -#define emberAfSimpleMeteringClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSimpleMeteringClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSimpleMeteringClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER, (buffer)) #else #define emberAfSimpleMeteringClusterPrint(...) #define emberAfSimpleMeteringClusterPrintln(...) -#define emberAfSimpleMeteringClusterFlush() -#define emberAfSimpleMeteringClusterDebugExec(x) + #define emberAfSimpleMeteringClusterPrintBuffer(buffer, len, withSpace) #define emberAfSimpleMeteringClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SIMPLE_METERING_CLUSTER) @@ -1884,20 +1428,14 @@ #define emberAfMessagingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_MESSAGING_CLUSTER, __VA_ARGS__) #define emberAfMessagingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_MESSAGING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfMessagingClusterFlush() -#define emberAfMessagingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_MESSAGING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfMessagingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_MESSAGING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfMessagingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_MESSAGING_CLUSTER, (buffer)) #else #define emberAfMessagingClusterPrint(...) #define emberAfMessagingClusterPrintln(...) -#define emberAfMessagingClusterFlush() -#define emberAfMessagingClusterDebugExec(x) + #define emberAfMessagingClusterPrintBuffer(buffer, len, withSpace) #define emberAfMessagingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_MESSAGING_CLUSTER) @@ -1907,20 +1445,14 @@ #define emberAfTunnelingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TUNNELING_CLUSTER, __VA_ARGS__) #define emberAfTunnelingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TUNNELING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTunnelingClusterFlush() -#define emberAfTunnelingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TUNNELING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTunnelingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TUNNELING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTunnelingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_TUNNELING_CLUSTER, (buffer)) #else #define emberAfTunnelingClusterPrint(...) #define emberAfTunnelingClusterPrintln(...) -#define emberAfTunnelingClusterFlush() -#define emberAfTunnelingClusterDebugExec(x) + #define emberAfTunnelingClusterPrintBuffer(buffer, len, withSpace) #define emberAfTunnelingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TUNNELING_CLUSTER) @@ -1930,20 +1462,14 @@ #define emberAfPrepaymentClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PREPAYMENT_CLUSTER, __VA_ARGS__) #define emberAfPrepaymentClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PREPAYMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPrepaymentClusterFlush() -#define emberAfPrepaymentClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PREPAYMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPrepaymentClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PREPAYMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPrepaymentClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_PREPAYMENT_CLUSTER, (buffer)) #else #define emberAfPrepaymentClusterPrint(...) #define emberAfPrepaymentClusterPrintln(...) -#define emberAfPrepaymentClusterFlush() -#define emberAfPrepaymentClusterDebugExec(x) + #define emberAfPrepaymentClusterPrintBuffer(buffer, len, withSpace) #define emberAfPrepaymentClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PREPAYMENT_CLUSTER) @@ -1953,20 +1479,14 @@ #define emberAfEnergyManagementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER, __VA_ARGS__) #define emberAfEnergyManagementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfEnergyManagementClusterFlush() -#define emberAfEnergyManagementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfEnergyManagementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfEnergyManagementClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER, (buffer)) #else #define emberAfEnergyManagementClusterPrint(...) #define emberAfEnergyManagementClusterPrintln(...) -#define emberAfEnergyManagementClusterFlush() -#define emberAfEnergyManagementClusterDebugExec(x) + #define emberAfEnergyManagementClusterPrintBuffer(buffer, len, withSpace) #define emberAfEnergyManagementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ENERGY_MANAGEMENT_CLUSTER) @@ -1976,20 +1496,14 @@ #define emberAfCalendarClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_CALENDAR_CLUSTER, __VA_ARGS__) #define emberAfCalendarClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_CALENDAR_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfCalendarClusterFlush() -#define emberAfCalendarClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CALENDAR_CLUSTER)) \ - { \ - x; \ - } + #define emberAfCalendarClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CALENDAR_CLUSTER, (buffer), (len), (withSpace)) #define emberAfCalendarClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CALENDAR_CLUSTER, (buffer)) #else #define emberAfCalendarClusterPrint(...) #define emberAfCalendarClusterPrintln(...) -#define emberAfCalendarClusterFlush() -#define emberAfCalendarClusterDebugExec(x) + #define emberAfCalendarClusterPrintBuffer(buffer, len, withSpace) #define emberAfCalendarClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CALENDAR_CLUSTER) @@ -1999,20 +1513,14 @@ #define emberAfDeviceManagementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER, __VA_ARGS__) #define emberAfDeviceManagementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDeviceManagementClusterFlush() -#define emberAfDeviceManagementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDeviceManagementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDeviceManagementClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER, (buffer)) #else #define emberAfDeviceManagementClusterPrint(...) #define emberAfDeviceManagementClusterPrintln(...) -#define emberAfDeviceManagementClusterFlush() -#define emberAfDeviceManagementClusterDebugExec(x) + #define emberAfDeviceManagementClusterPrintBuffer(buffer, len, withSpace) #define emberAfDeviceManagementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEVICE_MANAGEMENT_CLUSTER) @@ -2022,20 +1530,14 @@ #define emberAfEventsClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_EVENTS_CLUSTER, __VA_ARGS__) #define emberAfEventsClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_EVENTS_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfEventsClusterFlush() -#define emberAfEventsClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_EVENTS_CLUSTER)) \ - { \ - x; \ - } + #define emberAfEventsClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_EVENTS_CLUSTER, (buffer), (len), (withSpace)) #define emberAfEventsClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_EVENTS_CLUSTER, (buffer)) #else #define emberAfEventsClusterPrint(...) #define emberAfEventsClusterPrintln(...) -#define emberAfEventsClusterFlush() -#define emberAfEventsClusterDebugExec(x) + #define emberAfEventsClusterPrintBuffer(buffer, len, withSpace) #define emberAfEventsClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_EVENTS_CLUSTER) @@ -2045,20 +1547,14 @@ #define emberAfMduPairingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER, __VA_ARGS__) #define emberAfMduPairingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfMduPairingClusterFlush() -#define emberAfMduPairingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfMduPairingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfMduPairingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER, (buffer)) #else #define emberAfMduPairingClusterPrint(...) #define emberAfMduPairingClusterPrintln(...) -#define emberAfMduPairingClusterFlush() -#define emberAfMduPairingClusterDebugExec(x) + #define emberAfMduPairingClusterPrintBuffer(buffer, len, withSpace) #define emberAfMduPairingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_MDU_PAIRING_CLUSTER) @@ -2068,20 +1564,14 @@ #define emberAfSubGhzClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SUB_GHZ_CLUSTER, __VA_ARGS__) #define emberAfSubGhzClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SUB_GHZ_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSubGhzClusterFlush() -#define emberAfSubGhzClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SUB_GHZ_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSubGhzClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SUB_GHZ_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSubGhzClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SUB_GHZ_CLUSTER, (buffer)) #else #define emberAfSubGhzClusterPrint(...) #define emberAfSubGhzClusterPrintln(...) -#define emberAfSubGhzClusterFlush() -#define emberAfSubGhzClusterDebugExec(x) + #define emberAfSubGhzClusterPrintBuffer(buffer, len, withSpace) #define emberAfSubGhzClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SUB_GHZ_CLUSTER) @@ -2091,20 +1581,14 @@ #define emberAfKeyEstablishmentClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER, __VA_ARGS__) #define emberAfKeyEstablishmentClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfKeyEstablishmentClusterFlush() -#define emberAfKeyEstablishmentClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfKeyEstablishmentClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfKeyEstablishmentClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER, (buffer)) #else #define emberAfKeyEstablishmentClusterPrint(...) #define emberAfKeyEstablishmentClusterPrintln(...) -#define emberAfKeyEstablishmentClusterFlush() -#define emberAfKeyEstablishmentClusterDebugExec(x) + #define emberAfKeyEstablishmentClusterPrintBuffer(buffer, len, withSpace) #define emberAfKeyEstablishmentClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_KEY_ESTABLISHMENT_CLUSTER) @@ -2114,20 +1598,14 @@ #define emberAfInformationClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_INFORMATION_CLUSTER, __VA_ARGS__) #define emberAfInformationClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_INFORMATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfInformationClusterFlush() -#define emberAfInformationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_INFORMATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfInformationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_INFORMATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfInformationClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_INFORMATION_CLUSTER, (buffer)) #else #define emberAfInformationClusterPrint(...) #define emberAfInformationClusterPrintln(...) -#define emberAfInformationClusterFlush() -#define emberAfInformationClusterDebugExec(x) + #define emberAfInformationClusterPrintBuffer(buffer, len, withSpace) #define emberAfInformationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_INFORMATION_CLUSTER) @@ -2137,20 +1615,14 @@ #define emberAfDataSharingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DATA_SHARING_CLUSTER, __VA_ARGS__) #define emberAfDataSharingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DATA_SHARING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDataSharingClusterFlush() -#define emberAfDataSharingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DATA_SHARING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDataSharingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DATA_SHARING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDataSharingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DATA_SHARING_CLUSTER, (buffer)) #else #define emberAfDataSharingClusterPrint(...) #define emberAfDataSharingClusterPrintln(...) -#define emberAfDataSharingClusterFlush() -#define emberAfDataSharingClusterDebugExec(x) + #define emberAfDataSharingClusterPrintBuffer(buffer, len, withSpace) #define emberAfDataSharingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DATA_SHARING_CLUSTER) @@ -2160,20 +1632,14 @@ #define emberAfGamingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_GAMING_CLUSTER, __VA_ARGS__) #define emberAfGamingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_GAMING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfGamingClusterFlush() -#define emberAfGamingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_GAMING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfGamingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_GAMING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfGamingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_GAMING_CLUSTER, (buffer)) #else #define emberAfGamingClusterPrint(...) #define emberAfGamingClusterPrintln(...) -#define emberAfGamingClusterFlush() -#define emberAfGamingClusterDebugExec(x) + #define emberAfGamingClusterPrintBuffer(buffer, len, withSpace) #define emberAfGamingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_GAMING_CLUSTER) @@ -2183,20 +1649,14 @@ #define emberAfDataRateControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER, __VA_ARGS__) #define emberAfDataRateControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDataRateControlClusterFlush() -#define emberAfDataRateControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDataRateControlClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDataRateControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER, (buffer)) #else #define emberAfDataRateControlClusterPrint(...) #define emberAfDataRateControlClusterPrintln(...) -#define emberAfDataRateControlClusterFlush() -#define emberAfDataRateControlClusterDebugExec(x) + #define emberAfDataRateControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfDataRateControlClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DATA_RATE_CONTROL_CLUSTER) @@ -2206,20 +1666,14 @@ #define emberAfVoiceOverZigbeeClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER, __VA_ARGS__) #define emberAfVoiceOverZigbeeClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfVoiceOverZigbeeClusterFlush() -#define emberAfVoiceOverZigbeeClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER)) \ - { \ - x; \ - } + #define emberAfVoiceOverZigbeeClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER, (buffer), (len), (withSpace)) #define emberAfVoiceOverZigbeeClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER, (buffer)) #else #define emberAfVoiceOverZigbeeClusterPrint(...) #define emberAfVoiceOverZigbeeClusterPrintln(...) -#define emberAfVoiceOverZigbeeClusterFlush() -#define emberAfVoiceOverZigbeeClusterDebugExec(x) + #define emberAfVoiceOverZigbeeClusterPrintBuffer(buffer, len, withSpace) #define emberAfVoiceOverZigbeeClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_VOICE_OVER_ZIGBEE_CLUSTER) @@ -2229,20 +1683,14 @@ #define emberAfChattingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_CHATTING_CLUSTER, __VA_ARGS__) #define emberAfChattingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_CHATTING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfChattingClusterFlush() -#define emberAfChattingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CHATTING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfChattingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CHATTING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfChattingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CHATTING_CLUSTER, (buffer)) #else #define emberAfChattingClusterPrint(...) #define emberAfChattingClusterPrintln(...) -#define emberAfChattingClusterFlush() -#define emberAfChattingClusterDebugExec(x) + #define emberAfChattingClusterPrintBuffer(buffer, len, withSpace) #define emberAfChattingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CHATTING_CLUSTER) @@ -2252,20 +1700,14 @@ #define emberAfPaymentClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PAYMENT_CLUSTER, __VA_ARGS__) #define emberAfPaymentClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PAYMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfPaymentClusterFlush() -#define emberAfPaymentClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PAYMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfPaymentClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_PAYMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfPaymentClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_PAYMENT_CLUSTER, (buffer)) #else #define emberAfPaymentClusterPrint(...) #define emberAfPaymentClusterPrintln(...) -#define emberAfPaymentClusterFlush() -#define emberAfPaymentClusterDebugExec(x) + #define emberAfPaymentClusterPrintBuffer(buffer, len, withSpace) #define emberAfPaymentClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PAYMENT_CLUSTER) @@ -2275,20 +1717,14 @@ #define emberAfBillingClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_BILLING_CLUSTER, __VA_ARGS__) #define emberAfBillingClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_BILLING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfBillingClusterFlush() -#define emberAfBillingClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_BILLING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfBillingClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_BILLING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfBillingClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_BILLING_CLUSTER, (buffer)) #else #define emberAfBillingClusterPrint(...) #define emberAfBillingClusterPrintln(...) -#define emberAfBillingClusterFlush() -#define emberAfBillingClusterDebugExec(x) + #define emberAfBillingClusterPrintBuffer(buffer, len, withSpace) #define emberAfBillingClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BILLING_CLUSTER) @@ -2299,12 +1735,7 @@ #define emberAfApplianceIdentificationClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_APPLIANCE_IDENTIFICATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplianceIdentificationClusterFlush() -#define emberAfApplianceIdentificationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLIANCE_IDENTIFICATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplianceIdentificationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLIANCE_IDENTIFICATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplianceIdentificationClusterPrintString(buffer) \ @@ -2312,8 +1743,7 @@ #else #define emberAfApplianceIdentificationClusterPrint(...) #define emberAfApplianceIdentificationClusterPrintln(...) -#define emberAfApplianceIdentificationClusterFlush() -#define emberAfApplianceIdentificationClusterDebugExec(x) + #define emberAfApplianceIdentificationClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplianceIdentificationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLIANCE_IDENTIFICATION_CLUSTER) @@ -2323,12 +1753,7 @@ #define emberAfMeterIdentificationClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_METER_IDENTIFICATION_CLUSTER, __VA_ARGS__) #define emberAfMeterIdentificationClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_METER_IDENTIFICATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfMeterIdentificationClusterFlush() -#define emberAfMeterIdentificationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_METER_IDENTIFICATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfMeterIdentificationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_METER_IDENTIFICATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfMeterIdentificationClusterPrintString(buffer) \ @@ -2336,8 +1761,7 @@ #else #define emberAfMeterIdentificationClusterPrint(...) #define emberAfMeterIdentificationClusterPrintln(...) -#define emberAfMeterIdentificationClusterFlush() -#define emberAfMeterIdentificationClusterDebugExec(x) + #define emberAfMeterIdentificationClusterPrintBuffer(buffer, len, withSpace) #define emberAfMeterIdentificationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_METER_IDENTIFICATION_CLUSTER) @@ -2348,12 +1772,7 @@ #define emberAfApplianceEventsAndAlertClusterPrintln(...) \ emberAfPrintln(EMBER_AF_PRINT_APPLIANCE_EVENTS_AND_ALERT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplianceEventsAndAlertClusterFlush() -#define emberAfApplianceEventsAndAlertClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLIANCE_EVENTS_AND_ALERT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplianceEventsAndAlertClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLIANCE_EVENTS_AND_ALERT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplianceEventsAndAlertClusterPrintString(buffer) \ @@ -2361,8 +1780,7 @@ #else #define emberAfApplianceEventsAndAlertClusterPrint(...) #define emberAfApplianceEventsAndAlertClusterPrintln(...) -#define emberAfApplianceEventsAndAlertClusterFlush() -#define emberAfApplianceEventsAndAlertClusterDebugExec(x) + #define emberAfApplianceEventsAndAlertClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplianceEventsAndAlertClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLIANCE_EVENTS_AND_ALERT_CLUSTER) @@ -2372,12 +1790,7 @@ #define emberAfApplianceStatisticsClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_APPLIANCE_STATISTICS_CLUSTER, __VA_ARGS__) #define emberAfApplianceStatisticsClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_APPLIANCE_STATISTICS_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplianceStatisticsClusterFlush() -#define emberAfApplianceStatisticsClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLIANCE_STATISTICS_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplianceStatisticsClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLIANCE_STATISTICS_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplianceStatisticsClusterPrintString(buffer) \ @@ -2385,8 +1798,7 @@ #else #define emberAfApplianceStatisticsClusterPrint(...) #define emberAfApplianceStatisticsClusterPrintln(...) -#define emberAfApplianceStatisticsClusterFlush() -#define emberAfApplianceStatisticsClusterDebugExec(x) + #define emberAfApplianceStatisticsClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplianceStatisticsClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLIANCE_STATISTICS_CLUSTER) @@ -2396,12 +1808,7 @@ #define emberAfElectricalMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ELECTRICAL_MEASUREMENT_CLUSTER, __VA_ARGS__) #define emberAfElectricalMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ELECTRICAL_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfElectricalMeasurementClusterFlush() -#define emberAfElectricalMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ELECTRICAL_MEASUREMENT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfElectricalMeasurementClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ELECTRICAL_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfElectricalMeasurementClusterPrintString(buffer) \ @@ -2409,8 +1816,7 @@ #else #define emberAfElectricalMeasurementClusterPrint(...) #define emberAfElectricalMeasurementClusterPrintln(...) -#define emberAfElectricalMeasurementClusterFlush() -#define emberAfElectricalMeasurementClusterDebugExec(x) + #define emberAfElectricalMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfElectricalMeasurementClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ELECTRICAL_MEASUREMENT_CLUSTER) @@ -2420,20 +1826,14 @@ #define emberAfDiagnosticsClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER, __VA_ARGS__) #define emberAfDiagnosticsClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfDiagnosticsClusterFlush() -#define emberAfDiagnosticsClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER)) \ - { \ - x; \ - } + #define emberAfDiagnosticsClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER, (buffer), (len), (withSpace)) #define emberAfDiagnosticsClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER, (buffer)) #else #define emberAfDiagnosticsClusterPrint(...) #define emberAfDiagnosticsClusterPrintln(...) -#define emberAfDiagnosticsClusterFlush() -#define emberAfDiagnosticsClusterDebugExec(x) + #define emberAfDiagnosticsClusterPrintBuffer(buffer, len, withSpace) #define emberAfDiagnosticsClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DIAGNOSTICS_CLUSTER) @@ -2443,20 +1843,14 @@ #define emberAfApplicationBasicClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER, __VA_ARGS__) #define emberAfApplicationBasicClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplicationBasicClusterFlush() -#define emberAfApplicationBasicClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplicationBasicClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplicationBasicClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER, (buffer)) #else #define emberAfApplicationBasicClusterPrint(...) #define emberAfApplicationBasicClusterPrintln(...) -#define emberAfApplicationBasicClusterFlush() -#define emberAfApplicationBasicClusterDebugExec(x) + #define emberAfApplicationBasicClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplicationBasicClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLICATION_BASIC_CLUSTER) @@ -2466,20 +1860,14 @@ #define emberAfZllCommissioningClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER, __VA_ARGS__) #define emberAfZllCommissioningClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfZllCommissioningClusterFlush() -#define emberAfZllCommissioningClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER)) \ - { \ - x; \ - } + #define emberAfZllCommissioningClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER, (buffer), (len), (withSpace)) #define emberAfZllCommissioningClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER, (buffer)) #else #define emberAfZllCommissioningClusterPrint(...) #define emberAfZllCommissioningClusterPrintln(...) -#define emberAfZllCommissioningClusterFlush() -#define emberAfZllCommissioningClusterDebugExec(x) + #define emberAfZllCommissioningClusterPrintBuffer(buffer, len, withSpace) #define emberAfZllCommissioningClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ZLL_COMMISSIONING_CLUSTER) @@ -2489,20 +1877,14 @@ #define emberAfSampleMfgSpecificClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER, __VA_ARGS__) #define emberAfSampleMfgSpecificClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSampleMfgSpecificClusterFlush() -#define emberAfSampleMfgSpecificClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSampleMfgSpecificClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSampleMfgSpecificClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER, (buffer)) #else #define emberAfSampleMfgSpecificClusterPrint(...) #define emberAfSampleMfgSpecificClusterPrintln(...) -#define emberAfSampleMfgSpecificClusterFlush() -#define emberAfSampleMfgSpecificClusterDebugExec(x) + #define emberAfSampleMfgSpecificClusterPrintBuffer(buffer, len, withSpace) #define emberAfSampleMfgSpecificClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER) @@ -2512,12 +1894,7 @@ #define emberAfSampleMfgSpecificCluster2Print(...) emberAfPrint(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER_2, __VA_ARGS__) #define emberAfSampleMfgSpecificCluster2Println(...) emberAfPrintln(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER_2, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSampleMfgSpecificCluster2Flush() -#define emberAfSampleMfgSpecificCluster2DebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER_2)) \ - { \ - x; \ - } + #define emberAfSampleMfgSpecificCluster2PrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER_2, (buffer), (len), (withSpace)) #define emberAfSampleMfgSpecificCluster2PrintString(buffer) \ @@ -2525,8 +1902,7 @@ #else #define emberAfSampleMfgSpecificCluster2Print(...) #define emberAfSampleMfgSpecificCluster2Println(...) -#define emberAfSampleMfgSpecificCluster2Flush() -#define emberAfSampleMfgSpecificCluster2DebugExec(x) + #define emberAfSampleMfgSpecificCluster2PrintBuffer(buffer, len, withSpace) #define emberAfSampleMfgSpecificCluster2PrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SAMPLE_MFG_SPECIFIC_CLUSTER_2) @@ -2536,20 +1912,14 @@ #define emberAfOtaConfigurationClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER, __VA_ARGS__) #define emberAfOtaConfigurationClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfOtaConfigurationClusterFlush() -#define emberAfOtaConfigurationClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER)) \ - { \ - x; \ - } + #define emberAfOtaConfigurationClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfOtaConfigurationClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER, (buffer)) #else #define emberAfOtaConfigurationClusterPrint(...) #define emberAfOtaConfigurationClusterPrintln(...) -#define emberAfOtaConfigurationClusterFlush() -#define emberAfOtaConfigurationClusterDebugExec(x) + #define emberAfOtaConfigurationClusterPrintBuffer(buffer, len, withSpace) #define emberAfOtaConfigurationClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_OTA_CONFIGURATION_CLUSTER) @@ -2559,20 +1929,14 @@ #define emberAfMfglibClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_MFGLIB_CLUSTER, __VA_ARGS__) #define emberAfMfglibClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_MFGLIB_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfMfglibClusterFlush() -#define emberAfMfglibClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_MFGLIB_CLUSTER)) \ - { \ - x; \ - } + #define emberAfMfglibClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_MFGLIB_CLUSTER, (buffer), (len), (withSpace)) #define emberAfMfglibClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_MFGLIB_CLUSTER, (buffer)) #else #define emberAfMfglibClusterPrint(...) #define emberAfMfglibClusterPrintln(...) -#define emberAfMfglibClusterFlush() -#define emberAfMfglibClusterDebugExec(x) + #define emberAfMfglibClusterPrintBuffer(buffer, len, withSpace) #define emberAfMfglibClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_MFGLIB_CLUSTER) @@ -2582,20 +1946,14 @@ #define emberAfSlWwahClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_SL_WWAH_CLUSTER, __VA_ARGS__) #define emberAfSlWwahClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_SL_WWAH_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfSlWwahClusterFlush() -#define emberAfSlWwahClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_SL_WWAH_CLUSTER)) \ - { \ - x; \ - } + #define emberAfSlWwahClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_SL_WWAH_CLUSTER, (buffer), (len), (withSpace)) #define emberAfSlWwahClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_SL_WWAH_CLUSTER, (buffer)) #else #define emberAfSlWwahClusterPrint(...) #define emberAfSlWwahClusterPrintln(...) -#define emberAfSlWwahClusterFlush() -#define emberAfSlWwahClusterDebugExec(x) + #define emberAfSlWwahClusterPrintBuffer(buffer, len, withSpace) #define emberAfSlWwahClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_SL_WWAH_CLUSTER) @@ -2607,18 +1965,12 @@ #define emberAfCorePrintln(...) emberAfPrintln(EMBER_AF_PRINT_CORE, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfCoreFlush() -#define emberAfCoreDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CORE)) \ - { \ - x; \ - } #define emberAfCorePrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_CORE, (buffer), (len), (withSpace)) #define emberAfCorePrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CORE, (buffer)) #else #define emberAfCorePrint(...) #define emberAfCorePrintln(...) #define emberAfCoreFlush() -#define emberAfCoreDebugExec(x) #define emberAfCorePrintBuffer(buffer, len, withSpace) #define emberAfCorePrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CORE) @@ -2630,18 +1982,12 @@ #define emberAfDebugPrintln(...) emberAfPrintln(EMBER_AF_PRINT_DEBUG, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfDebugFlush() -#define emberAfDebugDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_DEBUG)) \ - { \ - x; \ - } #define emberAfDebugPrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_DEBUG, (buffer), (len), (withSpace)) #define emberAfDebugPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_DEBUG, (buffer)) #else #define emberAfDebugPrint(...) #define emberAfDebugPrintln(...) #define emberAfDebugFlush() -#define emberAfDebugDebugExec(x) #define emberAfDebugPrintBuffer(buffer, len, withSpace) #define emberAfDebugPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEBUG) @@ -2653,18 +1999,12 @@ #define emberAfAppPrintln(...) emberAfPrintln(EMBER_AF_PRINT_APP, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfAppFlush() -#define emberAfAppDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APP)) \ - { \ - x; \ - } #define emberAfAppPrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_APP, (buffer), (len), (withSpace)) #define emberAfAppPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_APP, (buffer)) #else #define emberAfAppPrint(...) #define emberAfAppPrintln(...) #define emberAfAppFlush() -#define emberAfAppDebugExec(x) #define emberAfAppPrintBuffer(buffer, len, withSpace) #define emberAfAppPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APP) @@ -2676,11 +2016,6 @@ #define emberAfAttributesPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ATTRIBUTES, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfAttributesFlush() -#define emberAfAttributesDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ATTRIBUTES)) \ - { \ - x; \ - } #define emberAfAttributesPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ATTRIBUTES, (buffer), (len), (withSpace)) #define emberAfAttributesPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ATTRIBUTES, (buffer)) @@ -2688,7 +2023,6 @@ #define emberAfAttributesPrint(...) #define emberAfAttributesPrintln(...) #define emberAfAttributesFlush() -#define emberAfAttributesDebugExec(x) #define emberAfAttributesPrintBuffer(buffer, len, withSpace) #define emberAfAttributesPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ATTRIBUTES) @@ -2700,11 +2034,6 @@ #define emberAfRegistrationPrintln(...) emberAfPrintln(EMBER_AF_PRINT_REGISTRATION, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfRegistrationFlush() -#define emberAfRegistrationDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_REGISTRATION)) \ - { \ - x; \ - } #define emberAfRegistrationPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_REGISTRATION, (buffer), (len), (withSpace)) #define emberAfRegistrationPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_REGISTRATION, (buffer)) @@ -2712,7 +2041,6 @@ #define emberAfRegistrationPrint(...) #define emberAfRegistrationPrintln(...) #define emberAfRegistrationFlush() -#define emberAfRegistrationDebugExec(x) #define emberAfRegistrationPrintBuffer(buffer, len, withSpace) #define emberAfRegistrationPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_REGISTRATION) @@ -2724,18 +2052,12 @@ #define emberAfZdoPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ZDO, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfZdoFlush() -#define emberAfZdoDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ZDO)) \ - { \ - x; \ - } #define emberAfZdoPrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_ZDO, (buffer), (len), (withSpace)) #define emberAfZdoPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ZDO, (buffer)) #else #define emberAfZdoPrint(...) #define emberAfZdoPrintln(...) #define emberAfZdoFlush() -#define emberAfZdoDebugExec(x) #define emberAfZdoPrintBuffer(buffer, len, withSpace) #define emberAfZdoPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ZDO) @@ -2747,18 +2069,12 @@ #define emberAfCustom1Println(...) emberAfPrintln(EMBER_AF_PRINT_CUSTOM1, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfCustom1Flush() -#define emberAfCustom1DebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CUSTOM1)) \ - { \ - x; \ - } #define emberAfCustom1PrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_CUSTOM1, (buffer), (len), (withSpace)) #define emberAfCustom1PrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CUSTOM1, (buffer)) #else #define emberAfCustom1Print(...) #define emberAfCustom1Println(...) #define emberAfCustom1Flush() -#define emberAfCustom1DebugExec(x) #define emberAfCustom1PrintBuffer(buffer, len, withSpace) #define emberAfCustom1PrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CUSTOM1) @@ -2770,18 +2086,12 @@ #define emberAfCustom2Println(...) emberAfPrintln(EMBER_AF_PRINT_CUSTOM2, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfCustom2Flush() -#define emberAfCustom2DebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CUSTOM2)) \ - { \ - x; \ - } #define emberAfCustom2PrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_CUSTOM2, (buffer), (len), (withSpace)) #define emberAfCustom2PrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CUSTOM2, (buffer)) #else #define emberAfCustom2Print(...) #define emberAfCustom2Println(...) #define emberAfCustom2Flush() -#define emberAfCustom2DebugExec(x) #define emberAfCustom2PrintBuffer(buffer, len, withSpace) #define emberAfCustom2PrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CUSTOM2) @@ -2791,20 +2101,14 @@ #define emberAfAccountLoginClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER, __VA_ARGS__) #define emberAfAccountLoginClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfAccountLoginClusterFlush() -#define emberAfAccountLoginClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER)) \ - { \ - x; \ - } + #define emberAfAccountLoginClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER, (buffer), (len), (withSpace)) #define emberAfAccountLoginClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER, (buffer)) #else #define emberAfAccountLoginClusterPrint(...) #define emberAfAccountLoginClusterPrintln(...) -#define emberAfAccountLoginClusterFlush() -#define emberAfAccountLoginClusterDebugExec(x) + #define emberAfAccountLoginClusterPrintBuffer(buffer, len, withSpace) #define emberAfAccountLoginClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ACCOUNT_LOGIN_CLUSTER) @@ -2814,20 +2118,14 @@ #define emberAfMediaPlaybackClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER, __VA_ARGS__) #define emberAfMediaPlaybackClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfMediaPlaybackClusterFlush() -#define emberAfMediaPlaybackClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER)) \ - { \ - x; \ - } + #define emberAfMediaPlaybackClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER, (buffer), (len), (withSpace)) #define emberAfMediaPlaybackClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER, (buffer)) #else #define emberAfMediaPlaybackClusterPrint(...) #define emberAfMediaPlaybackClusterPrintln(...) -#define emberAfMediaPlaybackClusterFlush() -#define emberAfMediaPlaybackClusterDebugExec(x) + #define emberAfMediaPlaybackClusterPrintBuffer(buffer, len, withSpace) #define emberAfMediaPlaybackClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_MEDIA_PLAYBACK_CLUSTER) @@ -2839,18 +2137,12 @@ #define emberAfCustom3Println(...) emberAfPrintln(EMBER_AF_PRINT_CUSTOM3, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfCustom3Flush() -#define emberAfCustom3DebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CUSTOM3)) \ - { \ - x; \ - } #define emberAfCustom3PrintBuffer(buffer, len, withSpace) emberAfPrintBuffer(EMBER_AF_PRINT_CUSTOM3, (buffer), (len), (withSpace)) #define emberAfCustom3PrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CUSTOM3, (buffer)) #else #define emberAfCustom3Print(...) #define emberAfCustom3Println(...) #define emberAfCustom3Flush() -#define emberAfCustom3DebugExec(x) #define emberAfCustom3PrintBuffer(buffer, len, withSpace) #define emberAfCustom3PrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CUSTOM3) @@ -2860,12 +2152,7 @@ #define emberAfApplicationLauncherClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_APPLICATION_LAUNCHER_CLUSTER, __VA_ARGS__) #define emberAfApplicationLauncherClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_APPLICATION_LAUNCHER_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfApplicationLauncherClusterFlush() -#define emberAfApplicationLauncherClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_APPLICATION_LAUNCHER_CLUSTER)) \ - { \ - x; \ - } + #define emberAfApplicationLauncherClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_APPLICATION_LAUNCHER_CLUSTER, (buffer), (len), (withSpace)) #define emberAfApplicationLauncherClusterPrintString(buffer) \ @@ -2873,8 +2160,7 @@ #else #define emberAfApplicationLauncherClusterPrint(...) #define emberAfApplicationLauncherClusterPrintln(...) -#define emberAfApplicationLauncherClusterFlush() -#define emberAfApplicationLauncherClusterDebugExec(x) + #define emberAfApplicationLauncherClusterPrintBuffer(buffer, len, withSpace) #define emberAfApplicationLauncherClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_APPLICATION_LAUNCHER_CLUSTER) @@ -2884,20 +2170,14 @@ #define emberAfAudioOutputClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER, __VA_ARGS__) #define emberAfAudioOutputClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfAudioOutputClusterFlush() -#define emberAfAudioOutputClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfAudioOutputClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfAudioOutputClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER, (buffer)) #else #define emberAfAudioOutputClusterPrint(...) #define emberAfAudioOutputClusterPrintln(...) -#define emberAfAudioOutputClusterFlush() -#define emberAfAudioOutputClusterDebugExec(x) + #define emberAfAudioOutputClusterPrintBuffer(buffer, len, withSpace) #define emberAfAudioOutputClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_AUDIO_OUTPUT_CLUSTER) @@ -2907,20 +2187,14 @@ #define emberAfKeypadInputClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER, __VA_ARGS__) #define emberAfKeypadInputClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfKeypadInputClusterFlush() -#define emberAfKeypadInputClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER)) \ - { \ - x; \ - } + #define emberAfKeypadInputClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER, (buffer), (len), (withSpace)) #define emberAfKeypadInputClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER, (buffer)) #else #define emberAfKeypadInputClusterPrint(...) #define emberAfKeypadInputClusterPrintln(...) -#define emberAfKeypadInputClusterFlush() -#define emberAfKeypadInputClusterDebugExec(x) + #define emberAfKeypadInputClusterPrintBuffer(buffer, len, withSpace) #define emberAfKeypadInputClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_KEYPAD_INPUT_CLUSTER) @@ -2930,20 +2204,14 @@ #define emberAfContentLauncherClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER, __VA_ARGS__) #define emberAfContentLauncherClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfContentLauncherClusterFlush() -#define emberAfContentLauncherClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER)) \ - { \ - x; \ - } + #define emberAfContentLauncherClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER, (buffer), (len), (withSpace)) #define emberAfContentLauncherClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER, (buffer)) #else #define emberAfContentLauncherClusterPrint(...) #define emberAfContentLauncherClusterPrintln(...) -#define emberAfContentLauncherClusterFlush() -#define emberAfContentLauncherClusterDebugExec(x) + #define emberAfContentLauncherClusterPrintBuffer(buffer, len, withSpace) #define emberAfContentLauncherClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_CONTENT_LAUNCHER_CLUSTER) @@ -2953,20 +2221,14 @@ #define emberAfTargetNavigatorClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER, __VA_ARGS__) #define emberAfTargetNavigatorClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfTargetNavigatorClusterFlush() -#define emberAfTargetNavigatorClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER)) \ - { \ - x; \ - } + #define emberAfTargetNavigatorClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER, (buffer), (len), (withSpace)) #define emberAfTargetNavigatorClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER, (buffer)) #else #define emberAfTargetNavigatorClusterPrint(...) #define emberAfTargetNavigatorClusterPrintln(...) -#define emberAfTargetNavigatorClusterFlush() -#define emberAfTargetNavigatorClusterDebugExec(x) + #define emberAfTargetNavigatorClusterPrintBuffer(buffer, len, withSpace) #define emberAfTargetNavigatorClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TARGET_NAVIGATOR_CLUSTER) @@ -2976,20 +2238,14 @@ #define emberAfWakeOnLanClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER, __VA_ARGS__) #define emberAfWakeOnLanClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. -#define emberAfWakeOnLanClusterFlush() -#define emberAfWakeOnLanClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER)) \ - { \ - x; \ - } + #define emberAfWakeOnLanClusterPrintBuffer(buffer, len, withSpace) \ emberAfPrintBuffer(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER, (buffer), (len), (withSpace)) #define emberAfWakeOnLanClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER, (buffer)) #else #define emberAfWakeOnLanClusterPrint(...) #define emberAfWakeOnLanClusterPrintln(...) -#define emberAfWakeOnLanClusterFlush() -#define emberAfWakeOnLanClusterDebugExec(x) + #define emberAfWakeOnLanClusterPrintBuffer(buffer, len, withSpace) #define emberAfWakeOnLanClusterPrintString(buffer) #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_WAKE_ON_LAN_CLUSTER) diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h index b0b4aa875ed0c2..eda4276fa02ce3 100644 --- a/src/app/util/types_stub.h +++ b/src/app/util/types_stub.h @@ -44,86 +44,11 @@ enum EMBER_UNUSED_BINDING = 0, /** A unicast binding whose 64-bit identifier is the destination EUI64. */ EMBER_UNICAST_BINDING = 1, - /** A unicast binding whose 64-bit identifier is the many-to-one - * destination EUI64. Route discovery should be disabled when sending - * unicasts via many-to-one bindings. */ - EMBER_MANY_TO_ONE_BINDING = 2, /** A multicast binding whose 64-bit identifier is the group address. This * binding can be used to send messages to the group and to receive * messages sent to the group. */ EMBER_MULTICAST_BINDING = 3, }; -/** @brief The type of method used for joining. - * - */ - -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberJoinMethod -#else -typedef uint8_t EmberJoinMethod; -enum -#endif -{ - /** Devices normally use MAC association to join a network, which respects - * the "permit joining" flag in the MAC beacon. - * This value should be used by default. - */ - EMBER_USE_MAC_ASSOCIATION = 0, - - /** For networks where the "permit joining" flag is never turned - * on, devices will need to use a ZigBee NWK Rejoin. This value causes the - * rejoin to be sent withOUT NWK security and the Trust Center will be - * asked to send the NWK key to the device. The NWK key sent to the device - * can be encrypted with the device's corresponding Trust Center link key. - * That is determined by the ::EmberJoinDecision on the Trust Center - * returned by the ::emberTrustCenterJoinHandler(). - */ - EMBER_USE_NWK_REJOIN = 1, - - /* For networks where the "permit joining" flag is never turned - * on, devices will need to use a NWK Rejoin. If those devices have been - * preconfigured with the NWK key (including sequence number), they can use - * a secured rejoin. This is only necessary for end devices since they need - * a parent. Routers can simply use the ::EMBER_USE_CONFIGURED_NWK_STATE - * join method below. - */ - EMBER_USE_NWK_REJOIN_HAVE_NWK_KEY = 2, - - /** For networks where all network and security information is known - ahead of time, a router device may be commissioned such that it does - not need to send any messages to begin communicating on the network. - */ - EMBER_USE_CONFIGURED_NWK_STATE = 3, -}; - -/** - * @brief Type of Ember software version - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberVersionType -#else -typedef uint8_t EmberVersionType; -enum -#endif -{ - EMBER_VERSION_TYPE_PRE_RELEASE = 0x00, - - // Alpha, should be used rarely - EMBER_VERSION_TYPE_ALPHA_1 = 0x11, - EMBER_VERSION_TYPE_ALPHA_2 = 0x12, - EMBER_VERSION_TYPE_ALPHA_3 = 0x13, - // Leave space in case we decide to add other types in the future. - EMBER_VERSION_TYPE_BETA_1 = 0x21, - EMBER_VERSION_TYPE_BETA_2 = 0x22, - EMBER_VERSION_TYPE_BETA_3 = 0x23, - - // Anything other than 0xAA is considered pre-release - // Silicon Labs may define other types in the future (e.g. beta, alpha) - // Silicon Labs chose an arbitrary number (0xAA) to allow for expansion, but - // to prevent ambiguity in case 0x00 or 0xFF is accidentally retrieved - // as the version type. - EMBER_VERSION_TYPE_GA = 0xAA, -}; /** * @brief Either marks an event as inactive or specifies the units for the @@ -140,15 +65,9 @@ enum EMBER_EVENT_INACTIVE = 0, /** The execution time is in approximate milliseconds. */ EMBER_EVENT_MS_TIME, - /** The execution time is in 'binary' quarter seconds (256 timer ticks). */ - EMBER_EVENT_QS_TIME, - /** The execution time is in 'binary' minutes (65536 timer ticks). */ - EMBER_EVENT_MINUTE_TIME, /** The event is scheduled to run at the earliest opportunity. */ EMBER_EVENT_ZERO_DELAY }; -/** @brief An identifier for a task */ -typedef uint8_t EmberTaskId; /** * @brief Options to use when sending a message. @@ -163,26 +82,6 @@ typedef uint16_t EmberApsOption; enum #endif { - /** No options. */ - EMBER_APS_OPTION_NONE = 0x0000, - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - EMBER_APS_OPTION_ENCRYPT_WITH_TRANSIENT_KEY = 0x0001, - EMBER_APS_OPTION_USE_ALIAS_SEQUENCE_NUMBER = 0x0002, -#endif - - /** This signs the application layer message body (APS Frame not included) - and appends the ECDSA signature to the end of the message, which is needed by - Smart Energy applications and requires the CBKE and ECC libraries. - The ::emberDsaSignHandler() function is called after DSA signing - is complete but before the message has been sent by the APS layer. - Note that when passing a buffer to the stack for DSA signing, the final - byte in the buffer has a special significance as an indicator of how many - leading bytes should be ignored for signature purposes. See the API - documentation of emberDsaSign() or the dsaSign EZSP command for more - details about this requirement. - */ - EMBER_APS_OPTION_DSA_SIGN = 0x0010, /** Resend the message using the APS retry mechanism. This option and the enable route discovery option must be enabled for an existing route to be repaired automatically. */ @@ -193,32 +92,9 @@ enum option must be enabled an existing route to be repaired automatically. */ EMBER_APS_OPTION_ENABLE_ROUTE_DISCOVERY = 0x0100, - /** Send the message with the NWK 'force route discovery' flag, which causes - a route discovery to be initiated even if one is known. */ - EMBER_APS_OPTION_FORCE_ROUTE_DISCOVERY = 0x0200, - /** Include the source EUI64 in the network frame. */ - EMBER_APS_OPTION_SOURCE_EUI64 = 0x0400, - /** Include the destination EUI64 in the network frame. */ - EMBER_APS_OPTION_DESTINATION_EUI64 = 0x0800, /** Send a ZDO request to discover the node ID of the destination if it is not already known. */ EMBER_APS_OPTION_ENABLE_ADDRESS_DISCOVERY = 0x1000, - /** This message is being sent in response to a call to - ::emberPollHandler(). It causes the message to be sent - immediately instead of being queued up until the next poll from the - (end device) destination. */ - EMBER_APS_OPTION_POLL_RESPONSE = 0x2000, - /** This incoming message is a valid ZDO request and the application - * is responsible for sending a ZDO response. This flag is used only - * within emberIncomingMessageHandler() when - * EMBER_APPLICATION_RECEIVES_UNSUPPORTED_ZDO_REQUESTS is defined. */ - EMBER_APS_OPTION_ZDO_RESPONSE_REQUIRED = 0x4000, - /** This message is part of a fragmented message. This option may only - be set for unicasts. The groupId field gives the index of this - fragment in the low-order byte. If the low-order byte is zero this - is the first fragment and the high-order byte contains the number - of fragments in the message. */ - EMBER_APS_OPTION_FRAGMENT = 0x8000 }; /** @@ -226,16 +102,6 @@ enum */ #define EUI64_SIZE 8 -/** - * @brief Size of an encryption key in bytes (16). - */ -#define EMBER_ENCRYPTION_KEY_SIZE 16 - -/** - * @brief Size of an extended PAN identifier in bytes (8). - */ -#define EXTENDED_PAN_ID_SIZE 8 - /** * @brief EUI 64-bit ID (an IEEE address). */ @@ -251,52 +117,6 @@ typedef uint16_t EmberNodeId; */ typedef uint16_t EmberPanId; -/** @brief This enumeration determines whether or not a Trust Center - * answers trust center link key requests. - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberTcLinkKeyRequestPolicy -#else -typedef uint8_t EmberTcLinkKeyRequestPolicy; -enum -#endif -{ - EMBER_DENY_TC_LINK_KEY_REQUESTS = 0x00, - EMBER_ALLOW_TC_LINK_KEY_REQUEST_AND_SEND_CURRENT_KEY = 0x01, - // When using the following mode a unique random link key is created. - // The key which is generated due to this mode is added to the link - // key table. Therefore make sure that the link key table size is not - // zero as this can result in the newly generated key not being saved - // and communication breaking between the trust center and the nodes. - EMBER_ALLOW_TC_LINK_KEY_REQUEST_AND_GENERATE_NEW_KEY = 0x02 -}; - -/** @brief This enumeration determines whether or not a Trust Center - * answers app link key requests. - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberAppLinkKeyRequestPolicy -#else -typedef uint8_t EmberAppLinkKeyRequestPolicy; -enum -#endif -{ - EMBER_DENY_APP_LINK_KEY_REQUESTS = 0x00, - EMBER_ALLOW_APP_LINK_KEY_REQUEST = 0x01 -}; - -/** @brief This data structure contains the key data that is passed - * into various other functions. */ -typedef struct -{ - /** This is the key byte data. */ - uint8_t contents[EMBER_ENCRYPTION_KEY_SIZE]; -} EmberKeyData; -/** - * @brief Defines the possible types of nodes and the roles that a - * node might play in a network. - */ - /** * @brief Defines the possible incoming message types. */ @@ -321,128 +141,6 @@ enum EMBER_INCOMING_BROADCAST_LOOPBACK }; -/** @brief Endpoint information (a ZigBee Simple Descriptor). - * - * This is a ZigBee Simple Descriptor and contains information - * about an endpoint. This information is shared with other nodes in the - * network by the ZDO. - */ - -typedef struct -{ - /** The endpoint's device ID within the application profile. */ - uint16_t deviceId; - /** The endpoint's device version. */ - uint8_t deviceVersion; - /** The number of input clusters. */ - uint8_t inputClusterCount; - /** The number of output clusters. */ - uint8_t outputClusterCount; -} EmberEndpointDescription; - -/** @brief A type of packet received by the stack - * - * This enum provides a way to indicate which protocol layer in the Ember - * stack an incoming packet is meant for, or from which protocol layer - * an outgoing command is being sent from. - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberZigbeePacketType -#else -typedef uint8_t EmberZigbeePacketType; -enum -#endif -{ - /** Describes an 802.15.4 raw MAC message, unprocessed by the stack. */ - EMBER_ZIGBEE_PACKET_TYPE_RAW_MAC, - /** Describes an 802.15.4 MAC layer command. */ - EMBER_ZIGBEE_PACKET_TYPE_MAC_COMMAND, - /** Describes a ZigBee Network layer data message. */ - EMBER_ZIGBEE_PACKET_TYPE_NWK_DATA, - /** Describes a ZigBee Network layer command. */ - EMBER_ZIGBEE_PACKET_TYPE_NWK_COMMAND, - /** Describes a ZigBee Application Support layer data message. */ - EMBER_ZIGBEE_PACKET_TYPE_APS_DATA, - /** Describes a ZigBee Application Support layer command. */ - EMBER_ZIGBEE_PACKET_TYPE_APS_COMMAND, - /** Describes a ZigBee Device Object command. */ - EMBER_ZIGBEE_PACKET_TYPE_ZDO, - /** Describes a ZigBee Cluster Library command. */ - EMBER_ZIGBEE_PACKET_TYPE_ZCL, - - /** Distinguishing between raw MAC and beacons for simplicity */ - EMBER_ZIGBEE_PACKET_TYPE_BEACON, -}; - -/** - * @brief Defines a ZigBee network and the associated parameters. - */ -typedef struct -{ - uint16_t panId; - uint8_t channel; - bool allowingJoin; - uint8_t extendedPanId[EXTENDED_PAN_ID_SIZE]; - uint8_t stackProfile; - uint8_t nwkUpdateId; -} EmberZigbeeNetwork; - -/** @brief indication of the action taken on a packet */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberPacketAction -#else -typedef uint8_t EmberPacketAction; -enum -#endif -{ - EMBER_DROP_PACKET = 0, - EMBER_ACCEPT_PACKET = 1, - EMBER_MANGLE_PACKET, -}; - -/** - * @name ZigBee Device Object (ZDO) Definitions - */ -//@{ - -/** @name ZDO response status. - * - * Most responses to ZDO commands contain a status byte. - * The meaning of this byte is defined by the ZigBee Device Profile. - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberZdoStatus -#else -typedef uint8_t EmberZdoStatus; -enum -#endif -{ - // These values are taken from Table 48 of ZDP Errata 043238r003 and Table 2 - // of NWK 02130r10. - EMBER_ZDP_SUCCESS = 0x00, - // 0x01 to 0x7F are reserved - EMBER_ZDP_INVALID_REQUEST_TYPE = 0x80, - EMBER_ZDP_DEVICE_NOT_FOUND = 0x81, - EMBER_ZDP_INVALID_ENDPOINT = 0x82, - EMBER_ZDP_NOT_ACTIVE = 0x83, - EMBER_ZDP_NOT_SUPPORTED = 0x84, - EMBER_ZDP_TIMEOUT = 0x85, - EMBER_ZDP_NO_MATCH = 0x86, - // 0x87 is reserved = 0x87, - EMBER_ZDP_NO_ENTRY = 0x88, - EMBER_ZDP_NO_DESCRIPTOR = 0x89, - EMBER_ZDP_INSUFFICIENT_SPACE = 0x8a, - EMBER_ZDP_NOT_PERMITTED = 0x8b, - EMBER_ZDP_TABLE_FULL = 0x8c, - EMBER_ZDP_NOT_AUTHORIZED = 0x8d, - EMBER_ZDP_DEVICE_BINDING_TABLE_FULL = 0x8e, - EMBER_ZDP_INVALID_INDEX = 0x8f, - - EMBER_NWK_ALREADY_PRESENT = 0xC5, - EMBER_NWK_TABLE_FULL = 0xC7, - EMBER_NWK_UNKNOWN_DEVICE = 0xC8 -}; - /** @brief Defines an entry in the binding table. * * A binding entry specifies a local endpoint, a remote endpoint, a @@ -527,1262 +225,123 @@ struct EmberBindingTableEntry } }; -/** - * @brief The decision made by the Trust Center when a node attempts to join. - */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberJoinDecision -#else -typedef uint8_t EmberJoinDecision; -enum -#endif -{ - /** Allow the node to join. The node has the key. */ - EMBER_USE_PRECONFIGURED_KEY = 0, - /** Allow the node to join. Send the key to the node. */ - EMBER_SEND_KEY_IN_THE_CLEAR, - /** Deny join. */ - EMBER_DENY_JOIN, - /** Take no action. */ - EMBER_NO_ACTION -}; - -/** @brief This denotes the status of an attempt to establish - * a key with another device. - */ #ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberKeyStatus +enum EmberStatus #else -typedef uint8_t EmberKeyStatus; +typedef uint8_t EmberStatus; enum -#endif +#endif // DOXYGEN_SHOULD_SKIP_THIS { - EMBER_KEY_STATUS_NONE = 0x00, - EMBER_APP_LINK_KEY_ESTABLISHED = 0x01, - EMBER_TRUST_CENTER_LINK_KEY_ESTABLISHED = 0x03, - - EMBER_KEY_ESTABLISHMENT_TIMEOUT = 0x04, - EMBER_KEY_TABLE_FULL = 0x05, - - // These are success status values applying only to the - // Trust Center answering key requests. - EMBER_TC_RESPONDED_TO_KEY_REQUEST = 0x06, - EMBER_TC_APP_KEY_SENT_TO_REQUESTER = 0x07, - - // These are failure status values applying only to the - // Trust Center answering key requests. - EMBER_TC_RESPONSE_TO_KEY_REQUEST_FAILED = 0x08, - EMBER_TC_REQUEST_KEY_TYPE_NOT_SUPPORTED = 0x09, - EMBER_TC_NO_LINK_KEY_FOR_REQUESTER = 0x0A, - EMBER_TC_REQUESTER_EUI64_UNKNOWN = 0x0B, - EMBER_TC_RECEIVED_FIRST_APP_KEY_REQUEST = 0x0C, - EMBER_TC_TIMEOUT_WAITING_FOR_SECOND_APP_KEY_REQUEST = 0x0D, - EMBER_TC_NON_MATCHING_APP_KEY_REQUEST_RECEIVED = 0x0E, - EMBER_TC_FAILED_TO_SEND_APP_KEYS = 0x0F, - EMBER_TC_FAILED_TO_STORE_APP_KEY_REQUEST = 0x10, - EMBER_TC_REJECTED_APP_KEY_REQUEST = 0x11, - EMBER_TC_FAILED_TO_GENERATE_NEW_KEY = 0x12, - EMBER_TC_FAILED_TO_SEND_TC_KEY = 0x13, - - // These are generic status values for a key requester. - EMBER_TRUST_CENTER_IS_PRE_R21 = 0x1E, - - // These are status values applying only to the Trust Center - // verifying link keys. - EMBER_TC_REQUESTER_VERIFY_KEY_TIMEOUT = 0x32, - EMBER_TC_REQUESTER_VERIFY_KEY_FAILURE = 0x33, - EMBER_TC_REQUESTER_VERIFY_KEY_SUCCESS = 0x34, + /** + * @name Generic Messages + * These messages are system wide. + */ + //@{ - // These are status values applying only to the key requester - // verifying link keys. - EMBER_VERIFY_LINK_KEY_FAILURE = 0x64, - EMBER_VERIFY_LINK_KEY_SUCCESS = 0x65, -}; + /** + * @brief The generic "no error" message. + */ + EMBER_SUCCESS = 0x00, -typedef uint8_t EmberAfPluginNetworkSteeringJoiningState; + /** + * @brief An invalid value was passed as an argument to a function. + */ + EMBER_BAD_ARGUMENT = 0x02, -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum SleepModes -#else -typedef uint8_t SleepModes; -enum -#endif -{ - SLEEPMODE_IDLE = 1, + //@} // END Generic Messages }; /** - * @brief Defines the possible join states for a node. + * @brief Function pointer for timer callback */ -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberNetworkStatus -#else -typedef uint8_t EmberNetworkStatus; -enum -#endif -{ - /** The node is not associated with a network in any way. */ - EMBER_NO_NETWORK, - /** The node is currently attempting to join a network. */ - EMBER_JOINING_NETWORK, - /** The node is joined to a network. */ - EMBER_JOINED_NETWORK, - /** The node is an end device joined to a network but its parent - is not responding. */ - EMBER_JOINED_NETWORK_NO_PARENT, - /** The node is in the process of leaving its current network. */ - EMBER_LEAVING_NETWORK -}; +typedef void (*TimerCallback)(chip::EndpointId); -/** @brief Holds network parameters. +/** @brief The control structure for events. * - * For information about power settings and radio channels, - * see the technical specification for the - * RF communication module in your Developer Kit. + * It holds the event status (one of the @e EMBER_EVENT_ values) + * and the callback and it's parameters */ typedef struct { - /** The network's extended PAN identifier.*/ - uint8_t extendedPanId[EXTENDED_PAN_ID_SIZE]; - /** The network's PAN identifier.*/ - uint16_t panId; - /** A power setting, in dBm.*/ - int8_t radioTxPower; - /** A radio channel. Be sure to specify a channel supported by the radio. */ - uint8_t radioChannel; - /** Join method: The protocol messages used to establish an initial parent. It is - * ignored when forming a ZigBee network, or when querying the stack for its - network parameters. - */ - EmberJoinMethod joinMethod; + /** The event's status, either inactive or the units for timeToExecute. */ + EmberEventUnits status; - /** NWK Manager ID. The ID of the network manager in the current network. - This may only be set at joining when using EMBER_USE_CONFIGURED_NWK_STATE - as the join method. - */ - EmberNodeId nwkManagerId; - /** An NWK Update ID. The value of the ZigBee nwkUpdateId known by the stack. - It is used to determine the newest instance of the network after a PAN - ID or channel change. This may only be set at joining when using - EMBER_USE_CONFIGURED_NWK_STATE as the join method. - */ - uint8_t nwkUpdateId; - /** The NWK channel mask. The list of preferred channels that the NWK manager - has told this device to use when searching for the network. - This may only be set at joining when using EMBER_USE_CONFIGURED_NWK_STATE - as the join method. - */ - uint32_t channels; -} EmberNetworkParameters; + /* Callback information */ + TimerCallback callback; + chip::EndpointId endpoint; + +} EmberEventControl; /** - * @brief Incoming and outgoing messages are stored in buffers. - * These buffers are allocated and freed as needed. - * - * Buffers are 32 bytes in length and can be linked together to hold - * longer messages. - * - * See packet-buffer.h for APIs related to stack and linked buffers. + * @description Useful macro for avoiding compiler warnings related to unused + * function arguments or unused variables. */ -typedef uint8_t EmberMessageBuffer; +#define UNUSED_VAR(x) (void) (x) /** - * @brief A version structure containing all version information. + * @brief The broadcast endpoint, as defined in the ZigBee spec. */ -typedef struct -{ - uint16_t build; - uint8_t major; - uint8_t minor; - uint8_t patch; - uint8_t special; - EmberVersionType type; -} EmberVersion; +#define EMBER_BROADCAST_ENDPOINT (chip::kInvalidEndpointId) /** - * @brief A distinguished network ID that will never be assigned - * to any node. This value is used when getting the remote node ID - * from the address or binding tables. It indicates that the address - * or binding table entry is currently in use but the node ID - * corresponding to the EUI64 in the table is currently unknown. + * @brief Useful to reference a single bit of a byte. */ -#define EMBER_UNKNOWN_NODE_ID 0xFFFD +#define EMBER_BIT(nr) (1UL << (nr)) // Unsigned avoids compiler warnings re EMBER_BIT(15) /** - * @brief A distinguished network ID that will never be assigned - * to any node. Used to indicate the absence of a node ID. + * @brief Returns the low byte of the 16-bit value \c n as an \c uint8_t. */ -#define EMBER_NULL_NODE_ID 0xFFFF - -#ifdef DOXYGEN_SHOULD_SKIP_THIS -enum EmberStatus -#else -typedef uint8_t EmberStatus; -enum -#endif // DOXYGEN_SHOULD_SKIP_THIS -{ - /** - * @name Generic Messages - * These messages are system wide. - */ - //@{ - - /** - * @brief The generic "no error" message. - */ - EMBER_SUCCESS = 0x00, - - /** - * @brief The generic "fatal error" message. - */ - EMBER_ERR_FATAL = 0x01, - - /** - * @brief An invalid value was passed as an argument to a function. - */ - EMBER_BAD_ARGUMENT = 0x02, +#define EMBER_LOW_BYTE(n) ((uint8_t)((n) &0xFF)) - /** - * @brief The requested information was not found. - */ - EMBER_NOT_FOUND = 0x03, +/** + * @brief Returns the high byte of the 16-bit value \c n as an \c uint8_t. + */ +#define EMBER_HIGH_BYTE(n) ((uint8_t)(EMBER_LOW_BYTE((n) >> 8))) +/** + * @brief Returns the low byte of the 32-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_0(n) ((uint8_t)((n) &0xFF)) - /** - * @brief The manufacturing and stack token format in non-volatile memory - * is different than what the stack expects (returned at initialization). - */ - EMBER_EEPROM_MFG_STACK_VERSION_MISMATCH = 0x04, +/** + * @brief Returns the second byte of the 32-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_1(n) EMBER_BYTE_0((n) >> 8) - /** - * @brief The static memory definitions in ember-static-memory.h - * are incompatible with this stack version. - */ - EMBER_INCOMPATIBLE_STATIC_MEMORY_DEFINITIONS = 0x05, +/** + * @brief Returns the third byte of the 32-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_2(n) EMBER_BYTE_0((n) >> 16) - /** - * @brief The manufacturing token format in non-volatile memory is - * different than what the stack expects (returned at initialization). - */ - EMBER_EEPROM_MFG_VERSION_MISMATCH = 0x06, +/** + * @brief Returns the high byte of the 32-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_3(n) EMBER_BYTE_0((n) >> 24) - /** - * @brief The stack token format in non-volatile memory is different - * than what the stack expects (returned at initialization). - */ - EMBER_EEPROM_STACK_VERSION_MISMATCH = 0x07, +/** + * @brief Returns the fifth byte of the 64-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_4(n) EMBER_BYTE_0((n) >> 32) - //@} // END Generic Messages +/** + * @brief Returns the sixth byte of the 64-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_5(n) EMBER_BYTE_0((n) >> 40) - /** - * @name Packet Buffer Module Errors - */ - //@{ +/** + * @brief Returns the seventh byte of the 64-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_6(n) EMBER_BYTE_0((n) >> 48) - /** - * @brief There are no more buffers. - */ - EMBER_NO_BUFFERS = 0x18, +/** + * @brief Returns the high byte of the 64-bit value \c n as an \c uint8_t. + */ +#define EMBER_BYTE_7(n) EMBER_BYTE_0((n) >> 56) - //@} / END Packet Buffer Module Errors - - /** - * @name Serial Manager Errors - */ - //@{ - - /** - * @brief Specifies an invalid baud rate. - */ - EMBER_SERIAL_INVALID_BAUD_RATE = 0x20, - - /** - * @brief Specifies an invalid serial port. - */ - EMBER_SERIAL_INVALID_PORT = 0x21, - - /** - * @brief Tried to send too much data. - */ - EMBER_SERIAL_TX_OVERFLOW = 0x22, - - /** - * @brief There wasn't enough space to store a received character - * and the character was dropped. - */ - EMBER_SERIAL_RX_OVERFLOW = 0x23, - - /** - * @brief Detected a UART framing error. - */ - EMBER_SERIAL_RX_FRAME_ERROR = 0x24, - - /** - * @brief Detected a UART parity error. - */ - EMBER_SERIAL_RX_PARITY_ERROR = 0x25, - - /** - * @brief There is no received data to process. - */ - EMBER_SERIAL_RX_EMPTY = 0x26, - - /** - * @brief The receive interrupt was not handled in time and a - * character was dropped. - */ - EMBER_SERIAL_RX_OVERRUN_ERROR = 0x27, - - //@} - - /** - * @name MAC Errors - */ - //@{ - - /** - * @brief The MAC transmit queue is full. - */ - EMBER_MAC_TRANSMIT_QUEUE_FULL = 0x39, - // Internal - - /** - * @brief MAC header FCF error on receive. - */ - EMBER_MAC_UNKNOWN_HEADER_TYPE = 0x3A, - - /** - * @brief MAC ACK header received. - */ - EMBER_MAC_ACK_HEADER_TYPE = 0x3B, - - /** - * @brief The MAC can't complete this task because it is scanning. - */ - EMBER_MAC_SCANNING = 0x3D, - - /** - * @brief No pending data exists for a data poll. - */ - EMBER_MAC_NO_DATA = 0x31, - - /** - * @brief Attempts to scan when joined to a network. - */ - EMBER_MAC_JOINED_NETWORK = 0x32, - - /** - * @brief Scan duration must be 0 to 14 inclusive. Tried to - * scan with an incorrect duration value. - */ - EMBER_MAC_BAD_SCAN_DURATION = 0x33, - - /** - * @brief emberStartScan was called with an incorrect scan type. - */ - EMBER_MAC_INCORRECT_SCAN_TYPE = 0x34, - - /** - * @brief emberStartScan was called with an invalid channel mask. - */ - EMBER_MAC_INVALID_CHANNEL_MASK = 0x35, - - /** - * @brief Failed to scan the current channel because - * the relevant MAC command could not be transmitted. - */ - EMBER_MAC_COMMAND_TRANSMIT_FAILURE = 0x36, - - /** - * @brief An ACK was expected following the transmission but - * the MAC level ACK was never received. - */ - EMBER_MAC_NO_ACK_RECEIVED = 0x40, - - /** - * @brief MAC failed to transmit a message because it could not successfully - * perform a radio network switch. - */ - EMBER_MAC_RADIO_NETWORK_SWITCH_FAILED = 0x41, - - /** - * @brief An indirect data message timed out before a poll requested it. - */ - EMBER_MAC_INDIRECT_TIMEOUT = 0x42, - - //@} - - /** - * @name Simulated EEPROM Errors - */ - //@{ - - /** - * @brief The Simulated EEPROM is telling the application that - * at least one flash page to be erased. The GREEN status means the - * current page has not filled above the ::ERASE_CRITICAL_THRESHOLD. - * - * The application should call the function ::halSimEepromErasePage() - * when it can to erase a page. - */ - EMBER_SIM_EEPROM_ERASE_PAGE_GREEN = 0x43, - - /** - * @brief The Simulated EEPROM is telling the application that - * at least one flash page must be erased. The RED status means the - * current page has filled above the ::ERASE_CRITICAL_THRESHOLD. - * - * Due to the shrinking availability of write space, data could - * be lost. The application must call the function ::halSimEepromErasePage() - * as soon as possible to erase a page. - */ - EMBER_SIM_EEPROM_ERASE_PAGE_RED = 0x44, - - /** - * @brief The Simulated EEPROM has run out of room to write new data - * and the data trying to be set has been lost. This error code is the - * result of ignoring the ::SIM_EEPROM_ERASE_PAGE_RED error code. - * - * The application must call the function ::halSimEepromErasePage() to make room for - * any further calls to set a token. - */ - EMBER_SIM_EEPROM_FULL = 0x45, - - // Errors 46 and 47 are now defined below in the - // flash error block (was attempting to prevent renumbering). - - /** - * @brief Attempt 1 to initialize the Simulated EEPROM has failed. - * - * This failure means the information already stored in the Flash (or a lack - * thereof), is fatally incompatible with the token information compiled - * into the code image being run. - */ - EMBER_SIM_EEPROM_INIT_1_FAILED = 0x48, - - /** - * @brief Attempt 2 to initialize the Simulated EEPROM has failed. - * - * This failure means Attempt 1 failed, and the token system failed to - * properly reload default tokens and reset the Simulated EEPROM. - */ - EMBER_SIM_EEPROM_INIT_2_FAILED = 0x49, - - /** - * @brief Attempt 3 to initialize the Simulated EEPROM has failed. - * - * This failure means one or both of the tokens ::TOKEN_MFG_NVDATA_VERSION or - * ::TOKEN_STACK_NVDATA_VERSION were incorrect and the token system failed to - * properly reload default tokens and reset the Simulated EEPROM. - */ - EMBER_SIM_EEPROM_INIT_3_FAILED = 0x4A, - - /** - * @brief The Simulated EEPROM is repairing itself. - * - * While there's nothing for an app to do when the SimEE is going to - * repair itself (SimEE has to be fully functional for the rest of the - * system to work), alert the application to the fact that repair - * is occurring. There are debugging scenarios where an app might want - * to know that repair is happening, such as monitoring frequency. - * @note Common situations will trigger an expected repair, such as - * using an erased chip or changing token definitions. - */ - EMBER_SIM_EEPROM_REPAIRING = 0x4D, - - //@} - - /** - * @name Flash Errors - */ - //@{ - - /** - * @brief A fatal error has occurred while trying to write data to the - * Flash. The target memory attempting to be programmed is already programmed. - * The flash write routines were asked to flip a bit from a 0 to 1, which is - * physically impossible and the write was therefore inhibited. The data in - * the Flash cannot be trusted after this error. - */ - EMBER_ERR_FLASH_WRITE_INHIBITED = 0x46, - - /** - * @brief A fatal error has occurred while trying to write data to the - * Flash and the write verification has failed. Data in the Flash - * cannot be trusted after this error and it is possible this error is the - * result of exceeding the life cycles of the Flash. - */ - EMBER_ERR_FLASH_VERIFY_FAILED = 0x47, - - /** - * @description A fatal error has occurred while trying to write data to the - * Flash possibly due to write protection or an invalid address. Data in - * the Flash cannot be trusted after this error and it is possible this error - * is the result of exceeding the life cycles of the Flash. - */ - EMBER_ERR_FLASH_PROG_FAIL = 0x4B, - - /** - * @description A fatal error has occurred while trying to erase the Flash possibly - * due to write protection. Data in the Flash cannot be trusted after - * this error and it is possible this error is the result of exceeding the - * life cycles of the Flash. - */ - EMBER_ERR_FLASH_ERASE_FAIL = 0x4C, - - //@} - - /** - * @name Bootloader Errors - */ - //@{ - - /** - * @brief The bootloader received an invalid message (failed attempt - * to go into bootloader). - */ - EMBER_ERR_BOOTLOADER_TRAP_TABLE_BAD = 0x58, - - /** - * @brief The bootloader received an invalid message (failed attempt to go - * into the bootloader). - */ - EMBER_ERR_BOOTLOADER_TRAP_UNKNOWN = 0x59, - - /** - * @brief The bootloader cannot complete the bootload operation because - * either an image was not found or the image exceeded memory bounds. - */ - EMBER_ERR_BOOTLOADER_NO_IMAGE = 0x05A, - - //@} - - /** - * @name Transport Errors - */ - //@{ - - /** - * @brief The APS layer attempted to send or deliver a message - * and failed. - */ - EMBER_DELIVERY_FAILED = 0x66, - - /** - * @brief This binding index is out of range for the current binding table. - */ - EMBER_BINDING_INDEX_OUT_OF_RANGE = 0x69, - - /** - * @brief This address table index is out of range for the current - * address table. - */ - EMBER_ADDRESS_TABLE_INDEX_OUT_OF_RANGE = 0x6A, - - /** - * @brief An invalid binding table index was given to a function. - */ - EMBER_INVALID_BINDING_INDEX = 0x6C, - - /** - * @brief The API call is not allowed given the current state of the - * stack. - */ - EMBER_INVALID_CALL = 0x70, - - /** - * @brief The link cost to a node is not known. - */ - EMBER_COST_NOT_KNOWN = 0x71, - - /** - * @brief The maximum number of in-flight messages = i.e., - * ::EMBER_APS_UNICAST_MESSAGE_COUNT, has been reached. - */ - EMBER_MAX_MESSAGE_LIMIT_REACHED = 0x72, - - /** - * @brief The message to be transmitted is too big to fit into a - * single over-the-air packet. - */ - EMBER_MESSAGE_TOO_LONG = 0x74, - - /** - * @brief The application is trying to delete or overwrite a binding - * that is in use. - */ - EMBER_BINDING_IS_ACTIVE = 0x75, - - /** - * @brief The application is trying to overwrite an address table entry - * that is in use. - */ - EMBER_ADDRESS_TABLE_ENTRY_IS_ACTIVE = 0x76, - - /** - * @brief An attempt was made to transmit during the suspend period. - */ - EMBER_TRANSMISSION_SUSPENDED = 0x77, - - //@} - // - - /** - * @name Green Power status codes - */ - //@{ - - /** - * @brief Security match. - */ - EMBER_MATCH = 0x78, - /** - * @brief Drop frame. - */ - EMBER_DROP_FRAME = 0x79, - EMBER_PASS_UNPROCESSED = 0x7A, - EMBER_TX_THEN_DROP = 0x7B, - EMBER_NO_SECURITY = 0x7C, - EMBER_COUNTER_FAILURE = 0x7D, - EMBER_AUTH_FAILURE = 0x7E, - EMBER_UNPROCESSED = 0x7F, - - //@} - // - - /** - * @name HAL Module Errors - */ - //@{ - - /** - * @brief The conversion is complete. - */ - EMBER_ADC_CONVERSION_DONE = 0x80, - - /** - * @brief The conversion cannot be done because a request is being - * processed. - */ - EMBER_ADC_CONVERSION_BUSY = 0x81, - - /** - * @brief The conversion is deferred until the current request has been - * processed. - */ - EMBER_ADC_CONVERSION_DEFERRED = 0x82, - - /** - * @brief No results are pending. - */ - EMBER_ADC_NO_CONVERSION_PENDING = 0x84, - - /** - * @brief Sleeping (for a duration) has been abnormally interrupted - * and exited prematurely. - */ - EMBER_SLEEP_INTERRUPTED = 0x85, - - //@} - - /** - * @name PHY Errors - */ - //@{ - - /** - * @brief The transmit attempt failed because the radio scheduler could not find - * a slot to transmit this packet in or a higher priority event interrupted it. - */ - EMBER_PHY_TX_SCHED_FAIL = 0x87, - - /** - * @brief The transmit hardware buffer underflowed. - */ - EMBER_PHY_TX_UNDERFLOW = 0x88, - - /** - * @brief The transmit hardware did not finish transmitting a packet. - */ - EMBER_PHY_TX_INCOMPLETE = 0x89, - - /** - * @brief An unsupported channel setting was specified. - */ - EMBER_PHY_INVALID_CHANNEL = 0x8A, - - /** - * @brief An unsupported power setting was specified. - */ - EMBER_PHY_INVALID_POWER = 0x8B, - - /** - * @brief The requested operation cannot be completed because the radio - * is currently busy, either transmitting a packet or performing calibration. - */ - EMBER_PHY_TX_BUSY = 0x8C, - - /** - * @brief The transmit attempt failed because all CCA attempts indicated that - * the channel was busy. - */ - EMBER_PHY_TX_CCA_FAIL = 0x8D, - - /** - * @brief The transmit attempt was blocked from going over the air. Typically - * this is due to the Radio Hold Off (RHO) or Coexistence plugins as they can - * prevent transmits based on external signals. - */ - EMBER_PHY_TX_BLOCKED = 0x8E, - - /** - * @brief The expected ACK was received after the last transmission. - */ - EMBER_PHY_ACK_RECEIVED = 0x8F, - - //@} - - /** - * @name Return Codes Passed to emberStackStatusHandler() - * See also ::emberStackStatusHandler = ,. - */ - //@{ - - /** - * @brief The stack software has completed initialization and is ready - * to send and receive packets over the air. - */ - EMBER_NETWORK_UP = 0x90, - - /** - * @brief The network is not operating. - */ - EMBER_NETWORK_DOWN = 0x91, - - /** - * @brief An attempt to join a network failed. - */ - EMBER_JOIN_FAILED = 0x94, - - /** - * @brief After moving, a mobile node's attempt to re-establish contact - * with the network failed. - */ - EMBER_MOVE_FAILED = 0x96, - - /** - * @brief An attempt to join as a router failed due to a Zigbee - * versus Zigbee Pro incompatibility. Zigbee devices joining Zigbee Pro networks - * (or vice versa) must join as End Devices, not Routers. - */ - EMBER_CANNOT_JOIN_AS_ROUTER = 0x98, - - /** @brief The local node ID has changed. The application can get the new - * node ID by calling ::emberGetNodeId(). - */ - EMBER_NODE_ID_CHANGED = 0x99, - - /** @brief The local PAN ID has changed. The application can get the new PAN - * ID by calling ::emberGetPanId(). - */ - EMBER_PAN_ID_CHANGED = 0x9A, - - /** @brief The channel has changed. - */ - EMBER_CHANNEL_CHANGED = 0x9B, - - /** @brief An attempt to join or rejoin the network failed because - * no router beacons could be heard by the joining node. - */ - EMBER_NO_BEACONS = 0xAB, - - /** @brief An attempt was made to join a Secured Network using a pre-configured - * key, but the Trust Center sent back a Network Key in-the-clear when - * an encrypted Network Key was required. (::EMBER_REQUIRE_ENCRYPTED_KEY). - */ - EMBER_RECEIVED_KEY_IN_THE_CLEAR = 0xAC, - - /** @brief An attempt was made to join a Secured Network, but the device did - * not receive a Network Key. - */ - EMBER_NO_NETWORK_KEY_RECEIVED = 0xAD, - - /** @brief After a device joined a Secured Network, a Link Key was requested - * (::EMBER_GET_LINK_KEY_WHEN_JOINING) but no response was ever received. - */ - EMBER_NO_LINK_KEY_RECEIVED = 0xAE, - - /** @brief An attempt was made to join a Secured Network without a - * pre-configured key, but the Trust Center sent encrypted data using a - * pre-configured key. - */ - EMBER_PRECONFIGURED_KEY_REQUIRED = 0xAF, - - //@} - - /** - * @name Security Errors - */ - /** - * @brief The passed key data is not valid. A key of all zeros or - * all F's are reserved values and cannot be used. - */ - EMBER_KEY_INVALID = 0xB2, - - /** - * @brief The chosen security level (the value of ::EMBER_SECURITY_LEVEL) - * is not supported by the stack. - */ - EMBER_INVALID_SECURITY_LEVEL = 0x95, - - /** - * @brief An error occurred when trying to encrypt at the APS Level. - * - * In order to APS encrypt an outgoing packet, the sender - * needs to know the EUI64 of the destination. This error occurs because - * the EUI64 of the destination can't be determined from - * the short address (no entry in the neighbor, child, binding - * or address tables). - * - * Everytime this error code is seen, note that the stack initiates an - * IEEE address discovery request behind the scenes. Responses - * to the request are stored in the trust center cache portion of the - * address table. Note that you need at least 1 entry allocated for - * TC cache in the address table plugin. Depending on the available rows in - * the table, newly discovered addresses may replace old ones. The address - * table plugin is enabled by default on the host. If you are using an SoC - * platform, please be sure to add the address table plugin. - * - * When customers choose to send APS messages by using short addresses, - * they should incorporate a retry mechanism and try again, no sooner than - * 2 seconds later, to resend the APS message. If the app always - * receives 0xBE (EMBER_IEEE_ADDR_DISCOVERY_IN_PROGRESS) after - * multiple retries, that might indicate that: - * a) destination node is not on the network - * b) there are problems with the health of the network - * c) there may not be any space set asidein the address table for - * the newly discovered address - this can be rectified by reserving - * more entries for the trust center cache in the address table plugin - */ - EMBER_IEEE_ADDRESS_DISCOVERY_IN_PROGRESS = 0xBE, - /** - * @brief An error occurred when trying to encrypt at the APS Level. - * - * This error occurs either because the long address of the recipient can't be - * determined from the short address (no entry in the binding table) - * or there is no link key entry in the table associated with the destination, - * or there was a failure to load the correct key into the encryption core. - */ - EMBER_APS_ENCRYPTION_ERROR = 0xA6, - - /** @brief There was an attempt to form or join a network with security - * without calling ::emberSetInitialSecurityState() first. - */ - EMBER_SECURITY_STATE_NOT_SET = 0xA8, - - /** @brief There was an attempt to set an entry in the key table using - * an invalid long address. Invalid addresses include: - * - The local device's IEEE address - * - Trust Center's IEEE address - * - An existing table entry's IEEE address - * - An address consisting of all zeros or all F's - */ - EMBER_KEY_TABLE_INVALID_ADDRESS = 0xB3, - - /** @brief There was an attempt to set a security configuration that - * is not valid given the other security settings. - */ - EMBER_SECURITY_CONFIGURATION_INVALID = 0xB7, - - /** @brief There was an attempt to broadcast a key switch too quickly after - * broadcasting the next network key. The Trust Center must wait at - * least a period equal to the broadcast timeout so that all routers - * have a chance to receive the broadcast of the new network key. - */ - EMBER_TOO_SOON_FOR_SWITCH_KEY = 0xB8, - - /** @brief The received signature corresponding to the message that was passed - to the CBKE Library failed verification and is not valid. - */ - EMBER_SIGNATURE_VERIFY_FAILURE = 0xB9, - - /** @brief The message could not be sent because the link key corresponding - to the destination is not authorized for use in APS data messages. - APS Commands (sent by the stack) are allowed. To use it for encryption - of APS data messages it must be authorized using a key agreement protocol - (such as CBKE). - */ - EMBER_KEY_NOT_AUTHORIZED = 0xBB, - - /** @brief The security data provided was not valid, or an - * integrity check failed. - */ - EMBER_SECURITY_DATA_INVALID = 0xBD, - - //@} - - /** - * @name Miscellaneous Network Errors - */ - //@{ - - /** - * @brief The node has not joined a network. - */ - EMBER_NOT_JOINED = 0x93, - - /** - * @brief A message cannot be sent because the network is currently - * overloaded. - */ - EMBER_NETWORK_BUSY = 0xA1, - - /** - * @brief The application tried to send a message using an - * endpoint that it has not defined. - */ - EMBER_INVALID_ENDPOINT = 0xA3, - - /** - * @brief The application tried to use a binding that has been remotely - * modified and the change has not yet been reported to the application. - */ - EMBER_BINDING_HAS_CHANGED = 0xA4, - - /** - * @brief An attempt to generate random bytes failed because of - * insufficient random data from the radio. - */ - EMBER_INSUFFICIENT_RANDOM_DATA = 0xA5, - - /** A Zigbee route error command frame was received indicating - * that a source routed message from this node failed en route. - */ - EMBER_SOURCE_ROUTE_FAILURE = 0xA9, - - /** A Zigbee route error command frame was received indicating - * that a message sent to this node along a many-to-one route - * failed en route. The route error frame was delivered by - * an ad-hoc search for a functioning route. - */ - EMBER_MANY_TO_ONE_ROUTE_FAILURE = 0xAA, - - //@} - - /** - * @name Miscellaneous Utility Errors - */ - //@{ - - /** - * @brief A critical and fatal error indicating that the version of the - * stack trying to run does not match with the chip it's running on. The - * software (stack) on the chip must be replaced with software - * compatible with the chip. - */ - EMBER_STACK_AND_HARDWARE_MISMATCH = 0xB0, - - /** - * @brief An index was passed into the function that was larger - * than the valid range. - */ - EMBER_INDEX_OUT_OF_RANGE = 0xB1, - - /** - * @brief There are no empty entries left in the table. - */ - EMBER_TABLE_FULL = 0xB4, - - /** - * @brief The requested table entry has been erased and contains - * no valid data. - */ - EMBER_TABLE_ENTRY_ERASED = 0xB6, - - /** - * @brief The requested function cannot be executed because - * the library that contains the necessary functionality is not present. - */ - EMBER_LIBRARY_NOT_PRESENT = 0xB5, - - /** - * @brief The stack accepted the command and is currently processing - * the request. The results will be returned via an appropriate handler. - */ - EMBER_OPERATION_IN_PROGRESS = 0xBA, - - /** - * @brief The EUI of the Trust center has changed due to a successful rejoin. - * The device may need to perform other authentication to verify the new TC - * is authorized to take over. - */ - EMBER_TRUST_CENTER_EUI_HAS_CHANGED = 0xBC, - - //@} - - /** - * @name NVM3 Token Errors - */ - //@{ - - /** - * @brief NVM3 is telling the application that the initialization was aborted - * as no valid NVM3 page was found. - */ - EMBER_NVM3_TOKEN_NO_VALID_PAGES = 0xC0, - - /** - * @brief NVM3 is telling the application that the initialization was aborted - * as the NVM3 instance was already opened with other parameters. - */ - EMBER_NVM3_ERR_OPENED_WITH_OTHER_PARAMETERS = 0xC1, - - /** - * @brief NVM3 is telling the application that the initialization was aborted - * as the NVM3 instance is not aligned properly in memory. - */ - EMBER_NVM3_ERR_ALIGNMENT_INVALID = 0xC2, - - /** - * @brief NVM3 is telling the application that the initialization was aborted - * as the size of the NVM3 instance is too small. - */ - EMBER_NVM3_ERR_SIZE_TOO_SMALL = 0xC3, - - /** - * @brief NVM3 is telling the application that the initialization was aborted - * as the NVM3 page size is not supported. - */ - EMBER_NVM3_ERR_PAGE_SIZE_NOT_SUPPORTED = 0xC4, - - /** - * @brief NVM3 is telling the application that there was an error initializing - * some of the tokens. - */ - EMBER_NVM3_ERR_TOKEN_INIT = 0xC5, - - /** - * @brief NVM3 is telling the application there has been an error when - * attempting to upgrade SimEE tokens. - */ - EMBER_NVM3_ERR_UPGRADE = 0xC6, - - /** - * @brief NVM3 is telling the application that there has been an unknown - * error. - */ - EMBER_NVM3_ERR_UNKNOWN = 0xC7, - - //@} - - /** - * @name Application Errors - * These error codes are available for application use. - */ - //@{ - - /** - * @brief This error is reserved for customer application use. - * This will never be returned from any portion of the network stack or HAL. - */ - EMBER_APPLICATION_ERROR_0 = 0xF0, - EMBER_APPLICATION_ERROR_1 = 0xF1, - EMBER_APPLICATION_ERROR_2 = 0xF2, - EMBER_APPLICATION_ERROR_3 = 0xF3, - EMBER_APPLICATION_ERROR_4 = 0xF4, - EMBER_APPLICATION_ERROR_5 = 0xF5, - EMBER_APPLICATION_ERROR_6 = 0xF6, - EMBER_APPLICATION_ERROR_7 = 0xF7, - EMBER_APPLICATION_ERROR_8 = 0xF8, - EMBER_APPLICATION_ERROR_9 = 0xF9, - EMBER_APPLICATION_ERROR_10 = 0xFA, - EMBER_APPLICATION_ERROR_11 = 0xFB, - EMBER_APPLICATION_ERROR_12 = 0xFC, - EMBER_APPLICATION_ERROR_13 = 0xFD, - EMBER_APPLICATION_ERROR_14 = 0xFE, - EMBER_APPLICATION_ERROR_15 = 0xFF, -}; - -/** - * @brief Function pointer for timer callback - */ -typedef void (*TimerCallback)(chip::EndpointId); - -/** @brief The control structure for events. - * - * It holds the event status (one of the @e EMBER_EVENT_ values) - * and the callback and it's parameters - */ -typedef struct -{ - /** The event's status, either inactive or the units for timeToExecute. */ - EmberEventUnits status; - - /* Callback information */ - TimerCallback callback; - chip::EndpointId endpoint; - -} EmberEventControl; - -/** - * @name ZigBee Broadcast Addresses - *@{ - * ZigBee specifies three different broadcast addresses that - * reach different collections of nodes. Broadcasts are normally sent only - * to routers. Broadcasts can also be forwarded to end devices, either - * all of them or only those that do not sleep. Broadcasting to end - * devices is both significantly more resource-intensive and significantly - * less reliable than broadcasting to routers. - */ - -/** Broadcast to all routers. */ -#define EMBER_BROADCAST_ADDRESS 0xFFFC - -/** - * @description Useful macro for avoiding compiler warnings related to unused - * function arguments or unused variables. - */ -#define UNUSED_VAR(x) (void) (x) - -/** - * @brief The maximum 802.15.4 channel number is 26. - */ -#define EMBER_MAX_802_15_4_CHANNEL_NUMBER 26 - -/** - * @brief The minimum 2.4GHz 802.15.4 channel number is 11. - */ -#define EMBER_MIN_802_15_4_CHANNEL_NUMBER 11 - -/** - * @brief The maximum SubGhz channel number on pages 28, 30, 31 is 26. - */ -#define EMBER_MAX_SUBGHZ_CHANNEL_NUMBER_ON_PAGES_28_30_31 26 - -/** - * @brief The maximum SubGhz channel number on page 29 is 8. - */ -#define EMBER_MAX_SUBGHZ_CHANNEL_NUMBER_ON_PAGE_29 8 - -/** - * @brief The broadcast endpoint, as defined in the ZigBee spec. - */ -#define EMBER_BROADCAST_ENDPOINT (chip::kInvalidEndpointId) - -/** - * @brief Useful to reference a single bit of a byte. - */ -#define EMBER_BIT(nr) (1UL << (nr)) // Unsigned avoids compiler warnings re EMBER_BIT(15) - -/** - * @brief Returns the low byte of the 16-bit value \c n as an \c uint8_t. - */ -#define EMBER_LOW_BYTE(n) ((uint8_t)((n) &0xFF)) - -/** - * @brief Returns the high byte of the 16-bit value \c n as an \c uint8_t. - */ -#define EMBER_HIGH_BYTE(n) ((uint8_t)(EMBER_LOW_BYTE((n) >> 8))) -/** - * @brief Returns the low byte of the 32-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_0(n) ((uint8_t)((n) &0xFF)) - -/** - * @brief Returns the second byte of the 32-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_1(n) EMBER_BYTE_0((n) >> 8) - -/** - * @brief Returns the third byte of the 32-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_2(n) EMBER_BYTE_0((n) >> 16) - -/** - * @brief Returns the high byte of the 32-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_3(n) EMBER_BYTE_0((n) >> 24) - -/** - * @brief Returns the fifth byte of the 64-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_4(n) EMBER_BYTE_0((n) >> 32) - -/** - * @brief Returns the sixth byte of the 64-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_5(n) EMBER_BYTE_0((n) >> 40) - -/** - * @brief Returns the seventh byte of the 64-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_6(n) EMBER_BYTE_0((n) >> 48) - -/** - * @brief Returns the high byte of the 64-bit value \c n as an \c uint8_t. - */ -#define EMBER_BYTE_7(n) EMBER_BYTE_0((n) >> 56) - -/** - * @brief Returns the value built from the two \c uint8_t - * values \c high and \c low. - */ -#define EMBER_HIGH_LOW_TO_INT(high, low) (((uint16_t)(((uint16_t)(high)) << 8)) + ((uint16_t)((low) &0xFF))) - -/** - * @brief The kind of arguments the main function takes - */ -#define MAIN_FUNCTION_PARAMETERS void -#define MAIN_FUNCTION_ARGUMENTS - -// Stubs to just silence some compile errors - -#define emberAfPrintEnabled(...) false - -#define emberAfPrintActiveArea EMBER_AF_PRINT_CORE - -/** - * @brief Returns the value of \c bit within the register or byte \c reg. - */ -#define READBIT(reg, bit) ((reg) & (EMBER_BIT(bit))) - -/** - * @brief Returns the value of the bitmask \c bits within - * the register or byte \c reg. - */ -#define READBITS(reg, bits) ((reg) & (bits)) +/** + * @brief Returns the value of the bitmask \c bits within + * the register or byte \c reg. + */ +#define READBITS(reg, bits) ((reg) & (bits)) #define MILLISECOND_TICKS_PER_SECOND 1000 #define MILLISECOND_TICKS_PER_DECISECOND (MILLISECOND_TICKS_PER_SECOND / 10) - -/** - * @brief Macro that copies the token value from non-volatile storage into a RAM - * location. This macro can only be used with tokens that are defined using - * DEFINE_INDEXED_TOKEN. - * - * @note To better understand the parameters of this macro, refer to the - * example of token usage above. - * - * @param data A pointer to where the token data should be placed. - * - * @param token The token name used in DEFINE_*_TOKEN, - * prepended with TOKEN_. - * @param index The index to access in the indexed token. - */ -#define halCommonGetIndexedToken(data, token, index) - -/** - * @brief Macro that sets the value of a token in non-volatile storage. This - * macro can only be used with tokens that are defined using - * DEFINE_INDEXED_TOKEN. - * - * @note To better understand the parameters of this macro, refer to the - * example of token usage above. - * - * @param token The token name used in DEFINE_*_TOKEN, - * prepended with TOKEN_. - * - * @param index The index to access in the indexed token. - * - * @param data A pointer to where the token data should be placed. - */ -#define halCommonSetIndexedToken(token, index, data) diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 8156e123cf161d..a7f2ed2178b149 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -219,22 +219,6 @@ uint16_t emberAfFindClusterNameIndex(ClusterId cluster) return 0xFFFF; } -// This function parses into the cluster name table, and tries to find -// the index in the table that has the right cluster id. -void emberAfDecodeAndPrintCluster(ClusterId cluster) -{ - uint16_t index = emberAfFindClusterNameIndex(cluster); - if (index == 0xFFFF) - { - static_assert(sizeof(ClusterId) == 4, "Adjust the print formatting"); - emberAfPrint(emberAfPrintActiveArea, "(Unknown clus. [" ChipLogFormatMEI "])", ChipLogValueMEI(cluster)); - } - else - { - emberAfPrint(emberAfPrintActiveArea, "(%p)", zclClusterNames[index].name); - } -} - // This function makes the assumption that // emberAfCurrentCommand will either be NULL // when invalid, or will have a valid mfgCode @@ -529,117 +513,6 @@ uint8_t emberAfAppendCharacters(uint8_t * zclString, uint8_t zclStringMaxLen, co return charsToWrite; } -/* - On each page, first channel maps to channel number zero and so on. - Example: - page Band Rage of 90 channels Per page channel mapping - 28 863 MHz 0-26 0-26 - 29 863 MHz 27-34,62 0-8 (Here 7th channel maps to 34 and 8th to 62) - 30 863 MHz 35 - 61 0-26 - 31 915 0-26 0-26 - - */ -EmberStatus emAfValidateChannelPages(uint8_t page, uint8_t channel) -{ - switch (page) - { - case 0: - if (!((channel <= EMBER_MAX_802_15_4_CHANNEL_NUMBER) && - ((EMBER_MIN_802_15_4_CHANNEL_NUMBER == 0) || (channel >= EMBER_MIN_802_15_4_CHANNEL_NUMBER)))) - { - return EMBER_PHY_INVALID_CHANNEL; - } - break; - case 28: - case 30: - case 31: - if (channel > EMBER_MAX_SUBGHZ_CHANNEL_NUMBER_ON_PAGES_28_30_31) - { - return EMBER_PHY_INVALID_CHANNEL; - } - break; - case 29: - if (channel > EMBER_MAX_SUBGHZ_CHANNEL_NUMBER_ON_PAGE_29) - { - return EMBER_PHY_INVALID_CHANNEL; - } - break; - default: - return EMBER_PHY_INVALID_CHANNEL; - break; - } - return EMBER_SUCCESS; -} - -void slabAssert(const char * file, int line) -{ - (void) file; // Unused parameter - (void) line; // Unused parameter - // Wait forever until the watchdog fires - while (true) - { - } -} - -#define ENCODED_8BIT_CHANPG_PAGE_MASK 0xE0 // top 3 bits -#define ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_0 0x00 // 0b000xxxxx -#define ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_28 0x80 // 0b100xxxxx -#define ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_29 0xA0 // 0b101xxxxx -#define ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_30 0xC0 // 0b110xxxxx -#define ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_31 0xE0 // 0b111xxxxx - -#define ENCODED_8BIT_CHANPG_CHANNEL_MASK 0x1F // bottom 5 bits - -uint8_t emberAfGetPageFrom8bitEncodedChanPg(uint8_t chanPg) -{ - switch (chanPg & ENCODED_8BIT_CHANPG_PAGE_MASK) - { - case ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_0: - return 0; - case ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_28: - return 28; - case ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_29: - return 29; - case ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_30: - return 30; - case ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_31: - return 31; - default: - return 0xFF; - } -} - -uint8_t emberAfGetChannelFrom8bitEncodedChanPg(uint8_t chanPg) -{ - return chanPg & ENCODED_8BIT_CHANPG_CHANNEL_MASK; -} - -uint8_t emberAfMake8bitEncodedChanPg(uint8_t page, uint8_t channel) -{ - if (emAfValidateChannelPages(page, channel) != EMBER_SUCCESS) - { - return 0xFF; - } - - switch (page) - { - case 28: - return channel | ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_28; - case 29: - return channel | ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_29; - case 30: - return channel | ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_30; - case 31: - return channel | ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_31; - default: - // Strictly speaking, we only need case 0 here, but MISRA in its infinite - // wisdom requires a default case. Since we have validated the arguments - // already, and 0 is the only remaining case, we simply treat the default - // as case 0 to make MISRA happy. - return channel | ENCODED_8BIT_CHANPG_PAGE_MASK_PAGE_0; - } -} - bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId) { return (emberAfGetServerAttributeIndexByAttributeId(endpoint, clusterId, attributeId) != UINT16_MAX); diff --git a/src/app/util/util.h b/src/app/util/util.h index 0949aea7afef9b..f105304b740cb4 100644 --- a/src/app/util/util.h +++ b/src/app/util/util.h @@ -24,16 +24,6 @@ // void userAssert (int file, int line); // declaration // #define USER_ASSERT(file, line) userAssert(file, line) // definition -#if defined(NO_ASSERT) -#define SLAB_ASSERT(expr) -#else -#if defined(USER_ASSERT) -#define SLAB_ASSERT(expr) ((expr) ? ((void) 0) : USER_ASSERT(__FILE__, __LINE__)) -#else -#define SLAB_ASSERT(expr) ((expr) ? ((void) 0) : slabAssert(__FILE__, __LINE__)) -#endif // USER_ASSERT -#endif // NO_ASSERT - // This controls the type of response. Normally The library sends an automatic // response (if appropriate) on the same PAN. The reply can be disabled by // calling emberAfSetNoReplyForNextMessage. @@ -114,8 +104,6 @@ void emberAfTick(void); uint16_t emberAfFindClusterNameIndex(chip::ClusterId cluster); void emberAfStackDown(void); -void emberAfDecodeAndPrintCluster(chip::ClusterId cluster); - /** * Retrieves the difference between the two passed values. * This function assumes that the two values have the same endianness. @@ -190,58 +178,6 @@ uint16_t emberAfStrnlen(const uint8_t * string, uint16_t maxLength); uint8_t emberAfAppendCharacters(uint8_t * zclString, uint8_t zclStringMaxLen, const uint8_t * appendingChars, uint8_t appendingCharsLen); -EmberStatus emAfValidateChannelPages(uint8_t page, uint8_t channel); - -/* @brief A Silicon Labs assert function - * - * This function is provided to call an assert function in the application code. - * It starts an infinite loop that provokes the watchdog to fire. - * - * @param file - the source file that calls this assert - * @param line - the line that calls this assert - * - * @return void - * - */ -void slabAssert(const char * file, int line); - -/* @brief Get the page number from an 8-bit encoded channel-page - * - * The top three bits denote the page number, like this: - * 000x xxxx = page 0 - * 100x xxxx = page 28 - * 101x xxxx = page 29 - * 110x xxxx = page 30 - * 111x xxxx = page 31 - * - * @param chanPg - 8-bit encoded channel and page - * - * @return page number (0, 28-31, 0xFF if invalid) - */ -uint8_t emberAfGetPageFrom8bitEncodedChanPg(uint8_t chanPg); - -/* @brief Get the channel number from an 8-bit encoded channel-page - * - * The bottom 5 bits denote the channel within the page. - * - * Provided for symmetry with the above emberAfGetPageFrom8bitEncodedChanPg(). - * It simply masks the bottom 5 bits. - * - * @param chanPg - 8-bit encoded channel and page - * - * @return channel number (0-8, 0-26, 11-26, depending on the page) - */ -uint8_t emberAfGetChannelFrom8bitEncodedChanPg(uint8_t chanPg); - -/* @brief Make an 8-bit encoded channel-page from channel and page arguments - * - * @param page - * @param channel - * - * @return 8-bit encoded channel-page, 0xFF if invalid - */ -uint8_t emberAfMake8bitEncodedChanPg(uint8_t page, uint8_t channel); - bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId); /* @brief returns true if the attribute is known to be volatile (i.e. RAM