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

[Build] Use PlatformIO Espressif8266@2.0.1 (core 2.5.0)

Browse Source 
Also:
- included core 2.6.0 alpha build with SDK2.2.1
- included core 2.6.0 alpha build with SDK3.0.0-dev
- Made memory size in bin filenames consistent (_4M instead of _4096)
This commit is contained in:
TD-er
2019-02-24 23:21:56 +01:00
parent 37d6140434
commit 3e7d641973
4 changed files with 93 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+11 -12
View File
@@ -12,7 +12,6 @@ Introduction and wiki: https://www.letscontrolit.com/wiki/index.php/ESPEasy#Intr
**MEGA**
:warning:This is the development branch of ESPEasy. All new untested features go into this branch. If you want to do a bugfix, do it on the stable branch, we will merge the fix to the development branch as well.:warning:
Next stable branch: https://github.com/letscontrolit/ESPEasy/tree/v2.0 (bug fixes only, since oct 2017))
Check here to learn how to use this branch and help us improving ESPEasy: http://www.letscontrolit.com/wiki/index.php/ESPEasy#Source_code_development
@@ -21,24 +20,24 @@ Check here to learn how to use this branch and help us improving ESPEasy: http:/
Every night our build-bot will build a new binary release: https://github.com/letscontrolit/ESPEasy/releases
The releases are named something like 'mega-20180102' (last number is the build date)
The releases are named something like 'mega-20190225' (last number is the build date)
Depending on your needs, we release different types of files:
Firmware name | Hardware | Included plugins |
----------------------------------------------|-------------------------|-----------------------------|
ESPEasy_mega-20180102_normal_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable |
ESPEasy_mega-20180102_test_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test |
ESPEasy_mega-20180102_dev_ESP8266_1024.bin | ESP8266 with 1Mb flash | Stable + Test + Development |
ESPEasy_mega-20180102_normal_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable |
ESPEasy_mega-20180102_test_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test |
ESPEasy_mega-20180102_dev_ESP8266_4096.bin | ESP8266 with 4Mb flash | Stable + Test + Development |
ESPEasy_mega-20180102_normal_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable |
ESPEasy_mega-20180102_test_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test |
ESPEasy_mega-20180102_dev_ESP8285_1024.bin | ESP8285 with 1Mb flash | Stable + Test + Development |
ESPEasy_mega-20190225_normal_ESP8266_1M.bin | ESP8266 with 1MB flash | Stable |
ESPEasy_mega-20190225_test_ESP8266_1M.bin | ESP8266 with 1MB flash | Stable + Test |
ESPEasy_mega-20190225_dev_ESP8266_1M.bin | ESP8266 with 1MB flash | Stable + Test + Development |
ESPEasy_mega-20190225_normal_ESP8266_4M.bin | ESP8266 with 4MB flash | Stable |
ESPEasy_mega-20190225_test_ESP8266_4M.bin | ESP8266 with 4MB flash | Stable + Test |
ESPEasy_mega-20190225_dev_ESP8266_4M.bin | ESP8266 with 4MB flash | Stable + Test + Development |
ESPEasy_mega-20190225_normal_ESP8285_1M.bin | ESP8285 with 1MB flash | Stable |
ESPEasy_mega-20190225_test_ESP8285_1M.bin | ESP8285 with 1MB flash | Stable + Test |
ESPEasy_mega-20190225_dev_ESP8285_1M.bin | ESP8285 with 1MB flash | Stable + Test + Development |
## More info
Details and discussion are on the Experimental forum: https://www.letscontrolit.com/forum/viewforum.php?f=18
Details and discussion are on the "Experimental" section of the forum: https://www.letscontrolit.com/forum/viewforum.php?f=18
Automated builds of the (new) documentation can be found at [ESPEasy.readthedocs.io](https://espeasy.readthedocs.io/en/latest/)
before_deploy
+24 -24
View File
@@ -30,38 +30,38 @@ if [ -d "docs/build" ]; then
cp -r docs/build/* ${TMP_DIST}/docs/
fi
for ENV in \
dev_ESP8266_4096\
dev_ESP8266_4M\
esp-wrover-kit_test_1M8_partition\
esp32test_1M8_partition\
hard_SONOFF_POW_4M\
hard_Ventus_W266\
hard_core_250_SONOFF_POW_4M\
hard_core_250_Shelly_1_2M256\
minimal_ESP8266_1024_OTA\
minimal_ESP8285_1024_OTA\
minimal_core_250_ESP8266_1024_OTA\
minimal_core_250_ESP8285_1024_OTA\
normal_ESP8266_1024\
normal_ESP8266_1024_VCC\
normal_ESP8266_4096\
normal_ESP8285_1024\
normal_IR_ESP8266_1024\
normal_IR_ESP8266_4096\
normal_WROOM02_2048\
normal_core_241_ESP8266_1024\
normal_core_241_ESP8266_4096\
normal_core_242_ESP8266_1024\
normal_core_250_ESP8266_1024\
normal_core_250_ESP8266_4096\
normal_core_250_IR_ESP8266_4096\
minimal_ESP8266_1M_OTA\
minimal_ESP8285_1M_OTA\
minimal_core_250_ESP8266_1M_OTA\
minimal_core_250_ESP8285_1M_OTA\
normal_ESP8266_1M\
normal_ESP8266_1M_VCC\
normal_ESP8266_4M\
normal_ESP8285_1M\
normal_IR_ESP8266_1M\
normal_IR_ESP8266_4M\
normal_WROOM02_2M\
normal_core_241_ESP8266_1M\
normal_core_241_ESP8266_4M\
normal_core_242_ESP8266_1M\
normal_core_250_ESP8266_1M\
normal_core_250_ESP8266_4M\
normal_core_250_IR_ESP8266_4M\
normal_core_250_WROOM02_2M256\
test_ESP8266_4096_VCC\
test_core_242_ESP8266_4096\
test_core_250_ESP8266_4096\
test_core_260_alpha_ESP8266_4096\
test_core_260_alpha_ESP8266_4096_VCC;\
test_ESP8266_4M_VCC\
test_core_242_ESP8266_4M\
test_core_250_ESP8266_4M\
test_core_260_alpha_ESP8266_4M_VCC\
test_core_260_sdk2_alpha_ESP8266_4M\
test_core_260_sdk3_alpha_ESP8266_4M;\
do
MAX_FILESIZE=1044464
if [[ ${ENV} == *"1024"* ]]; then
dist/README.txt
Vendored
+14 -5
View File
@@ -22,8 +22,11 @@ Build type can be: (differ in included plugins)
There is also a number of special builds:
- normal_IR => "Normal" + IR receiver/transmitter plugins and library
- hard_xxxxx => Special builds for some off-the-shelf hardware.
- minimal_ESP82xx_1M_OTA => Minimum number of plugins and a limited set of controllers included to be able to perform a 2-step OTA on 1 MB flash nodes.
- normal_core_241 => "Normal" using core 2.4.1, since 2.4.2 has issues with PWM
- minimal_ESP82xx_1024_OTA => Minimum number of plugins and a limited set of controllers included to be able to perform a 2-step OTA on 1 MB flash nodes.
- xxx_core_260_sdk2_alpha -> core 2.6.0 alpha version (under development) using SDK 2.2.1
- xxx_core_260_sdk3_alpha -> core 2.6.0 alpha version (under development) using SDK 3.0.0-dev (under development too)
Chip can be:
- ESP8266 => Most likely option
@@ -31,13 +34,19 @@ Chip can be:
- ESP32 => Experimental support at this moment
MemorySize can be:
- 1024 => 1 MB flash modules (e.g. almost all Sonoff modules)
- 2048 => 2 MB flash modules (e.g. Shelly1/WROOM02)
- 4096 => 4 MB flash modules (e.g. NodeMCU/ESP32)
- 1M => 1 MB flash modules (e.g. almost all Sonoff modules)
- 2M => 2 MB flash modules (e.g. Shelly1/WROOM02)
- 4M => 4 MB flash modules (e.g. NodeMCU/ESP32)
ESP32 now has 2 builds:
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)
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.
Please note that changing between those versions will destroy the settings!
The SPIFFS partition will be lost and that contains all settings.
platformio.ini
+44 -32
View File
@@ -113,9 +113,7 @@ platform = https://github.com/TD-er/platform-espressif8266.git#
build_flags = ${esp82xx_defaults.build_flags}
[core_2_5_0]
;platform = platform-espressif8266@1.9.0
;platform = https://github.com/TD-er/platform-espressif8266.git#feature/2.5.0-beta1
platform = https://github.com/platformio/platform-espressif8266.git#feature/stage
platform = espressif8266@2.0.1
build_flags = ${esp82xx_2_5_0.build_flags}
[core_stage]
@@ -241,7 +239,6 @@ build_flags = ${core_2_5_0.build_flags} -DPLUGIN_BUILD_TESTING
platform = ${beta_platform.platform}
build_flags = ${beta_platform.build_flags} -DPLUGIN_BUILD_TESTING
[dev]
platform = ${regular_platform.platform}
build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_DEV
@@ -356,7 +353,7 @@ board_upload.maximum_size = 1900544
; *********************************************************************
; NORMAL: 1024k version --------------------------
[env:normal_ESP8266_1024]
[env:normal_ESP8266_1M]
platform = ${normal.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -372,7 +369,7 @@ board_build.flash_mode = ${esp8266_1M.board_build.flash_mode}
build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${esp8266_1M.build_flags} ${normal.build_flags}
[env:normal_ESP8266_1024_VCC]
[env:normal_ESP8266_1M_VCC]
platform = ${normal.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -388,7 +385,7 @@ board_build.flash_mode = ${esp8266_1M.board_build.flash_mode}
build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${esp8266_1M.build_flags} ${normal.build_flags} -D FEATURE_ADC_VCC=true
[env:minimal_ESP8266_1024_OTA]
[env:minimal_ESP8266_1M_OTA]
platform = ${normal_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -404,7 +401,7 @@ board_build.flash_mode = ${esp8266_1M.board_build.flash_mode}
build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${esp8266_1M.build_flags} ${normal_ota.build_flags}
[env:minimal_ESP8285_1024_OTA]
[env:minimal_ESP8285_1M_OTA]
platform = ${normal_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -420,7 +417,7 @@ board_build.flash_mode = ${esp8285_1M.board_build.flash_mode}
build_unflags = ${esp8285_1M.build_unflags}
build_flags = ${esp8285_1M.build_flags} ${normal_ota.build_flags}
[env:minimal_core_250_ESP8266_1024_OTA]
[env:minimal_core_250_ESP8266_1M_OTA]
platform = ${normal_250_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -436,7 +433,7 @@ board_build.flash_mode = ${esp8266_1M.board_build.flash_mode}
build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${esp8266_1M.build_flags} ${normal_250_ota.build_flags}
[env:minimal_core_250_ESP8285_1024_OTA]
[env:minimal_core_250_ESP8285_1M_OTA]
platform = ${normal_250_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -452,7 +449,7 @@ board_build.flash_mode = ${esp8285_1M.board_build.flash_mode}
build_unflags = ${esp8285_1M.build_unflags}
build_flags = ${esp8285_1M.build_flags} ${normal_250_ota.build_flags}
[env:normal_core_241_ESP8266_1024]
[env:normal_core_241_ESP8266_1M]
platform = ${normal_241.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -468,7 +465,7 @@ board_build.flash_mode = ${esp8266_1M.board_build.flash_mode}
build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${normal_241.build_flags} ${esp8266_1M.build_flags}
[env:normal_core_242_ESP8266_1024]
[env:normal_core_242_ESP8266_1M]
platform = ${normal_242.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -485,7 +482,7 @@ build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${normal_242.build_flags} ${esp8266_1M.build_flags}
[env:normal_core_250_ESP8266_1024]
[env:normal_core_250_ESP8266_1M]
platform = ${normal_250.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -502,7 +499,7 @@ build_unflags = ${esp8266_1M.build_unflags}
build_flags = ${normal_250.build_flags} ${esp8266_1M.build_flags}
; NORMAL: 1024k for esp8285 ----------------------
[env:normal_ESP8285_1024]
[env:normal_ESP8285_1M]
platform = ${normal.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -519,7 +516,7 @@ build_unflags = ${esp8285_1M.build_unflags}
build_flags = ${esp8285_1M.build_flags} ${normal.build_flags}
; NORMAL: 2048k WROOM02 version --------------------------
[env:normal_WROOM02_2048]
[env:normal_WROOM02_2M]
platform = ${normal.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -554,7 +551,7 @@ build_flags = ${espWroom2M256.build_flags} ${normal_250.build_flag
; NORMAL: 4096k version --------------------------
[env:normal_ESP8266_4096]
[env:normal_ESP8266_4M]
platform = ${normal.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -569,7 +566,7 @@ board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${normal.build_flags}
[env:normal_core_241_ESP8266_4096]
[env:normal_core_241_ESP8266_4M]
platform = ${normal_241.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -584,7 +581,7 @@ board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${normal_241.build_flags} ${esp8266_4M.build_flags}
[env:normal_core_250_ESP8266_4096]
[env:normal_core_250_ESP8266_4M]
platform = ${normal_250.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -602,7 +599,7 @@ build_flags = ${normal_250.build_flags} ${esp8266_4M.build_flags}
; NORMAL IR: 4096k version --------------------------
; Build including IR libraries
[env:normal_IR_ESP8266_1024]
[env:normal_IR_ESP8266_1M]
platform = ${normal_ir.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${normal_ir.lib_ignore}
@@ -619,7 +616,7 @@ build_flags = ${normal_ir.build_flags} ${esp8266_1M.build_flags}
; NORMAL IR: 4096k version --------------------------
; Build including IR libraries
[env:normal_IR_ESP8266_4096]
[env:normal_IR_ESP8266_4M]
platform = ${normal_ir.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${normal_ir.lib_ignore}
@@ -634,7 +631,7 @@ board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${normal_ir.build_flags} ${esp8266_4M.build_flags}
[env:normal_core_250_IR_ESP8266_4096]
[env:normal_core_250_IR_ESP8266_4M]
platform = ${normal_250_ir.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${normal_250_ir.lib_ignore}
@@ -655,7 +652,7 @@ build_flags = ${normal_250_ir.build_flags} ${esp8266_4M.build_flag
; *********************************************************************
; TEST: 1024k version ----------------------------
;[env:test_ESP8266_1024]
;[env:test_ESP8266_1M]
;platform = ${testing.platform}
;lib_deps = ${common.lib_deps}
;lib_ignore = ${common.lib_ignore}
@@ -672,7 +669,7 @@ build_flags = ${normal_250_ir.build_flags} ${esp8266_4M.build_flag
;build_flags = ${esp8266_1M.build_flags} ${testing.build_flags}
; TEST: 1024k for esp8285 ------------------------
;[env:test_ESP8285_1024]
;[env:test_ESP8285_1M]
;platform = ${testing.platform}
;lib_deps = ${common.lib_deps}
;lib_ignore = ${common.lib_ignore}
@@ -690,7 +687,7 @@ build_flags = ${normal_250_ir.build_flags} ${esp8266_4M.build_flag
; TEST: 4096k version ----------------------------
[env:test_core_242_ESP8266_4096]
[env:test_core_242_ESP8266_4M]
platform = ${testing_242.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -706,7 +703,7 @@ build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${testing_242.build_flags}
[env:test_core_250_ESP8266_4096]
[env:test_core_250_ESP8266_4M]
platform = ${testing_250.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -721,7 +718,7 @@ board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${testing_250.build_flags}
[env:test_core_260_alpha_ESP8266_4096]
[env:test_core_260_sdk2_alpha_ESP8266_4M]
platform = ${testing_beta.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -737,8 +734,23 @@ build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags}
[env:test_core_260_sdk3_alpha_ESP8266_4M]
platform = ${testing_beta.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
lib_ldf_mode = ${common.lib_ldf_mode}
lib_archive = ${common.lib_archive}
framework = ${common.framework}
board = ${esp8266_4M.board}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
board_build.f_cpu = ${esp8266_4M.board_build.f_cpu}
board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
; TEST: 1024k version + FEATURE_ADC_VCC ----------
;[env:test_ESP8266_1024_VCC]
;[env:test_ESP8266_1M_VCC]
;platform = ${testing.platform}
;lib_deps = ${common.lib_deps}
;lib_ignore = ${common.lib_ignore}
@@ -754,7 +766,7 @@ build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags
;build_flags = ${esp8266_1M.build_flags} ${testing.build_flags} -D FEATURE_ADC_VCC=true
; TEST: 4096k version + FEATURE_ADC_VCC ----------
[env:test_ESP8266_4096_VCC]
[env:test_ESP8266_4M_VCC]
platform = ${testing.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -769,7 +781,7 @@ board_build.flash_mode = ${esp8266_4M.board_build.flash_mode}
build_unflags = ${esp8266_4M.build_unflags}
build_flags = ${esp8266_4M.build_flags} ${testing.build_flags} -D FEATURE_ADC_VCC=true
[env:test_core_260_alpha_ESP8266_4096_VCC]
[env:test_core_260_sdk2_alpha_ESP8266_4M_VCC]
platform = ${testing_beta.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
@@ -790,7 +802,7 @@ build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags
; *********************************************************************
; DEV : 1024k version ----------------------------
;[env:dev_ESP8266_1024]
;[env:dev_ESP8266_1M]
;platform = ${dev.platform}
;lib_deps = ${common.lib_deps}
;lib_ignore = ${common.lib_ignore}
@@ -807,7 +819,7 @@ build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags
;build_flags = ${esp8266_1M.build_flags} ${dev.build_flags}
; DEV: 1024k for esp8285 -------------------------
;[env:dev_ESP8285_1024]
;[env:dev_ESP8285_1M]
;platform = ${dev.platform}
;lib_deps = ${common.lib_deps}
;lib_ignore = ${common.lib_ignore}
@@ -824,7 +836,7 @@ build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags
;build_flags = ${esp8285_1M.build_flags} ${dev.build_flags}
; DEV : 4096k version ----------------------------
[env:dev_ESP8266_4096]
[env:dev_ESP8266_4M]
platform = ${dev.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}