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] Set core 2.5.2 as default and add custom build

Browse Source
This commit is contained in:
Gijs Noorlander
2019-07-14 01:25:41 +02:00
parent 2a5eb1a5ab
commit da88dfb537
3 changed files with 76 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
before_deploy
+5 -2
View File
@@ -33,6 +33,7 @@ fi
mkdir -p ${TMP_DIST}/memstats
for ENV in \
custom_ESP8266_4M\
dev_ESP8266_4M\
esp-wrover-kit_test_1M8_partition\
esp32test_1M8_partition\
@@ -40,8 +41,10 @@ for ENV in \
hard_Ventus_W266\
hard_core_252_SONOFF_POW_4M\
hard_core_252_Shelly_1_2M256\
minimal_ESP8266_1M_OTA\
minimal_ESP8285_1M_OTA\
hard_core_252_other_POW_ESP8285_1M\
hard_other_POW_ESP8285_1M\
minimal_core_242_ESP8266_1M_OTA\
minimal_core_242_ESP8285_1M_OTA\
minimal_core_252_ESP8266_1M_OTA\
minimal_core_252_ESP8285_1M_OTA\
normal_ESP8266_1M\
platformio.ini
+42 -23
View File
@@ -90,7 +90,7 @@ build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
-DCORE_POST_2_5_0
[esp82xx_2_6_x]
build_flags = ${esp82xx_2_5_x.build_flags} -DCORE_POST_2_6_0
build_flags = ${esp82xx_2_5_x.build_flags} -DCORE_POST_2_6_0
[core_2_3_0]
@@ -179,8 +179,8 @@ targets =
[regular_platform]
build_unflags =
build_flags = ${core_2_4_2.build_flags} ${common.build_flags}
platform = ${core_2_4_2.platform}
build_flags = ${core_2_5_2.build_flags} ${common.build_flags}
platform = ${core_2_5_2.platform}
[beta_platform]
build_unflags =
@@ -210,30 +210,30 @@ platform = ${beta_platform.platform}
build_flags = ${beta_platform.build_flags}
[normal_ota]
platform = ${regular_platform.platform}
build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA
[normal_242_ota]
platform = ${core_2_4_2.platform}
build_flags = ${core_2_4_2.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA
board_upload.maximum_size = 616448
[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}
board_upload.maximum_size = ${normal_242_ota.board_upload.maximum_size}
[normal_beta_ota]
platform = ${beta_platform.platform}
build_flags = ${beta_platform.build_flags} -DPLUGIN_BUILD_MINIMAL_OTA
board_upload.maximum_size = ${normal_ota.board_upload.maximum_size}
board_upload.maximum_size = ${normal_242_ota.board_upload.maximum_size}
[normal_ir]
platform = ${regular_platform.platform}
build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_NORMAL_IR
lib_ignore = ESP32_ping, ESP32WebServer
[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
;[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
[normal_ir_extended]
platform = ${regular_platform.platform}
@@ -390,8 +390,27 @@ targets = ${common.targets}
;;; NORMAL (STABLE) ; ****; ****; ****; ****; ****; ****; ****; ****; ****; ****; ****;;;;
; normal version with stable plugins ;
; NORMAL: 4096k version --------------------------
[env:custom_ESP8266_4M]
platform = ${normal_252.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 = ${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 = ${esp8266_4M.build_flags} ${normal_252.build_flags} -DPLUGIN_BUILD_CUSTOM
targets = ${common.targets}
extra_scripts = pre:pre_extra_script.py
;;; NORMAL (STABLE) ***************************************************
; normal version with stable plugins ;
; *********************************************************************
; NORMAL: 1024k version --------------------------
@@ -431,8 +450,8 @@ build_flags = ${esp8266_1M.build_flags} ${normal.build_flags} -D F
targets = ${common.targets}
[env:minimal_ESP8266_1M_OTA]
platform = ${normal_ota.platform}
[env:minimal_core_242_ESP8266_1M_OTA]
platform = ${normal_242_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
lib_ldf_mode = ${common.lib_ldf_mode}
@@ -441,16 +460,16 @@ framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
board = ${esp8266_1M.board}
board_upload.maximum_size = ${normal_ota.board_upload.maximum_size}
board_upload.maximum_size = ${normal_242_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_ota.build_flags}
build_flags = ${esp8266_1M.build_flags} ${normal_242_ota.build_flags}
targets = ${common.targets}
[env:minimal_ESP8285_1M_OTA]
platform = ${normal_ota.platform}
[env:minimal_core_242_ESP8285_1M_OTA]
platform = ${normal_242_ota.platform}
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
lib_ldf_mode = ${common.lib_ldf_mode}
@@ -459,11 +478,11 @@ framework = ${common.framework}
upload_speed = ${common.upload_speed}
monitor_speed = ${common.monitor_speed}
board = ${esp8285_1M.board}
board_upload.maximum_size = ${normal_ota.board_upload.maximum_size}
board_upload.maximum_size = ${normal_242_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_ota.build_flags}
build_flags = ${esp8285_1M.build_flags} ${normal_242_ota.build_flags}
targets = ${common.targets}
@@ -856,7 +875,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} ${normal_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x
build_flags = ${esp8266_4M.build_flags} ${normal_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
targets = ${common.targets}
pre_extra_script.py
+29
View File
@@ -0,0 +1,29 @@
Import("env")
# access to global construction environment
#print env
# Dump construction environment (for debug purpose)
#print env.Dump()
# append extra flags to global build environment
# which later will be used to build:
# - project source code
# - frameworks
# - dependent libraries
env.Append(CPPDEFINES=[
"PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x",
"CONTROLLER_SET_ALL",
"NOTIFIER_SET_NONE",
"PLUGIN_SET_ONLY_SWITCH",
"USES_P002", # ADC
"USES_P028", # BME280
"USES_P036", # FrameOLED
"USES_P049", # MHZ19
"USES_P052", # SenseAir
"USES_P056", # SDS011-Dust
"USES_P082", # GPS
"USES_P085", # AcuDC24x
("WEBSERVER_RULES_DEBUG", "0")
])