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 994:1f46234b1237, committed 2015-12-02

Comitter:
rgrover1
Date:
Wed Dec 02 10:29:44 2015 +0000
Parent:
993:4d62b7967c11
Child:
995:287604cca609
Commit message:
Synchronized with git rev 3d9913ce
Author: Rohit Grover
Release 2.1.4
=============

Minor change to fix a build issue:
Disable DFUService except for nRF51 targets.

Changed in this revision

ble/services/DFUService.h Show annotated file Show diff for this revision Revisions of this file
module.json Show annotated file Show diff for this revision Revisions of this file
source/services/DFUService.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/ble/services/DFUService.h	Wed Dec 02 10:29:44 2015 +0000
+++ b/ble/services/DFUService.h	Wed Dec 02 10:29:44 2015 +0000
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */
+
 #ifndef __BLE_DFU_SERVICE_H__
 #define __BLE_DFU_SERVICE_H__
 
@@ -140,4 +142,5 @@
     static ResetPrepare_t handoverCallback;  /**< Application-specific handover callback. */
 };
 
-#endif /* #ifndef __BLE_DFU_SERVICE_H__*/
\ No newline at end of file
+#endif /* #ifndef __BLE_DFU_SERVICE_H__*/
+#endif /* #ifdef TARGET_NRF51822 */
\ No newline at end of file

--- a/module.json	Wed Dec 02 10:29:44 2015 +0000
+++ b/module.json	Wed Dec 02 10:29:44 2015 +0000
@@ -1,6 +1,6 @@
 {
   "name": "ble",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "The BLE module offers a high level abstraction for using Bluetooth Low Energy on multiple platforms.",
   "keywords": [
     "Bluetooth",

--- a/source/services/DFUService.cpp	Wed Dec 02 10:29:44 2015 +0000
+++ b/source/services/DFUService.cpp	Wed Dec 02 10:29:44 2015 +0000
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#ifdef TARGET_NRF51822 /* DFU only supported on nrf51 platforms */
+
 #include "ble/services/DFUService.h"
 
 const uint8_t              DFUServiceBaseUUID[] = {
@@ -37,4 +39,6 @@
     0x15, 0x23, 0x78, 0x5F, 0xEA, 0xBC, 0xD1, 0x23,
 };
 
-DFUService::ResetPrepare_t DFUService::handoverCallback = NULL;
\ No newline at end of file
+DFUService::ResetPrepare_t DFUService::handoverCallback = NULL;
+
+#endif /* #ifdef TARGET_NRF51822 */
\ No newline at end of file