Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[ESP32 PSRAM] Rename define ESP32_ENABLE_PSRAM to BOARD_HAS_PSRAM

Browse Source 
As IDF code and board definition already uses BOARD_HAS_PSRAM
This commit is contained in:
TD-er
2022-02-08 13:02:13 +01:00
parent 1678550a60
commit b0ad6939f8
7 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32s2_envs.ini
-2
View File
@@ -6,8 +6,6 @@
extends = esp32_common
build_flags = ${esp32_common.build_flags}
-DESP32S2
-DBOARD_HAS_PSRAM
-DESP32_ENABLE_PSRAM
-DFEATURE_ARDUINO_OTA
[esp32s2_common_LittleFS]
platformio_special_envs.ini
+1 -1
View File
@@ -65,7 +65,7 @@ build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_MAX_ESP32
-DPLUGIN_BUILD_IR_EXTENDED
; TODO: To enable PS-RAM Support needs more build flags than these 2, for now define ESP32_ENABLE_PSRAM is used to en/disable detecting PS-Ram size on Info page
; TODO: To enable PS-RAM Support needs more build flags than these 2, for now define BOARD_HAS_PSRAM is used to en/disable detecting PS-Ram size on Info page
; -DBOARD_HAS_PSRAM // both flags already enabled for Lolin D32 Pro board by PlatformIO
; -mfix-esp32-psram-cache-issue
board = lolin_d32_pro
src/src/ESPEasyCore/ESPEasy_setup.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ void ESPEasy_setup()
initWiFi();
run_compiletime_checks();
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
psramInit();
#endif
#ifndef BUILD_NO_RAM_TRACKER
@@ -145,7 +145,7 @@ void ESPEasy_setup()
#ifndef BUILD_NO_RAM_TRACKER
logMemUsageAfter(F("initLog()"));
#endif
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
if (psramFound()) {
addLog(LOG_LEVEL_INFO, F("Found PSRAM"));
}
src/src/Helpers/StringProvider.cpp
+4 -4
View File
@@ -82,12 +82,12 @@ const __FlashStringHelper * getLabel(LabelType::Enum label) {
#ifdef ESP32
case LabelType::HEAP_SIZE: return F("Heap Size");
case LabelType::HEAP_MIN_FREE: return F("Heap Min Free");
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
case LabelType::PSRAM_SIZE: return F("PSRAM Size");
case LabelType::PSRAM_FREE: return F("PSRAM Free");
case LabelType::PSRAM_MIN_FREE: return F("PSRAM Min Free");
case LabelType::PSRAM_MAX_FREE_BLOCK: return F("PSRAM Max Free Block");
#endif // ESP32_ENABLE_PSRAM
#endif // BOARD_HAS_PSRAM
#endif // ifdef ESP32
case LabelType::JSON_BOOL_QUOTES: return F("JSON bool output without quotes");
@@ -273,12 +273,12 @@ String getValue(LabelType::Enum label) {
#ifdef ESP32
case LabelType::HEAP_SIZE: return String(ESP.getHeapSize());
case LabelType::HEAP_MIN_FREE: return String(ESP.getMinFreeHeap());
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
case LabelType::PSRAM_SIZE: return String(ESP.getPsramSize());
case LabelType::PSRAM_FREE: return String(ESP.getFreePsram());
case LabelType::PSRAM_MIN_FREE: return String(ESP.getMinFreePsram());
case LabelType::PSRAM_MAX_FREE_BLOCK: return String(ESP.getMaxAllocPsram());
#endif // ESP32_ENABLE_PSRAM
#endif // BOARD_HAS_PSRAM
#endif // ifdef ESP32
src/src/Helpers/StringProvider.h
+2 -2
View File
@@ -51,12 +51,12 @@ struct LabelType {
#ifdef ESP32
HEAP_SIZE,
HEAP_MIN_FREE,
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
PSRAM_SIZE,
PSRAM_FREE,
PSRAM_MIN_FREE,
PSRAM_MAX_FREE_BLOCK,
#endif // ESP32_ENABLE_PSRAM
#endif // BOARD_HAS_PSRAM
#endif // ifdef ESP32
JSON_BOOL_QUOTES,
src/src/WebServer/JSON.cpp
+2 -2
View File
@@ -180,12 +180,12 @@ void handle_json()
#ifdef ESP32
LabelType::HEAP_SIZE,
LabelType::HEAP_MIN_FREE,
#ifdef ESP32_ENABLE_PSRAM
#ifdef BOARD_HAS_PSRAM
LabelType::PSRAM_SIZE,
LabelType::PSRAM_FREE,
LabelType::PSRAM_MIN_FREE,
LabelType::PSRAM_MAX_FREE_BLOCK,
#endif // ESP32_ENABLE_PSRAM
#endif // BOARD_HAS_PSRAM
#endif // ifdef ESP32
LabelType::SUNRISE,
src/src/WebServer/SysInfoPage.cpp
+4 -4
View File
@@ -386,15 +386,15 @@ void handle_sysinfo_memory() {
addHtml(html);
}
# if defined(ESP32) && defined(ESP32_ENABLE_PSRAM)
# if defined(ESP32) && defined(BOARD_HAS_PSRAM)
addRowLabelValue(LabelType::PSRAM_SIZE);
if (ESP.getPsramSize() > 0) {
addRowLabelValue(LabelType::PSRAM_SIZE);
addRowLabelValue(LabelType::PSRAM_FREE);
addRowLabelValue(LabelType::PSRAM_MIN_FREE);
addRowLabelValue(LabelType::PSRAM_MAX_FREE_BLOCK);
}
# endif // if defined(ESP32) && defined(ESP32_ENABLE_PSRAM)
}
# endif // if defined(ESP32) && defined(BOARD_HAS_PSRAM)
}
# ifdef HAS_ETHERNET