Merge pull request #9286 from Jason2866/patch-2

Move ESP32 build variants selection out of pio override file...
This commit is contained in:
Theo Arends 2020-09-11 18:33:45 +02:00 committed by GitHub
commit 9a1510fa49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 9 deletions

View File

@ -7,16 +7,9 @@
; Please visit documentation for the other options and examples ; Please visit documentation for the other options and examples
; http://docs.platformio.org/en/stable/projectconf.html ; http://docs.platformio.org/en/stable/projectconf.html
[platformio]
description = Provide ESP8266 based devices with Web, MQTT and OTA firmware
src_dir = tasmota
build_cache_dir = .cache
extra_configs = platformio_tasmota32.ini
platformio_tasmota_env.ini
platformio_tasmota_env32.ini
platformio_override.ini
; *** Build/upload environment ; *** Tasmota build variant selection
[build_envs]
default_envs = default_envs =
; *** Uncomment by deleting ";" in the line(s) below to select version(s) ; *** Uncomment by deleting ";" in the line(s) below to select version(s)
; tasmota ; tasmota
@ -51,10 +44,21 @@ default_envs =
; tasmota-TW ; tasmota-TW
; tasmota-UK ; tasmota-UK
; ;
; *** Selection for Tasmota ESP32 is done in platformio_tasmota32.ini
;
; *** alternatively can be done in: platformio_override.ini ; *** alternatively can be done in: platformio_override.ini
; *** See example: platformio_override_sample.ini ; *** See example: platformio_override_sample.ini
; ********************************************************************* ; *********************************************************************
[platformio]
description = Provide ESP8266 / ESP32 based devices with Web, MQTT and OTA firmware
src_dir = tasmota
build_cache_dir = .cache
extra_configs = platformio_tasmota32.ini
platformio_tasmota_env.ini
platformio_tasmota_env32.ini
platformio_override.ini
default_envs = ${build_envs.default_envs}
[common] [common]
framework = arduino framework = arduino

View File

@ -1,6 +1,44 @@
; *** BETA ESP32 Tasmota version *** ; *** BETA ESP32 Tasmota version ***
; *** expect the unexpected. Some features not working!!! *** ; *** expect the unexpected. Some features not working!!! ***
[platformio]
; *** Tasmota build variant selection
default_envs = ${build_envs.default_envs}
; *** Uncomment by deleting ";" in the line(s) below to select version(s)
; tasmota32
; tasmota32-webcam
; tasmota32-minimal
; tasmota32-lite
; tasmota32-knx
; tasmota32-sensors
; tasmota32-display
; tasmota32-ir
; tasmota32-ircustom
; tasmota32-BG
; tasmota32-BR
; tasmota32-CN
; tasmota32-CZ
; tasmota32-DE
; tasmota32-ES
; tasmota32-FR
; tasmota32-GR
; tasmota32-HE
; tasmota32-HU
; tasmota32-IT
; tasmota32-KO
; tasmota32-NL
; tasmota32-PL
; tasmota32-PT
; tasmota32-RO
; tasmota32-RU
; tasmota32-SE
; tasmota32-SK
; tasmota32-TR
; tasmota32-TW
; tasmota32-UK
[common32] [common32]
platform = espressif32@2.0.0 platform = espressif32@2.0.0
platform_packages = tool-esptoolpy@1.20800.0 platform_packages = tool-esptoolpy@1.20800.0