diff --git a/boards/esp32s3cdc-qio_opi-16M.json b/boards/esp32s3cdc-qio_opi-16M.json index 05b680768..964cb33ef 100644 --- a/boards/esp32s3cdc-qio_opi-16M.json +++ b/boards/esp32s3cdc-qio_opi-16M.json @@ -5,10 +5,11 @@ "memory_type": "qio_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1", "f_cpu": "240000000L", "f_flash": "80000000L", + "boot": "opi", "flash_mode": "qio", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1", "hwids": [ [ "0x303A", diff --git a/boards/esp8266_160MHz_4M1M_board.json b/boards/esp8266_160MHz_4M1M_board.json new file mode 100644 index 000000000..01bddc562 --- /dev/null +++ b/boards/esp8266_160MHz_4M1M_board.json @@ -0,0 +1,31 @@ +{ + "build": { + "arduino": { + "ldscript": "eagle.flash.4m1m.ld" + }, + "core": "esp8266", + "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M1M", + "f_cpu": "120000000L", + "f_flash": "40000000L", + "flash_mode": "dout", + "mcu": "esp8266", + "variant": "generic" + }, + "connectivity": [ + "wifi" + ], + "frameworks": [ + "arduino" + ], + "name": "Espressif Generic ESP8266 ESPEasy 4M Flash 1M FS", + "upload": { + "maximum_ram_size": 81920, + "maximum_size": 1040316, + "require_upload_port": true, + "resetmethod": "nodemcu", + "speed": 115200 + }, + "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family", + "vendor": "Espressif" + } + \ No newline at end of file diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 55019ee6e..abc5bb7a0 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -217,9 +217,9 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_IR_EXTENDED -DCONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -custom_sdkconfig = - CONFIG_RMT_ISR_CACHE_SAFE=y - CONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 +;custom_sdkconfig = +; CONFIG_RMT_ISR_CACHE_SAFE=y +; CONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index a51d074c3..3e8246a42 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -302,6 +302,7 @@ lib_ignore = ${normal.lib_ignore} [env:normal_beta_2ndheap_ESP8266_4M1M] extends = esp8266_4M1M +board = esp8266_160MHz_4M1M_board platform = ${normal_beta_2ndheap.platform} platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} @@ -312,6 +313,7 @@ lib_ignore = ${normal_beta_2ndheap.lib_ignore} [env:normal_beta_2ndheap_ESP8266_4M1M_VCC] extends = esp8266_4M1M +board = esp8266_160MHz_4M1M_board platform = ${normal_beta_2ndheap.platform} platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 0f092f664..c956a8640 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -129,6 +129,10 @@ void sw_watchdog_callback(void *arg) \*********************************************************************************************/ void ESPEasy_setup() { +# ifdef BOARD_HAS_PSRAM + psramInit(); +# endif // ifdef BOARD_HAS_PSRAM + #if defined(ESP8266_DISABLE_EXTRA4K) || defined(USE_SECOND_HEAP) // disable_extra4k_at_link_time(); @@ -144,9 +148,6 @@ void ESPEasy_setup() DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection # endif // DISABLE_ESP32_BROWNOUT -# ifdef BOARD_HAS_PSRAM - psramInit(); -# endif // ifdef BOARD_HAS_PSRAM # if CONFIG_IDF_TARGET_ESP32