Janek Mann / nRF51822_openwear

Openwear requires RC oscillator to be used

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 40:1cb3707fa798, committed 2014-07-10

Comitter:
Rohit Grover
Date:
Thu Jul 10 11:29:44 2014 +0100
Parent:
39:d52a28e1fa80
Child:
41:6e66cd970659
Commit message:
white space diffs
undoing the line-splitting affects of a previous use of uncrustify.

Changed in this revision

btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
nRF51Gap.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/btle/btle.cpp	Tue Jul 08 11:15:50 2014 +0100
+++ b/btle/btle.cpp	Thu Jul 10 11:29:44 2014 +0100
@@ -86,8 +86,7 @@
     /* Custom event handler */
     switch (p_ble_evt->header.evt_id) {
         case BLE_GAP_EVT_CONNECTED:
-            nRF51Gap::getInstance().setConnectionHandle(
-                p_ble_evt->evt.gap_evt.conn_handle );
+            nRF51Gap::getInstance().setConnectionHandle(p_ble_evt->evt.gap_evt.conn_handle);
             nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_CONNECTED);
             break;
 
@@ -122,8 +121,7 @@
         break;
 
         case BLE_GAP_EVT_TIMEOUT:
-            if (p_ble_evt->evt.gap_evt.params.timeout.src ==
-                    BLE_GAP_TIMEOUT_SRC_ADVERTISEMENT) {
+            if (p_ble_evt->evt.gap_evt.params.timeout.src == BLE_GAP_TIMEOUT_SRC_ADVERTISEMENT) {
                 nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_TIMEOUT);
             }
             break;

--- a/nRF51Gap.cpp	Tue Jul 08 11:15:50 2014 +0100
+++ b/nRF51Gap.cpp	Thu Jul 10 11:29:44 2014 +0100
@@ -225,9 +225,7 @@
 
     /* Disconnect if we are connected to a central device */
     ASSERT_INT(ERROR_NONE,
-               sd_ble_gap_disconnect(m_connectionHandle,
-                                     BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION),
-               BLE_ERROR_PARAM_OUT_OF_RANGE);
+        sd_ble_gap_disconnect(m_connectionHandle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION), BLE_ERROR_PARAM_OUT_OF_RANGE);
 
     return BLE_ERROR_NONE;
 }