mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-27 02:14:37 +00:00
Merge branch 'master' into power-fsm-experiment
This commit is contained in:
commit
0c65c73f90
@ -3,6 +3,7 @@
|
|||||||
#include "NodeDB.h"
|
#include "NodeDB.h"
|
||||||
#include "SPILock.h"
|
#include "SPILock.h"
|
||||||
#include "configuration.h"
|
#include "configuration.h"
|
||||||
|
#include "main.h"
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
#include "mesh-pb-constants.h"
|
#include "mesh-pb-constants.h"
|
||||||
#include <pb_decode.h>
|
#include <pb_decode.h>
|
||||||
@ -87,10 +88,8 @@ bool RadioLibInterface::canSendImmediately()
|
|||||||
if (busyTx && (millis() - lastTxStart > 60000)) {
|
if (busyTx && (millis() - lastTxStart > 60000)) {
|
||||||
DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
|
DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
|
||||||
RECORD_CRITICALERROR(CriticalErrorCode_TRANSMIT_FAILED);
|
RECORD_CRITICALERROR(CriticalErrorCode_TRANSMIT_FAILED);
|
||||||
#ifdef ARCH_ESP32
|
// reboot in 5 seconds when this condition occurs.
|
||||||
if (busyTx && (millis() - lastTxStart > 65000)) // After 5s more, reboot
|
rebootAtMsec = lastTxStart + 65000;
|
||||||
ESP.restart();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
if (busyRx)
|
if (busyRx)
|
||||||
DEBUG_MSG("Can not send yet, busyRx\n");
|
DEBUG_MSG("Can not send yet, busyRx\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user