Fix back compatible build issue

Author: sgbihu

libraries/BLE/src/ArduinoBLE.h

@@ -23,6 +23,7 @@
 #define ARDUINO_BLE_API_VERSION 10000 // version 1.0.0
 
 class BLEDevice;
+class BLECentral;
 class BLECharacteristic;
 class BLEDescriptor;
 class BLEService;

libraries/BLE/src/BLECentral.h

@@ -1,45 +1,46 @@
-/*
-  BLE Central API (deprecated)
-  Copyright (c) 2016 Arduino LLC. All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#ifndef ARDUINO_CENTRAL_H
-#define ARDUINO_CENTRAL_H
-
-class BLECentral {
-  public:
-    bool connected(void); // is the central connected
-    
-    const char* address(void) const; // address of the Central in string form
-
-    bool disconnect(void); // Disconnect the central if it is connected
-    void poll(void); // Poll the central for events
-
-    operator bool(void) const;
-    bool operator==(const BLECentral& rhs) const;
-    bool operator!=(const BLECentral& rhs) const;
-protected:
-    friend void bleBackCompatiblePeripheralConnectHandler(BLEDevice central);
-    friend void bleBackCompatiblePeripheralDisconnectHandler(BLEDevice central);
-    friend class BLEPeripheral;
-    BLECentral(BLEDevice& device);
-  private:
-
-    BLEDevice _device;
-};
-
+/*
+  BLE Central API (deprecated)
+  Copyright (c) 2016 Arduino LLC. All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef ARDUINO_CENTRAL_H
+#define ARDUINO_CENTRAL_H
+
+class BLECentral {
+  public:
+    bool connected(void); // is the central connected
+    
+    const char* address(void) const; // address of the Central in string form
+
+    bool disconnect(void); // Disconnect the central if it is connected
+    void poll(void); // Poll the central for events
+
+    operator bool(void) const;
+    bool operator==(const BLECentral& rhs) const;
+    bool operator!=(const BLECentral& rhs) const;
+protected:
+    friend class BLECharacteristicImp;
+    friend void bleBackCompatiblePeripheralConnectHandler(BLEDevice central);
+    friend void bleBackCompatiblePeripheralDisconnectHandler(BLEDevice central);
+    friend class BLEPeripheral;
+    BLECentral(BLEDevice& device);
+  private:
+
+    BLEDevice _device;
+};
+
 #endif

libraries/BLE/src/BLECharacteristic.cpp

@@ -550,6 +550,25 @@ void BLECharacteristic::setEventHandler(BLECharacteristicEvent event,
     }
 }
 
+void BLECharacteristic::setEventHandler(BLECharacteristicEvent event, 
+                                        BLECharacteristicEventHandlerOld eventHandler)
+{
+    BLECharacteristicImp *characteristicImp = getImplementation();
+    if (event >= BLECharacteristicEventLast)
+    {
+        return;
+    }
+    
+    if (NULL != characteristicImp)
+    {
+        characteristicImp->setEventHandler(event, eventHandler);
+    }
+    else
+    {
+        _oldevent_handlers[event] = eventHandler;
+    }
+}
+
 
 void
 BLECharacteristic::_setValue(const uint8_t value[], uint16_t length)

libraries/BLE/src/BLECharacteristic.h

@@ -43,6 +43,8 @@ enum BLEProperty {
 
 typedef void (*BLECharacteristicEventHandler)(BLEDevice bledev, BLECharacteristic characteristic);
 
+typedef void (*BLECharacteristicEventHandlerOld)(BLECentral &central, BLECharacteristic &characteristic);
+
 //#include "BLECharacteristicImp.h"
 
 class BLECharacteristic: public BLEAttributeWithValue
@@ -462,6 +464,8 @@ class BLECharacteristic: public BLEAttributeWithValue
      */
     void setEventHandler(BLECharacteristicEvent event, 
                          BLECharacteristicEventHandler eventHandler);
+    void setEventHandler(BLECharacteristicEvent event, 
+                         BLECharacteristicEventHandlerOld eventHandler);
 
 protected:
     friend class BLEDevice;
@@ -525,6 +529,8 @@ class BLECharacteristic: public BLEAttributeWithValue
     unsigned char* _value;          // The value. Will delete after create the _internal
 
     BLECharacteristicEventHandler _event_handlers[BLECharacteristicEventLast];  // Sid. Define the arr as in BLECharacteristicImp.h
+    
+    BLECharacteristicEventHandlerOld _oldevent_handlers[BLECharacteristicEventLast];
 };
 
 #endif

libraries/BLE/src/BLEDevice.cpp

@@ -59,6 +59,12 @@ BLEDevice::BLEDevice(const BLEDevice* bledevice)
     memcpy(&_conn_param, &bledevice->_conn_param, sizeof (ble_conn_param_t));
 }
 
+BLEDevice::BLEDevice(const BLEDevice& bledevice)
+{
+    memcpy(&_bt_addr, bledevice.bt_le_address(), sizeof(bt_addr_le_t));
+    memcpy(&_conn_param, &bledevice._conn_param, sizeof (ble_conn_param_t));
+}
+
 BLEDevice::~BLEDevice()
 {
     //pr_debug(LOG_MODULE_BLE, "%s-%d", __FUNCTION__, __LINE__);
@@ -190,15 +196,15 @@ BLEDevice::operator bool() const
     return BLEUtils::macAddressValid(_bt_addr);
 }
 
-//BLEDevice& BLEDevice::operator=(const BLEDevice& device)
-//{
-//    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;
-//}
+BLEDevice& BLEDevice::operator=(const BLEDevice& device)
+{
+    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;
+}
 
 bool BLEDevice::operator==(const BLEDevice& device) const
 {

libraries/BLE/src/BLEDevice.h

@@ -58,7 +58,7 @@ class BLEDevice
      * @note  none
      */
     BLEDevice(const BLEDevice* bledevice);
-    
+    BLEDevice(const BLEDevice& bledevice);
     virtual ~BLEDevice();
 
 
@@ -340,7 +340,7 @@ class BLEDevice
     operator bool() const;
     bool operator==(const BLEDevice& device) const;
     bool operator!=(const BLEDevice& device) const;
-    
+    BLEDevice& operator=(const BLEDevice& device);
     // central mode
 
     //void scanForAddress(String address); // Not include in baseline. Add here as feature for feature release.

libraries/BLE/src/internal/BLECharacteristicImp.cpp

@@ -86,6 +86,7 @@ BLECharacteristicImp::BLECharacteristicImp(const bt_uuid_t* uuid,
     }
     _gatt_chrc.uuid = (bt_uuid_t*)this->bt_uuid();//&_characteristic_uuid;//this->uuid();
     memset(_event_handlers, 0, sizeof(_event_handlers));
+    memset(_oldevent_handlers, 0, sizeof(_oldevent_handlers));
 
     _sub_params.notify = profile_notify_process;
 
@@ -149,6 +150,7 @@ BLECharacteristicImp::BLECharacteristicImp(BLECharacteristic& characteristic,
     _gatt_chrc.uuid = (bt_uuid_t*)this->bt_uuid();//&_characteristic_uuid;//this->uuid();
 
     memcpy(_event_handlers, characteristic._event_handlers, sizeof(_event_handlers));
+    memcpy(_oldevent_handlers, characteristic._oldevent_handlers, sizeof(_oldevent_handlers));
 
     _sub_params.notify = profile_notify_process;
 
@@ -251,6 +253,13 @@ BLECharacteristicImp::setValue(const unsigned char value[], uint16_t length)
             BLECharacteristic chrcTmp(this, &_ble_device);
             _event_handlers[BLEWritten](_ble_device, chrcTmp);
         }
+        
+        if (_oldevent_handlers[BLEWritten]) 
+        {
+            BLECharacteristic chrcTmp(this, &_ble_device);
+            BLECentral central(_ble_device);
+            _oldevent_handlers[BLEWritten](central, chrcTmp);
+        }
     }
     else
     {
@@ -262,6 +271,13 @@ BLECharacteristicImp::setValue(const unsigned char value[], uint16_t length)
             BLECharacteristic chrcTmp(this, &_ble_device);
             _event_handlers[BLEValueUpdated](_ble_device, chrcTmp);
         }
+        
+        if (_oldevent_handlers[BLEValueUpdated]) 
+        {
+            BLECharacteristic chrcTmp(this, &_ble_device);
+            BLECentral central(_ble_device);
+            _oldevent_handlers[BLEValueUpdated](central, chrcTmp);
+        }
     }
 
     return true;
@@ -456,6 +472,16 @@ BLECharacteristicImp::setEventHandler(BLECharacteristicEvent event, BLECharacter
     interrupts();
 }
 
+void
+BLECharacteristicImp::setEventHandler(BLECharacteristicEvent event, BLECharacteristicEventHandlerOld callback)
+{
+    noInterrupts();
+    if (event < BLECharacteristicEventLast) {
+        _oldevent_handlers[event] = callback;
+    }
+    interrupts();
+}
+
 void
 BLECharacteristicImp::setHandle(uint16_t handle)
 {

libraries/BLE/src/internal/BLECharacteristicImp.h

@@ -141,6 +141,7 @@ class BLECharacteristicImp: public BLEAttribute{
      * @param[in] callback  Pointer to callback function to invoke when the event occurs.
      */
     void setEventHandler(BLECharacteristicEvent event, BLECharacteristicEventHandler callback);
+    void setEventHandler(BLECharacteristicEvent event, BLECharacteristicEventHandlerOld callback);
 
     /**
      * @brief   Schedule the read request to read the characteristic in peripheral
@@ -331,6 +332,7 @@ class BLECharacteristicImp: public BLEAttribute{
     typedef LinkNode<BLEDescriptorImp *>  BLEDescriptorNode;
 
     BLECharacteristicEventHandler _event_handlers[BLECharacteristicEventLast];
+    BLECharacteristicEventHandlerOld  _oldevent_handlers[BLECharacteristicEventLast];
     BLEDescriptorLinkNodeHeader  _descriptors_header;
     BLEDevice   _ble_device;
 };