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-S3] Fix board definitions + build errors on ESP32-S3

Browse Source
This commit is contained in:
TD-er
2023-05-03 00:18:19 +02:00
parent 1c542f2368
commit 1afcaf8e5b
6 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/esp32s3.json
+9 -9
View File
@@ -1,29 +1,29 @@
{
"build": {
"arduino":{
"ldscript": "esp32s2_out.ld",
"memory_type": "dio_qspi"
"ldscript": "esp32s3_out.ld",
"memory_type": "qio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"mcu": "esp32s2",
"variant": "esp32s2",
"flash_mode": "qio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s2.cfg"
"openocd_target": "esp32s3.cfg"
},
"frameworks": [
"espidf",
"arduino"
],
"name": "Espressif Generic ESP32-S2 4M Flash ESPEasy 1810k Code/OTA 316k FS",
"name": "Espressif Generic ESP32-S3 >= 4M Flash QSPI PSRAM, ESPEasy 1810k Code/OTA 316k FS",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
@@ -31,6 +31,6 @@
"require_upload_port": true,
"speed": 460800
},
"url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html",
"url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
"vendor": "Espressif"
}
docs/source/Controller/C013.rst
+3
View File
@@ -233,6 +233,9 @@ The node type is defined as:
* 33 = "ESP Easy 32"
* 34 = "ESP Easy 32-S2"
* 35 = "ESP Easy 32-C3"
* 36 = "ESP Easy 32-S3"
* 37 = "ESP Easy 32-C2"
* 38 = "ESP Easy 32-H2"
* 65 = "Arduino Easy"
* 81 = "Nano Easy"
platformio_esp32s3_envs.ini
+13 -13
View File
@@ -25,7 +25,7 @@ board_build.filesystem = littlefs
[env:custom_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_BUILD_CUSTOM
extra_scripts = ${esp32s3_common.extra_scripts}
@@ -33,7 +33,7 @@ extra_scripts = ${esp32s3_common.extra_scripts}
[env:neopixel_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DFEATURE_ARDUINO_OTA=1
-DFEATURE_SD=1
@@ -42,7 +42,7 @@ build_flags = ${esp32s3_common.build_flags}
[env:custom_IR_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_BUILD_CUSTOM
-DPLUGIN_BUILD_IR
@@ -56,46 +56,46 @@ extra_scripts = ${esp32s3_common.extra_scripts}
[env:normal_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
[env:collection_A_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_ESP32
-DCOLLECTION_USE_RTTTL
[env:collection_B_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_B_ESP32
-DCOLLECTION_USE_RTTTL
[env:collection_C_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_C_ESP32
-DCOLLECTION_USE_RTTTL
[env:collection_D_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_D_ESP32
-DCOLLECTION_USE_RTTTL
[env:collection_E_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_E_ESP32
-DCOLLECTION_USE_RTTTL
[env:collection_F_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-DPLUGIN_SET_COLLECTION_F_ESP32
-DCOLLECTION_USE_RTTTL
@@ -103,18 +103,18 @@ build_flags = ${esp32s3_common.build_flags}
[env:energy_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
[env:climate_ESP32s3_4M316k]
extends = esp32s3_common
board = esp32s3
board = esp32s3-qio_qspi
build_flags = ${esp32s3_common.build_flags}
-D PLUGIN_CLIMATE_COLLECTION
src/src/DataTypes/NodeTypeID.cpp
+3
View File
@@ -8,7 +8,10 @@ const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType) {
case NODE_TYPE_ID_ESP_EASYM_STD: return F("ESP Easy Mega");
case NODE_TYPE_ID_ESP_EASY32_STD: return F("ESP Easy 32");
case NODE_TYPE_ID_ESP_EASY32S2_STD: return F("ESP Easy 32-s2");
case NODE_TYPE_ID_ESP_EASY32S3_STD: return F("ESP Easy 32-s3");
case NODE_TYPE_ID_ESP_EASY32C2_STD: return F("ESP Easy 32-c2");
case NODE_TYPE_ID_ESP_EASY32C3_STD: return F("ESP Easy 32-c3");
case NODE_TYPE_ID_ESP_EASY32H2_STD: return F("ESP Easy 32-h2");
case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy");
case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy");
case NODE_TYPE_ID_NANO_EASY_STD: return F("Nano Easy");
src/src/DataTypes/NodeTypeID.h
+4 -3
View File
@@ -8,9 +8,10 @@
#define NODE_TYPE_ID_ESP_EASYM_STD 17
#define NODE_TYPE_ID_ESP_EASY32_STD 33
#define NODE_TYPE_ID_ESP_EASY32S2_STD 34
#define NODE_TYPE_ID_ESP_EASY32S3_STD 35
#define NODE_TYPE_ID_ESP_EASY32C2_STD 36
#define NODE_TYPE_ID_ESP_EASY32C3_STD 37
#define NODE_TYPE_ID_ESP_EASY32C3_STD 35
#define NODE_TYPE_ID_ESP_EASY32S3_STD 36
#define NODE_TYPE_ID_ESP_EASY32C2_STD 37
#define NODE_TYPE_ID_ESP_EASY32H2_STD 38
#define NODE_TYPE_ID_ARDUINO_EASY_STD 65
#define NODE_TYPE_ID_NANO_EASY_STD 81
src/src/Helpers/Hardware.cpp
+4 -2
View File
@@ -38,8 +38,10 @@
# if ESP_IDF_VERSION_MAJOR > 3 // IDF 4+
# if CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3
# include <esp32s2/rom/spi_flash.h>
# include <esp32s3/rom/spi_flash.h>
# include <esp32s3/spiram.h>
# define HAS_HALL_EFFECT_SENSOR 0
# elif CONFIG_IDF_TARGET_ESP32S2 // ESP32-S2
# include <esp32s2/rom/spi_flash.h>
# include <esp32s2/spiram.h>
@@ -677,7 +679,7 @@ const __FlashStringHelper* getFlashChipMode() {
# if ESP_IDF_VERSION_MAJOR > 3 // IDF 4+
# if CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3
// FIXME TD-er: implement for ESP32-S3
const uint32_t spi_ctrl = REG_READ(PERIPHS_SPI_FLASH_CTRL);
const uint32_t spi_ctrl = REG_READ(SPI_CTRL_REG(0));
if (spi_ctrl & SPI_FREAD_OCT) {
return F("OCT");
} else if (spi_ctrl & SPI_FREAD_QUAD) {