Jira 544 BLE peripheral disconnect and end functions

The state not aligned and make disconnect failed. Update when connect and disconnect event received

Author: sgbihu

libraries/CurieBLE/src/BLECentralHelper.cpp

@@ -92,12 +92,3 @@ BLECentralHelper::disconnect() {
     return false;
 }
 
-void
-BLECentralHelper::setAddress(bt_addr_le_t address) {
-    _address = address;
-}
-
-void
-BLECentralHelper::clearAddress() {
-    memset(&_address, 0x00, sizeof(_address));
-}

libraries/CurieBLE/src/BLECentralHelper.h

@@ -61,8 +61,6 @@ class BLECentralHelper: public BLEHelper{
 
     protected:
         BLECentralHelper(BLEPeripheralRole* peripheral);
-        void setAddress(bt_addr_le_t address);
-        void clearAddress();
 
     private:
         BLEPeripheralRole* _peripheral;

libraries/CurieBLE/src/BLEHelper.cpp

@@ -106,8 +106,8 @@ BLEHelper::poll() {
 }
 
 void
-BLEHelper::setAddress(bt_addr_le_t address) {
-    _address = address;
+BLEHelper::setAddress(const bt_addr_le_t &address) {
+    memcpy(&_address, &address, sizeof(bt_addr_le_t));
 }
 
 void

libraries/CurieBLE/src/BLEHelper.h

@@ -63,7 +63,7 @@ class BLEHelper {
                             uint16_t timeout);
 
     protected:
-        void setAddress(bt_addr_le_t address);
+        void setAddress(const bt_addr_le_t &address);
         void clearAddress();
         BLEHelper();
         virtual ~BLEHelper();

libraries/CurieBLE/src/BLEPeripheralRole.cpp

@@ -128,14 +128,16 @@ bool
 BLEPeripheralRole::disconnect()
 {
     BleStatus status = BLE_STATUS_WRONG_STATE;
+    int err;
 
     if (BLE_PERIPH_STATE_CONNECTED == _state)
     {
         struct bt_conn *central_conn = bt_conn_lookup_addr_le(_central.bt_le_address());
         if (NULL != central_conn)
         {
-            status = bt_conn_disconnect (central_conn, 
-                                         BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+            err = bt_conn_disconnect (central_conn, 
+                                      BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+            status = errorno_to_ble_status(err);
             bt_conn_unref(central_conn);
         }
     }
@@ -246,6 +248,9 @@ void BLEPeripheralRole::handleConnectEvent(struct bt_conn *conn, uint8_t err)
     // Call the CB
     if (_event_handlers[BLEConnected])
         _event_handlers[BLEConnected](_central);
+    
+    if (BLE_PERIPH_STATE_ADVERTISING == _state)
+        _state = BLE_PERIPH_STATE_CONNECTED;
 }
 
 
@@ -263,6 +268,9 @@ void BLEPeripheralRole::handleDisconnectEvent(struct bt_conn *conn, uint8_t reas
     {
         bt_conn_unref(central_conn);
     }
+    
+    if (BLE_PERIPH_STATE_CONNECTED == _state)
+        _state = BLE_PERIPH_STATE_ADVERTISING;
 }
 
 void BLEPeripheralRole::handleParamUpdated(struct bt_conn *conn,