Merge pull request #2744 from TD-er/feature/core261

[PIO] Cleanup platformio.ini and move to core 2.6.1 as default (#2742)

.gitignore

@@ -41,3 +41,5 @@ tools/vagrant/.vagrant/
 tools/vagrant/build/
 
 tools/vagrant/Custom.h
+
+.buildcache/

.travis.yml

@@ -33,31 +33,39 @@ script:
  # - cppcheck --enable=warning src/*.ino -q --force -I src --include=src/ESPEasy.ino --error-exitcode=1
  # - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump
  # - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run --target clean
+ # Same list as in tools/build_ESPeasy.sh and before_deploy
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP32_4M316k
  - 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_4M316k
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e esp32test_4M316k
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_ESP8266_4M2M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_beta_ESP8266_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e custom_sdk3_ESP8266_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e dev_ESP8266_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e hard_SONOFF_POW_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e hard_Shelly_1_2M256
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e hard_Ventus_W266
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e hard_other_POW_ESP8285_1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_IRext_ESP8266_1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_IRext_ESP8266_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_IRext_ESP8266_4M2M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_242_ESP8266_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_242_ESP8285_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_261_ESP8266_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_261_ESP8285_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_261_sdk3_ESP8266_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_261_sdk3_ESP8285_1M_OTA
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8266_16M
  - 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
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_core_241_ESP8266_1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_WROOM02_2M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_core_252_WROOM02_2M256
  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8266_4M1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_core_241_ESP8266_4M1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_core_260_sdk222_alpha_ESP8266_4M1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_242_ESP8266_1M_OTA
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_242_ESP8285_1M_OTA
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_252_ESP8266_1M_OTA
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_core_252_ESP8285_1M_OTA
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_IRext_ESP8266_1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e minimal_IRext_ESP8266_4M2M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_ESP8285_1M
  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_IRext_no_rx_ESP8266_4M2M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_core_260_sdk222_alpha_ESP8266_4M1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_core_260_sdk3_alpha_ESP8266_4M1M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_WROOM02_2M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e normal_WROOM02_2M256
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_ESP32-wrover-kit_4M316k
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_ESP32_4M316k
  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_ESP8266_4M_VCC
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e dev_ESP8266_4M1M
- - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e hard_SONOFF_POW_4M1M
-
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_beta_ESP8266_16M
+ - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e test_beta_ESP8266_4M1M
 
 before_deploy:
  - ./before_deploy

before_deploy

@@ -39,39 +39,10 @@ fi
 
 mkdir -p ${TMP_DIST}/memstats
 
-for ENV in \
- custom_ESP8266_4M1M\
- esp-wrover-kit_test_4M316k\
- esp32test_4M316k\
- normal_ESP8266_1M\
- normal_ESP8266_1M_VCC\
- normal_ESP8285_1M\
- normal_core_241_ESP8266_1M\
- normal_WROOM02_2M\
- normal_core_252_WROOM02_2M256\
- normal_ESP8266_4M1M\
- normal_core_241_ESP8266_4M1M\
- normal_core_252_ESP8266_16M\
- normal_core_260_sdk222_alpha_ESP8266_4M1M\
- normal_core_260_sdk222_alpha_ESP8266_16M\
- minimal_core_242_ESP8266_1M_OTA\
- minimal_core_242_ESP8285_1M_OTA\
- minimal_core_252_ESP8266_1M_OTA\
- minimal_core_252_ESP8285_1M_OTA\
- minimal_IRext_ESP8266_1M\
- minimal_IRext_ESP8266_4M1M\
- minimal_IRext_ESP8266_4M2M\
- normal_IRext_no_rx_ESP8266_4M2M\
- test_core_260_sdk222_alpha_ESP8266_4M1M\
- test_core_260_sdk3_alpha_ESP8266_4M1M\
- test_core_260_sdk222_alpha_ESP8266_16M\
- test_ESP8266_4M_VCC\
- dev_ESP8266_4M1M\
- hard_SONOFF_POW_4M1M\
- hard_other_POW_ESP8285_1M\
- hard_Shelly_1_2M256\
- hard_Ventus_W266;\
-do
+# Must look into all possible env definitions.
+# Exclude so called "spec_" (special) builds
+for ENV in `grep "^\[env:" platformio*.ini |cut -d'[' -f2|cut -d']' -f1|cut -d':' -f2|sort -n|grep -v spec_`;
+do 
  MAX_FILESIZE=1044464
  if [[ ${ENV} == *"_1M"* ]]; then
  # max 872 kiB - 16 bytes
@@ -81,14 +52,11 @@ do
  # max 600 kiB - 16 bytes
  MAX_FILESIZE=614384
  fi
- if [[ ${ENV} == *"esp32"* ]]; then
- MAX_FILESIZE=1310720
- fi
  if [[ ${ENV} == *"4M316k"* ]]; then
  # ESP32 with 1800k of sketch space.
  MAX_FILESIZE=1900544
  fi
- if [[ ${ENV} == *"ebug_custom"* ]]; then
+ if [[ ${ENV} == *"debug_"* ]]; then
  # Debug env, used for analysis, not to be run on a node.
  MAX_FILESIZE=0
  fi

dist/README.txt

@@ -23,11 +23,8 @@ 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
-- xxx_core_260_sdk2_alpha -> core 2.6.0 alpha version (under development) using SDK 2.2.1
-- xxx_core_260_sdk222_alpha -> core 2.6.0 alpha version (under development) using SDK 2.2.2
-- xxx_core_260_sdk3_alpha -> core 2.6.0 alpha version (under development) using SDK 3.0.0-dev (under development too)
-
+- normal_core_xxx => "Normal" using core xxx (e.g. 2.4.1)
+- normal_beta => "Normal" using the staged (beta) branch of the esp8266/Arduino repository.
 
 Chip can be:
 - ESP8266 => Most likely option
@@ -56,7 +53,7 @@ Special memory partitioning:
 
 ESP32 now has 3 builds:
 - 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.
+- test_ESP32-wrover-kit_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.

memanalyzer.py

@@ -23,7 +23,7 @@
 TOTAL_IRAM = 32786;
 TOTAL_DRAM = 81920;
 
-env="memanalyze_ESP8266"
+env="spec_memanalyze_ESP8266"
 
 sections = OrderedDict([
  ("data", "Initialized Data (RAM)"),