andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 09:19:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge #2108

Browse Source
This commit is contained in:
proddy
2025-01-04 13:41:39 +01:00
parent 4138598db2
commit eb87651c47
166 changed files with 2099 additions and 10446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build_interface.py
View File

@@ -3,7 +3,6 @@ import os
Import("env")
def buildWeb():
os.chdir("interface")
print("Building web interface...")
@@ -20,6 +19,9 @@ def buildWeb():
finally:
os.chdir("..")
if not (env.IsCleanTarget()):
buildWeb()
# Don't buuld webUI if called from GitHub Actions
if "NO_BUILD_WEBUI" in os.environ:
print("!! Skipping the build of the web interface !!")
else:
if not (env.IsCleanTarget()):
buildWeb()

2
scripts/generate_csv_and_headers.sh
View File

@@ -2,7 +2,7 @@
#
# Builds the dump CSV files, modbus headers and documentation.
# Called by /scripts/generate_csv_and_headers.sh
# Run as `sh scripts/generate_csv_and_headers.sh` from the root of the repository.
# build dummy modbus_entity_parameters.hpp so it compiles
cat >./src/modbus_entity_parameters.hpp <<EOL

8
scripts/rename_fw.py
View File

@@ -100,17 +100,17 @@ def bin_copy(source, target, env):
file1.close()
# make a copy using the old 3.6.x filename format for backwards compatibility with the WebUI version check, e.g.
# create a EMS-ESP-<version>-ESP32_S3.bin if target is ci_s3_16M_P (16MB, PSRAM)
# create a EMS-ESP-<version>-ESP32.bin if target is ci_s_4M (4MB, no PSRAM), compatible only with S32 V1 and E32 V1.0,1.4,1.5
# create a EMS-ESP-<version>-ESP32_S3.bin if target is s3_16M_P (16MB, PSRAM)
# create a EMS-ESP-<version>-ESP32.bin if target is s_4M (4MB, no PSRAM), compatible only with S32 V1 and E32 V1.0,1.4,1.5
#
# Note: there is a chance newer E32V2s (which use the 16MB partition table and PSRAM) are running a custom build
# of the 3.6.5 firmware as 3.6.5 was released before production of the gateway board. Updating via the WebUI will break the system and require a manual update.
#
extra_variant = ""
if env.get('PIOENV') == "ci_s3_16M_P":
if env.get('PIOENV') == "s3_16M_P":
extra_variant = "EMS-ESP-" + \
app_version.replace(".", "_") + "-ESP32_S3"
elif env.get('PIOENV') == "ci_s_4M":
elif env.get('PIOENV') == "s_4M":
extra_variant = "EMS-ESP-" + app_version.replace(".", "_") + "-ESP32"
if extra_variant:

13
scripts/show_mem.sh Normal file
View File

@@ -0,0 +1,13 @@
#!/bin/sh
echo -n "Arduino: "
curl -s http://10.10.10.93/api/system/system/arduino | jq -r '.value'
echo -n "SDK: "
curl -s http://10.10.10.93/api/system/system/sdk | jq -r '.value'
echo -n "Free heap: "
curl -s http://10.10.10.93/api/system/system/freeMem | jq -r '.value'
echo -n "Max Alloc: "
curl -s http://10.10.10.93/api/system/system/maxAlloc | jq -r '.value'

2
scripts/update_modbus_registers.py
View File

@@ -140,7 +140,7 @@ cpp_entry_template = Template(
# read translations
listNames = {}
transre = re.compile(r'^MAKE_TRANSLATION\(([^,\s]+)\s*,\s*\"([^\"]+)\"')
transf = open('./src/locale_translations.h', 'r')
transf = open('./src/core/locale_translations.h', 'r')
while True:
line = transf.readline()
if not line:

7
scripts/upload.py
View File

@@ -19,6 +19,8 @@ import requests
import hashlib
from urllib.parse import urlparse
import time
import os
Import("env")
try:
@@ -159,5 +161,6 @@ def on_upload(source, target, env):
print()
env.Replace(UPLOADCMD=on_upload)
if env.get('UPLOAD_PROTOCOL') == 'custom':
env.Replace(UPLOADCMD=on_upload)