test

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
GlimwormBeacons
Date:
Sat Oct 10 09:19:50 2015 +0000
Parent:
447:088f5738bf18
Commit message:
test

Changed in this revision

source/btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
source/nordic-sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h Show annotated file Show diff for this revision Revisions of this file
source/nordic-sdk/components/drivers_nrf/pstorage/pstorage.h Show annotated file Show diff for this revision Revisions of this file
source/projectconfig.h Show annotated file Show diff for this revision Revisions of this file
diff -r 088f5738bf18 -r b71e96a821de source/btle/btle.cpp
--- a/source/btle/btle.cpp	Fri Sep 25 15:26:59 2015 +0100
+++ b/source/btle/btle.cpp	Sat Oct 10 09:19:50 2015 +0000
@@ -47,6 +47,9 @@
 
 static void sys_evt_dispatch(uint32_t sys_evt)
 {
+    if ((sys_evt != NRF_EVT_FLASH_OPERATION_SUCCESS) && (sys_evt != NRF_EVT_FLASH_OPERATION_ERROR)) {
+        return;
+    }
     pstorage_sys_event_handler(sys_evt);
 }
 
diff -r 088f5738bf18 -r b71e96a821de source/nordic-sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h
--- a/source/nordic-sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h	Fri Sep 25 15:26:59 2015 +0100
+++ b/source/nordic-sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h	Sat Oct 10 09:19:50 2015 +0000
@@ -78,7 +78,7 @@
 typedef uint16_t pstorage_size_t;      /** Size of length and offset fields. */
 
 /**@brief Handles Flash Access Result Events. To be called in the system event dispatcher of the application. */
-void pstorage_sys_event_handler (uint32_t sys_evt);
+
 
 #ifdef __cplusplus
 }
diff -r 088f5738bf18 -r b71e96a821de source/nordic-sdk/components/drivers_nrf/pstorage/pstorage.h
--- a/source/nordic-sdk/components/drivers_nrf/pstorage/pstorage.h	Fri Sep 25 15:26:59 2015 +0100
+++ b/source/nordic-sdk/components/drivers_nrf/pstorage/pstorage.h	Sat Oct 10 09:19:50 2015 +0000
@@ -135,6 +135,7 @@
  * @retval     NRF_SUCCESS             on success, else an error code indicating reason for failure.
  */
 uint32_t pstorage_init(void);
+void pstorage_sys_event_handler (uint32_t sys_evt);
 
 
 /**@brief Register with persistent storage interface.
diff -r 088f5738bf18 -r b71e96a821de source/projectconfig.h
--- a/source/projectconfig.h	Fri Sep 25 15:26:59 2015 +0100
+++ b/source/projectconfig.h	Sat Oct 10 09:19:50 2015 +0000
@@ -118,7 +118,7 @@
     #define CFG_GAP_CONNECTION_MIN_INTERVAL_MS           50                     /**< Minimum acceptable connection interval */
     #define CFG_GAP_CONNECTION_MAX_INTERVAL_MS          500                     /**< Maximum acceptable connection interval */
     #define CFG_GAP_CONNECTION_SUPERVISION_TIMEOUT_MS  4000                     /**< Connection supervisory timeout */
-    #define CFG_GAP_CONNECTION_SLAVE_LATENCY           0                        /**< Slave Latency in number of connection events. */
+    #define CFG_GAP_CONNECTION_SLAVE_LATENCY           2                        /**< Slave Latency in number of connection events. */
 
     #define CFG_GAP_ADV_INTERVAL_MS                    25                       /**< The advertising interval in miliseconds, should be multiply of 0.625 */
     #define CFG_GAP_ADV_TIMEOUT_S                      180                      /**< The advertising timeout in units of seconds. */