From 2c8fc6dfc02ab761d237b6fc6df20e8faa49e114 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 21 May 2019 22:10:37 +0200 Subject: [PATCH] [PIO build] Core 2.5.2 has been released Core 2.5.2 does contain a lot of fixes. If this core version does seem to appear stable in the next few weeks, we will use it as the standard core for nightly builds. --- before_deploy | 26 +++++------- platformio.ini | 106 +++++++++++++++++++++++++------------------------ 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/before_deploy b/before_deploy index d839050cb..9bcade062 100755 --- a/before_deploy +++ b/before_deploy @@ -38,12 +38,12 @@ for ENV in \ esp32test_1M8_partition\ hard_SONOFF_POW_4M\ hard_Ventus_W266\ - hard_core_250_SONOFF_POW_4M\ - hard_core_250_Shelly_1_2M256\ + hard_core_252_SONOFF_POW_4M\ + hard_core_252_Shelly_1_2M256\ minimal_ESP8266_1M_OTA\ minimal_ESP8285_1M_OTA\ - minimal_core_250_ESP8266_1M_OTA\ - minimal_core_250_ESP8285_1M_OTA\ + minimal_core_252_ESP8266_1M_OTA\ + minimal_core_252_ESP8285_1M_OTA\ normal_ESP8266_1M\ normal_ESP8266_1M_VCC\ normal_ESP8266_4M\ @@ -54,19 +54,19 @@ for ENV in \ normal_core_241_ESP8266_1M\ normal_core_241_ESP8266_4M\ normal_core_242_ESP8266_1M\ - normal_core_250_ESP8266_16M\ - normal_core_250_ESP8266_1M\ - normal_core_250_ESP8266_4M\ - normal_core_250_IR_ESP8266_4M\ - normal_core_250_WROOM02_2M256\ + normal_core_252_ESP8266_16M\ + normal_core_252_ESP8266_1M\ + normal_core_252_ESP8266_4M\ + normal_core_252_IR_ESP8266_4M\ + normal_core_252_WROOM02_2M256\ normal_core_260_sdk222_alpha_ESP8266_16M\ normal_core_260_sdk222_alpha_ESP8266_4M\ normal_core_260_sdk2_alpha_ESP8266_16M\ normal_core_260_sdk2_alpha_ESP8266_4M\ test_ESP8266_4M_VCC\ test_core_242_ESP8266_4M\ - test_core_250_ESP8266_16M\ - test_core_250_ESP8266_4M\ + test_core_252_ESP8266_16M\ + test_core_252_ESP8266_4M\ test_core_260_sdk222_alpha_ESP8266_16M\ test_core_260_sdk222_alpha_ESP8266_4M\ test_core_260_sdk2_alpha_ESP8266_16M\ @@ -90,10 +90,6 @@ do if [[ ${ENV} == *"1M8_partition"* ]]; then MAX_FILESIZE=1900544 fi - if [[ ${ENV} == *"core_250"* ]]; then - # disable core 250 for now, since it is buggy (20180211) - MAX_FILESIZE=0 - fi FILESIZE=$(stat -c%s .pioenvs/${ENV}/firmware.bin ) if (( FILESIZE < MAX_FILESIZE )); then diff --git a/platformio.ini b/platformio.ini index 54d38fecf..eae43914a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -79,7 +79,7 @@ build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"' -DVTABLES_IN_FLASH -DPUYA_SUPPORT=1 -[esp82xx_2_5_0] +[esp82xx_2_5_x] build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"' -DNDEBUG -DVTABLES_IN_FLASH @@ -114,11 +114,15 @@ build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RE [core_2_5_0] platform = espressif8266@2.0.4 -build_flags = ${esp82xx_2_5_0.build_flags} +build_flags = ${esp82xx_2_5_x.build_flags} + +[core_2_5_2] +platform = espressif8266@2.2.0 +build_flags = ${esp82xx_2_5_x.build_flags} [core_stage] platform = https://github.com/platformio/platform-espressif8266.git#feature/stage -build_flags = ${esp82xx_2_5_0.build_flags} +build_flags = ${esp82xx_2_5_x.build_flags} [core_esp32_0_12_0] @@ -193,9 +197,9 @@ build_flags = ${core_2_4_1.build_flags} ${common.build_flags} -DFO platform = ${core_2_4_2.platform} build_flags = ${core_2_4_2.build_flags} ${common.build_flags} -DFORCE_PRE_2_5_0 -[normal_250] -platform = ${core_2_5_0.platform} -build_flags = ${core_2_5_0.build_flags} ${common.build_flags} +[normal_252] +platform = ${core_2_5_2.platform} +build_flags = ${core_2_5_2.build_flags} ${common.build_flags} [normal_beta] platform = ${beta_platform.platform} @@ -207,9 +211,9 @@ platform = ${regular_platform.platform} build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA board_upload.maximum_size = 616448 -[normal_250_ota] -platform = ${core_2_5_0.platform} -build_flags = ${core_2_5_0.build_flags} ${common.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA +[normal_252_ota] +platform = ${core_2_5_2.platform} +build_flags = ${core_2_5_2.build_flags} ${common.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA board_upload.maximum_size = ${normal_ota.board_upload.maximum_size} [normal_beta_ota] @@ -222,9 +226,9 @@ platform = ${regular_platform.platform} build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_NORMAL_IR lib_ignore = ESP32_ping, ESP32WebServer -[normal_250_ir] -platform = ${core_2_5_0.platform} -build_flags = ${core_2_5_0.build_flags} ${common.build_flags} -DPLUGIN_BUILD_NORMAL_IR +[normal_252_ir] +platform = ${core_2_5_2.platform} +build_flags = ${core_2_5_2.build_flags} ${common.build_flags} -DPLUGIN_BUILD_NORMAL_IR lib_ignore = ESP32_ping, ESP32WebServer [testing] @@ -235,9 +239,9 @@ build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_TESTI platform = ${core_2_4_2.platform} build_flags = ${core_2_4_2.build_flags} ${common.build_flags} -DPLUGIN_BUILD_TESTING -[testing_250] -platform = ${core_2_5_0.platform} -build_flags = ${core_2_5_0.build_flags} ${common.build_flags} -DPLUGIN_BUILD_TESTING +[testing_252] +platform = ${core_2_5_2.platform} +build_flags = ${core_2_5_2.build_flags} ${common.build_flags} -DPLUGIN_BUILD_TESTING [testing_beta] platform = ${beta_platform.platform} @@ -449,8 +453,8 @@ build_flags = ${esp8285_1M.build_flags} ${normal_ota.build_flags} targets = ${common.targets} -[env:minimal_core_250_ESP8266_1M_OTA] -platform = ${normal_250_ota.platform} +[env:minimal_core_252_ESP8266_1M_OTA] +platform = ${normal_252_ota.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -459,16 +463,16 @@ framework = ${common.framework} upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} board = ${esp8266_1M.board} -board_upload.maximum_size = ${normal_250_ota.board_upload.maximum_size} +board_upload.maximum_size = ${normal_252_ota.board_upload.maximum_size} board_build.f_cpu = ${esp8266_1M.board_build.f_cpu} 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} +build_flags = ${esp8266_1M.build_flags} ${normal_252_ota.build_flags} targets = ${common.targets} -[env:minimal_core_250_ESP8285_1M_OTA] -platform = ${normal_250_ota.platform} +[env:minimal_core_252_ESP8285_1M_OTA] +platform = ${normal_252_ota.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -477,11 +481,11 @@ framework = ${common.framework} upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} board = ${esp8285_1M.board} -board_upload.maximum_size = ${normal_250_ota.board_upload.maximum_size} +board_upload.maximum_size = ${normal_252_ota.board_upload.maximum_size} board_build.f_cpu = ${esp8285_1M.board_build.f_cpu} 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} +build_flags = ${esp8285_1M.build_flags} ${normal_252_ota.build_flags} targets = ${common.targets} @@ -522,8 +526,8 @@ targets = ${common.targets} -[env:normal_core_250_ESP8266_1M] -platform = ${normal_250.platform} +[env:normal_core_252_ESP8266_1M] +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -536,7 +540,7 @@ board_upload.maximum_size = ${esp8266_1M.board_upload.maximum_size} board_build.f_cpu = ${esp8266_1M.board_build.f_cpu} board_build.flash_mode = ${esp8266_1M.board_build.flash_mode} build_unflags = ${esp8266_1M.build_unflags} -build_flags = ${normal_250.build_flags} ${esp8266_1M.build_flags} +build_flags = ${normal_252.build_flags} ${esp8266_1M.build_flags} targets = ${common.targets} @@ -579,8 +583,8 @@ targets = ${common.targets} ; NORMAL: 2048k WROOM02 version 256k SPIFFS -------------------------- -[env:normal_core_250_WROOM02_2M256] -platform = ${normal_250.platform} +[env:normal_core_252_WROOM02_2M256] +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -593,7 +597,7 @@ board_upload.maximum_size = ${espWroom2M256.board_upload.maximum_size} board_build.f_cpu = ${espWroom2M256.board_build.f_cpu} board_build.flash_mode = ${espWroom2M256.board_build.flash_mode} build_unflags = ${espWroom2M256.build_unflags} -build_flags = ${espWroom2M256.build_flags} ${normal_250.build_flags} +build_flags = ${espWroom2M256.build_flags} ${normal_252.build_flags} targets = ${common.targets} @@ -633,8 +637,8 @@ build_flags = ${normal_241.build_flags} ${esp8266_4M.build_flags} targets = ${common.targets} -[env:normal_core_250_ESP8266_4M] -platform = ${normal_250.platform} +[env:normal_core_252_ESP8266_4M] +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -646,12 +650,12 @@ board = ${esp8266_4M.board} 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 = ${normal_250.build_flags} ${esp8266_4M.build_flags} +build_flags = ${normal_252.build_flags} ${esp8266_4M.build_flags} targets = ${common.targets} -[env:normal_core_250_ESP8266_16M] -platform = ${normal_250.platform} +[env:normal_core_252_ESP8266_16M] +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -663,7 +667,7 @@ board = ${esp8266_16M.board} board_build.f_cpu = ${esp8266_16M.board_build.f_cpu} board_build.flash_mode = ${esp8266_16M.board_build.flash_mode} build_unflags = ${esp8266_16M.build_unflags} -build_flags = ${normal_250.build_flags} ${esp8266_16M.build_flags} +build_flags = ${normal_252.build_flags} ${esp8266_16M.build_flags} targets = ${common.targets} @@ -706,10 +710,10 @@ build_flags = ${normal_ir.build_flags} ${esp8266_4M.build_flags} targets = ${common.targets} -[env:normal_core_250_IR_ESP8266_4M] -platform = ${normal_250_ir.platform} +[env:normal_core_252_IR_ESP8266_4M] +platform = ${normal_252_ir.platform} lib_deps = ${common.lib_deps} -lib_ignore = ${normal_250_ir.lib_ignore} +lib_ignore = ${normal_252_ir.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} lib_archive = ${common.lib_archive} framework = ${common.framework} @@ -719,7 +723,7 @@ board = ${esp8266_4M.board} 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 = ${normal_250_ir.build_flags} ${esp8266_4M.build_flags} +build_flags = ${normal_252_ir.build_flags} ${esp8266_4M.build_flags} targets = ${common.targets} @@ -786,8 +790,8 @@ targets = ${common.targets} -[env:test_core_250_ESP8266_4M] -platform = ${testing_250.platform} +[env:test_core_252_ESP8266_4M] +platform = ${testing_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -799,7 +803,7 @@ 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_250.build_flags} +build_flags = ${esp8266_4M.build_flags} ${testing_252.build_flags} targets = ${common.targets} @@ -885,8 +889,8 @@ build_unflags = ${esp8266_4M.build_unflags} build_flags = ${esp8266_4M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 targets = ${common.targets} -[env:test_core_250_ESP8266_16M] -platform = ${testing_250.platform} +[env:test_core_252_ESP8266_16M] +platform = ${testing_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -898,7 +902,7 @@ monitor_speed = ${common.monitor_speed} board_build.f_cpu = ${esp8266_16M.board_build.f_cpu} board_build.flash_mode = ${esp8266_16M.board_build.flash_mode} build_unflags = ${esp8266_16M.build_unflags} -build_flags = ${esp8266_16M.build_flags} ${testing_250.build_flags} +build_flags = ${esp8266_16M.build_flags} ${testing_252.build_flags} targets = ${common.targets} @@ -1174,11 +1178,11 @@ build_flags = ${normal.build_flags} ${esp8266_4M.build_flags} -D P targets = ${common.targets} -[env:hard_core_250_SONOFF_POW_4M] +[env:hard_core_252_SONOFF_POW_4M] upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} framework = ${common.framework} -platform = ${normal_250.platform} +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -1187,7 +1191,7 @@ board_build.f_cpu = ${esp8266_4M.board_build.f_cpu} board_build.flash_mode = ${esp8266_4M.board_build.flash_mode} board = ${esp8266_4M.board} build_unflags = ${esp8266_4M.build_unflags} -build_flags = ${normal_250.build_flags} ${esp8266_4M.build_flags} -D PLUGIN_SET_SONOFF_POW +build_flags = ${normal_252.build_flags} ${esp8266_4M.build_flags} -D PLUGIN_SET_SONOFF_POW targets = ${common.targets} @@ -1249,11 +1253,11 @@ targets = ${common.targets} ; https://shelly.cloud/shelly1-open-source/ ; GPIO04 Relay (non inverted) ; GPIO05 Button -[env:hard_core_250_Shelly_1_2M256] +[env:hard_core_252_Shelly_1_2M256] upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} framework = ${common.framework} -platform = ${normal_250.platform} +platform = ${normal_252.platform} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} lib_ldf_mode = ${common.lib_ldf_mode} @@ -1262,7 +1266,7 @@ board_build.f_cpu = ${esp8266_2M256.board_build.f_cpu} board_build.flash_mode = ${esp8266_2M256.board_build.flash_mode} board = ${esp8266_2M256.board} build_unflags = ${esp8266_2M256.build_unflags} -build_flags = ${normal_250.build_flags} ${esp8266_2M256.build_flags} -D PLUGIN_SET_SHELLY_1 +build_flags = ${normal_252.build_flags} ${esp8266_2M256.build_flags} -D PLUGIN_SET_SHELLY_1 targets = ${common.targets}