From 3c9e7784336563c1054e82617796b51507bc6203 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Thu, 28 Feb 2019 11:23:05 +0000 Subject: [PATCH] BLE - Remove conditionnal directive within services --- features/FEATURE_BLE/source/services/DFUService.cpp | 10 +--------- features/FEATURE_BLE/source/services/UARTService.cpp | 10 +--------- .../source/services/URIBeaconConfigService.cpp | 10 +--------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/features/FEATURE_BLE/source/services/DFUService.cpp b/features/FEATURE_BLE/source/services/DFUService.cpp index 2e67535182..429c9da607 100644 --- a/features/FEATURE_BLE/source/services/DFUService.cpp +++ b/features/FEATURE_BLE/source/services/DFUService.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include "BLERoles.h" - -#if BLE_FEATURE_GATT_SERVER -#if BLE_ROLE_BROADCASTER - #ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */ #include "ble/services/DFUService.h" @@ -46,7 +41,4 @@ const uint8_t DFUServicePacketCharacteristicUUID[] = { DFUService::ResetPrepare_t DFUService::handoverCallback = NULL; -#endif /* #ifdef TARGET_NRF51822 */ - -#endif // BLE_ROLE_BROADCASTER -#endif // BLE_FEATURE_GATT_SERVER +#endif /* #ifdef TARGET_NRF51822 */ \ No newline at end of file diff --git a/features/FEATURE_BLE/source/services/UARTService.cpp b/features/FEATURE_BLE/source/services/UARTService.cpp index 9fc7f730b0..a397d83f68 100644 --- a/features/FEATURE_BLE/source/services/UARTService.cpp +++ b/features/FEATURE_BLE/source/services/UARTService.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include "BLERoles.h" - -#if BLE_FEATURE_GATT_SERVER -#if BLE_ROLE_BROADCASTER - #include "ble/services/UARTService.h" const uint8_t UARTServiceBaseUUID[UUID::LENGTH_OF_LONG_UUID] = { @@ -43,7 +38,4 @@ const uint8_t UARTServiceTXCharacteristicUUID[UUID::LENGTH_OF_LONG_UUID] = { const uint8_t UARTServiceRXCharacteristicUUID[UUID::LENGTH_OF_LONG_UUID] = { 0x6E, 0x40, (uint8_t)(UARTServiceRXCharacteristicShortUUID >> 8), (uint8_t)(UARTServiceRXCharacteristicShortUUID & 0xFF), 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E, -}; - -#endif // BLE_ROLE_BROADCASTER -#endif // BLE_FEATURE_GATT_SERVER +}; \ No newline at end of file diff --git a/features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp b/features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp index 09f28c20a0..ad0e184d35 100644 --- a/features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp +++ b/features/FEATURE_BLE/source/services/URIBeaconConfigService.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include "BLERoles.h" - -#if BLE_FEATURE_GATT_SERVER -#if BLE_ROLE_BROADCASTER - #include "ble/services/URIBeaconConfigService.h" #define UUID_URI_BEACON(FIRST, SECOND) { \ @@ -37,7 +32,4 @@ const uint8_t UUID_TX_POWER_MODE_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_B const uint8_t UUID_BEACON_PERIOD_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_BEACON(0x20, 0x88); const uint8_t UUID_RESET_CHAR[UUID::LENGTH_OF_LONG_UUID] = UUID_URI_BEACON(0x20, 0x89); -const uint8_t BEACON_UUID[sizeof(UUID::ShortUUIDBytes_t)] = {0xD8, 0xFE}; - -#endif // BLE_ROLE_BROADCASTER -#endif // BLE_FEATURE_GATT_SERVER +const uint8_t BEACON_UUID[sizeof(UUID::ShortUUIDBytes_t)] = {0xD8, 0xFE}; \ No newline at end of file