Merge pull request #6806 from Jason2866/patch-2

Bring setting -DUSE_CONFIG_OVERRIDE more to top...
This commit is contained in:
Theo Arends 2019-11-01 13:35:52 +01:00 committed by GitHub
commit 5ff4b11909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 98 additions and 92 deletions

View File

@ -12,36 +12,104 @@ src_dir = tasmota
build_dir = .pioenvs build_dir = .pioenvs
build_cache_dir = .cache build_cache_dir = .cache
; *** Uncomment one of the lines below to build/upload only one environment ; *** Build/upload environment
;default_envs = tasmota default_envs =
;default_envs = tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; *** Uncomment by deleting ";" in the line(s) below to select version(s)
;default_envs = tasmota-minimal ; tasmota
;default_envs = tasmota-basic ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big
;default_envs = tasmota-knx ; tasmota-minimal
;default_envs = tasmota-sensors ; tasmota-basic
;default_envs = tasmota-display ; tasmota-knx
;default_envs = tasmota-ir ; tasmota-sensors
;default_envs = tasmota-BG ; tasmota-display
;default_envs = tasmota-BR ; tasmota-ir
;default_envs = tasmota-CN ; tasmota-BG
;default_envs = tasmota-CZ ; tasmota-BR
;default_envs = tasmota-DE ; tasmota-CN
;default_envs = tasmota-ES ; tasmota-CZ
;default_envs = tasmota-FR ; tasmota-DE
;default_envs = tasmota-GR ; tasmota-ES
;default_envs = tasmota-HE ; tasmota-FR
;default_envs = tasmota-HU ; tasmota-GR
;default_envs = tasmota-IT ; tasmota-HE
;default_envs = tasmota-KO ; tasmota-HU
;default_envs = tasmota-NL ; tasmota-IT
;default_envs = tasmota-PL ; tasmota-KO
;default_envs = tasmota-PT ; tasmota-NL
;default_envs = tasmota-RU ; tasmota-PL
;default_envs = tasmota-SE ; tasmota-PT
;default_envs = tasmota-SK ; tasmota-RU
;default_envs = tasmota-TR ; tasmota-SE
;default_envs = tasmota-TW ; tasmota-SK
;default_envs = tasmota-UK ; tasmota-TR
; tasmota-TW
; tasmota-UK
[common]
framework = arduino
board = esp01_1m
board_build.flash_mode = dout
platform = ${core_active.platform}
build_flags = ${core_active.build_flags}
; *********************************************************************
; *** Uncomment, by deleting ";" in line below, to use custom settings from file user_config_override.h
; -DUSE_CONFIG_OVERRIDE
; *********************************************************************
; *** Optional Debug messages
; -DDEBUG_TASMOTA_CORE
; -DDEBUG_TASMOTA_DRIVER
; -DDEBUG_TASMOTA_SENSOR
; *** Optional Firmware configurations
; -DFIRMWARE_MINIMAL
; -DFIRMWARE_SENSORS
; -DFIRMWARE_BASIC
; -DFIRMWARE_KNX_NO_EMULATION
; -DFIRMWARE_DISPLAYS
; -DFIRMWARE_IR
; -DFIRMWARE_IR_CUSTOM
; *** Fix espressif8266@1.7.0 induced undesired all warnings
build_unflags = -Wall
; set CPU frequency to 80MHz (default) or 160MHz
board_build.f_cpu = 80000000L
;board_build.f_cpu = 160000000L
monitor_speed = 115200
upload_speed = 115200
upload_resetmethod = nodemcu
; *** Upload Serial reset method for Wemos and NodeMCU
upload_port = COM5
extra_scripts = pio/strip-floats.py
pio/obj-dump.py
; *** Upload file to OTA server using SCP
;upload_port = user@host:/path
;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py
; *** Upload file to OTA server in folder api/arduino using HTTP
;upload_port = domus1:80/api/upload-arduino.php
;extra_scripts = pio/strip-floats.py, pio/http-uploader.py
[core_active]
; Select one core set for platform and build_flags
;platform = ${core_2_3_0.platform}
;build_flags = ${core_2_3_0.build_flags}
;platform = ${core_2_4_2.platform}
;build_flags = ${core_2_4_2.build_flags}
platform = ${core_pre.platform}
build_flags = ${core_pre.build_flags}
;platform = ${core_pre_ipv6.platform}
;build_flags = ${core_pre_ipv6.build_flags}
;platform = ${core_stage.platform}
;build_flags = ${core_stage.build_flags}
; *********************************************************************
[esp82xx_defaults] [esp82xx_defaults]
build_flags = -D NDEBUG build_flags = -D NDEBUG
@ -188,68 +256,6 @@ build_flags = ${esp82xx_defaults.build_flags}
; -fexceptions ; -fexceptions
; -lstdc++-exc ; -lstdc++-exc
[core_active]
; Select one core set for platform and build_flags
;platform = ${core_2_3_0.platform}
;build_flags = ${core_2_3_0.build_flags}
;platform = ${core_2_4_2.platform}
;build_flags = ${core_2_4_2.build_flags}
platform = ${core_pre.platform}
build_flags = ${core_pre.build_flags}
;platform = ${core_pre_ipv6.platform}
;build_flags = ${core_pre_ipv6.build_flags}
;platform = ${core_stage.platform}
;build_flags = ${core_stage.build_flags}
[common]
framework = arduino
board = esp01_1m
board_build.flash_mode = dout
platform = ${core_active.platform}
build_flags = ${core_active.build_flags}
; *** Optional Debug messages
; -DDEBUG_TASMOTA_CORE
; -DDEBUG_TASMOTA_DRIVER
; -DDEBUG_TASMOTA_SENSOR
; *** Optional Firmware configurations
; -DFIRMWARE_MINIMAL
; -DFIRMWARE_SENSORS
; -DFIRMWARE_BASIC
; -DFIRMWARE_KNX_NO_EMULATION
; -DFIRMWARE_DISPLAYS
; -DFIRMWARE_IR
; -DFIRMWARE_IR_CUSTOM
; -DUSE_CONFIG_OVERRIDE
; *** Fix espressif8266@1.7.0 induced undesired all warnings
build_unflags = -Wall
; set CPU frequency to 80MHz (default) or 160MHz
board_build.f_cpu = 80000000L
;board_build.f_cpu = 160000000L
monitor_speed = 115200
upload_speed = 115200
upload_resetmethod = nodemcu
; *** Upload Serial reset method for Wemos and NodeMCU
upload_port = COM5
extra_scripts = pio/strip-floats.py
pio/obj-dump.py
; *** Upload file to OTA server using SCP
;upload_port = user@host:/path
;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py
; *** Upload file to OTA server in folder api/arduino using HTTP
;upload_port = domus1:80/api/upload-arduino.php
;extra_scripts = pio/strip-floats.py, pio/http-uploader.py
; *********************************************************************
[env:tasmota] [env:tasmota]
platform = ${common.platform} platform = ${common.platform}
framework = ${common.framework} framework = ${common.framework}