From 100ac8a75e7a87c5c971071b91a6f5ee30444b75 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:40:11 +0100 Subject: [PATCH 01/10] Move ENVs back in platformio.ini... since the idea to have 3 files for setting up was not liked at all. --- platformio.ini | 103 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 5db6b8ed0..a1c604735 100755 --- a/platformio.ini +++ b/platformio.ini @@ -11,8 +11,7 @@ src_dir = tasmota build_dir = .pioenvs build_cache_dir = .cache -extra_configs = pio/tasmota_env.ini - pio/platformio_override.ini +extra_configs = pio/platformio_override.ini ; *** Build/upload environment default_envs = @@ -107,3 +106,103 @@ build_flags = ${esp82xx_defaults.build_flags} ; No exception code in firmware -fno-exceptions -lstdc++ + +[env] +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_build.flash_mode = ${common.board_build.flash_mode} +board_build.f_cpu = ${common.board_build.f_cpu} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} +monitor_speed = ${common.monitor_speed} +upload_port = ${common.upload_port} +upload_resetmethod = ${common.upload_resetmethod} +upload_speed = ${common.upload_speed} +extra_scripts = ${common.extra_scripts} + +[env:tasmota] + +[env:tasmota-minimal] +build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL + +[env:tasmota-basic] +build_flags = ${common.build_flags} -DFIRMWARE_BASIC + +[env:tasmota-knx] +build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION + +[env:tasmota-sensors] +build_flags = ${common.build_flags} -DFIRMWARE_SENSORS + +[env:tasmota-display] +build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS + +[env:tasmota-ir] +build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR + +[env:tasmota-ircustom] +build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL + +[env:tasmota-BG] +build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG + +[env:tasmota-BR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR + +[env:tasmota-CN] +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN + +[env:tasmota-CZ] +build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ + +[env:tasmota-DE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE + +[env:tasmota-ES] +build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES + +[env:tasmota-FR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR + +[env:tasmota-GR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR + +[env:tasmota-HE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE + +[env:tasmota-HU] +build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU + +[env:tasmota-IT] +build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT + +[env:tasmota-KO] +build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO + +[env:tasmota-NL] +build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL + +[env:tasmota-PL] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL + +[env:tasmota-PT] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT + +[env:tasmota-RU] +build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU + +[env:tasmota-SE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE + +[env:tasmota-SK] +build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK + +[env:tasmota-TR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR + +[env:tasmota-TW] +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW + +[env:tasmota-UK] +build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK From b92a3c9764c645160981f6f157be3174630c63ee Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:40:42 +0100 Subject: [PATCH 02/10] Delete tasmota_env.ini --- pio/tasmota_env.ini | 99 --------------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 pio/tasmota_env.ini diff --git a/pio/tasmota_env.ini b/pio/tasmota_env.ini deleted file mode 100644 index 46e71d7af..000000000 --- a/pio/tasmota_env.ini +++ /dev/null @@ -1,99 +0,0 @@ -[env] -platform = ${common.platform} -framework = ${common.framework} -board = ${common.board} -board_build.flash_mode = ${common.board_build.flash_mode} -board_build.f_cpu = ${common.board_build.f_cpu} -build_unflags = ${common.build_unflags} -build_flags = ${common.build_flags} -monitor_speed = ${common.monitor_speed} -upload_port = ${common.upload_port} -upload_resetmethod = ${common.upload_resetmethod} -upload_speed = ${common.upload_speed} -extra_scripts = ${common.extra_scripts} - -[env:tasmota] - -[env:tasmota-minimal] -build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL - -[env:tasmota-basic] -build_flags = ${common.build_flags} -DFIRMWARE_BASIC - -[env:tasmota-knx] -build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION - -[env:tasmota-sensors] -build_flags = ${common.build_flags} -DFIRMWARE_SENSORS - -[env:tasmota-display] -build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS - -[env:tasmota-ir] -build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR - -[env:tasmota-ircustom] -build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL - -[env:tasmota-BG] -build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG - -[env:tasmota-BR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR - -[env:tasmota-CN] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN - -[env:tasmota-CZ] -build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ - -[env:tasmota-DE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE - -[env:tasmota-ES] -build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES - -[env:tasmota-FR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR - -[env:tasmota-GR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR - -[env:tasmota-HE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE - -[env:tasmota-HU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU - -[env:tasmota-IT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT - -[env:tasmota-KO] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO - -[env:tasmota-NL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL - -[env:tasmota-PL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL - -[env:tasmota-PT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT - -[env:tasmota-RU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU - -[env:tasmota-SE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE - -[env:tasmota-SK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK - -[env:tasmota-TR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR - -[env:tasmota-TW] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW - -[env:tasmota-UK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK From 3ab7d8306108e39ec0f27aad09400bcb3dd63f29 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:52:17 +0100 Subject: [PATCH 03/10] Add files via upload --- platformio_override.ini | 277 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 platformio_override.ini diff --git a/platformio_override.ini b/platformio_override.ini new file mode 100644 index 000000000..ca6f80845 --- /dev/null +++ b/platformio_override.ini @@ -0,0 +1,277 @@ +[platformio] + +; *** Build/upload environment +default_envs = +; *** Uncomment the line(s) below to select version(s) + tasmota +; tasmota-debug +; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big +; tasmota-minimal +; tasmota-basic +; tasmota-knx +; tasmota-sensors +; tasmota-display +; tasmota-ir + + +[common] +platform = ${core_active.platform} +platform_packages = ${core_active.platform_packages} +build_flags = ${core_active.build_flags} + + -DUSE_CONFIG_OVERRIDE + +; *** Optional Firmware configurations +; -DFIRMWARE_MINIMAL +; -DFIRMWARE_SENSORS +; -DFIRMWARE_BASIC +; -DFIRMWARE_KNX_NO_EMULATION +; -DFIRMWARE_DISPLAYS +; -DFIRMWARE_IR +; -DFIRMWARE_IR_CUSTOM + +; *** Optional Debug messages +; -DDEBUG_TASMOTA_CORE +; -DDEBUG_TASMOTA_DRIVER +; -DDEBUG_TASMOTA_SENSOR + +; set CPU frequency to 80MHz (default) or 160MHz +;board_build.f_cpu = 160000000L + +; *** Upload Serial reset method for Wemos and NodeMCU +upload_port = COM5 + +extra_scripts = ${scripts_defaults.extra_scripts} +; pio/obj-dump.py + +; *** Upload file to OTA server using SCP +;upload_port = user@host:/path +;extra_scripts = ${scripts_defaults.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 = ${scripts_defaults.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_2_6_1.platform} +build_flags = ${core_2_6_1.build_flags} + +;platform = ${core_2_6_2.platform} +;build_flags = ${core_2_6_2.build_flags} + +;platform = ${core_stage.platform} +;build_flags = ${core_stage.build_flags} +;platform_packages = ${core_stage.platform_packages} + +;platform = ${core_cstage.platform} +;build_flags = ${core_cstage.build_flags} + + + +[core_2_3_0] +; *** Esp8266 core for Arduino version 2.3.0 +platform = espressif8266@~1.5.0 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Tesp8266.flash.1m0.ld + +[core_2_4_2] +; *** Esp8266 core for Arduino version 2.4.2 +platform = espressif8266@~1.8.0 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m0.ld + -lstdc++ -lsupc++ +; link with an memory optimized version of lib_bearssl + -Llib_bearssl -lbearssl +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH + -DVTABLES_IN_FLASH + +[core_2_6_1] +; *** Esp8266 core for Arduino version 2.6.1 +;platform = https://github.com/Jason2866/platform-espressif8266.git#new_gcc +platform = espressif8266@2.3.0 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + +[core_2_6_2] +; *** Esp8266 core for Arduino version 2.6.2 +platform = espressif8266@2.3.1 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + +[core_stage] +; *** Esp8266 core for Arduino version latest beta +platform = espressif8266 +platform_packages = + framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + +[core_cstage] +; *** Arduino Esp8266 -> Wstring optimization +platform = https://github.com/Jason2866/platform-espressif8266.git#feature/stage +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Tesp8266.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; VTABLES in Flash (default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + + +; *** Debug version used for PlatformIO Home Project Inspection +[env:tasmota-debug] +build_type = debug From 9de4ba1801269b164a985eccc31beb0c485f0c7e Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:52:42 +0100 Subject: [PATCH 04/10] Update platformio.ini --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index a1c604735..e6b31968c 100755 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ src_dir = tasmota build_dir = .pioenvs build_cache_dir = .cache -extra_configs = pio/platformio_override.ini +extra_configs = platformio_override.ini ; *** Build/upload environment default_envs = From 54ce44cc5e428db88df7e56804532f1bd24d2582 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:57:11 +0100 Subject: [PATCH 05/10] Update platformio.ini --- platformio.ini | 103 +------------------------------------------------ 1 file changed, 2 insertions(+), 101 deletions(-) diff --git a/platformio.ini b/platformio.ini index e6b31968c..554c0d1eb 100755 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,8 @@ src_dir = tasmota build_dir = .pioenvs build_cache_dir = .cache -extra_configs = platformio_override.ini +extra_configs = platformio_tasmota_env.ini + platformio_override.ini ; *** Build/upload environment default_envs = @@ -106,103 +107,3 @@ build_flags = ${esp82xx_defaults.build_flags} ; No exception code in firmware -fno-exceptions -lstdc++ - -[env] -platform = ${common.platform} -framework = ${common.framework} -board = ${common.board} -board_build.flash_mode = ${common.board_build.flash_mode} -board_build.f_cpu = ${common.board_build.f_cpu} -build_unflags = ${common.build_unflags} -build_flags = ${common.build_flags} -monitor_speed = ${common.monitor_speed} -upload_port = ${common.upload_port} -upload_resetmethod = ${common.upload_resetmethod} -upload_speed = ${common.upload_speed} -extra_scripts = ${common.extra_scripts} - -[env:tasmota] - -[env:tasmota-minimal] -build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL - -[env:tasmota-basic] -build_flags = ${common.build_flags} -DFIRMWARE_BASIC - -[env:tasmota-knx] -build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION - -[env:tasmota-sensors] -build_flags = ${common.build_flags} -DFIRMWARE_SENSORS - -[env:tasmota-display] -build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS - -[env:tasmota-ir] -build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR - -[env:tasmota-ircustom] -build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL - -[env:tasmota-BG] -build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG - -[env:tasmota-BR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR - -[env:tasmota-CN] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN - -[env:tasmota-CZ] -build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ - -[env:tasmota-DE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE - -[env:tasmota-ES] -build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES - -[env:tasmota-FR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR - -[env:tasmota-GR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR - -[env:tasmota-HE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE - -[env:tasmota-HU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU - -[env:tasmota-IT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT - -[env:tasmota-KO] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO - -[env:tasmota-NL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL - -[env:tasmota-PL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL - -[env:tasmota-PT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT - -[env:tasmota-RU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU - -[env:tasmota-SE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE - -[env:tasmota-SK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK - -[env:tasmota-TR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR - -[env:tasmota-TW] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW - -[env:tasmota-UK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK From 52f5bebd413827d0bf2c25f1e7f1f90e4213f767 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:57:30 +0100 Subject: [PATCH 06/10] Add files via upload --- platformio_tasmota_env.ini | 99 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 platformio_tasmota_env.ini diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini new file mode 100644 index 000000000..46e71d7af --- /dev/null +++ b/platformio_tasmota_env.ini @@ -0,0 +1,99 @@ +[env] +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_build.flash_mode = ${common.board_build.flash_mode} +board_build.f_cpu = ${common.board_build.f_cpu} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} +monitor_speed = ${common.monitor_speed} +upload_port = ${common.upload_port} +upload_resetmethod = ${common.upload_resetmethod} +upload_speed = ${common.upload_speed} +extra_scripts = ${common.extra_scripts} + +[env:tasmota] + +[env:tasmota-minimal] +build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL + +[env:tasmota-basic] +build_flags = ${common.build_flags} -DFIRMWARE_BASIC + +[env:tasmota-knx] +build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION + +[env:tasmota-sensors] +build_flags = ${common.build_flags} -DFIRMWARE_SENSORS + +[env:tasmota-display] +build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS + +[env:tasmota-ir] +build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR + +[env:tasmota-ircustom] +build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL + +[env:tasmota-BG] +build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG + +[env:tasmota-BR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR + +[env:tasmota-CN] +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN + +[env:tasmota-CZ] +build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ + +[env:tasmota-DE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE + +[env:tasmota-ES] +build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES + +[env:tasmota-FR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR + +[env:tasmota-GR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR + +[env:tasmota-HE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE + +[env:tasmota-HU] +build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU + +[env:tasmota-IT] +build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT + +[env:tasmota-KO] +build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO + +[env:tasmota-NL] +build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL + +[env:tasmota-PL] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL + +[env:tasmota-PT] +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT + +[env:tasmota-RU] +build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU + +[env:tasmota-SE] +build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE + +[env:tasmota-SK] +build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK + +[env:tasmota-TR] +build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR + +[env:tasmota-TW] +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW + +[env:tasmota-UK] +build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK From 2fff09ddc9b8cf532ae2e1b8ea78d42c5fa0f570 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:58:43 +0100 Subject: [PATCH 07/10] Delete platformio_override_sample.ini --- pio/platformio_override_sample.ini | 211 ----------------------------- 1 file changed, 211 deletions(-) delete mode 100644 pio/platformio_override_sample.ini diff --git a/pio/platformio_override_sample.ini b/pio/platformio_override_sample.ini deleted file mode 100644 index d94903d0e..000000000 --- a/pio/platformio_override_sample.ini +++ /dev/null @@ -1,211 +0,0 @@ -; *** Example PlatformIO Project Configuration Override File *** -; *** Changes done here overrides settings in platformio.ini *** -; -; **************************************************************** -; *** to activate rename this fie to platformio_override.ini *** -; **************************************************************** -; -; Please visit documentation for the options and examples -; http://docs.platformio.org/en/stable/projectconf.html -; - - -[platformio] - -; *** Build/upload environment -default_envs = -; *** Uncomment the line(s) below to select version(s) - tasmota -; tasmota-debug -; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big -; tasmota-minimal -; tasmota-basic -; tasmota-knx -; tasmota-sensors -; tasmota-display -; tasmota-ir - - -[common] -platform = ${core_active.platform} -build_flags = ${core_active.build_flags} -; *** Use settings from file user_config_override.h - -DUSE_CONFIG_OVERRIDE - -; *** Optional Firmware configurations -; -DFIRMWARE_MINIMAL -; -DFIRMWARE_SENSORS -; -DFIRMWARE_BASIC -; -DFIRMWARE_KNX_NO_EMULATION -; -DFIRMWARE_DISPLAYS -; -DFIRMWARE_IR -; -DFIRMWARE_IR_CUSTOM - -; *** Optional Debug messages -; -DDEBUG_TASMOTA_CORE -; -DDEBUG_TASMOTA_DRIVER -; -DDEBUG_TASMOTA_SENSOR - -; set CPU frequency to 80MHz (default) or 160MHz -;board_build.f_cpu = 160000000L - -; *** Upload Serial reset method for Wemos and NodeMCU -upload_port = COM5 - -extra_scripts = ${scripts_defaults.extra_scripts} - pio/obj-dump.py - -; *** Upload file to OTA server using SCP -;upload_port = user@host:/path -;extra_scripts = ${scripts_defaults.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 = ${scripts_defaults.extra_scripts} -; pio/strip-floats.py, pio/http-uploader.py - -[core_active] -; Select one core set for platform and build_flags -platform = ${core_2_6_1.platform} -build_flags = ${core_2_6_1.build_flags} -;platform = ${core_2_6_2.platform} -;build_flags = ${core_2_6_2.build_flags} -;platform = ${core_stage.platform} -;build_flags = ${core_stage.build_flags} - - -[core_2_6_1] -; *** Esp8266 core for Arduino version 2.6.1 -platform = espressif8266@2.3.0 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!) -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - -[core_2_6_2] -; *** Esp8266 core for Arduino version 2.6.2 -platform = espressif8266@2.3.1 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!) -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - -[core_stage] -; *** Esp8266 core for Arduino version latest beta -platform = https://github.com/platformio/platform-espressif8266.git#feature/stage -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - - -; *** Debug version used for PlatformIO Home Project Inspection -[env:tasmota-debug] -build_type = debug From 9805a840d7a56b6a61b0f3413c3da0c890cbd385 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:59:03 +0100 Subject: [PATCH 08/10] Add files via upload --- platformio_override_sample.ini | 211 +++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 platformio_override_sample.ini diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini new file mode 100644 index 000000000..d94903d0e --- /dev/null +++ b/platformio_override_sample.ini @@ -0,0 +1,211 @@ +; *** Example PlatformIO Project Configuration Override File *** +; *** Changes done here overrides settings in platformio.ini *** +; +; **************************************************************** +; *** to activate rename this fie to platformio_override.ini *** +; **************************************************************** +; +; Please visit documentation for the options and examples +; http://docs.platformio.org/en/stable/projectconf.html +; + + +[platformio] + +; *** Build/upload environment +default_envs = +; *** Uncomment the line(s) below to select version(s) + tasmota +; tasmota-debug +; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big +; tasmota-minimal +; tasmota-basic +; tasmota-knx +; tasmota-sensors +; tasmota-display +; tasmota-ir + + +[common] +platform = ${core_active.platform} +build_flags = ${core_active.build_flags} +; *** Use settings from file user_config_override.h + -DUSE_CONFIG_OVERRIDE + +; *** Optional Firmware configurations +; -DFIRMWARE_MINIMAL +; -DFIRMWARE_SENSORS +; -DFIRMWARE_BASIC +; -DFIRMWARE_KNX_NO_EMULATION +; -DFIRMWARE_DISPLAYS +; -DFIRMWARE_IR +; -DFIRMWARE_IR_CUSTOM + +; *** Optional Debug messages +; -DDEBUG_TASMOTA_CORE +; -DDEBUG_TASMOTA_DRIVER +; -DDEBUG_TASMOTA_SENSOR + +; set CPU frequency to 80MHz (default) or 160MHz +;board_build.f_cpu = 160000000L + +; *** Upload Serial reset method for Wemos and NodeMCU +upload_port = COM5 + +extra_scripts = ${scripts_defaults.extra_scripts} + pio/obj-dump.py + +; *** Upload file to OTA server using SCP +;upload_port = user@host:/path +;extra_scripts = ${scripts_defaults.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 = ${scripts_defaults.extra_scripts} +; pio/strip-floats.py, pio/http-uploader.py + +[core_active] +; Select one core set for platform and build_flags +platform = ${core_2_6_1.platform} +build_flags = ${core_2_6_1.build_flags} +;platform = ${core_2_6_2.platform} +;build_flags = ${core_2_6_2.build_flags} +;platform = ${core_stage.platform} +;build_flags = ${core_stage.build_flags} + + +[core_2_6_1] +; *** Esp8266 core for Arduino version 2.6.1 +platform = espressif8266@2.3.0 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!) +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + +[core_2_6_2] +; *** Esp8266 core for Arduino version 2.6.2 +platform = espressif8266@2.3.1 +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!) +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + +[core_stage] +; *** Esp8266 core for Arduino version latest beta +platform = https://github.com/platformio/platform-espressif8266.git#feature/stage +build_flags = ${esp82xx_defaults.build_flags} + -Wl,-Teagle.flash.1m.ld + -DBEARSSL_SSL_BASIC +; NONOSDK221 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 +; NONOSDK22x_190313 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 +; NONOSDK22x_190703 (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 +; NONOSDK22x_191024 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 +; NONOSDK22x_191105 +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK3V0 (known issues) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 +; lwIP 1.4 +; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH +; lwIP 2 - Low Memory +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; lwIP 2 - Higher Bandwidth +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH +; lwIP 2 - Higher Bandwidth Low Memory no Features +; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH +; lwIP 2 - Higher Bandwidth no Features (Tasmota default) + -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH +; VTABLES in Flash (Tasmota default) + -DVTABLES_IN_FLASH +; VTABLES in Heap +; -DVTABLES_IN_DRAM +; VTABLES in IRAM +; -DVTABLES_IN_IRAM +; enable one option set -> No exception recommended +; No exception code in firmware + -fno-exceptions + -lstdc++ +; Exception code in firmware /needs much space! 90k +; -fexceptions +; -lstdc++-exc + + +; *** Debug version used for PlatformIO Home Project Inspection +[env:tasmota-debug] +build_type = debug From 2f18f0732f488ad6d3aaff648dc70209587b3b27 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 14:59:57 +0100 Subject: [PATCH 09/10] Update platformio.ini --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 554c0d1eb..70d7373f3 100755 --- a/platformio.ini +++ b/platformio.ini @@ -48,7 +48,7 @@ default_envs = ; tasmota-UK ; ; *** alternatively can be done in: pio/platformio_override.ini -; *** See example: platformio_override_sample.ini in folder pio +; *** See example: platformio_override_sample.ini ; ********************************************************************* @@ -64,8 +64,8 @@ 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 ; -; *** alternatively can be done in: pio/platformio_override.ini -; *** See example: platformio_override_sample.ini in folder pio +; *** alternatively can be done in: platformio_override.ini +; *** See example: platformio_override_sample.ini ; ********************************************************************* ; *** Fix espressif8266@1.7.0 induced undesired all warnings From b6f74f86d6fb81eb42a8581fb9685c9e233f5c5b Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 29 Nov 2019 15:02:05 +0100 Subject: [PATCH 10/10] Delete platformio_override.ini --- platformio_override.ini | 277 ---------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 platformio_override.ini diff --git a/platformio_override.ini b/platformio_override.ini deleted file mode 100644 index ca6f80845..000000000 --- a/platformio_override.ini +++ /dev/null @@ -1,277 +0,0 @@ -[platformio] - -; *** Build/upload environment -default_envs = -; *** Uncomment the line(s) below to select version(s) - tasmota -; tasmota-debug -; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big -; tasmota-minimal -; tasmota-basic -; tasmota-knx -; tasmota-sensors -; tasmota-display -; tasmota-ir - - -[common] -platform = ${core_active.platform} -platform_packages = ${core_active.platform_packages} -build_flags = ${core_active.build_flags} - - -DUSE_CONFIG_OVERRIDE - -; *** Optional Firmware configurations -; -DFIRMWARE_MINIMAL -; -DFIRMWARE_SENSORS -; -DFIRMWARE_BASIC -; -DFIRMWARE_KNX_NO_EMULATION -; -DFIRMWARE_DISPLAYS -; -DFIRMWARE_IR -; -DFIRMWARE_IR_CUSTOM - -; *** Optional Debug messages -; -DDEBUG_TASMOTA_CORE -; -DDEBUG_TASMOTA_DRIVER -; -DDEBUG_TASMOTA_SENSOR - -; set CPU frequency to 80MHz (default) or 160MHz -;board_build.f_cpu = 160000000L - -; *** Upload Serial reset method for Wemos and NodeMCU -upload_port = COM5 - -extra_scripts = ${scripts_defaults.extra_scripts} -; pio/obj-dump.py - -; *** Upload file to OTA server using SCP -;upload_port = user@host:/path -;extra_scripts = ${scripts_defaults.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 = ${scripts_defaults.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_2_6_1.platform} -build_flags = ${core_2_6_1.build_flags} - -;platform = ${core_2_6_2.platform} -;build_flags = ${core_2_6_2.build_flags} - -;platform = ${core_stage.platform} -;build_flags = ${core_stage.build_flags} -;platform_packages = ${core_stage.platform_packages} - -;platform = ${core_cstage.platform} -;build_flags = ${core_cstage.build_flags} - - - -[core_2_3_0] -; *** Esp8266 core for Arduino version 2.3.0 -platform = espressif8266@~1.5.0 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Tesp8266.flash.1m0.ld - -[core_2_4_2] -; *** Esp8266 core for Arduino version 2.4.2 -platform = espressif8266@~1.8.0 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m0.ld - -lstdc++ -lsupc++ -; link with an memory optimized version of lib_bearssl - -Llib_bearssl -lbearssl -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH - -DVTABLES_IN_FLASH - -[core_2_6_1] -; *** Esp8266 core for Arduino version 2.6.1 -;platform = https://github.com/Jason2866/platform-espressif8266.git#new_gcc -platform = espressif8266@2.3.0 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - -[core_2_6_2] -; *** Esp8266 core for Arduino version 2.6.2 -platform = espressif8266@2.3.1 -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - -[core_stage] -; *** Esp8266 core for Arduino version latest beta -platform = espressif8266 -platform_packages = - framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Teagle.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features (Tasmota default) - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; VTABLES in Flash (Tasmota default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - -[core_cstage] -; *** Arduino Esp8266 -> Wstring optimization -platform = https://github.com/Jason2866/platform-espressif8266.git#feature/stage -build_flags = ${esp82xx_defaults.build_flags} - -Wl,-Tesp8266.flash.1m.ld - -DBEARSSL_SSL_BASIC -; NONOSDK221 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 -; NONOSDK22x_190313 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 - -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 -; NONOSDK3V0 (known issues) -; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 -; lwIP 1.4 -; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -; lwIP 2 - Low Memory -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -; lwIP 2 - Higher Bandwidth -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -; lwIP 2 - Higher Bandwidth Low Memory no Features -; -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH -; lwIP 2 - Higher Bandwidth no Features - -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -; VTABLES in Flash (default) - -DVTABLES_IN_FLASH -; VTABLES in Heap -; -DVTABLES_IN_DRAM -; VTABLES in IRAM -; -DVTABLES_IN_IRAM -; enable one option set -> No exception recommended -; No exception code in firmware - -fno-exceptions - -lstdc++ -; Exception code in firmware /needs much space! 90k -; -fexceptions -; -lstdc++-exc - - -; *** Debug version used for PlatformIO Home Project Inspection -[env:tasmota-debug] -build_type = debug