Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

[ESP32 MAX] Add ESP32_16M1M_ETH configuration, disable PS-RAM support

Browse Source
This commit is contained in:
Ton Huisman
2021-04-03 16:44:47 +02:00
parent 032585e94c
commit 0a91bfa6c3
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32_envs.ini
+10 -2
View File
@@ -144,6 +144,9 @@ board_upload.maximum_size = 4194304
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_MAX_ESP32
; 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
; -DBOARD_HAS_PSRAM // both flags already enabled for Lolin D32 Pro board by PlatformIO
; -mfix-esp32-psram-cache-issue
board = lolin_d32_pro
; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem
@@ -167,12 +170,17 @@ board_build.partitions = esp32_partition_app4096k_spiffs2048k.csv
extends = max_ESP32_16M_LittleFS
board_build.partitions = esp32_partition_app4096k_spiffs8124k.csv
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M2M definition
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M1M definition
[env:max_ESP32_16M1M_ETH]
extends = env:max_ESP32_16M1M
build_flags = ${env:max_ESP32_16M1M.build_flags} -DHAS_ETHERNET
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M2M_LittleFS definition
[env:max_ESP32_16M2M_LittleFS_ETH]
extends = env:max_ESP32_16M2M_LittleFS
build_flags = ${env:max_ESP32_16M2M_LittleFS.build_flags} -DHAS_ETHERNET
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M definition
; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition
[env:max_ESP32_16M8M_LittleFS_ETH]
extends = env:max_ESP32_16M8M_LittleFS
build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} -DHAS_ETHERNET
src/src/Helpers/StringProvider.cpp
+4
View File
@@ -62,10 +62,12 @@ String 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
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 // ifdef ESP32
case LabelType::BOOT_TYPE: return F("Last Boot Cause");
@@ -203,10 +205,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
case LabelType::PSRAM_SIZE: return String(ESP.getPsramSize());
case LabelType::PSRAM_FREE: return String(ESP.getFreePsram());
case LabelType::PSRAM_MIN_FREE: return String(ESP.getMinFreeHeap());
case LabelType::PSRAM_MAX_FREE_BLOCK: return String(ESP.getMaxAllocPsram());
#endif // ESP32_ENABLE_PSRAM
#endif // ifdef ESP32
src/src/Helpers/StringProvider.h
+2
View File
@@ -35,10 +35,12 @@ struct LabelType {
#ifdef ESP32
HEAP_SIZE,
HEAP_MIN_FREE,
#ifdef ESP32_ENABLE_PSRAM
PSRAM_SIZE,
PSRAM_FREE,
PSRAM_MIN_FREE,
PSRAM_MAX_FREE_BLOCK,
#endif // ESP32_ENABLE_PSRAM
#endif // ifdef ESP32
BOOT_TYPE, // Cold boot
src/src/WebServer/SysInfoPage.cpp
+2 -2
View File
@@ -362,7 +362,7 @@ void handle_sysinfo_memory() {
addHtml(html);
}
# ifdef ESP32
# if defined(ESP32) && defined(ESP32_ENABLE_PSRAM)
if (ESP.getPsramSize() > 0) {
addRowLabelValue(LabelType::PSRAM_SIZE);
@@ -370,7 +370,7 @@ void handle_sysinfo_memory() {
addRowLabelValue(LabelType::PSRAM_MIN_FREE);
addRowLabelValue(LabelType::PSRAM_MAX_FREE_BLOCK);
}
# endif // ifdef ESP32
# endif // if defined(ESP32) && defined(ESP32_ENABLE_PSRAM)
}
# ifdef HAS_ETHERNET