jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12273 from Jason2866/partitions

Browse Source 
Final ESP32 partitions scheme fix
This commit is contained in:
Theo Arends 2021-06-02 18:35:34 +02:00 committed by GitHub
commit 9380e78db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/esp32-cam.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
@ -10,7 +9,8 @@
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "esp32" "variant": "esp32",
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -25,7 +25,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, 1856k Code/OTA, 320k SPIFFS", "name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, Tasmota 1856k Code/OTA, 320k SPIFFS",
"upload": { "upload": {
"flash_size": "4MB", "flash_size": "4MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32-m5core2.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
@ -10,7 +9,8 @@
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "m5stack_core2" "variant": "m5stack_core2",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -22,7 +22,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "M5Stack Core2 16M Flash, 4MB PSRAM, 2944k Code/OTA, 10M SPIFFS", "name": "M5Stack Core2 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M SPIFFS",
"upload": { "upload": {
"flash_size": "16MB", "flash_size": "16MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32-odroid.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
@ -10,7 +9,8 @@
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "odroid_esp32" "variant": "odroid_esp32",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -22,7 +22,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "ESP32 ODROID-GO 16M Flash, 4MB PSRAM, 2944k Code/OTA, 10M SPIFFS", "name": "ESP32 ODROID-GO 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M SPIFFS",
"upload": { "upload": {
"flash_size": "16MB", "flash_size": "16MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32_16M.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV", "extra_flags": "-DARDUINO_ESP32_DEV",
@ -10,7 +9,8 @@
"f_flash": "40000000L", "f_flash": "40000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "esp32" "variant": "esp32",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -25,7 +25,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "Espressif Generic ESP32 16M Flash, 2944k Code/OTA, 10M SPIFFS", "name": "Espressif Generic ESP32 16M Flash, Tasmota 2944k Code/OTA, 10M SPIFFS",
"upload": { "upload": {
"flash_size": "16MB", "flash_size": "16MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32_4M.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV", "extra_flags": "-DARDUINO_ESP32_DEV",
@ -10,7 +9,8 @@
"f_flash": "40000000L", "f_flash": "40000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "esp32" "variant": "esp32",
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -25,7 +25,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "Espressif Generic ESP32 4M Flash, 1856k Code/OTA, 320k SPIFFS", "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
"upload": { "upload": {
"flash_size": "4MB", "flash_size": "4MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32_8M.json
View File

@ -1,8 +1,7 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32_out.ld", "ldscript": "esp32_out.ld"
"partitions": "esp32_partition_app2944k_spiffs2M.csv"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV", "extra_flags": "-DARDUINO_ESP32_DEV",
@ -10,7 +9,8 @@
"f_flash": "40000000L", "f_flash": "40000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32", "mcu": "esp32",
"variant": "esp32" "variant": "esp32",
"partitions": "esp32_partition_app2944k_spiffs2M.csv"
}, },
"connectivity": [ "connectivity": [
"wifi", "wifi",
@ -25,7 +25,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "Espressif Generic ESP32 8M Flash, 2944k Code/OTA, 2112k SPIFFS", "name": "Espressif Generic ESP32 8M Flash, Tasmota 2944k Code/OTA, 2112k SPIFFS",
"upload": { "upload": {
"flash_size": "8MB", "flash_size": "8MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

5
boards/esp32c3.json
View File

@ -8,7 +8,8 @@
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32c3", "mcu": "esp32c3",
"variant": "esp32c3" "variant": "esp32c3",
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"connectivity": [ "connectivity": [
"wifi" "wifi"
@ -16,7 +17,7 @@
"frameworks": [ "frameworks": [
"arduino" "arduino"
], ],
"name": "Espressif ESP32-C3", "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
"upload": { "upload": {
"flash_size": "4MB", "flash_size": "4MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

8
boards/esp32s2.json
View File

@ -1,15 +1,15 @@
{ {
"build": { "build": {
"arduino":{ "arduino":{
"ldscript": "esp32s2_out.ld", "ldscript": "esp32s2_out.ld"
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"core": "esp32", "core": "esp32",
"f_cpu": "240000000L", "f_cpu": "240000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",
"mcu": "esp32s2", "mcu": "esp32s2",
"variant": "esp32s2" "variant": "esp32s2",
"partitions": "esp32_partition_app1856k_spiffs320k.csv"
}, },
"connectivity": [ "connectivity": [
"wifi" "wifi"
@ -21,7 +21,7 @@
"espidf", "espidf",
"arduino" "arduino"
], ],
"name": "Espressif ESP32-S2-Saola-1", "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
"upload": { "upload": {
"flash_size": "4MB", "flash_size": "4MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

4
boards/esp8266_1M.json
View File

@ -19,10 +19,10 @@
"esp8266-rtos-sdk", "esp8266-rtos-sdk",
"esp8266-nonos-sdk" "esp8266-nonos-sdk"
], ],
"name": "Espressif Generic ESP8266 1M sketch NO SPIFFS", "name": "Espressif Generic ESP8266 Tasmota 1M sketch NO SPIFFS",
"upload": { "upload": {
"maximum_ram_size": 81920, "maximum_ram_size": 81920,
"maximum_size": 1048576, "maximum_size": 995326,
"require_upload_port": true, "require_upload_port": true,
"resetmethod": "ck", "resetmethod": "ck",
"speed": 115200 "speed": 115200

4
boards/esp8266_2M1M.json
View File

@ -19,10 +19,10 @@
"esp8266-rtos-sdk", "esp8266-rtos-sdk",
"esp8266-nonos-sdk" "esp8266-nonos-sdk"
], ],
"name": "Espressif Generic ESP8266 1M sketch 1M SPIFFS", "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M SPIFFS",
"upload": { "upload": {
"maximum_ram_size": 81920, "maximum_ram_size": 81920,
"maximum_size": 1048576, "maximum_size": 995326,
"require_upload_port": true, "require_upload_port": true,
"resetmethod": "ck", "resetmethod": "ck",
"speed": 115200 "speed": 115200

4
boards/esp8266_4M2M.json
View File

@ -19,10 +19,10 @@
"esp8266-rtos-sdk", "esp8266-rtos-sdk",
"esp8266-nonos-sdk" "esp8266-nonos-sdk"
], ],
"name": "Espressif Generic ESP8266 1M sketch 1M OTA 2M SPIFFS", "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M OTA 2M SPIFFS",
"upload": { "upload": {
"maximum_ram_size": 81920, "maximum_ram_size": 81920,
"maximum_size": 1048576, "maximum_size": 995326,
"require_upload_port": true, "require_upload_port": true,
"resetmethod": "ck", "resetmethod": "ck",
"speed": 115200 "speed": 115200

4
boards/esp8266_4M3M.json
View File

@ -19,10 +19,10 @@
"esp8266-rtos-sdk", "esp8266-rtos-sdk",
"esp8266-nonos-sdk" "esp8266-nonos-sdk"
], ],
"name": "Espressif Generic ESP8266 1M sketch 3M SPIFFS", "name": "Espressif Generic ESP8266 Tasmota 1M sketch 3M SPIFFS",
"upload": { "upload": {
"maximum_ram_size": 81920, "maximum_ram_size": 81920,
"maximum_size": 1048576, "maximum_size": 995326,
"require_upload_port": true, "require_upload_port": true,
"resetmethod": "ck", "resetmethod": "ck",
"speed": 115200 "speed": 115200

4
platformio_tasmota_cenv_sample.ini
View File

@ -40,8 +40,6 @@ build_flags = ${esp32_defaults.build_flags}
[env:tasmota32s2] [env:tasmota32s2]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s2 board = esp32s2
board_build.partitions = esp32_partition_app1856k_spiffs320k.csv
board_build.flash_mode = qio
platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522 platformio/tool-mklittlefs @ ~1.203.200522
@ -57,7 +55,6 @@ lib_ignore =
[env:tasmota32c3] [env:tasmota32c3]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c3 board = esp32c3
board_build.partitions = esp32_partition_app1856k_spiffs320k.csv
platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3 platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
tasmota/toolchain-riscv32 tasmota/toolchain-riscv32
@ -75,7 +72,6 @@ lib_ignore =
; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4. ; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
[env:tasmota32idf4] [env:tasmota32idf4]
extends = env:tasmota32_base extends = env:tasmota32_base
board_build.partitions = esp32_partition_app1856k_spiffs320k.csv
platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/259/framework-arduinoespressif32-master-c13afea63.tar.gz
toolchain-xtensa32 @ ~2.80400.0 toolchain-xtensa32 @ ~2.80400.0