Merge remote-tracking branch 'mrg_main/main' into work

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jason2866
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,39 @@
+[![Build_special_firmware](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner-direct.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
+
+![Tasmota logo](https://github.com/arendst/Tasmota/blob/development/tools/logo/TASMOTA_FullLogo_Vector.svg#gh-light-mode-only)![Tasmota logo](https://github.com/arendst/Tasmota/blob/development/tools/logo/TASMOTA_FullLogo_Vector_White.svg#gh-dark-mode-only)
+
+
+## These special Tasmota binaries are not official stable releases
+
+## ⚠️ No support/warranty with these binaries! ⚠️
+
+[![Build_special_firmware](https://github.com/Jason2866/Tasmota-build/actions/workflows/Build_special_firmware.yml/badge.svg)](https://github.com/Jason2866/Tasmota-build/actions/workflows/Build_special_firmware.yml)
+
+## The special firmware files are [here](https://github.com/Jason2866/Tasmota-specials/tree/firmware/firmware). [Source code](https://github.com/Jason2866/Tasmota-build)<br>
+Official ✨ Tasmota ✨ firmware files are [here](https://github.com/arendst/Tasmota-firmware)
+
+## For easy flashing Tasmota use:
+- [Tasmota WebInstaller](https://tasmota.github.io/install/) Only Chrome or Edge Browser needed!
+- [ESP_Flasher](https://github.com/Jason2866/ESP_Flasher/releases)
+
+## Build variants:
+-  tasmota32c2 - Support for ESP32-C2 2M/4M
+ - tasmota32c3 - Support for ESP32-C3 2M no OTA variant (tasmota32c3_2M)
+ - tasmota32(c3/s3)-bluetooth - Support for BLE
+ - tasmota-battery - extremely cut down build for battery powered Tuya sensors
+ - tasmota32(c3/s2/s3/c6)-teleinfo - (ESP32 only) for Teleinfo French metering system, MQTT and TLS included 
+ - tasmota32-zigbeebridge - ESP32 based [ZigbeeBridge](https://templates.blakadder.com/ewelink_ZB-GW03.html)
+ - tasmota-zigbee - Zigbee for TI based chips (Esp8266 and ESP32)
+ - tasmota-minicustom - even smaller minimal build, **only for Updates (warning MQTT only! No Webserver)**
+ - tasmota-gps - GPS driver enabled
+ - tasmota-mega - big binary, almost every sensor included, OTA possible only with minimal
+ - tasmota-allsensors - guess whats in ;-)
+ - tasmota-platinum - IT...IS...HUGE!!! nearly everything is enabled (only for devices with >=4Mb flash)
+ - tasmota-titanium - as platinum with scripting enabled
+ - tasmota-rangeextender - Experimental build where Tasmota acts as AP range extender
+ - tasmota-scripting - all scripting features instead of rules + Smart Meter Interface enabled
+ - tasmota-thermostat - Thermostat driver and temperature sensors (ESP32 has Bluetooth included)
+ - tasmota32solo1-thermostat - ESP32 Single Core Thermostat driver and Bluetooth temperature sensors (used on Shelly Plus 1PM for example)
+ - tasmota-teleinfo - For Teleinfo French metering system, MQTT enabled but No TLS due to lack of ressources
+ - tasmota-tls - MQTT TLS enabled
+ - tasmota32(c3/s3)-mi - Support for MI BLE devices

genManifest.py

@@ -0,0 +1,128 @@
+#!/usr/bin/python3
+
+from curses.ascii import isupper
+from platform import release
+import sys
+from os import listdir
+from os import mkdir
+from os import remove
+from os import path
+import json
+
+def convertJSON(infile,outfile):
+    with open(infile) as json_file:
+        data = json.load(json_file)
+        for build in data['builds']:
+            for path in build['parts']:
+                # print(path['path'])
+                path['path'] = path['path'].replace("..", "https://Jason2866.github.io/Tasmota-specials")
+        # print(data)
+        j = json.dumps(data,indent=4)
+        f = open(outfile,"w")
+        f.write(j)
+        f.close()
+
+def getManifestEntry(manifest):
+    entry = {}
+    with open(manifest) as json_file:
+        data = json.load(json_file)
+        entry['path'] = "https://Jason2866.github.io/Tasmota-specials/" + manifest
+        entry['name'] = data['name']
+        entry['chipFamilies'] = []
+        for build in data['builds']:
+            entry['chipFamilies'].append(build['chipFamily'])
+        return entry
+
+
+
+def main(args):
+    path_manifests          = path.join('manifest')
+    path_manifests_ext      = path.join('manifest_ext')
+    if not path.exists(path_manifests):
+        print("No manifest folder, exiting ...")
+        return -1
+    files = listdir(path_manifests)
+    if len(files) == 0:
+        print("Empty manifest folder, exiting ...")
+        return -1
+    if path.exists(path_manifests_ext):
+        m_e_files = listdir(path_manifests_ext)
+        # for file in m_e_files:
+        #     remove(file)
+    else:
+        mkdir(path_manifests_ext)
+
+
+    output = {}
+
+    for file in files:
+        # create absolute path-version of each manifest file in /manifest_ext
+        convertJSON(path.join(path_manifests,file),path.join(path_manifests_ext,file))
+        line = file.split('.')
+        if len(line) != 4:
+            print("Incompatible path name, ignoring file:",file)
+            continue
+        # print(line[1])
+        if line[0] not in output:
+            output[line[0]] = [[],[],[],[],[],[]]
+        if line[1] == "tasmota":
+            output[line[0]][0].insert(0,getManifestEntry(path.join(path_manifests_ext,file))) # vanilla first
+            continue
+        elif line[1] == "tasmota32":
+            output[line[0]][1].insert(0,getManifestEntry(path.join(path_manifests_ext,file)))
+            continue
+        else: #solo1,4M,...
+            output[line[0]][2].append(getManifestEntry(path.join(path_manifests_ext,file)))
+            continue
+        name_components = line[1].split('-')
+        if name_components[0] == "tasmota":
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][1].append(getManifestEntry(path.join(path_manifests_ext,file))) # language versions last
+                continue
+            output[line[0]][0].append(getManifestEntry(path.join(path_manifests_ext,file)))
+            continue
+        elif name_components[0] == "tasmota32":
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][3].append(getManifestEntry(path.join(path_manifests_ext,file))) # language versions last
+                continue
+            output[line[0]][2].append(getManifestEntry(path.join(path_manifests_ext,file)))
+            continue
+        else: #solo1,4M,...
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][5].append(getManifestEntry(path.join(path_manifests_ext,file))) # language versions last
+                continue
+            output[line[0]][4].append(getManifestEntry(path.join(path_manifests_ext,file)))
+    # print(output)
+
+    for section in output:
+        merged = sorted(output[section][0],key=lambda d: d['name']) + sorted(output[section][1],key=lambda d: d['name']) + sorted(output[section][2],key=lambda d: d['name']) + sorted(output[section][3],key=lambda d: d['name']) + sorted(output[section][4],key=lambda d: d['name']) + sorted(output[section][5],key=lambda d: d['name'])
+        output[section] = merged
+
+    #release = output.pop("release")
+    #development  = output.pop("development")
+    unofficial = output.pop("unofficial")
+
+
+    final_json = {}
+    #final_json["release"] = release
+    #final_json["development"] = development
+    final_json["unofficial"] = unofficial
+    for key in output:
+        final_json[key] = output[key] # just in case we have another section in the future
+
+    print(final_json)
+
+    j = json.dumps(final_json,indent=4)
+    f = open("manifests.json", "w")
+    f.write(j)
+    f.close()
+
+    # intermediate version with double output (DEPRECATED)
+    f = open("manifests_new.json", "w")
+    f.write(j)
+    f.close()
+    # end deprecated version
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
+# end if

genManifestRelease.py

@@ -0,0 +1,138 @@
+#!/usr/bin/python3
+
+from curses.ascii import isupper
+from platform import release
+import sys
+from os import listdir
+from os import mkdir
+from os import remove
+from os import path
+import json
+import requests
+
+def convertJSON(infile, outfile, tag):
+    with open(infile) as json_file:
+        data = json.load(json_file)
+        for build in data['builds']:
+            for path in build['parts']:
+                components = path['path'].split("/")
+                path['path'] = "https://github.com/Jason2866/Tasmota-specials/releases/download/" + tag + "/" + components[-1]
+        # print(data)
+        j = json.dumps(data,indent=4)
+        f = open(outfile,"w")
+        f.write(j)
+        f.close()
+
+def firmwareVersion(tag):
+    commit = tag.split(".")[2]
+    url = "https://raw.githubusercontent.com/arendst/Tasmota/"+commit+"/tasmota/include/tasmota_version.h"
+    response = requests.get(url)
+    for line in response.text.split("\n"):
+        if "const uint32_t VERSION =" in line:
+            return line.split("//")[1].strip()
+
+def getManifestEntry(manifest, tag):
+    entry = {}
+    with open(manifest) as json_file:
+        data = json.load(json_file)
+        components = manifest.split("/")
+        entry['path'] = "https://github.com/Jason2866/Tasmota-specials/releases/download/" + tag + "/" + components[-1]
+        entry['name'] = data['name']
+        entry['version'] = firmwareVersion(tag)
+        entry['chipFamilies'] = []
+        for build in data['builds']:
+            entry['chipFamilies'].append(build['chipFamily'])
+        return entry
+
+def getTag():
+        with open("tag_latest.txt") as tag:
+            tag_latest = tag.readline().strip()
+            return tag_latest
+
+
+def main(args):
+    path_manifests          = path.join('manifest')
+    path_manifests_release  = path.join('manifest_release')
+    if not path.exists(path_manifests):
+        print("No manifest folder, exiting ...")
+        return -1
+    files = listdir(path_manifests)
+    if len(files) == 0:
+        print("Empty manifest folder, exiting ...")
+        return -1
+    if path.exists(path_manifests_release):
+        m_e_files = listdir(path_manifests_release)
+        # for file in m_e_files:
+        #     remove(file)
+    else:
+        mkdir(path_manifests_release)
+
+    tag_latest = getTag()
+
+    output = {}
+
+    for file in files:
+        # create absolute path-version of each manifest file in /manifest_ext
+        convertJSON(path.join(path_manifests,file),path.join(path_manifests_release,file),tag_latest)
+        line = file.split('.')
+        if len(line) != 4:
+            print("Incompatible path name, ignoring file:",file)
+            continue
+        # print(line[1])
+        if line[0] not in output:
+            output[line[0]] = [[],[],[],[],[],[]]
+        if line[1] == "tasmota":
+            output[line[0]][0].insert(0,getManifestEntry(path.join(path_manifests_release,file)),tag_latest) # vanilla first
+            continue
+        elif line[1] == "tasmota32":
+            output[line[0]][1].insert(0,getManifestEntry(path.join(path_manifests_release,file)),tag_latest)
+            continue
+        else: #solo1,4M,...
+            output[line[0]][2].append(getManifestEntry(path.join(path_manifests_release,file),tag_latest))
+            continue
+        name_components = line[1].split('-')
+        if name_components[0] == "tasmota":
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][1].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest) # language versions last
+                continue
+            output[line[0]][0].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest)
+            continue
+        elif name_components[0] == "tasmota32":
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][3].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest) # language versions last
+                continue
+            output[line[0]][2].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest)
+            continue
+        else: #solo1,4M,...
+            if len(name_components[1]) and name_components[1].isupper():
+                output[line[0]][5].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest) # language versions last
+                continue
+            output[line[0]][4].append(getManifestEntry(path.join(path_manifests_release,file)),tag_latest)
+    # print(output)
+
+    for section in output:
+        merged = sorted(output[section][0],key=lambda d: d['name']) + sorted(output[section][1],key=lambda d: d['name']) + sorted(output[section][2],key=lambda d: d['name']) + sorted(output[section][3],key=lambda d: d['name']) + sorted(output[section][4],key=lambda d: d['name']) + sorted(output[section][5],key=lambda d: d['name'])
+        output[section] = merged
+
+    #release = output.pop("release")
+    #development  = output.pop("development")
+    unofficial = output.pop("unofficial")
+
+
+    final_json = {}
+    #final_json["release"] = release
+    #final_json["development"] = development
+    final_json["unofficial"] = unofficial
+    for key in output:
+        final_json[key] = output[key] # just in case we have another section in the future
+
+    print(final_json)
+    j = json.dumps(final_json,indent=4)
+    f = open("manifests_release.json", "w")
+    f.write(j)
+    f.close()
+    # end deprecated version
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
+# end if