Wang Xinglu / BLE_API

High level Bluetooth Low Energy API and radio abstraction layer

Dependencies:   nRF51822

Dependents:   LinkNode_LIS3DH

Fork of BLE_API by Bluetooth Low Energy

Files at this revision

API Documentation at this revision

Revision 968:9b6005880241, committed 2015-11-26

Comitter:
rgrover1
Date:
Thu Nov 26 12:52:35 2015 +0000
Parent:
967:7e304dcc3a73
Child:
969:61f13bc8edbf
Commit message:
Synchronized with git rev 2c0747f0
Author: Liyou Zhou
Merge branch 'develop' of github.com:LiyouZhou/ble into develop

Conflicts:
ble/services/DFUService.h

Changed in this revision

ble/services/DFUService.h Show annotated file Show diff for this revision Revisions of this file 
--- a/ble/services/DFUService.h	Thu Nov 26 12:52:35 2015 +0000
+++ b/ble/services/DFUService.h	Thu Nov 26 12:52:35 2015 +0000
@@ -106,7 +106,7 @@
             // Call bootloader_start implicitly trough a event handler call
             // it is a work around for bootloader_start not being public in sdk 8.1
             ble_dfu_t *p_dfu;
-            p_dfu-> conn_handle = params->connHandle;
+            p_dfu->conn_handle = params->connHandle;
             ble_dfu_evt_t *p_evt;
             p_evt->ble_dfu_evt_type = BLE_DFU_START;
             dfu_app_on_dfu_evt(p_dfu, p_evt);