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] Rename ESP32 env 1M8_partition to 4M316k

Browse Source 
1M8 does look a bit too much like "1MB".
4M316k does use the same naming schema as the other builds, stating the flash size and SPIFFS size.
This commit is contained in:
Gijs Noorlander
2019-10-27 13:38:16 +01:00
parent 1dec446974
commit 83c600e82d
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -34,8 +34,8 @@ script:
# - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump
# - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run --target clean
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP8266_4M1M
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e esp-wrover-kit_test_1M8_partition
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e esp32test_1M8_partition
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e esp-wrover-kit_test_4M316k
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e esp32test_4M316k
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8266_1M
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8266_1M_VCC
- PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8285_1M
before_deploy
+4 -3
View File
@@ -41,8 +41,8 @@ mkdir -p ${TMP_DIST}/memstats
for ENV in \
custom_ESP8266_4M1M\
esp-wrover-kit_test_1M8_partition\
esp32test_1M8_partition\
esp-wrover-kit_test_4M316k\
esp32test_4M316k\
normal_ESP8266_1M\
normal_ESP8266_1M_VCC\
normal_ESP8285_1M\
@@ -84,7 +84,8 @@ do
if [[ ${ENV} == *"esp32"* ]]; then
MAX_FILESIZE=1310720
fi
if [[ ${ENV} == *"1M8_partition"* ]]; then
if [[ ${ENV} == *"4M316k"* ]]; then
# ESP32 with 1800k of sketch space.
MAX_FILESIZE=1900544
fi
dist/README.txt
Vendored
+5 -6
View File
@@ -49,15 +49,14 @@ If these speed issues will be fixed, it is very likely the SPIFFS must then be r
Special memory partitioning:
- 2M256 => 2 MB flash modules (e.g. Shelly1/WROOM02) with 256k SPIFFS (only core 2.5.0 or newer)
- 1M8_partition => For ESP32 with 4MB flash, sketch size is set to 1.8 MByte (default: 1.4 MByte)
- 4M1M => 4MB flash, 1 MB SPIFFS.
- 4M2M => 4MB flash, 2 MB SPIFFS.
- 4M316k => For ESP32 with 4MB flash, sketch size is set to 1.8 MByte (default: 1.4 MByte)
- 4M1M => 4MB flash, 1 MB SPIFFS. Default layout for 4MB flash.
- 4M2M => 4MB flash, 2 MB SPIFFS. Introduced in October 2019. Only possible with core 2.5.2 or newer.
ESP32 now has 3 builds:
- esp32dev Using the default partition layout (1.4 MB for the sketch)
- esp32test_1M8_partition Larger sketch partition (1.8MB) smaller SPIFFS (316 kB)
- esp-wrover-kit_test_1M8_partition A build for ESP32 including build flags for the official WRover test kit.
- esp32test_4M316k Larger sketch partition (1.8MB) smaller SPIFFS (316 kB)
- esp-wrover-kit_test_4M316k A build for ESP32 including build flags for the official WRover test kit.
Please note that changing between those versions will destroy the settings!
The SPIFFS partition will be lost and that contains all settings.
docs/source/Participate/PlatformIO.rst
+1 -1
View File
@@ -90,7 +90,7 @@ For example:
* ..._ESP8266_4M -> ESP8266 has external flash, which can vary in size from 512 kB to 16 MB.
* ..._ESP8285_1M -> ESP8285 has the flash internal, so is always 1 MB.
* ..._ESP32_1M8_partition -> ESP32 with 4 MB flash and a 1.8 MB partition for the sketch.
* ..._ESP32_4M316k -> ESP32 with 4 MB flash and a 1.8 MB partition for the sketch. (316k SPIFFS)
Make a custom build using PlatformIO
------------------------------------
platformio.ini
+4 -4
View File
@@ -452,7 +452,7 @@ extra_scripts = pre:pre_extra_script.py
; Custom: 4096k version --------------------------
[env:debug_custom_ESP32_1M8_partition]
[env:debug_custom_ESP32_4M316k]
build_type = debug
platform = ${core_esp32.platform}
build_unflags = ${core_esp32.build_unflags}
@@ -467,7 +467,7 @@ board_upload.maximum_size = 1900544
extra_scripts = pre:pre_custom_esp32.py
[env:custom_ESP32_1M8_partition]
[env:custom_ESP32_4M316k]
platform = ${core_esp32.platform}
build_unflags = ${core_esp32.build_unflags}
build_flags = ${core_esp32.build_flags} -DPLUGIN_BUILD_CUSTOM
@@ -503,7 +503,7 @@ extra_scripts = pre:pre_memanalyze.py
; Will probably not work, not tested and guaranteed to take a few hours time of some ;
; still trying to build the version without reading this warning. ;
; *********************************************************************
[env:esp-wrover-kit_test_1M8_partition]
[env:esp-wrover-kit_test_4M316k]
platform = ${core_esp32.platform}
build_unflags = ${core_esp32.build_unflags}
build_flags = ${core_esp32.build_flags} -DPLUGIN_SET_TEST_ESP32
@@ -530,7 +530,7 @@ debug_extra_cmds = break Misc.ino:3011
;lib_deps = ${core_esp32.lib_deps}
;lib_ignore = ${core_esp32.lib_ignore}
[env:esp32test_1M8_partition]
[env:esp32test_4M316k]
platform = ${core_esp32.platform}
build_unflags = ${core_esp32.build_unflags}
build_flags = ${core_esp32.build_flags} -DPLUGIN_SET_TEST_ESP32