fix psram check

technyon · Dec 21, 2024 · 02c3b58 · 02c3b58
1 parent dc43b45
commit 02c3b58
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/clion/CMakeLists.txt b/clion/CMakeLists.txt
@@ -54,8 +54,6 @@ set(SRCFILES
         ../src/NukiOfficial.cpp
         ../src/NukiPublisher.cpp
         ../src/EspMillis.h
-        ../src/util/PSRAM.cpp
-        ../src/util/PSRAM.h
 )
 
 file(GLOB_RECURSE SRCFILESREC

diff --git a/src/networkDevices/EthernetDevice.cpp b/src/networkDevices/EthernetDevice.cpp
@@ -6,9 +6,9 @@
 
 #ifdef CONFIG_IDF_TARGET_ESP32
 #include "esp_private/esp_gpio_reserve.h"
-#include "util/PSRAM.h"
 #include <bootloader_common.h>
-
+#include "esp_psram.h"
+#include "esp32-hal.h"
 #endif
 
 extern bool ethCriticalFailure;
@@ -101,7 +101,7 @@ void EthernetDevice::initialize()
         // https://github.com/arendst/Tasmota/commit/f8fbe153000591727e40b5007e0de78c33833131
         // https://github.com/arendst/Tasmota/commit/f8fbe153000591727e40b5007e0de78c33833131#diff-32fc0eefbf488dd507b3bef52189bbe37158737aba6f96fe98a8746dc5021955R417
         uint32_t pkg_version = bootloader_common_get_chip_ver_pkg();
-        if(PSRAM::found && pkg_version <= 3)
+        if(esp_psram_get_size() <= 0 && pkg_version <= 3)
         {
             esp_gpio_revoke(0xFFFFFFFFFFFFFFFF);
         }

diff --git a/src/util/PSRAM.cpp b/src/util/PSRAM.cpp
diff --git a/src/util/PSRAM.h b/src/util/PSRAM.h