API Cleanup

Author: sandeepmistry

libraries/CurieBle/examples/AutomationIO/AutomationIO.ino

@@ -217,7 +217,6 @@ void setup() {
     CHECK_STATUS(blePeripheral.addAttribute(pin->userDescription));
     CHECK_STATUS(blePeripheral.addAttribute(pin->presentationFormat));
     CHECK_STATUS(blePeripheral.addAttribute(pin->numDigitalsDesc));
-    CHECK_STATUS(pin->numDigitalsDesc.setValue((uint8_t) 1));
   }
 
   /* Add characteristics for the Digital Outputs */
@@ -235,7 +234,6 @@ void setup() {
     CHECK_STATUS(blePeripheral.addAttribute(pin->userDescription));
     CHECK_STATUS(blePeripheral.addAttribute(pin->presentationFormat));
     CHECK_STATUS(blePeripheral.addAttribute(pin->numDigitalsDesc));
-    CHECK_STATUS(pin->numDigitalsDesc.setValue((uint8_t) 1));
   }
 
   /* Add characteristics for the Analog Inputs */

libraries/CurieBle/examples/BatteryMonitor/BatteryMonitor.ino

@@ -53,10 +53,7 @@ BleService battSvc(SERVICE_UUID_BATTERY);
 /* BLE Battery Level Characteristic */
 BleUnsignedCharCharacteristic battLvlChar(CHAR_UUID_BATTERY_LEVEL,     /* standard 16-bit characteristic UUID */
                               BleRead | BleNotify /* remote clients will be able to get notifications if this characteristic changes */
-                              );  
-
-/* Bluetooth MAC address for this device */
-BleDeviceAddress localAddress;
+                              );
 
 /* Variable to keep track of last battery level reading from analog input */
 unsigned char oldBattLvl = 0;

libraries/CurieBle/src/BleAddress.h

@@ -29,28 +29,32 @@ BleCentral::BleCentral(BlePeripheral* peripheral) :
 }
 
 BleCentral::operator bool() const {
-    BleDeviceAddress zero;
+    ble_addr_t zero;
 
     memset(&zero, 0, sizeof(zero));
 
     return (memcmp(&_address, &zero, sizeof(_address)) != 0);
 }
 
-bool BleCentral::operator==(const BleCentral& rhs) const {
+bool
+BleCentral::operator==(const BleCentral& rhs) const {
     return (memcmp(&_address, &rhs._address, sizeof(_address)) == 0);
 }
 
-bool BleCentral::operator!=(const BleCentral& rhs) const {
+bool
+BleCentral::operator!=(const BleCentral& rhs) const {
     return !(*this == rhs);
 }
 
-bool BleCentral::connected() {
+bool
+BleCentral::connected() {
     poll();
 
     return (*this && *this == _peripheral->central());
 }
 
-const char* BleCentral::address() const {
+const char* 
+BleCentral::address() const {
     static String address = "";
 
     for (int i = 5; i >= 0; i--) {
@@ -70,22 +74,26 @@ const char* BleCentral::address() const {
     return address.c_str();
 }
 
-void BleCentral::poll() {
+void
+BleCentral::poll() {
     _peripheral->poll();
 }
 
-BleStatus BleCentral::disconnect() {
+BleStatus
+BleCentral::disconnect() {
     if (connected()) {
         return _peripheral->disconnect();
     }
 
     return BLE_STATUS_WRONG_STATE;
 }
 
-void BleCentral::setAddress(BleDeviceAddress address) {
+void
+BleCentral::setAddress(ble_addr_t address) {
     _address = address;
 }
 
-void BleCentral::clearAddress() {
+void
+BleCentral::clearAddress() {
     memset(&_address, 0x00, sizeof(_address));
 }

libraries/CurieBle/src/BleCentral.cpp

@@ -20,7 +20,6 @@
 #ifndef _BLE_CENTRAL_H_INCLUDED
 #define _BLE_CENTRAL_H_INCLUDED
 
-#include "BleAddress.h"
 #include "BleCommon.h"
 
 class BlePeripheral;
@@ -39,14 +38,14 @@ class BleCentral {
 
         BleStatus disconnect();
 
-    // protected:
+    protected:
         BleCentral(BlePeripheral* peripheral);
-        void setAddress(BleDeviceAddress address);
+        void setAddress(ble_addr_t address);
         void clearAddress();
 
     private:
         BlePeripheral* _peripheral;
-        BleDeviceAddress  _address;
+        ble_addr_t     _address;
 };
 
 #endif