Norman Pohl / nRF51822_write_wo_resp_fix

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of nRF51822 by Nordic Semiconductor

Diff: btle/btle_gap.cpp

Revision:
56:a1071b629aa3
Parent:
42:120a96d10f90
diff -r 1e5c300cec7f -r a1071b629aa3 btle/btle_gap.cpp
--- a/btle/btle_gap.cpp	Fri Jul 25 10:33:52 2014 +0100
+++ b/btle/btle_gap.cpp	Tue Sep 02 15:50:05 2014 +0100
@@ -20,7 +20,9 @@
 #include "ble_conn_params.h"
 
 static inline uint32_t msec_to_1_25msec(uint32_t interval_ms) ATTR_ALWAYS_INLINE ATTR_CONST;
+#if SDK_CONN_PARAMS_MODULE_ENABLE
 static void   error_callback(uint32_t nrf_error);
+#endif // SDK_CONN_PARAMS_MODULE_ENABLE
 
 /**************************************************************************/
 /*!
@@ -46,6 +48,11 @@
     ASSERT_STATUS( sd_ble_gap_ppcp_set(&gap_conn_params));
     ASSERT_STATUS( sd_ble_gap_tx_power_set(CFG_BLE_TX_POWER_LEVEL));
 
+    /**
+     * Call to conn_params_init() is not necessary; and so is disabled by default.
+     * This API should be exposed to the user to be invoked when necessary.
+     */
+#if SDK_CONN_PARAMS_MODULE_ENABLE
     /* Connection Parameters */
     enum {
         FIRST_UPDATE_DELAY = APP_TIMER_TICKS(5000, CFG_TIMER_PRESCALER),
@@ -65,6 +72,7 @@
     cp_init.error_handler                  = error_callback;
 
     ASSERT_STATUS ( ble_conn_params_init(&cp_init));
+#endif // SDK_CONN_PARAMS_MODULE_ENABLE
 
     return ERROR_NONE;
 }
@@ -84,7 +92,9 @@
     return (interval_ms * 4) / 5;
 }
 
+#if SDK_CONN_PARAMS_MODULE_ENABLE
 static void error_callback(uint32_t nrf_error)
 {
     ASSERT_STATUS_RET_VOID( nrf_error );
 }
+#endif // SDK_CONN_PARAMS_MODULE_ENABLE