mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12401 from Jason2866/patch-2 

Remove platformio global upload speed setting
This commit is contained in:
Theo Arends 2021-06-18 11:15:46 +02:00 committed by GitHub
parent 2e8df5327f f79b362644
commit bdb53ef054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio.ini
View File

@ -36,7 +36,6 @@ build_flags = ${core.build_flags}
monitor_speed = 115200 monitor_speed = 115200
monitor_port = COM5 monitor_port = COM5
upload_speed = 115200
; *** Upload Serial reset method for Wemos and NodeMCU ; *** Upload Serial reset method for Wemos and NodeMCU
upload_resetmethod = nodemcu upload_resetmethod = nodemcu
upload_port = COM5 upload_port = COM5

14
platformio_override_sample.ini
View File

@ -62,12 +62,10 @@ build_flags = ${core.build_flags}
; Build variant 4MB = 1MB firmware, 1MB OTA, 2MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW) ; Build variant 4MB = 1MB firmware, 1MB OTA, 2MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
;board = esp8266_4M2M ;board = esp8266_4M2M
; *** Upload Serial reset method for Wemos and NodeMCU ; *** Serial port used for erasing/flashing the ESP82xx
upload_port = COM5 upload_port = COM5
extra_scripts = ${scripts_defaults.extra_scripts} extra_scripts = ${scripts_defaults.extra_scripts}
; pio-tools/obj-dump.py ; pio-tools/obj-dump.py
lib_extra_dirs = ${library.lib_extra_dirs} lib_extra_dirs = ${library.lib_extra_dirs}
@ -75,7 +73,17 @@ lib_extra_dirs = ${library.lib_extra_dirs}
platform_packages = ${core32.platform_packages} platform_packages = ${core32.platform_packages}
build_unflags = ${core32.build_unflags} build_unflags = ${core32.build_unflags}
build_flags = ${core32.build_flags} build_flags = ${core32.build_flags}
; Build variant ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k LITTLEFS (default)
;board = esp32_4M
; Build variant ESP32 8M Flash, Tasmota 2944k Code/OTA, 2112k LITTLEFS
;board = esp32_8M
; Build variant ESP32 16M Flash, Tasmota 2944k Code/OTA, 10M LITTLEFS
;board = esp32_16M
; *** Serial port used for erasing/flashing the ESP32
upload_port = COM4 upload_port = COM4
lib_extra_dirs = ${library.lib_extra_dirs} lib_extra_dirs = ${library.lib_extra_dirs}
; *** ESP32 lib. ALWAYS needed for ESP32 !!! ; *** ESP32 lib. ALWAYS needed for ESP32 !!!
lib/libesp32 lib/libesp32

1
platformio_tasmota32.ini
View File

@ -13,7 +13,6 @@ custom_unpack_dir = ${common.custom_unpack_dir}
monitor_speed = 115200 monitor_speed = 115200
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
upload_resetmethod = ${common.upload_resetmethod} upload_resetmethod = ${common.upload_resetmethod}
upload_speed = 921600
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
lib_ldf_mode = ${common.lib_ldf_mode} lib_ldf_mode = ${common.lib_ldf_mode}
lib_compat_mode = ${common.lib_compat_mode} lib_compat_mode = ${common.lib_compat_mode}

1
platformio_tasmota_env.ini
View File

@ -9,7 +9,6 @@ build_flags = ${common.build_flags}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
upload_port = ${common.upload_port} upload_port = ${common.upload_port}
upload_resetmethod = ${common.upload_resetmethod} upload_resetmethod = ${common.upload_resetmethod}
upload_speed = ${common.upload_speed}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
lib_extra_dirs = ${common.lib_extra_dirs} lib_extra_dirs = ${common.lib_extra_dirs}
lib_ldf_mode = ${common.lib_ldf_mode} lib_ldf_mode = ${common.lib_ldf_mode}

1
platformio_tasmota_env32.ini
View File

@ -6,7 +6,6 @@ board = ${common32.board}
monitor_speed = ${common32.monitor_speed} monitor_speed = ${common32.monitor_speed}
upload_port = ${common32.upload_port} upload_port = ${common32.upload_port}
upload_resetmethod = ${common32.upload_resetmethod} upload_resetmethod = ${common32.upload_resetmethod}
upload_speed = ${common32.upload_speed}
extra_scripts = ${common32.extra_scripts} extra_scripts = ${common32.extra_scripts}
build_unflags = ${common32.build_unflags} build_unflags = ${common32.build_unflags}
build_flags = ${common32.build_flags} build_flags = ${common32.build_flags}