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

intermediate 20151207

Browse Source
This commit is contained in:
tekka007
2015-12-07 22:28:28 +01:00
parent 9540cb2b30
commit 3485182945
3 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyHw.h
+2 -2
View File
@@ -43,8 +43,8 @@ uint8_t hwReadConfig(int adr);
*/ */
void hwSleep(unsigned long ms); 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 #ifdef MY_DEBUG
void hwDebugPrint(const char *fmt, ... ); void hwDebugPrint(const char *fmt, ... );
#endif #endif
libraries/MySensors/core/MyHwATMega328.cpp
+42 -60
View File
@@ -22,6 +22,7 @@
#include "MyHwATMega328.h" #include "MyHwATMega328.h"
int8_t pinIntTrigger = 0; int8_t pinIntTrigger = 0;
void wakeUp() //place to send the interrupts void wakeUp() //place to send the interrupts
{ {
pinIntTrigger = 1; pinIntTrigger = 1;
@@ -44,36 +45,28 @@ ISR (WDT_vect)
void hwPowerDown(period_t period) { void hwPowerDown(period_t period) {
// disable ADC for power saving
ADCSRA &= ~(1 << ADEN); ADCSRA &= ~(1 << ADEN);
if (period != SLEEP_FOREVER) if (period != SLEEP_FOREVER)
{ {
// change WDT to waiting period
wdt_enable(period); wdt_enable(period);
// enable WDT interrupt before system reset
WDTCSR |= (1 << WDIE); WDTCSR |= (1 << WDIE);
} }
#if defined __AVR_ATmega328P__ // maximum power saving
do { set_sleep_mode(SLEEP_MODE_PWR_DOWN);
set_sleep_mode(SLEEP_MODE_PWR_DOWN); cli();
cli(); sleep_enable();
sleep_enable(); #if defined __AVR_ATmega328P__
sleep_bod_disable(); sleep_bod_disable();
sei(); #endif
sleep_cpu(); sei();
sleep_disable(); // sleep until WDT or ext. interrupt
sei(); sleep_cpu();
} while (0); sleep_disable();
#else // enable ADC
do {
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
cli();
sleep_enable();
sei();
sleep_cpu();
sleep_disable();
sei();
} while (0);
#endif
ADCSRA |= (1 << ADEN); ADCSRA |= (1 << ADEN);
} }
@@ -99,50 +92,39 @@ void hwSleep(unsigned long ms) {
hwInternalSleep(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; // no interrupt triggered
int8_t retVal = -1;
// reset interrupt trigger
pinIntTrigger = 0;
// attach interrupts
attachInterrupt(interrupt1, wakeUp, mode1); attachInterrupt(interrupt1, wakeUp, mode1);
attachInterrupt(interrupt2, wakeUp2, mode2); if (interrupt2!=0xFF) attachInterrupt(interrupt2, wakeUp2, mode2);
if (ms>0) {
pinIntTrigger = 0;
hwInternalSleep(ms);
if (0 == pinIntTrigger) {
retVal = -1;
}
} else {
#ifndef MY_DISABLED_SERIAL
Serial.flush();
#endif
hwPowerDown(SLEEP_FOREVER);
}
detachInterrupt(interrupt1);
detachInterrupt(interrupt2);
if (1 == pinIntTrigger) { if (ms>0) {
// sleep for defined time
hwInternalSleep(ms);
} else {
// sleep until ext interrupt triggered
hwPowerDown(SLEEP_FOREVER);
}
detachInterrupt(interrupt1);
if (interrupt2!=0xFF) detachInterrupt(interrupt2);
if (pinIntTrigger == 0) {
// no interrupt triggered
retVal = -1;
} else if (pinIntTrigger == 1) {
retVal = (int8_t)interrupt1; retVal = (int8_t)interrupt1;
} else if (2 == pinIntTrigger) { } else if (pinIntTrigger == 2) {
retVal = (int8_t)interrupt2; retVal = (int8_t)interrupt2;
} }
return retVal; return retVal;
} }
libraries/MySensors/core/MyHwESP8266.cpp
+2 -2
View File
@@ -96,12 +96,12 @@ void hwSleep(unsigned long ms) {
// TODO: Not supported! // 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! // TODO: Not supported!
return false; 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! // TODO: Not supported!
return 0; return 0;
} }