From 65716d12588dd8348baa7f38fc3e6e61941a6555 Mon Sep 17 00:00:00 2001 From: Marius Bezuidenhout Date: Tue, 19 Oct 2021 19:06:48 +0200 Subject: [PATCH 1/5] Updated paths to work on windows and unix --- tools/unishox/compress-html-uncompressed.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/unishox/compress-html-uncompressed.py b/tools/unishox/compress-html-uncompressed.py index 7ee15091d..f5e8619bb 100644 --- a/tools/unishox/compress-html-uncompressed.py +++ b/tools/unishox/compress-html-uncompressed.py @@ -21,16 +21,19 @@ import unishox from os import listdir +from os import path from datetime import datetime +path_compressed = path.join('..','..','tasmota','html_compressed') +path_uncompressed = path.join('..','..','tasmota','html_uncompressed') -files = listdir('..\\..\\tasmota\\html_uncompressed') +files = listdir(path_uncompressed) totalIn = 0 totalSaved = 0 for file in files: - f = open('..\\..\\tasmota\\html_uncompressed\\' + file, "r") + f = open(path_uncompressed + path.sep + file, "r") text = f.read() f.close() @@ -83,7 +86,7 @@ for file in files: # print(text[lastel+1:pos:]) lastel = pos - print("####### Parsing input from "+'..\\..\\tasmota\\html_uncompressed\\' + file) + print("####### Parsing input from " + path_uncompressed + path.sep + file) print(" Const char name: "+const_name) #print('####### Cleaned input:') #print(input) @@ -142,9 +145,9 @@ for file in files: comment = comment + "// compressed by tools/unishox/compress-html-uncompressed.py\n" comment = comment + "/////////////////////////////////////////////////////////////////////\n" - f = open('..\\..\\tasmota\\html_compressed\\' + file, "w") + f = open(path_compressed + path.sep + file, "w") f.write(comment + lines + definition) f.close() - print("####### Wrote output to "+'..\\..\\tasmota\\html_compressed\\' + file) + print("####### Wrote output to " + path_compressed + path.sep + file) print("If all files are in use, total saving was "+str(totalSaved)+" out of "+str(totalIn)) From 4c19930ef363d364efb50a06aade8cdd4c1e9e0c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 20 Oct 2021 12:10:41 +0200 Subject: [PATCH 2/5] Tasmota ESP32 Core 1.0.7.5 --- platformio_tasmota32.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index ee02571e7..8a3d68536 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -29,7 +29,7 @@ build_flags = ${esp_defaults.build_flags} [core32] platform = espressif32 @ 3.3.1 -platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.4/tasmota-arduinoespressif32-release_v3.3.5.tar.gz +platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.5/tasmota-arduinoespressif32-release_v3.3.5.tar.gz platformio/tool-mklittlefs @ ~1.203.200522 build_unflags = ${esp32_defaults.build_unflags} build_flags = ${esp32_defaults.build_flags} From 35e375798ed0daeec66cb44ccaa4f77a858f30e9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 20 Oct 2021 12:11:36 +0200 Subject: [PATCH 3/5] Stable Tasmota ESP32 --- platformio_tasmota32.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index 8a3d68536..6871087ed 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -1,5 +1,4 @@ -; *** BETA ESP32 Tasmota version *** -; *** expect the unexpected. Some features not working!!! *** +; *** ESP32 Tasmota version *** [esp32_defaults] build_unflags = ${esp_defaults.build_unflags} From 79a07fcbbff016fc3ad20cc680c8b141f26a468f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 20 Oct 2021 12:12:33 +0200 Subject: [PATCH 4/5] PR Template Core 1.0.7.5 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 609d4ea86..f6351450a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,7 +7,7 @@ - [ ] Only relevant files were touched - [ ] Only one feature/fix was added per PR and the code change compiles without warnings - [ ] The code change is tested and works with Tasmota core ESP8266 V.2.7.4.9 - - [ ] The code change is tested and works with Tasmota core ESP32 V.1.0.7.4 + - [ ] The code change is tested and works with Tasmota core ESP32 V.1.0.7.5 - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla). _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_ From a2c68f501d0ff29319c5cc99badb9b10fdfd984e Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:32:40 +0200 Subject: [PATCH 5/5] Core 1.0.7.5 for solo1 --- platformio_tasmota_env32.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 42225bdc9..6104db9d5 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -50,7 +50,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 [env:tasmota32solo1] extends = env:tasmota32_base -platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.4/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz +platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.5/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz platformio/tool-esptoolpy @ ~1.30100 platformio/tool-mklittlefs @ ~1.203.200522 build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32