Skip to content

Feature/testbuild core2 5 0 beta1 #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TD-er merged 8 commits into from
Dec 13, 2018
Merged

Feature/testbuild core2 5 0 beta1 #2157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63d6b39
[core 2.5.0-beta1] Test build using platformIO
TD-er Dec 11, 2018
8c0ded3
[core 2.5.0-beta1] Allow building against core 2.5.0
TD-er Dec 12, 2018
1d00525
[Tools] Set executable bits to scripts
TD-er Dec 12, 2018
3c1c84b
[build] Add option to give a PR number at command line.
TD-er Dec 12, 2018
3b49dca
[core 2.5.0-beta1] Add core number and disable some 1MB builds
TD-er Dec 12, 2018
4de68af
[Rules] Modulo operator '%' only works on int
TD-er Dec 13, 2018
59b5adf
[core 2.5.0-beta1] Clean up PlatformIO.ini & add some 2.5.0 beta builds
TD-er Dec 13, 2018
122c193
[core 2.5.0-beta1] Update build names in deploy script
TD-er Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[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.
  • Loading branch information
@TD-er
TD-er committed Dec 12, 2018
commit 3b49dca5f5b70e0418cd870a76dec954a2e50ade
150 changes: 75 additions & 75 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}


Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tools/build_ESPeasy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down