mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/arendst/Tasmota into development

This commit is contained in:
Theo Arends 2021-10-21 16:24:58 +02:00
parent 071971edaa fcfc3a05c1
commit 28ed5e7960
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -7,7 +7,7 @@
- [ ] Only relevant files were touched - [ ] Only relevant files were touched
- [ ] Only one feature/fix was added per PR and the code change compiles without warnings - [ ] 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 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). - [ ] 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**_ _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_

5
platformio_tasmota32.ini
View File

@ -1,5 +1,4 @@
; *** BETA ESP32 Tasmota version *** ; *** ESP32 Tasmota version ***
; *** expect the unexpected. Some features not working!!! ***
[esp32_defaults] [esp32_defaults]
build_unflags = ${esp_defaults.build_unflags} build_unflags = ${esp_defaults.build_unflags}
@ -29,7 +28,7 @@ build_flags = ${esp_defaults.build_flags}
[core32] [core32]
platform = espressif32 @ 3.3.1 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 platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags} build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags} build_flags = ${esp32_defaults.build_flags}

2
platformio_tasmota_env32.ini
View File

@ -50,7 +50,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
[env:tasmota32solo1] [env:tasmota32solo1]
extends = env:tasmota32_base 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-esptoolpy @ ~1.30100
platformio/tool-mklittlefs @ ~1.203.200522 platformio/tool-mklittlefs @ ~1.203.200522
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32

13
tools/unishox/compress-html-uncompressed.py
View File

@ -21,16 +21,19 @@
import unishox import unishox
from os import listdir from os import listdir
from os import path
from datetime import datetime 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 totalIn = 0
totalSaved = 0 totalSaved = 0
for file in files: for file in files:
f = open('..\\..\\tasmota\\html_uncompressed\\' + file, "r") f = open(path_uncompressed + path.sep + file, "r")
text = f.read() text = f.read()
f.close() f.close()
@ -83,7 +86,7 @@ for file in files:
# print(text[lastel+1:pos:]) # print(text[lastel+1:pos:])
lastel = 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(" Const char name: "+const_name)
#print('####### Cleaned input:') #print('####### Cleaned input:')
#print(input) #print(input)
@ -142,9 +145,9 @@ for file in files:
comment = comment + "// compressed by tools/unishox/compress-html-uncompressed.py\n" comment = comment + "// compressed by tools/unishox/compress-html-uncompressed.py\n"
comment = comment + "/////////////////////////////////////////////////////////////////////\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.write(comment + lines + definition)
f.close() 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)) print("If all files are in use, total saving was "+str(totalSaved)+" out of "+str(totalIn))