Jira 541 Peripheral Start fails on X Number of Attributes

Change the interface and add return value

Author: sgbihu

libraries/CurieBLE/src/BLECentral.cpp

@@ -61,9 +61,9 @@ void BLECentral::setScanParam(const struct bt_le_scan_param &scan_param)
     BLECentralRole::instance()->setScanParam(scan_param);
 }
 
-void BLECentral::addAttribute(BLEAttribute& attribute)
+BleStatus BLECentral::addAttribute(BLEAttribute& attribute)
 {
-    BLECentralRole::instance()->addAttribute(attribute);
+    return BLECentralRole::instance()->addAttribute(attribute);
 }
 
 bool BLECentral::begin(void)

libraries/CurieBLE/src/BLECentral.h

@@ -100,11 +100,12 @@ class BLECentral{
      *
      * @param   attribute   Attribute to add to Central
      *
-     * @return  none
+     * @return  BleStatus indicating success or error
      *
      * @note  The attribute will used for discover the peripheral handler
+     *          Only need check return value at first call. Memory only alloc at first call
      */
-    void addAttribute(BLEAttribute& attribute);
+    BleStatus addAttribute(BLEAttribute& attribute);
 
     /**
      * Provide a function to be called when events related to this Device are raised

libraries/CurieBLE/src/BLECentralRole.cpp

@@ -265,12 +265,18 @@ void BLECentralRole::setAdvertiseHandler(ble_advertise_handle_cb_t advcb)
     _adv_event_handle = advcb;
 }
 
-void BLECentralRole::addAttribute(BLEAttribute& attribute)
+BleStatus BLECentralRole::addAttribute(BLEAttribute& attribute)
 {
+    BleStatus err = BLE_STATUS_SUCCESS;
     for (int i = 0; i < BLE_MAX_CONN_CFG; i++)
     {
-        _peripherial[i]->addAttribute(attribute);
+        err = _peripherial[i]->addAttribute(attribute);
+        if (err != BLE_STATUS_SUCCESS) 
+        {
+            break;
+        }
     }
+    return err;
 }
 
 bool BLECentralRole::begin()

libraries/CurieBLE/src/BLECentralRole.h

@@ -110,11 +110,11 @@ class BLECentralRole: public BLERoleBase {
      *
      * @param   attribute   Attribute to add to Central
      *
-     * @return  none
+     * @return  BleStatus indicating success or error
      *
      * @note  The attribute will used for discover the peripheral handler
      */
-    void addAttribute(BLEAttribute& attribute);
+    BleStatus addAttribute(BLEAttribute& attribute);
 
     /**
      * Provide a function to be called when events related to this Device are raised
@@ -237,8 +237,8 @@ class BLECentralRole: public BLERoleBase {
      */
     void handleParamUpdated(struct bt_conn *conn, 
                             uint16_t interval,
-				            uint16_t latency, 
-				            uint16_t timeout);
+                            uint16_t latency, 
+                            uint16_t timeout);
     /**
      * @brief   Handle the advertisement
      *

libraries/CurieBLE/src/BLECommon.h

@@ -65,6 +65,7 @@ enum BLE_STATUS {
 	BLE_STATUS_ALREADY_REGISTERED, /**< BLE service already registered */
 	BLE_STATUS_WRONG_STATE, /**< Wrong state for request */
 	BLE_STATUS_ERROR_PARAMETER, /**< Parameter in request is wrong */
+	BLE_STATUS_NO_MEMORY, /**< System doesn't have memory */
 	BLE_STATUS_GAP_BASE = 0x100, /**< GAP specific error base */
 	BLE_STATUS_GATT_BASE = 0x200, /**< GATT specific Error base */
 };

libraries/CurieBLE/src/BLEPeripheral.cpp

@@ -143,9 +143,10 @@ BLEPeripheral::connected()
     return BLEPeripheralRole::instance()->connected();
 }
 
-void BLEPeripheral::addAttribute(BLEAttribute& attribute)
+BleStatus
+BLEPeripheral::addAttribute(BLEAttribute& attribute)
 {
-    BLEPeripheralRole::instance()->addAttribute(attribute);
+    return BLEPeripheralRole::instance()->addAttribute(attribute);
 }
 
 

libraries/CurieBLE/src/BLEPeripheral.h

@@ -146,8 +146,9 @@ class BLEPeripheral{
      * @return BleStatus indicating success or error
      *
      * @note This method must be called before the begin method
+     *        Only need check return value at first call. Memory only alloc at first call
      */
-    void addAttribute(BLEAttribute& attribute);
+    BleStatus addAttribute(BLEAttribute& attribute);
 
     /**
      * Provide a function to be called when events related to this Device are raised
@@ -195,35 +196,35 @@ class BLEPeripheral{
      */
     bool connected(void);
 
-	/**
-	 * @brief   Init the ADV data and start send advertisement
-	 *
-	 * @param   none
-	 *
-	 * @return  BleStatus		0 - Success. Others - error code
-	 *
-	 * @note  none
-	 */
+    /**
+     * @brief   Init the ADV data and start send advertisement
+     *
+     * @param   none
+     *
+     * @return  BleStatus       0 - Success. Others - error code
+     *
+     * @note  none
+     */
     BleStatus startAdvertising(void);
-	
-	/**
-	 * @brief   Stop send advertisement
-	 *
-	 * @param   none
-	 *
-	 * @return  BleStatus		0 - Success. Others - error code
-	 *
-	 * @note  none
-	 */
-	BleStatus stopAdvertising(void);
-	
+    
+    /**
+     * @brief   Stop send advertisement
+     *
+     * @param   none
+     *
+     * @return  BleStatus       0 - Success. Others - error code
+     *
+     * @note  none
+     */
+    BleStatus stopAdvertising(void);
+    
 protected:
     void handleConnectEvent(struct bt_conn *conn, uint8_t err);
     void handleDisconnectEvent(struct bt_conn *conn, uint8_t reason);
     void handleParamUpdated(struct bt_conn *conn, 
                             uint16_t interval,
-				            uint16_t latency, 
-				            uint16_t timeout);
+                            uint16_t latency, 
+                            uint16_t timeout);
 
 private:
 

libraries/CurieBLE/src/BLEPeripheralHelper.cpp

@@ -94,9 +94,9 @@ void BLEPeripheralHelper::linkLost(void)
     }
 }
 
-void BLEPeripheralHelper::addAttribute(BLEAttribute& attribute)
+BleStatus BLEPeripheralHelper::addAttribute(BLEAttribute& attribute)
 {
-    _profile.addAttribute(attribute);
+    return _profile.addAttribute(attribute);
 }
 
 int BLEPeripheralHelper::registerProfile()

libraries/CurieBLE/src/BLEPeripheralHelper.h

@@ -49,9 +49,11 @@ class BLEPeripheralHelper : public BLEHelper {
          *
          * @param attribute Attribute to add to Peripheral
          *
+         * @return  BleStatus indicating success or error
+         *
          * @note This method must be called before the begin method
          */
-        void addAttribute(BLEAttribute& attribute);
+        BleStatus addAttribute(BLEAttribute& attribute);
 
         BLEAttribute *attribute(struct bt_gatt_subscribe_params *params);
         BLEAttribute *attribute(uint16_t handle);

libraries/CurieBLE/src/BLEPeripheralRole.cpp

@@ -158,9 +158,10 @@ BLEPeripheralRole::connected()
     return _central;
 }
 
-void BLEPeripheralRole::addAttribute(BLEAttribute& attribute)
+BleStatus
+BLEPeripheralRole::addAttribute(BLEAttribute& attribute)
 {
-    _peripheral.addAttribute(attribute);
+    return _peripheral.addAttribute(attribute);
 }
 
 BleStatus