Gymtrack / nRF51822_1

SG RFID nRF51822 fork

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 98:f96993b65e90, committed 2015-03-13

Comitter:
rgrover1
Date:
Fri Mar 13 16:56:45 2015 +0000
Parent:
97:e95e35845e1c
Child:
99:bc524269c7c1
Commit message:
Synchronized with git rev 1d28ee86
Author: Rohit Grover
disable the connParameters module because it uses app_timer.

Changed in this revision

nordic/ble/ble_conn_params.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/nordic/ble/ble_conn_params.cpp	Mon Mar 02 11:34:45 2015 +0000
+++ b/nordic/ble/ble_conn_params.cpp	Fri Mar 13 16:56:45 2015 +0000
@@ -10,6 +10,8 @@
  *
  */
 
+#if SDK_CONN_PARAMS_MODULE_ENABLE
+
 #include "ble_conn_params.h"
 #include <stdlib.h>
 #include "nordic_common.h"
@@ -314,3 +316,5 @@
     }
     return err_code;
 }
+
+#endif /*SDK_CONN_PARAMS_MODULE_ENABLE*/
\ No newline at end of file