Diff: platform/src/btle.cpp

Revision:

65:f9958b8f2548

Parent:

64:6d7b775c3f6d

Child:

66:8c8813dd8e79

diff -r 6d7b775c3f6d -r f9958b8f2548 platform/src/btle.cpp
--- a/platform/src/btle.cpp	Wed Nov 19 11:24:37 2014 +0000
+++ b/platform/src/btle.cpp	Wed Apr 01 09:02:51 2015 +0000
@@ -79,6 +79,8 @@
 
 /* Private variables ---------------------------------------------------------*/
 volatile uint8_t set_connectable = 1;
+tHalUint8 *bleAddr;
+Gap::addr_type_t addr_type = Gap::ADDR_TYPE_PUBLIC;
 
 /**************************************************************************/
 /*!
@@ -93,7 +95,7 @@
 void btle_init(bool isSetAddress, PinName mosi, PinName miso, PinName sclk)
 {
     DEBUG("btle_init>>\n\r"); 
-    tHalUint8 *bleAddr;
+    
     int ret;
     uint16_t service_handle, dev_name_char_handle, appearance_char_handle;
 
@@ -122,7 +124,7 @@
     //check if issetAddress is set than set address.
     if(isSetAddress)
     {
-        bleAddr = BlueNRGGap::getInstance().getAddress();
+        BlueNRGGap::getInstance().getAddress(&addr_type, bleAddr);
         
         tHalUint8 bdaddr[BDADDR_SIZE];
         Osal_MemCpy(bdaddr, bleAddr, BDADDR_SIZE);
@@ -240,7 +242,7 @@
                         BlueNRGGap::getInstance().setConnectionHandle(cc->handle);
                         BlueNRGGap::ConnectionParams_t connectionParams;
                         BlueNRGGap::getInstance().getPreferredConnectionParams(&connectionParams);                                                
-                        BlueNRGGap::getInstance().processConnectionEvent(cc->handle, (const BlueNRGGap::ConnectionParams_t *)&connectionParams);                            
+                        BlueNRGGap::getInstance().processConnectionEvent(cc->handle, addr_type, bleAddr, (const BlueNRGGap::ConnectionParams_t *)&connectionParams);                            
                     }
                     break;
                 }
@@ -292,7 +294,17 @@
                                         (GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE_WITHOUT_RESPONSE|
                                             GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE))) {
                                 
-                                BlueNRGGattServer::getInstance().handleEvent(GattServerEvents::GATT_EVENT_DATA_WRITTEN, evt->attr_handle);
+                                GattCharacteristicWriteCBParams writeParams;
+                                writeParams.charHandle=evt->attr_handle;
+                                writeParams.op=GattCharacteristicWriteCBParams::GATTS_CHAR_OP_WRITE_REQ;//Where to find this property in BLUENRG?
+                                writeParams.len=evt->data_length;
+                                writeParams.data=evt->att_data;                                                                                    
+                                #if BLUENRG_MS
+                                writeParams.offset=evt->offset;//Not used in BlueNRG?
+                                #endif
+                                BlueNRGGattServer::getInstance().handleDataWrittenEvent(&writeParams);
+
+                                //BlueNRGGattServer::getInstance().handleEvent(GattServerEvents::GATT_EVENT_DATA_WRITTEN, evt->attr_handle);
                                 //Write the actual Data to the Attr Handle? (uint8_1[])evt->att_data contains the data
                                 if ((p_char->getValueAttribute().getValuePtr() != NULL) && (p_char->getValueAttribute().getInitialLength() > 0)) {
                                     BlueNRGGattServer::getInstance().updateValue(p_char->getValueAttribute().getHandle(),