Jonathan Austin / nRF51822

Nordic stack and drivers for the mbed BLE API. Version to work around build bug.

Dependents:   microbit_rubber_ducky microbit_mouse_BLE microbit_mouse_BLE_daybreak_version microbit_presenter

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 616:b52326e38ebd, committed 2016-08-31

Comitter:
JonnyA
Date:
Wed Aug 31 18:59:36 2016 +0000
Parent:
615:1751e2e2637a
Commit message:
Workaround for build system bug

Changed in this revision

source/btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
source/nordic_sdk/components/libraries/fstorage/fstorage_config.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 1751e2e2637a -r b52326e38ebd source/btle/btle.cpp
--- a/source/btle/btle.cpp	Tue Jan 12 19:58:03 2016 +0000
+++ b/source/btle/btle.cpp	Wed Aug 31 18:59:36 2016 +0000
@@ -190,9 +190,11 @@
             }
 
             // Close all pending discoveries for this connection
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
             nRF5xGattClient& gattClient = ble.getGattClient();
             gattClient.characteristicDescriptorDiscoverer().terminate(handle, BLE_ERROR_INVALID_STATE);
             gattClient.discovery().terminate(handle);
+#endif
 
             gap.processDisconnectionEvent(handle, reason);
             break;

diff -r 1751e2e2637a -r b52326e38ebd source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
--- a/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Tue Jan 12 19:58:03 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Wed Aug 31 18:59:36 2016 +0000
@@ -82,9 +82,7 @@
  */
 static __INLINE uint32_t fs_flash_page_end_addr()
 {
-    uint32_t const bootloader_addr = NRF_UICR->NRFFW[0];
-    return  ((bootloader_addr != FS_EMPTY_MASK) ?
-             bootloader_addr : NRF_FICR->CODESIZE * FS_PAGE_SIZE);
+
 }