Merge pull request #282 from tekka007/sleeping

WDT fixes

libraries/MySensors/core/MyHw.h

@@ -43,8 +43,8 @@ uint8_t hwReadConfig(int adr);
 */
 
 void hwSleep(unsigned long ms);
-bool hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms);
+int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms);
-uint8_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);
 #ifdef MY_DEBUG
 	void hwDebugPrint(const char *fmt, ... );
 #endif

libraries/MySensors/core/MyHwATMega328.cpp

@@ -22,6 +22,7 @@
 #include "MyHwATMega328.h"
 
 int8_t pinIntTrigger = 0;
+
 void wakeUp()	 //place to send the interrupts
 {
 	pinIntTrigger = 1;
@@ -35,45 +36,42 @@ void wakeUp2()	 //place to send the second interrupts
 // to allow automatic WDIF and WDIE bit clearance in hardware.
 ISR (WDT_vect)
 {
-	// WDIE & WDIF is cleared in hardware upon entering this ISR
-	wdt_disable();
 }
 
-
-
-
 void hwPowerDown(period_t period) {
 
+	// disable ADC for power saving
 	ADCSRA &= ~(1 << ADEN);
-
+	// save WDT settings
+	uint8_t WDTsave = WDTCSR;
 	if (period != SLEEP_FOREVER)
 	{
 		wdt_enable(period);
-		WDTCSR |= (1 << WDIE);
+		// enable WDT interrupt before system reset
+		WDTCSR |= (1 << WDCE) | (1 << WDIE);
+	} else {
+		// if sleeping forever, disable WDT
+		wdt_disable();
 	}
-	#if defined __AVR_ATmega328P__
-		do {
 	set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 	cli();
 	sleep_enable();
+#if defined __AVR_ATmega328P__
 	sleep_bod_disable();
+#endif
 	sei();
+	// sleep until WDT or ext. interrupt
 	sleep_cpu();
     sleep_disable();	
-			sei();
+	// restore previous WDT settings
-		} while (0);
-	#else
-		do {
-			set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 	cli();
-			sleep_enable();
+	wdt_reset();
+	// enable WDT changes
+	WDTCSR |= (1 << WDCE) | (1 << WDE);
+	// restore saved WDT settings
+	WDTCSR = WDTsave;
 	sei();
-			sleep_cpu();
+	// enable ADC
-			sleep_disable();
-			sei();
-		} while (0);
-	#endif
-
 	ADCSRA |= (1 << ADEN);
 }
 
@@ -82,6 +80,7 @@ void hwInternalSleep(unsigned long ms) {
   #ifndef MY_DISABLED_SERIAL
 	  Serial.flush();
   #endif
+	// reset interrupt trigger var
 	pinIntTrigger = 0;
 	while (!pinIntTrigger && ms >= 8000) { hwPowerDown(SLEEP_8S); ms -= 8000; }
 	if (!pinIntTrigger && ms >= 4000)    { hwPowerDown(SLEEP_4S); ms -= 4000; }
@@ -99,48 +98,34 @@ void hwSleep(unsigned long ms) {
 	hwInternalSleep(ms);
 }
 
-bool hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
+int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
-	// Let serial prints finish (debug, log etc)
+	return hwSleep(interrupt,mode,0xFF,0x00,ms);
-	bool pinTriggeredWakeup = true;
-	attachInterrupt(interrupt, wakeUp, mode);
-	if (ms>0) {
-		pinIntTrigger = 0;
-		hwInternalSleep(ms);
-		if (0 == pinIntTrigger) {
-			pinTriggeredWakeup = false;
-		}
-	} else {
-    #ifndef MY_DISABLED_SERIAL
-		  Serial.flush();
-    #endif
-		hwPowerDown(SLEEP_FOREVER);
-	}
-	detachInterrupt(interrupt);
-	return pinTriggeredWakeup;
 }
 
-uint8_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) {
-	int8_t retVal = 1;
+	// reset interrupt trigger var
-	attachInterrupt(interrupt1, wakeUp, mode1);
-	attachInterrupt(interrupt2, wakeUp2, mode2);
-	if (ms>0) {
 	pinIntTrigger = 0;
+	// attach interrupts 
+	attachInterrupt(interrupt1, wakeUp, mode1);
+	if (interrupt2!=0xFF) attachInterrupt(interrupt2, wakeUp2, mode2);
+	
+	if (ms>0) {
+		// sleep for defined time
 		hwInternalSleep(ms);
-		if (0 == pinIntTrigger) {
-			retVal = -1;
-		}
 	} else {
-    #ifndef MY_DISABLED_SERIAL
+		// sleep until ext interrupt triggered
-		  Serial.flush();
-    #endif
     	hwPowerDown(SLEEP_FOREVER);
 	}
-	detachInterrupt(interrupt1);
-	detachInterrupt(interrupt2);
 	
-	if (1 == pinIntTrigger) {
+	detachInterrupt(interrupt1);
+	if (interrupt2!=0xFF) detachInterrupt(interrupt2);
+	
+	// default: no interrupt triggered	
+	int8_t retVal = -1;
+
+	if (pinIntTrigger == 1) {
 		retVal = (int8_t)interrupt1;
-	} else if (2 == pinIntTrigger) {
+	} else if (pinIntTrigger == 2) {
 		retVal = (int8_t)interrupt2;
 	}
 	return retVal;

libraries/MySensors/core/MyHwESP8266.cpp

@@ -96,12 +96,12 @@ void hwSleep(unsigned long ms) {
   // TODO: Not supported!
 }
 
-bool hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
+int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
   // TODO: Not supported!
 	return false;
 }
 
-uint8_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) {
   // TODO: Not supported!
 	return 0;
 }