Fix Ethernet on -DFRAMEWORK_ARDUINO_ITEAD framework regression from v…

…14.3.0 (arendst#22367)
josef109 · Nov 10, 2024 · 0e62375 · 0e62375
1 parent fe88bbf
commit 0e62375
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file.
 - Shutter optimized behavior to publish shutter data with sensor request (#22353)
 
 ### Fixed
+- Ethernet on -DFRAMEWORK_ARDUINO_ITEAD framework regression from v14.3.0 (#22367)
 
 ### Removed
 - DALI inverted signal configuration using compile time defines

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -143,5 +143,6 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 ### Fixed
 - EQ3 TRV firmware version 1.46 fails if the default true is used in subscribe on the notify characteristic [#22328](https://github.com/arendst/Tasmota/issues/22328)
+- Ethernet on -DFRAMEWORK_ARDUINO_ITEAD framework regression from v14.3.0 [#22367](https://github.com/arendst/Tasmota/issues/22367)
 
 ### Removed
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
@@ -409,15 +409,15 @@ void setup(void) {
   DisableBrownout();      // Workaround possible weak LDO resulting in brownout detection during Wifi connection
 #endif  // DISABLE_ESP32_BROWNOUT
 
-  // restore GPIO16/17 if no PSRAM is found
+  // restore GPIO5/18 or 16/17 if no PSRAM is found which may be used by Ethernet among others
   if (!FoundPSRAM()) {
     // test if the CPU is not pico
     uint32_t pkg_version = bootloader_common_get_chip_ver_pkg();
     if (pkg_version <= 3) {         // D0WD, S0WD, D2WD
-      gpio_reset_pin(GPIO_NUM_16);  // D0WD_PSRAM_CS_IO
-      gpio_reset_pin(GPIO_NUM_17);  // D0WD_PSRAM_CLK_IO
+      gpio_reset_pin((gpio_num_t)CONFIG_D0WD_PSRAM_CS_IO);
+      gpio_reset_pin((gpio_num_t)CONFIG_D0WD_PSRAM_CLK_IO);
       // IDF5.3 fix esp_gpio_reserve used in init PSRAM
-      esp_gpio_revoke(BIT64(GPIO_NUM_16) | BIT64(GPIO_NUM_17));
+      esp_gpio_revoke(BIT64(CONFIG_D0WD_PSRAM_CS_IO) | BIT64(CONFIG_D0WD_PSRAM_CLK_IO));
     }
   }
 #endif  // CONFIG_IDF_TARGET_ESP32