From 9cf47def14cb850b7a8389bb78fb5f2a75223ed2 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 16:48:48 +0200 Subject: [PATCH 01/11] Update platformio_override_sample.ini --- platformio_override_sample.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 681144edc..b9d78e049 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -11,6 +11,7 @@ [platformio] ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run ;core_dir = .platformio +; Config examples -> platformio_tasmota_cenv_example.ini extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment From 8dd2086dade4d98c1f53393c7292a59fa5554aa8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 16:50:52 +0200 Subject: [PATCH 02/11] Add files via upload --- platformio_tasmota_cenv.ini | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 platformio_tasmota_cenv.ini diff --git a/platformio_tasmota_cenv.ini b/platformio_tasmota_cenv.ini new file mode 100644 index 000000000..ae7366d65 --- /dev/null +++ b/platformio_tasmota_cenv.ini @@ -0,0 +1,5 @@ +[env:tasmota-bluetooth] +board = esp8266_4M2M +build_flags = ${common.build_flags} + -DUSE_ZIGBEE + -DUSE_UFILESYS \ No newline at end of file From 0ae6373c2b8d59ef14aaff221aff4be5930c8265 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Sat, 24 Apr 2021 15:16:45 +0000 Subject: [PATCH 03/11] whitespaces --- platformio_tasmota_cenv.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platformio_tasmota_cenv.ini b/platformio_tasmota_cenv.ini index ae7366d65..fa6ae8f8a 100644 --- a/platformio_tasmota_cenv.ini +++ b/platformio_tasmota_cenv.ini @@ -1,5 +1,6 @@ [env:tasmota-bluetooth] board = esp8266_4M2M -build_flags = ${common.build_flags} - -DUSE_ZIGBEE - -DUSE_UFILESYS \ No newline at end of file +build_flags = ${common.build_flags} + -DUSE_ZIGBEE + -DUSE_UFILESYS + From 6e9f2a3c15ec38317427c102f2ee4c71934ac8ae Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 17:21:38 +0200 Subject: [PATCH 04/11] Update platformio_override_sample.ini --- platformio_override_sample.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index b9d78e049..2df4bd2c1 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -11,7 +11,7 @@ [platformio] ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run ;core_dir = .platformio -; Config examples -> platformio_tasmota_cenv_example.ini +; Custom config Bluetooth [env] -> platformio_tasmota_cenv_example.ini extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment From fb90abe2b0f6c4eadc14ece1064194fee215a8ce Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 17:22:24 +0200 Subject: [PATCH 05/11] Rename platformio_tasmota_cenv.ini to platformio_tasmota_cenv_sample.ini --- platformio_tasmota_cenv.ini => platformio_tasmota_cenv_sample.ini | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename platformio_tasmota_cenv.ini => platformio_tasmota_cenv_sample.ini (100%) diff --git a/platformio_tasmota_cenv.ini b/platformio_tasmota_cenv_sample.ini similarity index 100% rename from platformio_tasmota_cenv.ini rename to platformio_tasmota_cenv_sample.ini From 8e6ce5127b79c0b78d8248b39c2b02565febb4e5 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 19:56:44 +0200 Subject: [PATCH 06/11] Remove [env] --- platformio_override_sample.ini | 60 ---------------------------------- 1 file changed, 60 deletions(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 2df4bd2c1..56c71ddf2 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -162,63 +162,3 @@ lib_extra_dirs = lib/lib_rf ; *** Mostly not used functions. Recommended to disable lib/lib_div - - -; *** EXPERIMENTAL Tasmota version for ESP32-S2 -[env:tasmota32s2] -extends = env:tasmota32_base -board = esp32s2 -board_build.flash_mode = qio -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz - platformio/tool-mklittlefs @ ~1.203.200522 - platformio/tool-esptoolpy @ ~1.30000.0 -build_unflags = ${esp32_defaults.build_unflags} -build_flags = ${common32.build_flags} -DFIRMWARE_LITE -lib_extra_dirs = lib/libesp32 -lib_ignore = - NimBLE-Arduino - Micro-RTSP - ESP32-HomeKit - - -; *** EXPERIMENTAL Tasmota version for ESP32-C3 -[env:tasmota32c3] -extends = env:tasmota32_base -board = esp32c3 -platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz - tasmota/toolchain-riscv32 - platformio/tool-mklittlefs @ ~1.203.200522 -build_unflags = ${esp32_defaults.build_unflags} -mtarget-align -build_flags = ${esp32_defaults.build_flags} -DFIRMWARE_LITE - -I$PROJECT_DIR/include - -include "fix_esp32c3.h" - ;-DESP32_STAGE=true -lib_extra_dirs = lib/libesp32 -lib_ignore = - NimBLE-Arduino - Micro-RTSP - -; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4. -[env:tasmota32idf4] -extends = env:tasmota32_base -platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz - platformio/tool-mklittlefs @ ~1.203.200522 -build_unflags = ${esp32_defaults.build_unflags} -build_flags = ${esp32_defaults.build_flags} - ;-DESP32_STAGE=true - -; *** Debug version used for PlatformIO Home Project Inspection -[env:tasmota-debug] -build_type = debug -build_unflags = ${esp_defaults.build_unflags} -build_flags = ${esp82xx_defaults.build_flags} -; -Wstack-usage=300 - -[env:tasmota32-debug] -extends = env:tasmota32_base -build_type = debug -build_unflags = ${esp32_defaults.build_unflags} -build_flags = ${esp32_defaults.build_flags} -; -Wstack-usage=300 From e0773680de2ae5171cf634fc0c642738c96286a7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 19:59:44 +0200 Subject: [PATCH 07/11] Testing / special env in platformio_tasmota_cenv.ini --- platformio_tasmota_cenv_sample.ini | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index fa6ae8f8a..ca0b8a619 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -4,3 +4,60 @@ build_flags = ${common.build_flags} -DUSE_ZIGBEE -DUSE_UFILESYS +; *** EXPERIMENTAL Tasmota version for ESP32-S2 +[env:tasmota32s2] +extends = env:tasmota32_base +board = esp32s2 +board_build.flash_mode = qio +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz + platformio/tool-mklittlefs @ ~1.203.200522 + platformio/tool-esptoolpy @ ~1.30000.0 +build_unflags = ${esp32_defaults.build_unflags} +build_flags = ${common32.build_flags} -DFIRMWARE_LITE +lib_extra_dirs = lib/libesp32 +lib_ignore = + NimBLE-Arduino + Micro-RTSP + ESP32-HomeKit + +; *** EXPERIMENTAL Tasmota version for ESP32-C3 +[env:tasmota32c3] +extends = env:tasmota32_base +board = esp32c3 +platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-c3 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz + tasmota/toolchain-riscv32 + platformio/tool-mklittlefs @ ~1.203.200522 +build_unflags = ${esp32_defaults.build_unflags} -mtarget-align +build_flags = ${esp32_defaults.build_flags} -DFIRMWARE_LITE + -I$PROJECT_DIR/include + -include "fix_esp32c3.h" + ;-DESP32_STAGE=true +lib_extra_dirs = lib/libesp32 +lib_ignore = + NimBLE-Arduino + Micro-RTSP + +; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4. +[env:tasmota32idf4] +extends = env:tasmota32_base +platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz + platformio/tool-mklittlefs @ ~1.203.200522 +build_unflags = ${esp32_defaults.build_unflags} +build_flags = ${esp32_defaults.build_flags} + ;-DESP32_STAGE=true + +; *** Debug version used for PlatformIO Home Project Inspection +[env:tasmota-debug] +build_type = debug +build_unflags = ${esp_defaults.build_unflags} +build_flags = ${esp82xx_defaults.build_flags} +; -Wstack-usage=300 + +[env:tasmota32-debug] +extends = env:tasmota32_base +build_type = debug +build_unflags = ${esp32_defaults.build_unflags} +build_flags = ${esp32_defaults.build_flags} +; -Wstack-usage=300 From 7e862adf9a76bd1b215ef0fa87e6873a3ec587d3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 20:06:29 +0200 Subject: [PATCH 08/11] Autocopy platformio_tasmota_cenv_sample to platformio_tasmota_cenv.ini when not existing --- pio-tools/override_copy.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pio-tools/override_copy.py b/pio-tools/override_copy.py index 5318f9169..137da4171 100644 --- a/pio-tools/override_copy.py +++ b/pio-tools/override_copy.py @@ -13,3 +13,9 @@ if os.path.isfile("platformio_override.ini"): print ("*** use provided platformio_override.ini as planned ***") else: shutil.copy("platformio_override_sample.ini", "platformio_override.ini") + +# copy platformio_tasmota_cenv_sample.ini to platformio_tasmota_cenv.ini +if os.path.isfile("platformio_tasmota_cenv.ini"): + print ("*** use provided platformio_tasmota_cenv.ini as planned ***") +else: + shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini" From a15b6e8d730e55b47d4a53000f1ff2ef21524e23 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 20:11:27 +0200 Subject: [PATCH 09/11] typo --- pio-tools/override_copy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pio-tools/override_copy.py b/pio-tools/override_copy.py index 137da4171..4f17079b2 100644 --- a/pio-tools/override_copy.py +++ b/pio-tools/override_copy.py @@ -18,4 +18,4 @@ else: if os.path.isfile("platformio_tasmota_cenv.ini"): print ("*** use provided platformio_tasmota_cenv.ini as planned ***") else: - shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini" + shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini") From 09020723e6f93ae620e930d299417849fd71e952 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 20:52:48 +0200 Subject: [PATCH 10/11] Zigbee!!! --- platformio_override_sample.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 56c71ddf2..c03b24ba3 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -11,7 +11,7 @@ [platformio] ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run ;core_dir = .platformio -; Custom config Bluetooth [env] -> platformio_tasmota_cenv_example.ini +; Custom config Zigbee [env] -> platformio_tasmota_cenv_example.ini extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment From 79a1fec6d17ef2d3cfff01e74c8cc66e95f4e5b8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 24 Apr 2021 20:53:46 +0200 Subject: [PATCH 11/11] tasmota-zigbee --- platformio_tasmota_cenv_sample.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index ca0b8a619..6570d9e36 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -1,4 +1,4 @@ -[env:tasmota-bluetooth] +[env:tasmota-zigbee] board = esp8266_4M2M build_flags = ${common.build_flags} -DUSE_ZIGBEE