Bring setting -DUSE_CONFIG_OVERRIDE more to top...

to make it easier to find. Core Selection is moved too.
This commit is contained in:
Jason2866 2019-11-01 11:03:10 +01:00 committed by GitHub
parent 7d0cfe4217
commit c3b5c3638b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 66 additions and 62 deletions

View File

@ -43,6 +43,72 @@ build_cache_dir = .cache
;default_envs = tasmota-TW
;default_envs = tasmota-UK
[common]
framework = arduino
board = esp01_1m
board_build.flash_mode = dout
platform = ${core_active.platform}
build_flags = ${core_active.build_flags}
; *********************************************************************
; *** Uncomment 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]
build_flags = -D NDEBUG
-mtarget-align
@ -188,68 +254,6 @@ build_flags = ${esp82xx_defaults.build_flags}
; -fexceptions
; -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]
platform = ${common.platform}
framework = ${common.framework}