Ble conf

features/FEATURE_BLE/ble/BLE.h

@@ -17,11 +17,13 @@
 #ifndef MBED_BLE_H__
 #define MBED_BLE_H__
 
+#include "BLERoles.h"
+
 #include "blecommon.h"
 #include "ble/Gap.h"
-#include "GattServer.h"
-#include "GattClient.h"
-#include "SecurityManager.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+#include "ble/SecurityManager.h"
 
 #include "ble/FunctionPointerWithContext.h"
 
@@ -355,6 +357,7 @@ class BLE {
      */
     const Gap &gap() const;
 
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Accessor to GattServer. All GattServer related functionality requires
      * going through this accessor.
@@ -370,7 +373,9 @@ class BLE {
      * instance.
      */
     const GattServer &gattServer() const;
+#endif // BLE_FEATURE_GATT_SERVER
 
+#if BLE_FEATURE_GATT_CLIENT
     /**
      * Accessors to GattClient. All GattClient related functionality requires
      * going through this accessor.
@@ -386,7 +391,9 @@ class BLE {
      * instance.
      */
     const GattClient &gattClient() const;
+#endif // BLE_FEATURE_GATT_CLIENT
 
+#if BLE_FEATURE_SECURITY
     /**
      * Accessors to SecurityManager. All SecurityManager-related functionality
      * requires going through this accessor.
@@ -403,6 +410,7 @@ class BLE {
      * BLE instance.
      */
     const SecurityManager &securityManager() const;
+#endif // BLE_FEATURE_SECURITY
 
     /**
      * Translate error code into a printable string.
@@ -489,6 +497,7 @@ class BLE {
         return gap().getAddress(typeP, address);
     }
 
+#if BLE_ROLE_BROADCASTER
     /**
      * Set the GAP advertising mode to use for this device.
      *
@@ -834,7 +843,9 @@ class BLE {
      */
     MBED_DEPRECATED("Use ble.gap().stopAdvertising(...)")
     ble_error_t stopAdvertising(void);
+#endif // BLE_ROLE_BROADCASTER
 
+#if BLE_ROLE_OBSERVER
     /**
      * Set up parameters for GAP scanning (observer mode).
      *
@@ -1032,7 +1043,9 @@ class BLE {
     {
         return gap().stopScan();
     }
+#endif // BLE_ROLE_OBSERVER
 
+#if BLE_ROLE_CENTRAL
     /**
      * Create a connection (GAP Link Establishment).
      *
@@ -1061,7 +1074,9 @@ class BLE {
         const Gap::ConnectionParams_t *connectionParams = NULL,
         const GapScanningParams *scanParams = NULL
     );
+#endif // BLE_ROLE_CENTRAL
 
+#if BLE_FEATURE_CONNECTABLE
     /**
      * This call initiates the disconnection procedure, and its completion is
      * communicated to the application with an invocation of the
@@ -1104,6 +1119,7 @@ class BLE {
      */
     MBED_DEPRECATED("Use ble.gap().disconnect(...)")
     ble_error_t disconnect(Gap::DisconnectionReason_t reason);
+#endif // BLE_FEATURE_CONNECTABLE
 
     /**
      * Returns the current Gap state of the device using a bitmask that
@@ -1119,6 +1135,8 @@ class BLE {
     MBED_DEPRECATED("Use ble.gap().getState()")
     Gap::GapState_t getGapState(void) const;
 
+#if BLE_FEATURE_CONNECTABLE
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Get the GAP peripheral's preferred connection parameters. These are the
      * defaults that the peripheral would like to have in a connection. The
@@ -1163,6 +1181,7 @@ class BLE {
     {
         return gap().setPreferredConnectionParams(params);
     }
+#endif // BLE_FEATURE_GATT_SERVER
 
     /**
      * Update connection parameters while in the peripheral role.
@@ -1185,7 +1204,9 @@ class BLE {
      */
     MBED_DEPRECATED("Use ble.gap().updateConnectionParams(...)")
     ble_error_t updateConnectionParams(Gap::Handle_t handle, const Gap::ConnectionParams_t *params);
+#endif // BLE_FEATURE_CONNECTABLE
 
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Set the device name characteristic in the Gap service.
      *
@@ -1276,6 +1297,7 @@ class BLE {
     {
         return gap().getAppearance(appearanceP);
     }
+#endif // BLE_FEATURE_GATT_SERVER
 
     /**
      * Set the radio's transmit power.
@@ -1309,6 +1331,7 @@ class BLE {
     MBED_DEPRECATED("Use ble.gap().getPermittedTxPowerValues(...)")
     void getPermittedTxPowerValues(const int8_t **valueArrayPP, size_t *countP);
 
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Add a service declaration to the local server ATT table. Also add the
      * characteristics contained within.
@@ -1467,7 +1490,9 @@ class BLE {
     {
         return gattServer().write(connectionHandle, attributeHandle, value, size, localOnly);
     }
+#endif // BLE_FEATURE_GATT_SERVER
 
+#if BLE_FEATURE_SECURITY
     /**
      * Enable the BLE stack's Security Manager. The Security Manager implements
      * the cryptographic algorithms and protocol exchanges that allow two
@@ -1536,6 +1561,7 @@ class BLE {
     {
         return securityManager().purgeAllBondingState();
     }
+#endif // BLE_FEATURE_SECURITY
 
     /**
      * Set up a callback for timeout events. Refer to Gap::TimeoutSource_t for
@@ -1551,6 +1577,7 @@ class BLE {
     MBED_DEPRECATED("ble.gap().onTimeout(callback)")
     void onTimeout(Gap::TimeoutEventCallback_t timeoutCallback);
 
+#if BLE_FEATURE_CONNECTABLE
     /**
      * Set up a callback for connection events. Refer to Gap::ConnectionEventCallback_t.
      *
@@ -1595,6 +1622,7 @@ class BLE {
     {
         gap().onDisconnection(tptr, mptr);
     }
+#endif // BLE_FEATURE_CONNECTABLE
 
     /**
      * Radio Notification is a feature that enables ACTIVE and INACTIVE
@@ -1620,6 +1648,7 @@ class BLE {
     MBED_DEPRECATED("ble.gap().onRadioNotification(...)")
     void onRadioNotification(void (*callback)(bool));
 
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Add a callback for the GATT event DATA_SENT (which is triggered when
      * updates are sent out by GATT in the form of notifications).
@@ -1821,7 +1850,9 @@ class BLE {
     {
         gattServer().onConfirmationReceived(callback);
     }
+#endif // BLE_FEATURE_GATT_SERVER
 
+#if BLE_FEATURE_SECURITY
     /**
      * Set up a callback for when the security setup procedure (key generation
      * and exchange) for a link has started. This will be skipped for bonded
@@ -1918,6 +1949,7 @@ class BLE {
     {
         return securityManager().onPasskeyDisplay(callback);
     }
+#endif // BLE_FEATURE_SECURITY
 
 private:
     friend class BLEInstanceBase;

features/FEATURE_BLE/ble/BLEInstanceBase.h

@@ -21,13 +21,13 @@
 #ifndef MBED_BLE_DEVICE_INSTANCE_BASE__
 #define MBED_BLE_DEVICE_INSTANCE_BASE__
 
+#include "ble/BLE.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
-#include "ble/BLE.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+
 
-/* Forward declarations. */
-class GattServer;
-class GattClient;
 
 /**
  * @addtogroup ble
@@ -183,6 +183,8 @@ class BLEInstanceBase
      */
     virtual const Gap &getGap(void) const = 0;
 
+
+#if BLE_FEATURE_GATT_SERVER
     /**
      * Accessor to the vendor implementation of the GattServer interface.
      *
@@ -202,7 +204,9 @@ class BLEInstanceBase
      * @see BLE::gattServer() GattServer
      */
     virtual const GattServer &getGattServer(void) const = 0;
+#endif // BLE_FEATURE_GATT_SERVER
 
+#if BLE_FEATURE_GATT_CLIENT
     /**
      * Accessor to the vendor implementation of the GattClient interface.
      *
@@ -212,7 +216,9 @@ class BLEInstanceBase
      * @see BLE::gattClient() GattClient
      */
     virtual GattClient &getGattClient(void) = 0;
+#endif
 
+#if BLE_FEATURE_SECURITY
     /**
      * Accessor to the vendor implementation of the SecurityManager interface.
      *
@@ -232,6 +238,7 @@ class BLEInstanceBase
      * @see BLE::securityManager() SecurityManager
      */
     virtual const SecurityManager &getSecurityManager(void) const = 0;
+#endif // BLE_FEATURE_SECURITY
 
     /**
      * Process pending events present in the vendor subsystem; then, put the MCU

features/FEATURE_BLE/ble/BLERoles.h

@@ -0,0 +1,76 @@
+#ifndef MBED_BLE_ROLES_H__
+#define MBED_BLE_ROLES_H__
+
+#if !(BLE_ROLE_OBSERVER) && !(BLE_ROLE_BROADCASTER)
+    #error "BLE requires at least one role 'BROADCASTER' or 'OBSERVER' to be enabled"
+#endif
+
+#if (BLE_ROLE_PERIPHERAL) || (BLE_ROLE_CENTRAL)
+    #define BLE_FEATURE_CONNECTABLE 1
+#endif
+
+#if (BLE_FEATURE_GATT_CLIENT) || (BLE_FEATURE_GATT_SERVER)
+    #define BLE_FEATURE_ATT 1
+#endif
+
+#if BLE_ROLE_PERIPHERAL
+    #if !(BLE_ROLE_BROADCASTER)
+        #error "BLE role 'PERIPHERAL' depends on role 'BROADCASTER'"
+    #endif
+#endif // BLE_ROLE_PERIPHERAL
+
+#if BLE_ROLE_CENTRAL
+    #if !(BLE_ROLE_OBSERVER)
+        #error "BLE role 'CENTRAL' depends on role 'OBSERVER'"
+    #endif
+#endif // BLE_ROLE_CENTRAL
+
+#if BLE_FEATURE_SECURITY
+    #if !(BLE_ROLE_PERIPHERAL) && !(BLE_ROLE_CENTRAL)
+        #error "BLE feature 'SECURITY' requires 'PERIPHERAL' or 'CENTRAL' role"
+    #endif
+#endif // BLE_FEATURE_SECURITY
+
+#if BLE_FEATURE_SECURE_CONNECTIONS
+    #if !(BLE_FEATURE_SECURITY)
+        #error "BLE feature 'SECURE CONNECTIONS' requires the 'SECURITY' feature"
+    #endif
+#endif // BLE_FEATURE_SECURE_CONNECTIONS
+
+#if BLE_FEATURE_SIGNING
+    #if !(BLE_FEATURE_SECURITY)
+        #error "BLE feature 'SIGNING' requires the 'SECURITY' feature"
+    #endif
+#endif // BLE_FEATURE_SIGNING
+
+#if BLE_FEATURE_WHITELIST
+    #if !(BLE_FEATURE_SECURITY)
+        #error "BLE feature 'WHITELIST' requires the 'SECURITY' feature"
+    #endif
+#endif // BLE_FEATURE_WHITELIST
+
+#if BLE_FEATURE_PRIVACY
+    #if !(BLE_FEATURE_SECURITY)
+        #error "BLE feature 'PRIVACY' requires the 'SECURITY' feature"
+    #endif
+#endif // BLE_FEATURE_PRIVACY
+
+#if BLE_FEATURE_PERIODIC_ADVERTISING
+    #if !(BLE_FEATURE_EXTENDED_ADVERTISING)
+        #error "BLE feature 'PERIODIC ADVERTISING' requires the 'EXTENDED ADVERTISING' feature"
+    #endif
+#endif // BLE_FEATURE_PERIODIC_ADVERTISING
+
+#if BLE_FEATURE_GATT_CLIENT
+    #if !(BLE_FEATURE_CONNECTABLE)
+        #error "BLE feature 'GATT CLIENT' requires 'PERIPHERAL' or 'CENTRAL' role"
+    #endif
+#endif // BLE_FEATURE_GATT_CLIENT
+
+#if BLE_FEATURE_GATT_SERVER
+    #if !(BLE_FEATURE_CONNECTABLE)
+        #error "BLE feature 'GATT SERVER' requires 'PERIPHERAL' or 'CENTRAL' role"
+    #endif
+#endif // BLE_FEATURE_GATT_SERVER
+
+#endif // MBED_BLE_ROLES_H__

features/FEATURE_BLE/ble/DiscoveredCharacteristic.h

@@ -537,7 +537,7 @@ class DiscoveredCharacteristic {
      * @return Connection handle to the GattServer, which contains this
      * characteristic.
      */
-    Gap::Handle_t getConnectionHandle() const
+    ble::connection_handle_t getConnectionHandle() const
     {
         return connHandle;
     }
@@ -625,7 +625,7 @@ class DiscoveredCharacteristic {
     /**
      * Handle of the connection where the characteristic was discovered.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 };
 
 /**

features/FEATURE_BLE/ble/DiscoveredCharacteristicDescriptor.h

@@ -73,7 +73,7 @@ class DiscoveredCharacteristicDescriptor {
      */
     DiscoveredCharacteristicDescriptor(
         GattClient *client,
-        Gap::Handle_t connectionHandle,
+        ble::connection_handle_t connectionHandle,
         GattAttribute::Handle_t attributeHandle,
         const UUID &uuid
     ) : _client(client),
@@ -109,7 +109,7 @@ class DiscoveredCharacteristicDescriptor {
      * @return the connection handle to the GattServer containing this
      * descriptor.
      */
-    Gap::Handle_t getConnectionHandle() const
+    ble::connection_handle_t getConnectionHandle() const
     {
         return _connectionHandle;
     }
@@ -139,7 +139,7 @@ class DiscoveredCharacteristicDescriptor {
 
 private:
     GattClient  *_client;
-    Gap::Handle_t _connectionHandle;
+    ble::connection_handle_t _connectionHandle;
     UUID _uuid;
     GattAttribute::Handle_t _gattHandle;
 };