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

intermediate 20151208

Browse Source
This commit is contained in:
tekka007
2015-12-08 00:42:09 +01:00
parent 3485182945
commit cbb8a80791
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyHwATMega328.cpp
+6 -12
View File
@@ -40,9 +40,6 @@ ISR (WDT_vect)
wdt_disable(); wdt_disable();
} }
void hwPowerDown(period_t period) { void hwPowerDown(period_t period) {
// disable ADC for power saving // disable ADC for power saving
@@ -55,7 +52,6 @@ void hwPowerDown(period_t period) {
// enable WDT interrupt before system reset // enable WDT interrupt before system reset
WDTCSR |= (1 << WDIE); WDTCSR |= (1 << WDIE);
} }
// maximum power saving
set_sleep_mode(SLEEP_MODE_PWR_DOWN); set_sleep_mode(SLEEP_MODE_PWR_DOWN);
cli(); cli();
sleep_enable(); sleep_enable();
@@ -75,6 +71,7 @@ void hwInternalSleep(unsigned long ms) {
#ifndef MY_DISABLED_SERIAL #ifndef MY_DISABLED_SERIAL
Serial.flush(); Serial.flush();
#endif #endif
// reset interrupt trigger var
pinIntTrigger = 0; pinIntTrigger = 0;
while (!pinIntTrigger && ms >= 8000) { hwPowerDown(SLEEP_8S); ms -= 8000; } while (!pinIntTrigger && ms >= 8000) { hwPowerDown(SLEEP_8S); ms -= 8000; }
if (!pinIntTrigger && ms >= 4000) { hwPowerDown(SLEEP_4S); ms -= 4000; } if (!pinIntTrigger && ms >= 4000) { hwPowerDown(SLEEP_4S); ms -= 4000; }
@@ -97,9 +94,7 @@ int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
} }
int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) { int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) {
// no interrupt triggered // reset interrupt trigger var
int8_t retVal = -1;
// reset interrupt trigger
pinIntTrigger = 0; pinIntTrigger = 0;
// attach interrupts // attach interrupts
attachInterrupt(interrupt1, wakeUp, mode1); attachInterrupt(interrupt1, wakeUp, mode1);
@@ -116,15 +111,14 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo
detachInterrupt(interrupt1); detachInterrupt(interrupt1);
if (interrupt2!=0xFF) detachInterrupt(interrupt2); if (interrupt2!=0xFF) detachInterrupt(interrupt2);
if (pinIntTrigger == 0) { // default: no interrupt triggered
// no interrupt triggered int8_t retVal = -1;
retVal = -1;
} else if (pinIntTrigger == 1) { if (pinIntTrigger == 1) {
retVal = (int8_t)interrupt1; retVal = (int8_t)interrupt1;
} else if (pinIntTrigger == 2) { } else if (pinIntTrigger == 2) {
retVal = (int8_t)interrupt2; retVal = (int8_t)interrupt2;
} }
return retVal; return retVal;
} }