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

remove sleeping for repeaters

Browse Source
This commit is contained in:
tekka007
2015-12-15 21:32:21 +01:00
parent cb3c55ae3b
commit 26a2e18747
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MySensorCore.cpp
+29 -12
View File
@@ -319,13 +319,20 @@ int8_t sleep(unsigned long ms) {
#if defined(MY_OTA_FIRMWARE_FEATURE) #if defined(MY_OTA_FIRMWARE_FEATURE)
if (_fwUpdateOngoing) { if (_fwUpdateOngoing) {
// Do not sleep node while fw update is ongoing // Do not sleep node while fw update is ongoing
return -2; wait(ms);
return -1;
} }
#endif #endif
#if defined(MY_RADIO_FEATURE) // if repeater, do not sleep
transportPowerDown(); #if defined(MY_REPEATER_FEATURE)
wait(ms);
return -1;
#else
#if defined(MY_RADIO_FEATURE)
transportPowerDown();
#endif
return hwSleep(ms);
#endif #endif
return hwSleep(ms);
} }
int8_t smartSleep(unsigned long ms) { int8_t smartSleep(unsigned long ms) {
@@ -340,14 +347,19 @@ int8_t smartSleep(unsigned long ms) {
int8_t sleep(uint8_t interrupt, uint8_t mode, unsigned long ms) { int8_t sleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
#if defined(MY_OTA_FIRMWARE_FEATURE) #if defined(MY_OTA_FIRMWARE_FEATURE)
if (_fwUpdateOngoing) { if (_fwUpdateOngoing) {
// Do not sleep node while fw update is ongoing // not supported
return -2; return -2;
} }
#endif #endif
#if defined(MY_RADIO_FEATURE) #if defined(MY_REPEATER_FEATURE)
transportPowerDown(); // not supported
return -2;
#else
#if defined(MY_RADIO_FEATURE)
transportPowerDown();
#endif
return hwSleep(interrupt, mode, ms);
#endif #endif
return hwSleep(interrupt, mode, ms);
} }
int8_t smartSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) { int8_t smartSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
@@ -362,14 +374,19 @@ int8_t smartSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) {
int8_t sleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) { int8_t sleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) {
#if defined(MY_OTA_FIRMWARE_FEATURE) #if defined(MY_OTA_FIRMWARE_FEATURE)
if (_fwUpdateOngoing) { if (_fwUpdateOngoing) {
// Do not sleep node while fw update is ongoing // not supported
return -2; return -2;
} }
#endif #endif
#if defined(MY_RADIO_FEATURE) #if defined(MY_REPEATER_FEATURE)
transportPowerDown(); // not supported
return -2;
#else
#if defined(MY_RADIO_FEATURE)
transportPowerDown();
#endif
return hwSleep(interrupt1, mode1, interrupt2, mode2, ms);
#endif #endif
return hwSleep(interrupt1, mode1, interrupt2, mode2, ms);
} }
int8_t smartSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) { int8_t smartSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) {