Ken Todotani / nRF51822-hrm1017

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
todotani
Date:
Sat Sep 06 00:38:57 2014 +0000
Parent:
60:e861f2041469
Commit message:
Include changes for HRM1017 with library 0.1.0

Changed in this revision

btle/btle.cpp 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
diff -r e861f2041469 -r eb36b5b876a3 btle/btle.cpp
--- a/btle/btle.cpp	Tue Sep 02 17:01:18 2014 +0100
+++ b/btle/btle.cpp	Sat Sep 06 00:38:57 2014 +0000
@@ -63,7 +63,8 @@
 error_t btle_init(void)
 {
     const bool useScheduler = false;
-    SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, useScheduler);
+    //SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, useScheduler);
+    SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_RC_250_PPM_4000MS_CALIBRATION, false);
 
     // Enable BLE stack
     /**
@@ -137,9 +138,9 @@
             ASSERT_STATUS_RET_VOID ( ble_bondmngr_bonded_centrals_store());
 #endif
 
-            if (p_ble_evt->evt.gap_evt.params.disconnected.reason == BLE_HCI_LOCAL_HOST_TERMINATED_CONNECTION) {
+//            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);
-            }
+//            }
             break;
         }
 
diff -r e861f2041469 -r eb36b5b876a3 projectconfig.h
--- a/projectconfig.h	Tue Sep 02 17:01:18 2014 +0100
+++ b/projectconfig.h	Sat Sep 06 00:38:57 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                         "HRM1017"
 
     #define CFG_GAP_CONNECTION_MIN_INTERVAL_MS           50                     /**< Minimum acceptable connection interval */
     #define CFG_GAP_CONNECTION_MAX_INTERVAL_MS          500                     /**< Maximum acceptable connection interval */