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

[Build] Switch ESP32 board definitions to use DIO mode

Browse Source
This commit is contained in:
TD-er
2022-08-27 23:44:33 +02:00
parent 5e70bd94b0
commit b30776d66c
23 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/esp32-cam.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
boards/esp32-m5core2.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "m5stack_core2",
"partitions": "esp32_partition_app4096k_spiffs8124k.csv"
boards/esp32-odroid.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "odroid_esp32",
"partitions": "esp32_partition_app4096k_spiffs8124k.csv"
boards/esp32_16M1M.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app4096k_spiffs1024k.csv"
boards/esp32_16M8M.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app4096k_spiffs8124k.csv"
boards/esp32_4M.json
+5 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
@@ -32,6 +32,9 @@
"maximum_ram_size": 327680,
"maximum_size": 1900544,
"require_upload_port": true,
"resetmethod": "nodemcu",
"before_reset": "default_reset",
"after_reset": "hard_reset",
"speed": 460800
},
"url": "https://en.wikipedia.org/wiki/ESP32",
boards/esp32_8M.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_8M",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2944k_spiffs2M.csv"
boards/esp32_solo1_4M.json
+2 -2
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DCORE32SOLO1",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
boards/esp32c3.json
+4 -3
View File
@@ -2,19 +2,20 @@
"build": {
"arduino":{
"ldscript": "esp32c3_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32c3",
"variant": "esp32c3",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
},
"connectivity": [
"wifi"
"wifi",
"bluetooth"
],
"debug": {
"openocd_target": "esp32c3.cfg"
boards/esp32s2.json
+3 -3
View File
@@ -2,13 +2,13 @@
"build": {
"arduino":{
"ldscript": "esp32s2_out.ld",
"memory_type": "dout_qspi"
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dout",
"flash_mode": "dio",
"mcu": "esp32s2",
"variant": "esp32s2",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
@@ -27,7 +27,7 @@
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 1900544,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
boards/esp8266_16M14M_board.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 16M Flash 14M FS",
"upload": {
boards/esp8266_1M128k.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 1M Flash 128k FS",
"upload": {
boards/esp8266_1M128k_OTA.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 1M Flash 128k FS",
"upload": {
boards/esp8266_2M1M.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 1M sketch 1M FS",
"upload": {
boards/esp8266_2M256.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 2M Flash 256k FS",
"upload": {
boards/esp8266_4M1M_board.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 4M Flash 1M FS",
"upload": {
boards/esp8266_4M2M_board.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 4M Flash 2M FS",
"upload": {
boards/esp8266_4M3M.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8266 ESPEasy 4M Flash 3M FS",
"upload": {
boards/esp8266_zbbridge.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Sonoff ZbBridge ESPEasy 2M Flash 256k FS",
"upload": {
boards/esp8285_1M128k.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8285 ESPEasy 1M Flash 128k FS",
"upload": {
boards/esp8285_1M128k_OTA.json
+1 -3
View File
@@ -15,9 +15,7 @@
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
"arduino"
],
"name": "Espressif Generic ESP8285 ESPEasy 1M Flash 128k FS",
"upload": {
platformio_esp32_envs.ini
+3
View File
@@ -18,6 +18,9 @@ lib_ignore = ESP8266Ping
[esp32_base]
extends = common, core_esp32_IDF4_4__2_0_4
upload_speed = 460800
upload_before_reset = default_reset
upload_after_reset = hard_reset
lib_deps =
Adafruit ILI9341 ESPEasy
Adafruit_ST77xx
tools/pio/post_esp32.py
+1 -1
View File
@@ -40,7 +40,7 @@ def esp32_create_combined_bin(source, target, env):
flash_size = env.BoardConfig().get("upload.flash_size")
flash_freq = env.BoardConfig().get("build.f_flash", '40m')
flash_freq = flash_freq.replace('000000L', 'm')
flash_mode = env.BoardConfig().get("build.flash_mode", "dout")
flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
if flash_mode == "qio":
flash_mode = "dio"
elif flash_mode == "qout":