Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-08-02 18:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Interrupt WDT Reset

Browse Source
This commit is contained in:
Kevin Le
2026-05-28 15:13:14 +07:00
parent 21455e6296
commit f4c43f7eb7
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/ESP32Board.h
+15 -11
View File
@@ -19,6 +19,7 @@ class ESP32Board : public mesh::MainBoard {
protected: protected:
uint8_t startup_reason; uint8_t startup_reason;
bool inhibit_sleep = false; bool inhibit_sleep = false;
static inline portMUX_TYPE sleepMux = portMUX_INITIALIZER_UNLOCKED;
public: public:
void begin() { void begin() {
@@ -84,10 +85,8 @@ public:
} }
#endif #endif
// Configure GPIO wakeup // Set GPIO wakeup
gpio_num_t wakeupPin = (gpio_num_t)getIRQGpio(); gpio_num_t wakeupPin = (gpio_num_t)getIRQGpio();
esp_sleep_enable_gpio_wakeup();
gpio_wakeup_enable((gpio_num_t)wakeupPin, GPIO_INTR_HIGH_LEVEL); // Wake up when receiving a LoRa packet
// Configure timer wakeup // Configure timer wakeup
if (secs > 0) { if (secs > 0) {
@@ -95,14 +94,19 @@ public:
} }
// Disable CPU interrupt servicing // Disable CPU interrupt servicing
noInterrupts(); portENTER_CRITICAL(&sleepMux);
// Skip sleep if there is a LoRa packet // Skip sleep if there is a LoRa packet
if (digitalRead(wakeupPin) == HIGH) { if (gpio_get_level(wakeupPin) == HIGH) {
interrupts(); portEXIT_CRITICAL(&sleepMux);
delay(1);
return; return;
} }
// Configure GPIO wakeup
esp_sleep_enable_gpio_wakeup();
gpio_wakeup_enable((gpio_num_t)wakeupPin, GPIO_INTR_HIGH_LEVEL); // Wake up when receiving a LoRa packet
// MCU enters light sleep // MCU enters light sleep
esp_light_sleep_start(); esp_light_sleep_start();
@@ -111,7 +115,7 @@ public:
gpio_set_intr_type(wakeupPin, GPIO_INTR_POSEDGE); gpio_set_intr_type(wakeupPin, GPIO_INTR_POSEDGE);
// Enable CPU interrupt servicing // Enable CPU interrupt servicing
interrupts(); portEXIT_CRITICAL(&sleepMux);
} }
uint8_t getStartupReason() const override { return startup_reason; } uint8_t getStartupReason() const override { return startup_reason; }
@@ -135,7 +139,7 @@ public:
#endif #endif
uint16_t getBattMilliVolts() override { uint16_t getBattMilliVolts() override {
#ifdef PIN_VBAT_READ #ifdef PIN_VBAT_READ
analogReadResolution(12); analogReadResolution(12);
uint32_t raw = 0; uint32_t raw = 0;
@@ -174,9 +178,9 @@ public:
// start with some date/time in the recent past // start with some date/time in the recent past
struct timeval tv; struct timeval tv;
tv.tv_sec = 1715770351; // 15 May 2024, 8:50pm tv.tv_sec = 1715770351; // 15 May 2024, 8:50pm
tv.tv_usec = 0; tv.tv_usec = 0;
settimeofday(&tv, NULL); settimeofday(&tv, NULL);
} }
} }
uint32_t getCurrentTime() override { uint32_t getCurrentTime() override {
time_t _now; time_t _now;