From 3b49dca5f5b70e0418cd870a76dec954a2e50ade Mon Sep 17 00:00:00 2001
From: Gijs Noorlander <gijs.noorlander@gmail.com>
Date: Wed, 12 Dec 2018 16:08:03 +0100
Subject: [PATCH] [core 2.5.0-beta1] Add core number and disable some 1MB
 builds

Disabling dev/test builds for 1 MB chips, since the bin files will be too big to fit on 1 MB modules.
We have to decide later how to make the plugins in dev/test state available for 1 MB modules.
---
 platformio.ini         | 150 ++++++++++++++++++++---------------------
 tools/build_ESPeasy.sh |   2 +-
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index ec6cd72ac..644937bdc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -146,7 +146,7 @@ build_flags               = ${core_2_4_2.build_flags}
 platform                  = ${core_2_4_2.platform}
 
 [test_platform]
-build_flags               = ${core_staged.build_flags}
+build_flags               = ${core_staged.build_flags} -DARDUINO_ESP8266_RELEASE='"2.5.0-beta1"'
 platform                  = ${core_staged.platform}
 
 
@@ -460,38 +460,38 @@ build_flags               = ${esp8266_4M.build_flags} ${normal.build_flags} -DPL
 ; *********************************************************************
 
 ; TEST: 1024k version ----------------------------
-[env:test_ESP8266_1024]
-platform                  = ${testing.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}
-upload_speed              = ${common.upload_speed}
-monitor_speed             = ${common.monitor_speed}
-board                     = ${common.board}
-board_upload.maximum_size = ${esp8266_1M.board_upload.maximum_size}
-board_build.flash_mode    = ${esp8266_1M.board_build.flash_mode}
-board_build.f_cpu         = ${esp8266_1M.board_build.f_cpu}
-build_unflags             = ${esp8266_1M.build_unflags}
-build_flags               = ${esp8266_1M.build_flags} ${testing.build_flags}
+;[env:test_ESP8266_1024]
+;platform                  = ${testing.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}
+;upload_speed              = ${common.upload_speed}
+;monitor_speed             = ${common.monitor_speed}
+;board                     = ${common.board}
+;board_upload.maximum_size = ${esp8266_1M.board_upload.maximum_size}
+;board_build.flash_mode    = ${esp8266_1M.board_build.flash_mode}
+;board_build.f_cpu         = ${esp8266_1M.board_build.f_cpu}
+;build_unflags             = ${esp8266_1M.build_unflags}
+;build_flags               = ${esp8266_1M.build_flags} ${testing.build_flags}
 
 ; TEST: 1024k for esp8285 ------------------------
-[env:test_ESP8285_1024]
-platform                  = ${testing.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}
-upload_speed              = ${common.upload_speed}
-monitor_speed             = ${common.monitor_speed}
-board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
-board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
-board                     = ${esp8285_1M.board}
-build_unflags             = ${esp8285_1M.build_unflags}
-build_flags               = ${esp8285_1M.build_flags} ${testing.build_flags}
+;[env:test_ESP8285_1024]
+;platform                  = ${testing.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}
+;upload_speed              = ${common.upload_speed}
+;monitor_speed             = ${common.monitor_speed}
+;board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
+;board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
+;board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
+;board                     = ${esp8285_1M.board}
+;build_unflags             = ${esp8285_1M.build_unflags}
+;build_flags               = ${esp8285_1M.build_flags} ${testing.build_flags}
 
 ; TEST: 2048k version ----------------------------
 [env:test_WROOM02_2048]
@@ -526,20 +526,20 @@ build_unflags             = ${esp8266_4M.build_unflags}
 build_flags               = ${esp8266_4M.build_flags} ${testing.build_flags}
 
 ; TEST: 1024k version + FEATURE_ADC_VCC ----------
-[env:test_ESP8266_1024_VCC]
-platform                  = ${testing.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                     = ${common.board}
-upload_speed              = ${common.upload_speed}
-monitor_speed             = ${common.monitor_speed}
-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} ${testing.build_flags} -D FEATURE_ADC_VCC=true
+;[env:test_ESP8266_1024_VCC]
+;platform                  = ${testing.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                     = ${common.board}
+;upload_speed              = ${common.upload_speed}
+;monitor_speed             = ${common.monitor_speed}
+;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} ${testing.build_flags} -D FEATURE_ADC_VCC=true
 
 ; TEST: 4096k version + FEATURE_ADC_VCC ----------
 [env:test_ESP8266_4096_VCC]
@@ -564,38 +564,38 @@ build_flags               = ${esp8266_4M.build_flags} ${testing.build_flags} -D
 ; *********************************************************************
 
 ; DEV : 1024k version ----------------------------
-[env:dev_ESP8266_1024]
-platform                  = ${dev.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}
-upload_speed              = ${common.upload_speed}
-monitor_speed             = ${common.monitor_speed}
-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}
-board                     = ${common.board}
-build_unflags             = ${esp8266_1M.build_unflags}
-build_flags               = ${esp8266_1M.build_flags} ${dev.build_flags}
+;[env:dev_ESP8266_1024]
+;platform                  = ${dev.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}
+;upload_speed              = ${common.upload_speed}
+;monitor_speed             = ${common.monitor_speed}
+;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}
+;board                     = ${common.board}
+;build_unflags             = ${esp8266_1M.build_unflags}
+;build_flags               = ${esp8266_1M.build_flags} ${dev.build_flags}
 
 ; DEV: 1024k for esp8285 -------------------------
-[env:dev_ESP8285_1024]
-platform                  = ${dev.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}
-upload_speed              = ${common.upload_speed}
-monitor_speed             = ${common.monitor_speed}
-board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
-board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
-board                     = ${esp8285_1M.board}
-build_unflags             = ${esp8285_1M.build_unflags}
-build_flags               = ${esp8285_1M.build_flags} ${dev.build_flags}
+;[env:dev_ESP8285_1024]
+;platform                  = ${dev.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}
+;upload_speed              = ${common.upload_speed}
+;monitor_speed             = ${common.monitor_speed}
+;board_upload.maximum_size = ${esp8285_1M.board_upload.maximum_size}
+;board_build.f_cpu         = ${esp8285_1M.board_build.f_cpu}
+;board_build.flash_mode    = ${esp8285_1M.board_build.flash_mode}
+;board                     = ${esp8285_1M.board}
+;build_unflags             = ${esp8285_1M.build_unflags}
+;build_flags               = ${esp8285_1M.build_flags} ${dev.build_flags}
 
 ; DEV: 2048k version -----------------------------
 [env:dev_WROOM02_2048]
diff --git a/tools/build_ESPeasy.sh b/tools/build_ESPeasy.sh
index 31c4ebebd..58db8941e 100755
--- a/tools/build_ESPeasy.sh
+++ b/tools/build_ESPeasy.sh
@@ -58,7 +58,7 @@ if (( $PULL_REQ != 0 )); then
   if [ -z "$DESCRIPTION" ]
   then
     GIT_DESCRIBE=`git describe|cut -d'-' -f-3`
-    DESCRIPTION=`echo "${GIT_DESCRIBE}-PR #${PULL_REQ}"`
+    DESCRIPTION=`echo "${GIT_DESCRIBE}-PR_${PULL_REQ}"`
   fi
 fi