Skip to content
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

Refactor Platformio and fix override use #12442

Merged
merged 3 commits into from
Jun 22, 2021
Merged

Refactor Platformio and fix override use #12442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
213e49e
make override possible for flags
Jason2866 Jun 22, 2021
9fdb86a
More refactor Platformio
Jason2866 Jun 22, 2021
8d39972
wrong link to platform
Jason2866 Jun 22, 2021
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
7 changes: 3 additions & 4 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ extra_configs = platformio_tasmota32.ini
platformio_override.ini

[common]
platform = ${core.platform}
platform_packages = ${core.platform_packages}
framework = arduino
board = esp8266_1M
board_build.filesystem = littlefs
custom_unpack_dir = unpacked_littlefs
board = esp8266_1M
platform = ${core.platform}
platform_packages = ${core.platform_packages}
build_unflags = ${core.build_unflags}
build_flags = ${core.build_flags}

monitor_speed = 115200
monitor_port = COM5
; *** Upload Serial reset method for Wemos and NodeMCU
Expand Down
159 changes: 80 additions & 79 deletions platformio_override_sample.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
[platformio]
; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run
;core_dir = .platformio
extra_configs = platformio_tasmota_cenv.ini
extra_configs = platformio_tasmota_cenv.ini

; *** Build/upload environment
default_envs =
default_envs =
; *** Uncomment the line(s) below to select version(s)
tasmota
; tasmota-debug
; tasmota-minimal
; tasmota-lite
; tasmota-knx
; tasmota-sensors
; tasmota-display
; tasmota-zbbridge
; tasmota-ir
; tasmota32
; tasmota32-bluetooth
; tasmota32-webcam
; tasmota32-knx
; tasmota32-sensors
; tasmota32-display
; tasmota32-ir
; tasmota32-ircustom
; tasmota32solo1
; tasmota32c3
; tasmota32s2
; tasmota32-odroidgo
; tasmota32-core2
tasmota
; tasmota-debug
; tasmota-minimal
; tasmota-lite
; tasmota-knx
; tasmota-sensors
; tasmota-display
; tasmota-zbbridge
; tasmota-ir
; tasmota32
; tasmota32-bluetooth
; tasmota32-webcam
; tasmota32-knx
; tasmota32-sensors
; tasmota32-display
; tasmota32-ir
; tasmota32-ircustom
; tasmota32solo1
; tasmota32c3
; tasmota32s2
; tasmota32-odroidgo
; tasmota32-core2


[env]
Expand All @@ -61,97 +61,98 @@ build_flags = ${common.build_flags}
; -DDEBUG_TASMOTA_SENSOR
monitor_speed = ${common.monitor_speed}
; *** Serial port used for erasing/flashing the ESP82xx
upload_port = ${common.upload_port}
;upload_port = COM5
;upload_port = ${common.upload_port}
upload_port = COM5
upload_resetmethod = ${common.upload_resetmethod}
extra_scripts = ${scripts_defaults.extra_scripts}
; pio-tools/obj-dump.py
lib_ldf_mode = ${common.lib_ldf_mode}
lib_compat_mode = ${common.lib_compat_mode}
lib_ignore =
Servo(esp8266)
ESP8266AVRISP
ESP8266LLMNR
ESP8266NetBIOS
ESP8266SSDP
SP8266WiFiMesh
Ethernet(esp8266)
GDBStub
TFT_Touch_Shield_V2
ESP8266HTTPUpdateServer
ESP8266WiFiMesh
EspSoftwareSerial
SPISlave
Hash
Servo(esp8266)
ESP8266AVRISP
ESP8266LLMNR
ESP8266NetBIOS
ESP8266SSDP
SP8266WiFiMesh
Ethernet(esp8266)
GDBStub
TFT_Touch_Shield_V2
ESP8266HTTPUpdateServer
ESP8266WiFiMesh
EspSoftwareSerial
SPISlave
Hash
; Disable next if you want to use ArduinoOTA in Tasmota (default disabled)
ArduinoOTA
ArduinoOTA
lib_extra_dirs = ${library.lib_extra_dirs}


[env:tasmota32_base]
framework = ${common.framework}
platform = ${common32.platform}
platform_packages = ${common32.platform_packages}
platform = ${core32.platform}
platform_packages = ${core32.platform_packages}
; Build variant ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k LITTLEFS (default)
board = ${common32.board}
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
;board_build.f_cpu = 240000000L
;board_build.f_flash = 40000000L
monitor_speed = ${common32.monitor_speed}
upload_resetmethod = ${common32.upload_resetmethod}
monitor_speed = 115200
; *** Serial port used for erasing/flashing the ESP32
upload_port = ${common32.upload_port}
;upload_port = COM4
; upload_speed = 115200
extra_scripts = ${common32.extra_scripts}
build_unflags = ${common32.build_unflags}
build_flags = ${common32.build_flags}
lib_ldf_mode = ${common32.lib_ldf_mode}
lib_compat_mode = ${common32.lib_compat_mode}
;upload_port = ${common.upload_port}
upload_port = COM4
;upload_speed = 115200
upload_resetmethod = ${common.upload_resetmethod}
extra_scripts = ${common.extra_scripts}
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags}
lib_ldf_mode = ${common.lib_ldf_mode}
lib_compat_mode = ${common.lib_compat_mode}
lib_ignore =
ESP32 Azure IoT Arduino
ESP32 Async UDP
ESP32 BLE Arduino
; SimpleBLE
NetBIOS
ESP32
Preferences
BluetoothSerial
ESP32 Azure IoT Arduino
ESP32 Async UDP
ESP32 BLE Arduino
; SimpleBLE
NetBIOS
ESP32
Preferences
BluetoothSerial
; Disable next if you want to use ArduinoOTA in Tasmota32 (default disabled)
ArduinoOTA
ArduinoOTA

lib_extra_dirs = ${library.lib_extra_dirs}
lib_extra_dirs = ${library.lib_extra_dirs}
; *** ESP32 lib. ALWAYS needed for ESP32 !!!
lib/libesp32
lib/libesp32
; *** comment the following line if you dont use LVGL in a Tasmota32 build. Reduces compile time
lib/libesp32_lvgl
; *** comment the following line if you dont use Bluetooth or Apple Homekit in a Tasmota32 build. Reduces compile time
lib/libesp32_div
; *** uncomment the following line if you dont use Epaper driver epidy in your Tasmota32 build. Reduces compile time
lib/libesp32_epdiy
lib/libesp32_lvgl
; *** uncomment the following line if you use Bluetooth or Apple Homekit in a Tasmota32 build. Reduces compile time
; lib/libesp32_div
; *** uncomment the following line if you use Epaper driver epidy in your Tasmota32 build. Reduces compile time
; lib/libesp32_epdiy


[library]
shared_libdeps_dir = lib
shared_libdeps_dir = lib
; *** Library disable / enable for variant Tasmota(32). Disable reduces compile time
; *** !!! Disabling needed libs will generate compile errors !!!
; *** The resulting firmware will NOT be different if you leave all libs enabled
; *** Disabling by putting a ";" in front of the lib name
; *** If you dont know what it is all about, do not change
lib_extra_dirs =
lib_extra_dirs =
; *** Only disabled for Tasmota minimal and Tasmota light. For all other variants needed!
lib/lib_basic
lib/lib_basic
; **** I2C devices. Most sensors. Disable only if you dont have ANY I2C device enabled
lib/lib_i2c
lib/lib_i2c
; *** Displays. Disable if you dont have any Display activated
lib/lib_display
lib/lib_display
; *** Bear SSL and base64. Disable if you dont have SSL or TLS activated
lib/lib_ssl
lib/lib_ssl
; *** Audio needs a lot of time to compile. Mostly not used functions. Recommended to disable
lib/lib_audio
; lib/lib_audio
; *** RF 433 stuff (not RF Bridge). Recommended to disable
lib/lib_rf
lib/lib_rf
; *** Mostly not used functions. Recommended to disable
lib/lib_div
lib/lib_div
31 changes: 0 additions & 31 deletions platformio_tasmota32.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,6 @@
; *** BETA ESP32 Tasmota version ***
; *** expect the unexpected. Some features not working!!! ***

[common32]
framework = ${common.framework}
platform = ${core32.platform}
platform_packages = ${core32.platform_packages}
build_unflags = ${core32.build_unflags}
build_flags = ${core32.build_flags}
board = esp32_4M
board_build.filesystem = ${common.board_build.filesystem}
custom_unpack_dir = ${common.custom_unpack_dir}
monitor_speed = 115200
upload_port = ${common.upload_port}
upload_resetmethod = ${common.upload_resetmethod}
extra_scripts = ${common.extra_scripts}
lib_ldf_mode = ${common.lib_ldf_mode}
lib_compat_mode = ${common.lib_compat_mode}
shared_libdeps_dir = lib
lib_extra_dirs =
lib/libesp32
lib/libesp32_lvgl
; uncomment the following line if you need Bluetooth, Homekit or TTGO Watch libraries in your Tasmota32 build
; lib/libesp32_div
; uncomment the following line if you want to use Epaper driver epidy in your Tasmota32 build
; lib/libesp32_epdiy
lib/lib_basic
lib/lib_i2c
lib/lib_display
lib/lib_ssl
lib/lib_audio
lib/lib_rf
lib/lib_div

[esp32_defaults]
build_unflags = ${esp_defaults.build_unflags}
-fexceptions
Expand Down
2 changes: 1 addition & 1 deletion platformio_tasmota_cenv_sample.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ platform = https://github.com/platformio/platform-espressif32
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/307/framework-arduinoespressif32-master-1d7068e4b.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${common32.build_flags} -DFIRMWARE_LITE
build_flags = ${esp32_defaults.build_flags} -DFIRMWARE_LITE
lib_extra_dirs = lib/libesp32
lib_ignore =
NimBLE-Arduino
Expand Down
Loading