Microbug / nRF51822

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
rgrover1
Date:
Fri May 08 15:33:54 2015 +0100
Parent:
120:9f2d71804cfb
Child:
122:df81fcbfa150
Commit message:
Synchronized with git rev facb54c9
Author: Rohit Grover
Allow ble_conn_params to still use APP_TIMER if needed.
Particularly in the case of the Bootloader.

This is made optional based on a preprocessor macro: USE_APP_TIMER.
Some Nordic code assumes the use of AppTimer, and if we replace it with mbed's timer, then a lot more code gets pulled in than necessary. Ideally this should not have been a problem, but it is, and the bootloader is a bit unforgiving in its size constraints.

Changed in this revision

nordic-sdk/components/ble/common/ble_conn_params.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/nordic-sdk/components/ble/common/ble_conn_params.cpp	Fri May 08 15:33:54 2015 +0100
+++ b/nordic-sdk/components/ble/common/ble_conn_params.cpp	Fri May 08 15:33:54 2015 +0100
@@ -329,8 +329,7 @@
     }
 }
 
-
-uint32_t ble_conn_params_change_conn_params(ble_gap_conn_params_t * new_params)
+uint32_t ble_conn_params_change_conn_params(ble_gap_conn_params_t *new_params)
 {
     uint32_t err_code;