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 62:4dfe75dd5769, committed 2014-09-04

Comitter:
janekm
Date:
Thu Sep 04 21:18:28 2014 +0000
Parent:
61:eed2446c8377
Commit message:
?

Changed in this revision

btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
nordic/nordic_global.h Show annotated file Show diff for this revision Revisions of this file
projectconfig.h Show annotated file Show diff for this revision Revisions of this file 
--- a/btle/btle.cpp	Tue Sep 02 21:11:48 2014 +0000
+++ b/btle/btle.cpp	Thu Sep 04 21:18:28 2014 +0000
@@ -139,6 +139,10 @@
 
             if (p_ble_evt->evt.gap_evt.params.disconnected.reason == BLE_HCI_LOCAL_HOST_TERMINATED_CONNECTION) {
                 nRF51Gap::getInstance().processDisconnectionEvent(handle, Gap::LOCAL_HOST_TERMINATED_CONNECTION);
+            } else if (p_ble_evt->evt.gap_evt.params.disconnected.reason == BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION) {
+                nRF51Gap::getInstance().processDisconnectionEvent(handle, Gap::REMOTE_USER_TERMINATED_CONNECTION);
+            } else {
+                nRF51Gap::getInstance().processDisconnectionEvent(handle, Gap::CONN_INTERVAL_UNACCEPTABLE);
             }
             break;
         }

--- a/nordic/nordic_global.h	Tue Sep 02 21:11:48 2014 +0000
+++ b/nordic/nordic_global.h	Thu Sep 04 21:18:28 2014 +0000
@@ -19,7 +19,7 @@
 /* There are no global defines in mbed, so we need to define */
 /* mandatory conditional compilation flags here              */
 #define NRF51
-#define DEBUG_NRF_USER
+//#define DEBUG_NRF_USER
 #define BLE_STACK_SUPPORT_REQD
 #define BOARD_PCA10001
 

--- a/projectconfig.h	Tue Sep 02 21:11:48 2014 +0000
+++ b/projectconfig.h	Thu Sep 04 21:18:28 2014 +0000
@@ -113,7 +113,7 @@
 
     /*--------------------------------- GAP -------------------------------*/
     #define CFG_GAP_APPEARANCE                         BLE_APPEARANCE_GENERIC_TAG
-    #define CFG_GAP_LOCAL_NAME                         "nRF5x"
+    #define CFG_GAP_LOCAL_NAME                         "Logger"
 
     #define CFG_GAP_CONNECTION_MIN_INTERVAL_MS           50                     /**< Minimum acceptable connection interval */
     #define CFG_GAP_CONNECTION_MAX_INTERVAL_MS          500                     /**< Maximum acceptable connection interval */