Update the API

1. Implement the peripheral API in BLEDevice
2. Move the unimplemented API to private as feature release

Author: sgbihu

libraries/BLE/src/BLEDescriptor.cpp

@@ -124,13 +124,11 @@ const char* BLEDescriptor::uuid() const
 
 const byte* BLEDescriptor::value() const
 {
-    // TODO: Not support now
     return _value;
 }
 
 int BLEDescriptor::valueLength() const
 {
-    // TODO: Not support now
     return _value_size;
 }
 
@@ -142,8 +140,7 @@ byte BLEDescriptor::operator[] (int offset) const
 
 BLEDescriptor::operator bool() const
 {
-    // TODO: Not support now
-    return false;
+    return (strlen(_uuid_cstr) > 3);
 }
 
 bool BLEDescriptor::writeValue(const byte value[], int length)

libraries/BLE/src/BLEDescriptor.h

@@ -41,10 +41,24 @@ class BLEDescriptor
 
     virtual const byte* value() const; // returns the value buffer
     virtual int valueLength() const; // returns the current length of the value
-    virtual byte operator[] (int offset) const; // returns a byte of the value at the specified offset
-
+    
     virtual operator bool() const;  // is the descriptor valid (discovered from peripheral)
 
+    unsigned char properties() const;
+    int valueSize() const;
+private:
+    char    _uuid_cstr[37];  // The characteristic UUID
+    BLEDevice _bledev; 
+    
+    unsigned char _properties;      // The characteristic property
+    
+    unsigned short _value_size;       // The value size
+    unsigned char* _value;          // The value. Will delete after create the _internal
+
+
+    // The API reserved for feature release
+    // move here for temp
+    
     /**
      * @brief   Write the value of the descriptor
      *
@@ -83,22 +97,13 @@ class BLEDescriptor
      * @note  none
      */
     bool writeValue(const char* value);
+    virtual byte operator[] (int offset) const; // returns a byte of the value at the specified offset
 
     // GATT client Write the value of the descriptor
     virtual bool write(const byte value[], int length);
     bool write(const byte value[], int length, int offset);
     bool write(const char* value);
     bool read();
-    unsigned char properties() const;
-    int valueSize() const;
-private:
-    char    _uuid_cstr[37];  // The characteristic UUID
-    BLEDevice _bledev; 
-    
-    unsigned char _properties;      // The characteristic property
-    
-    unsigned short _value_size;       // The value size
-    unsigned char* _value;          // The value. Will delete after create the _internal
 };
 
 #endif

libraries/BLE/src/BLEDevice.cpp

@@ -182,9 +182,7 @@ BLEDevice BLEDevice::central()
 
 BLEDevice BLEDevice::peripheral()
 {
-    // TODO: How to get the target devices
-    BLEDevice temp;
-    return temp;
+    return BLEDeviceManager::instance()->peripheral();
 }
 
 BLEDevice::operator bool() const
@@ -197,6 +195,7 @@ BLEDevice::operator bool() const
 //    if (*this != device)
 //    {
 //        memcpy(&(this->_bt_addr), &(device._bt_addr), sizeof (bt_addr_le_t));
+//        memcpy(*this->_conn_param, &device._conn_param, sizeof (bt_le_conn_param));
 //    }
 //    return *this;
 //}

libraries/BLE/src/internal/BLEDeviceManager.cpp

@@ -45,7 +45,8 @@ BLEDeviceManager::BLEDeviceManager():
     _adv_data_idx(0),
     _local_name(""),
     _state(BLE_PERIPH_STATE_NOT_READY),
-    _local_ble(NULL)
+    _local_ble(NULL),
+    _peer_peripheral_index(0)
 {
     memset(&_local_bda, 0, sizeof(_local_bda));
     memset(&_wait_for_connect_peripheral, 0, sizeof(_wait_for_connect_peripheral));
@@ -490,8 +491,22 @@ BLEDevice BLEDeviceManager::central()
 
 BLEDevice BLEDeviceManager::peripheral()
 {
-    // TODO
     BLEDevice temp;
+    for (int i = 0; i < BLE_MAX_CONN_CFG; i++)
+    {
+        if (_peer_peripheral_index >= BLE_MAX_CONN_CFG)
+        {
+            _peer_peripheral_index = 0;
+        }
+        const bt_addr_le_t & addr = _peer_peripheral[_peer_peripheral_index];
+        _peer_peripheral_index++;
+        
+        if (true == BLEUtils::macAddressValid(addr))
+        {
+            temp.setAddress(addr);
+            break;
+        }
+    }
     return temp;
 }
 

libraries/BLE/src/internal/BLEDeviceManager.h

@@ -424,6 +424,7 @@ class BLEDeviceManager
     // Connected device object
     bt_addr_le_t _peer_central;
     bt_addr_le_t _peer_peripheral[BLE_MAX_CONN_CFG];
+    uint8_t      _peer_peripheral_index;
     uint8_t    _peer_peripheral_adv_data[BLE_MAX_CONN_CFG][BLE_MAX_ADV_SIZE];
     uint8_t    _peer_peripheral_adv_data_len[BLE_MAX_CONN_CFG];
     uint8_t    _peer_peripheral_adv_rssi[BLE_MAX_CONN_CFG];