MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NRF5: Fix and improve sleep(0) (#909)

Browse Source
This commit is contained in:
d00616
2017-08-29 09:29:03 +02:00
committed by Henrik Ekblad
parent 463358209d
commit 5776d2b650
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mystools/cppcheck/options.sh
+1
View File
@@ -4,6 +4,7 @@ OPTIONS="--quiet \
--error-exitcode=1 \ --error-exitcode=1 \
--force \ --force \
--enable=style,information \ --enable=style,information \
-DCPPCHECK \
--library=${LIBRARY:-avr} \ --library=${LIBRARY:-avr} \
--platform="${TOOLCONFIG}"/${PLATFORM:-avr.xml} \ --platform="${TOOLCONFIG}"/${PLATFORM:-avr.xml} \
--includes-file="${TOOLCONFIG}"/includes.cfg \ --includes-file="${TOOLCONFIG}"/includes.cfg \
hal/architecture/MyHwNRF5.cpp
+18 -8
View File
@@ -196,6 +196,9 @@ void hwSleepPrepare(unsigned long ms)
// Enable low power sleep mode // Enable low power sleep mode
NRF_POWER->TASKS_LOWPWR = 1; NRF_POWER->TASKS_LOWPWR = 1;
// Reset RTC trigger flag
nrf5_rtc_event_triggered = false;
if (ms > 0) { if (ms > 0) {
// Configure RTC // Configure RTC
#ifdef NRF51 #ifdef NRF51
@@ -204,16 +207,25 @@ void hwSleepPrepare(unsigned long ms)
// Reset RTC // Reset RTC
MY_HW_RTC->TASKS_CLEAR = 1; MY_HW_RTC->TASKS_CLEAR = 1;
// Calculate sleep time // Calculate sleep time and prescaler
// 8 Hz -> max 582.542 hours sleep. if (ms<512000) {
MY_HW_RTC->PRESCALER = 4095; // prescaler 0, 30.517 μs resolution -> max 512 s sleep
// Set compare register to 1/125ms + 2 to garantee event triggering MY_HW_RTC->PRESCALER = 0;
MY_HW_RTC->CC[0] = (ms / 125) + 2; // Set compare register to 1/30.517 µs to garantee event triggering
// A minimum of 2 ticks must be guaranteed
// (1000/32768)<<12 == 125
MY_HW_RTC->CC[0] = max((ms<<12 / 125), 2);
} else {
// 8 Hz -> max 582.542 hours sleep.
MY_HW_RTC->PRESCALER = 4095;
// Set compare register to 1/125ms
// A minimum of 2 ticks must be guaranteed
MY_HW_RTC->CC[0] = max((ms / 125), 2);
}
MY_HW_RTC->INTENSET = RTC_INTENSET_COMPARE0_Msk; MY_HW_RTC->INTENSET = RTC_INTENSET_COMPARE0_Msk;
MY_HW_RTC->EVTENSET = RTC_EVTENSET_COMPARE0_Msk; MY_HW_RTC->EVTENSET = RTC_EVTENSET_COMPARE0_Msk;
MY_HW_RTC->EVENTS_COMPARE[0] = 0; MY_HW_RTC->EVENTS_COMPARE[0] = 0;
nrf5_rtc_event_triggered = false;
MY_HW_RTC->TASKS_START = 1; MY_HW_RTC->TASKS_START = 1;
NVIC_SetPriority(MY_HW_RTC_IRQN, 15); NVIC_SetPriority(MY_HW_RTC_IRQN, 15);
NVIC_ClearPendingIRQ(MY_HW_RTC_IRQN); NVIC_ClearPendingIRQ(MY_HW_RTC_IRQN);
@@ -311,8 +323,6 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2,
// and sleep might cause the MCU to not wakeup from sleep as interrupt has // and sleep might cause the MCU to not wakeup from sleep as interrupt has
// already be handled! // already be handled!
MY_CRITICAL_SECTION { MY_CRITICAL_SECTION {
// Fix cppcheck "(style) Variable '__savePriMask' is assigned a value that is never used."
//(void)__savePriMask;
// attach interrupts // attach interrupts
_wakeUp1Interrupt = interrupt1; _wakeUp1Interrupt = interrupt1;
_wakeUp2Interrupt = interrupt2; _wakeUp2Interrupt = interrupt2;
hal/architecture/MyHwNRF5.h
+4 -2
View File
@@ -129,12 +129,14 @@ typedef struct {
uint8_t ciphertext[16]; uint8_t ciphertext[16];
} nrf_ecb_t; } nrf_ecb_t;
#ifndef DOXYGEN #if !defined(DOXYGEN) && !defined(CPPCHECK)
#define MY_CRITICAL_SECTION \ #define MY_CRITICAL_SECTION \
for (uint32_t __savePriMask \ for (uint32_t __savePriMask \
__attribute__((__cleanup__(__priMaskRestore))) = __get_PRIMASK(), \ __attribute__((__cleanup__(__priMaskRestore))) = __get_PRIMASK(), \
__ToDo = __disableIntsRetVal(); \ __ToDo = __disableIntsRetVal(); \
__ToDo; __ToDo = 0) __ToDo; __ToDo = 0)
#endif /* DOXYGEN */ #else
#define MY_CRITICAL_SECTION
#endif /* DOXYGEN || CPPCHECK */
#endif // #ifdef ARDUINO_ARCH_NRF5 #endif // #ifdef ARDUINO_ARCH_NRF5