jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-11 18:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix heap monitoring on esp32

Browse Source
This commit is contained in:
Yurii
2023-12-14 06:20:30 +03:00
parent e13984f869
commit adbf67ac13
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/MainTask.h
View File

@@ -51,9 +51,9 @@ protected:
digitalWrite(settings.externalPump.pin, false); digitalWrite(settings.externalPump.pin, false);
} }
#if defined(ESP32) #if defined(ARDUINO_ARCH_ESP32)
heapSize = ESP.getHeapSize(); heapSize = ESP.getHeapSize();
#elif defined(ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
heapSize = 81920; heapSize = 81920;
#elif #elif
heapSize = 99999; heapSize = 99999;
@@ -82,7 +82,6 @@ protected:
} }
if (WiFi.status() == WL_CONNECTED) { if (WiFi.status() == WL_CONNECTED) {
//timeClient.update();
vars.sensors.rssi = WiFi.RSSI(); vars.sensors.rssi = WiFi.RSSI();
if (!tMqtt->isEnabled() && strlen(settings.mqtt.server) > 0) { if (!tMqtt->isEnabled() && strlen(settings.mqtt.server) > 0) {
@@ -140,7 +139,11 @@ protected:
void heap() { void heap() {
unsigned int freeHeapSize = ESP.getFreeHeap(); unsigned int freeHeapSize = ESP.getFreeHeap();
unsigned int maxFreeBlockSize = ESP.getMaxFreeBlockSize(); #if defined(ARDUINO_ARCH_ESP32)
unsigned int maxFreeBlockSize = ESP.getMaxAllocHeap();
#else
unsigned int maxFreeBlockSize = ESP.getMaxFreeBlockSize();
#endif
if (freeHeapSize < 1024 || maxFreeBlockSize < 1024) { if (freeHeapSize < 1024 || maxFreeBlockSize < 1024) {
vars.actions.restart = true; vars.actions.restart = true;
@@ -152,7 +155,11 @@ protected:
} }
unsigned int minFreeHeapSizeDiff = 0; unsigned int minFreeHeapSizeDiff = 0;
uint8_t heapFrag = ESP.getHeapFragmentation(); #if defined(ARDUINO_ARCH_ESP32)
uint8_t heapFrag = 0;
#else
uint8_t heapFrag = ESP.getHeapFragmentation();
#endif
if (freeHeapSize < minFreeHeapSize) { if (freeHeapSize < minFreeHeapSize) {
minFreeHeapSizeDiff = minFreeHeapSize - freeHeapSize; minFreeHeapSizeDiff = minFreeHeapSize - freeHeapSize;

2
src/WifiManagerTask.h
View File

@@ -269,7 +269,7 @@ protected:
Log.sinfoln(FPSTR(S_WIFI), F("Connected. IP: %s, RSSI: %hhd"), WiFi.localIP().toString().c_str(), WiFi.RSSI()); Log.sinfoln(FPSTR(S_WIFI), F("Connected. IP: %s, RSSI: %hhd"), WiFi.localIP().toString().c_str(), WiFi.RSSI());
} }
#if defined(ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
if (connected && millis() - lastArpGratuitous > 60000) { if (connected && millis() - lastArpGratuitous > 60000) {
arpGratuitous(); arpGratuitous();
lastArpGratuitous = millis(); lastArpGratuitous = millis();

6
src/main.cpp
View File

@@ -9,9 +9,9 @@
#include "ESPTelnetStream.h" #include "ESPTelnetStream.h"
#endif #endif
#if defined(ESP32) #if defined(ARDUINO_ARCH_ESP32)
#include <ESP32Scheduler.h> #include <ESP32Scheduler.h>
#elif defined(ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include <Scheduler.h> #include <Scheduler.h>
#elif #elif
#error Wrong board. Supported boards: esp8266, esp32 #error Wrong board. Supported boards: esp8266, esp32
@@ -117,7 +117,7 @@ void setup() {
} }
void loop() { void loop() {
#if defined(ESP32) #if defined(ARDUINO_ARCH_ESP32)
vTaskDelete(NULL); vTaskDelete(NULL);
#endif #endif
} }