some fixes before DE 2025

Software/.gitignore

@@ -1,4 +1,6 @@
 data/
+data_src/version
+node_modules/
 .pio
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json

Software/codegen/README_flash_esp8266.md

@@ -0,0 +1,97 @@
+
+# Flash ESP8266 Script
+
+## Version: 1.0.0
+
+### Author: Marcel Peterkau
+### Copyright: 2024
+### License: MIT
+
+---
+
+## Beschreibung
+
+Dieses Skript entpackt ein ZIP-Archiv, das Firmware- und Dateisystem-Dateien für einen ESP8266 enthält, und flasht diese auf das Gerät. Nach dem Flashen werden die entpackten Dateien automatisch gelöscht.
+
+---
+
+## Benutzung
+
+```sh
+python flash_esp8266.py <zip_file> [-v]
+```
+
+### Parameter
+
+- `<zip_file>`: Der Name der ZIP-Datei, die die Firmware- und Dateisystem-Dateien enthält.
+- `-v`: Aktiviert Debug-Ausgaben (optional).
+
+### Beispiel
+
+```sh
+python flash_esp8266.py firmware_1.07_cbcdc34.zip -v
+```
+
+---
+
+## Voraussetzungen
+
+- Python 3.x
+- Die folgenden Python-Bibliotheken müssen installiert sein:
+  - esptool
+  - pyserial
+
+Installiere die benötigten Bibliotheken mit:
+
+```sh
+pip install esptool pyserial
+```
+
+---
+
+## Funktionen
+
+- **get_com_ports**: Ermittelt die verfügbaren COM-Ports.
+- **find_new_com_port**: Findet den neuen COM-Port, wenn der ESP8266 angeschlossen wird.
+- **extract_files**: Entpackt die ZIP-Datei und gibt die enthaltenen Dateien zurück.
+- **decompress_gz**: Entpackt eine GZ-Datei.
+- **clean_up**: Löscht die angegebenen Dateien nach dem Flashen.
+
+---
+
+## Ablauf
+
+1. Das Skript überprüft, ob die angegebene ZIP-Datei existiert.
+2. Die ZIP-Datei wird entpackt und die Firmware- und Dateisystem-Dateien werden identifiziert.
+3. Die Dateisystem-Datei (GZ) wird entpackt.
+4. Der Benutzer wird aufgefordert, den ESP8266 abzustecken und erneut anzustecken, um den neuen COM-Port zu ermitteln.
+5. Die Firmware- und Dateisystem-Dateien werden auf den ESP8266 geflasht.
+6. Die temporären Dateien werden nach dem erfolgreichen Flashen gelöscht.
+
+---
+
+## Fehlerbehebung
+
+- **ZIP-Datei nicht gefunden**: Stelle sicher, dass der Pfad zur ZIP-Datei korrekt angegeben ist.
+- **Erforderliche Dateien nicht im ZIP-Archiv**: Überprüfe, ob die ZIP-Datei die richtigen Dateien (`.fw.bin` und `.fs.gz`) enthält.
+- **Kein neuer COM-Port gefunden**: Stelle sicher, dass der ESP8266 korrekt angeschlossen ist und warte, bis der neue COM-Port erkannt wird.
+
+---
+
+## Lizenz
+
+Dieses Projekt ist unter der MIT-Lizenz lizenziert
+
+---
+
+## Versionshistorie
+
+- **1.0.0** - Initiale Version
+
+---
+
+## Haftungsausschluss
+
+Dieses Skript wird ohne Garantie bereitgestellt. Der Autor übernimmt keine Verantwortung für Schäden oder Datenverlust, die durch die Nutzung dieses Skripts entstehen könnten.
+
+---

Software/codegen/flash_esp8266.py

@@ -0,0 +1,156 @@
+"""
+flash_esp8266.py
+
+Version: 1.0.0
+Author: Marcel Peterkau
+Copyright: 2024
+License: MIT
+
+Beschreibung:
+Dieses Skript entpackt ein ZIP-Archiv mit Firmware- und Dateisystem-Dateien und flasht diese auf einen ESP8266.
+Die entpackten Dateien werden nach dem Flashen gelöscht.
+
+Versionshistorie:
+1.0.0 - Initiale Version
+
+Benutzung:
+python flash_esp8266.py <zip_file> [-v]
+
+Optionen:
+-v    Aktiviert Debug-Ausgaben
+"""
+
+import esptool
+import sys
+import serial.tools.list_ports
+import zipfile
+import os
+import gzip
+import shutil
+
+BAUD_RATE = 921600  # Erhöhte Baudrate
+DEBUG = '-v' in sys.argv
+
+def debug_print(message):
+    if DEBUG:
+        print(message)
+
+def get_com_ports():
+    ports = [comport.device for comport in serial.tools.list_ports.comports()]
+    debug_print(f"Verfügbare COM-Ports: {ports}")
+    return ports
+
+def find_new_com_port(old_ports, timeout=15):
+    debug_print("Suche nach neuen COM-Ports...")
+    import time
+    start_time = time.time()
+    while time.time() - start_time < timeout:
+        new_ports = get_com_ports()
+        added_ports = list(set(new_ports) - set(old_ports))
+        if added_ports:
+            new_port = added_ports[0]
+            print(f"Neuer COM-Port gefunden: {new_port}")
+            return new_port
+        time.sleep(1)
+    return None
+
+def extract_files(zip_file):
+    with zipfile.ZipFile(zip_file, 'r') as zip_ref:
+        zip_ref.extractall()
+        debug_print(f"Entpackt: {zip_ref.namelist()}")
+        return zip_ref.namelist()
+
+def decompress_gz(file_path):
+    output_file = file_path.replace('.gz', '')
+    with gzip.open(file_path, 'rb') as f_in:
+        with open(output_file, 'wb') as f_out:
+            shutil.copyfileobj(f_in, f_out)
+    debug_print(f"Entpackt {file_path} zu {output_file}")
+    return output_file
+
+def clean_up(files):
+    for file in files:
+        if os.path.isfile(file):
+            os.remove(file)
+            debug_print(f"Gelöscht: {file}")
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Verwendung: python flash_esp8266.py <zip_file> [-v]")
+        sys.exit(1)
+
+    ZIP_FILE = sys.argv[1]
+
+    # Überprüfe, ob das ZIP-Archiv existiert
+    if not os.path.isfile(ZIP_FILE):
+        print(f"ZIP-Archiv {ZIP_FILE} nicht gefunden.")
+        sys.exit(1)
+
+    # Entpacke das ZIP-Archiv
+    extracted_files = extract_files(ZIP_FILE)
+
+    # Finde die .fw.bin- und .fs.gz-Dateien
+    bin_file = None
+    fs_file = None
+
+    for file in extracted_files:
+        if file.endswith('.fw.bin'):
+            bin_file = file
+        elif file.endswith('.fs.gz'):
+            fs_file = file
+
+    if not bin_file or not fs_file:
+        print(f"Die erforderlichen Dateien (.fw.bin und .fs.gz) wurden nicht im ZIP-Archiv {ZIP_FILE} gefunden.")
+        sys.exit(1)
+
+    print(f"Gefundene Firmware-Datei: {bin_file}")
+    print(f"Gefundene Dateisystem-Datei: {fs_file}")
+
+    # Entpacke die .fs.gz-Datei
+    decompressed_fs_file = decompress_gz(fs_file)
+
+    print("Bitte stecke den ESP8266 ab, falls er angeschlossen ist, und drücke Enter.")
+    input()
+
+    print("Suche nach verfügbaren COM-Ports...")
+    old_ports = get_com_ports()
+
+    print("Bitte stecke den ESP8266 jetzt an und warte, bis der neue COM-Port erkannt wird...")
+
+    port = find_new_com_port(old_ports, timeout=15)
+
+    if port is None:
+        print("Kein neuer COM-Port gefunden. Bitte versuche es erneut.")
+        sys.exit(1)
+
+    print(f"Neuer COM-Port gefunden: {port}")
+
+    # Benutze esptool zum Flashen der Firmware und des Dateisystems
+    try:
+        # Flashen der Firmware
+        esptool_args_bin = [
+            '--port', port,
+            '--baud', str(BAUD_RATE),
+            'write_flash', '-fm', 'dout', '0x00000', bin_file
+        ]
+        esptool.main(esptool_args_bin)
+        print("Firmware erfolgreich geflasht!")
+
+        # Flashen des Dateisystems
+        esptool_args_fs = [
+            '--port', port,
+            '--baud', str(BAUD_RATE),
+            'write_flash', '0x300000', decompressed_fs_file
+        ]
+        esptool.main(esptool_args_fs)
+        print("Dateisystem erfolgreich geflasht!")
+
+        # Bereinigen der entpackten Dateien
+        clean_up(extracted_files)
+        clean_up([decompressed_fs_file])
+
+    except Exception as e:
+        print(f"Fehler beim Flashen: {e}")
+        sys.exit(1)
+
+    input("Drücke Enter, um das Fenster zu schließen...")  # Hält das Fenster offen

Software/codegen/git_rev_macro.py

@@ -1,8 +0,0 @@
-import subprocess
-
-revision = (
-    subprocess.check_output(["git", "rev-parse", "--short=10", "HEAD"])
-    .strip()
-    .decode("utf-8")
-)
-print("-DGIT_REV='\"%s\"'" % revision)

Software/codegen/prepare_littlefs.py

@@ -1,33 +1,46 @@
-# SCRIPT TO GZIP CRITICAL FILES FOR ACCELERATED WEBSERVING
-# see also https://community.platformio.org/t/question-esp32-compress-files-in-data-to-gzip-before-upload-possible-to-spiffs/6274/10
-
-
-import glob
 import shutil
 import gzip
 import os
 import subprocess
 import platform
+from os import popen
 Import("env")
 Import("projenv")
 
-# Überprüfe die Betriebssystemplattform
+def resolve_tool(name):
-if platform.system() == "Windows":
+    local_bin = os.path.join(env['PROJECT_DIR'], 'node_modules', '.bin', name)
-    # Setze die Pfade zu den Tools für Windows
+    if platform.system() == "Windows":
-    html_minifier_path = os.path.join(os.getenv("APPDATA"), "npm", "html-minifier.cmd")
+        local_bin += ".cmd"
-    uglifyjs_path = os.path.join(os.getenv("APPDATA"), "npm", "uglifyjs.cmd")
+    if os.path.exists(local_bin):
-    terser_path = os.path.join(os.getenv("APPDATA"), "npm", "terser.cmd")
+        return local_bin
-    cssnano_path = os.path.join(os.getenv("APPDATA"), "npm", "cssnano.cmd")
-elif platform.system() == "Linux":
-    # Setze die Namen der Tools für Linux
-    html_minifier_path = "html-minifier"
-    uglifyjs_path = "uglifyjs"
-    terser_path = "terser"
-    cssnano_path = "cssnano"
-else:
-    # Hier könntest du weitere Bedingungen für andere Betriebssysteme hinzufügen
-    raise Exception("Unterstütztes Betriebssystem nicht erkannt")
 
+    found = shutil.which(name)
+    if found:
+        return found
+
+    raise FileNotFoundError(f"{name} wurde nicht gefunden. Bitte `npm install` ausführen.")
+
+def ensure_npm_dependencies():
+    node_modules_bin = os.path.join(env['PROJECT_DIR'], 'node_modules', '.bin')
+    required_tools = ["html-minifier", "terser", "cleancss"]
+    missing = False
+
+    for tool in required_tools:
+        path = os.path.join(node_modules_bin, tool + ('.cmd' if platform.system() == "Windows" else ''))
+        if not os.path.exists(path):
+            missing = True
+            break
+
+    if missing:
+        print("NPM-Abhängigkeiten fehlen – führe `npm install` aus...")
+        subprocess.run(["npm", "install"], cwd=env['PROJECT_DIR'], check=True)
+
+
+ensure_npm_dependencies()
+
+html_minifier_path = resolve_tool("html-minifier")
+terser_path = resolve_tool("terser")
+cleancss_path = resolve_tool("cleancss")
 
 def minify_html(input_path, output_path):
     subprocess.run([html_minifier_path, '--collapse-whitespace', '--remove-comments', input_path, '-o', output_path])
@@ -36,7 +49,7 @@ def minify_js(input_path, output_path):
     subprocess.run([terser_path, input_path, '-o', output_path, '-c', '-m'])
 
 def minify_css(input_path, output_path):
-    subprocess.run([cssnano_path, '--no-discardUnused', input_path, output_path])
+    subprocess.run([cleancss_path, '--no-discardUnused', input_path, output_path])
 
 def process_file(src_path, dest_path):
     _, file_extension = os.path.splitext(src_path)
@@ -155,7 +168,8 @@ def gzip_webfiles(source, target, env):
             target_file_path = data_dir_path + filename_subdir
             os.makedirs(os.path.dirname(target_file_path), exist_ok=True)
             print('GZIP: Compressed... ' + target_file_path)
-            gzip_file(source_file_path, target_file_path + ".gz")
+            gzip_target_path = target_file_path + ".gz"
+            gzip_file(source_file_path, gzip_target_path)
     except IOError as e:
         was_error = True
         print('GZIP: Failed to compress file: ' + source_file_path)
@@ -167,10 +181,15 @@ def gzip_webfiles(source, target, env):
         shutil.rmtree(data_temp_dir_path)
 
     return
- 
+
 def gzip_binffiles(source, target, env):
+    git_revision = popen('git rev-parse --short HEAD').read().strip()
+    custom_flash_version = env.GetProjectOption("custom_flash_version", "0.99")
+
+    # Format the target file name
+    target_filename = f"filesystem_{custom_flash_version}_{git_revision}.fs"
     littlefsbin = target[0].get_abspath()
-    targetbin = os.path.join(os.path.dirname(littlefsbin), 'filesystem.fs')
+    targetbin = os.path.join(os.path.dirname(littlefsbin), target_filename)
     shutil.copyfile(littlefsbin, targetbin)
     gzip_file(targetbin, os.path.join(str(targetbin) + '.gz'))
     os.remove(targetbin)

Software/codegen/run_pre.py

@@ -3,6 +3,36 @@ env.Execute("\"$PYTHONEXE\" -m pip install jinja2")
 
 import struct2json
 import dtcs
+from os import popen
+
+git_revision = popen('git rev-parse --short HEAD').read().strip()
+
+# Versionsnummern aus platformio.ini holen
+custom_firmware_version = env.GetProjectOption("custom_firmware_version", "0.99")
+custom_flash_version = env.GetProjectOption("custom_flash_version", "0.99")
+
+# Versionsnummern aufteilen in Major und Minor
+fw_major, fw_minor = custom_firmware_version.split('.')
+fl_major, fl_minor = custom_flash_version.split('.')
+
+fw_major_int = int(fw_major)
+fw_minor_int = int(fw_minor)
+fl_major_int = int(fl_major)
+fl_minor_int = int(fl_minor)
+
+# Version in Datei "version" im Ordner "data_src" überschreiben
+with open('data_src/version', 'w') as version_file:
+    version_file.write(custom_flash_version)
+    
+# Build-Flags setzen
+env.Replace(PROGNAME="firmware_%s_%s.fw" % (custom_firmware_version, git_revision))
+env.Append(CPPDEFINES=[
+    ('GIT_REV', '\\"{}\\"'.format(git_revision)),
+    ('FW_MAJOR', fw_major_int),
+    ('FW_MINOR', fw_minor_int),
+    ('FL_MAJOR', fl_major_int),
+    ('FL_MINOR', fl_minor_int)
+])
 
 struct2json.struct2json()
 dtcs.build_dtcs()

Software/codegen/wifiAP_passcalc.py

@@ -0,0 +1,19 @@
+def djb2_hash(s):
+    hash = 5381
+    for c in s:
+        hash = ((hash << 5) + hash) + ord(c)  # hash * 33 + c
+    return hash & 0xFFFFFFFF  # Ensure it's a 32-bit unsigned integer
+
+def generate_password(seed, chip_id):
+    combined = (seed + chip_id)[:24]  # Ensure the combined string is up to 24 characters
+    hash_value = djb2_hash(combined)
+    hash_str = f"{hash_value:08X}{hash_value:08X}"  # Repeat the hash to ensure at least 16 characters
+    return hash_str[:32]  # Ensure the password is at most 32 characters
+
+if __name__ == "__main__":
+    SEED = "letmelubeyou"
+    chip_id = input("Enter the Chip ID in hex (e.g., 1A2B3C4D): ").strip()
+    chip_id = chip_id.zfill(8).upper()  # Ensure it's 8 characters, upper case
+
+    password = generate_password(SEED, chip_id)
+    print(f"Generated Password: {password}")

Software/data_src/index.htm

@@ -3,111 +3,155 @@
 
 <head>
   <meta charset="utf-8" />
-  <title>%DEVICENAME%</title>
+  <title>Dark Emergency Timer</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="static/css/bootstrap.min.css">
+  <link rel="stylesheet" href="static/css/bootstrap.min.css" />
-  <link rel="stylesheet" href="static/css/custom.css">
+  <link rel="stylesheet" href="static/css/custom.css" />
-  <link rel="stylesheet" href="static/css/tweaks.css">
+  <link rel="stylesheet" href="static/css/tweaks.css" />
   <script src="static/js/jquery.min.js"></script>
   <script src="static/js/bootstrap.min.js"></script>
   <script src="static/js/websocket.js"></script>
-  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <script src="static/js/dtc_table.js"></script>
-  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
+  <script src="static/js/script.js"></script>
-  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png" />
-  <link rel="manifest" href="static/img/site.webmanifest">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png" />
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png" />
+  <link rel="manifest" href="static/img/site.webmanifest" />
 </head>
 
 <body>
-
+  <!-- Connection-Overlay -->
+  <div id="overlay">
+    <div class="overlay-content">
+      <p>Verbinde...</p>
+      <span class="loader"></span>
+    </div>
+  </div>
+  <!-- Connection-Overlay -->
+  <!-- Notification-Container -->
+  <div id="notification-container" class="notification-container"></div>
+  <!-- Notification-Container -->
   <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
     <a class="navbar-brand" href="#">
-      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="">
+      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="" />
-      %DEVICENAME%
+      <span class="data-devicename">DE Airsoft Timer</span>
     </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
       aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-
     <div class="collapse navbar-collapse" id="collapsingNavbar">
       <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
-
+        <li class="nav-item">
-        <li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li>
+          <a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
+        </li>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a></li>
+        <li class="nav-item">
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_sysinfo">Systeminfo</a></li>
+          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li>
+        </li>
-
+        <li class="nav-item">
+          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a>
+        </li>
       </ul>
     </div>
   </nav>
-
   <main class="container">
-
     <!-- Tabs Content -->
     <div class="tab-content">
       <!-- Div Tab Home-->
       <div id="tab_home" class="tab-pane fade show active" role="tabpanel">
         <div class="col text-center">
           <div class="jumbotron">
-            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="">
+            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="" />
-            <h3 class="pt-3">%DEVICENAME%</h3>
+            <h3 class="pt-3">
+              <span class="data-devicename">DE Airsoft Timer</span>
+            </h3>
           </div>
         </div>
         <!-- Div Group Battery remain -->
         <hr />
-        <p>
+        <h4>Akkuladestand</h4>
-        <h4>Akku Ladestand</h4>
         <div class="progress">
-          <div class="progress-bar text-light" role="progressbar" aria-valuenow="%BAT_REMAIN_CAPACITY%"
+          <div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0"
-            aria-valuemin="0" aria-valuemax="100" style="width: %BAT_REMAIN_CAPACITY%&#37;">
+            aria-valuemin="0" aria-valuemax="100" style="width: 0%">
-            %BAT_REMAIN_CAPACITY%&#37;
+            0
           </div>
         </div>
-        </p>
         <!-- Div Group Battery remain -->
         <!-- Div Group current Mode -->
         <hr />
-        <p>
         <h4>aktueller Modus</h4>
-        <input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
+        <input class="data-systemstatus form-control" type="text" id="sysstatus" readonly />
-        </p>
         <!-- Div Group current Mode -->
         <!-- Div Group Faction Points -->
         <hr />
-        <p>
         <h4>aktueller Punktestand</h4>
         <div class="container-fluid">
           <div class="row">
-            <div class="col text-center %FACTION_1_ACTIVE% text-white p-3">%NAME_FAC_1%</div>
+            <div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">
-            <div class="col text-center %FACTION_2_ACTIVE% text-white p-3">%NAME_FAC_2%</div>
+              %NAME_FAC_1%
-            <div class="col text-center %FACTION_3_ACTIVE% text-white p-3">%NAME_FAC_3%</div>
-          </div>
-          <div class="row">
-            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac1.png"
-                class="rounded mx-auto img-fluid d-block" alt="...">
             </div>
-            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac2.png"
+            <div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">
-                class="rounded mx-auto img-fluid d-block" alt="...">
+              %NAME_FAC_2%
             </div>
-            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac3.png"
+            <div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">
-                class="rounded mx-auto img-fluid d-block" alt="...">
+              %NAME_FAC_3%
             </div>
           </div>
           <div class="row">
-            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_1%</div>
+            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1">
-            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_2%</div>
+              <div class="glow-container">
-            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_3%</div>
+                <img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="..." />
+              </div>
+            </div>
+            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction2 glow-active-faction">
+              <div class="glow-container">
+                <img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="..." />
+              </div>
+            </div>
+            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3">
+              <div class="glow-container">
+                <img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="..." />
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div id="time_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">
+              0
+            </div>
+            <div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">
+              0
+            </div>
+            <div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">
+              0
+            </div>
+          </div>
+          <div class="row mt-3">
+            <div class="col text-center">
+              <button id="faction1" class="btn-wsevent btn btn-outline-primary">
+                Aktivieren
+              </button>
+            </div>
+            <div class="col text-center">
+              <button id="faction2" class="btn-wsevent btn btn-outline-primary">
+                Aktivieren
+              </button>
+            </div>
+            <div class="col text-center">
+              <button id="faction3" class="btn-wsevent btn btn-outline-primary">
+                Aktivieren
+              </button>
+            </div>
           </div>
         </div>
-        </p>
         <!-- Div GroupFaction Points -->
         <!-- Div Group DTC Table -->
-        <div %SHOW_DTC_TABLE%>
+        <div id="dtc_container" hidden>
           <hr />
-          <p>
           <h4>Fehlercodes</h4>
-          <table class="table">
+          <table class="table" id="dtc_table">
             <tbody>
               <tr>
                 <th class="col-6" scope="col">Zeitstempel</th>
@@ -115,83 +159,56 @@
                 <th class="col-2" scope="col">Schwere</th>
                 <th class="col-2" scope="col">Aktiv</th>
               </tr>
-              %DTC_TABLE%
             </tbody>
           </table>
-          </p>
         </div>
         <!-- Div Group DTC Table -->
       </div>
       <!-- Div Tab Home-->
-
       <!-- Div Tab Maintenance -->
       <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
         <h3>Wartung</h3>
         <!-- Div Group Reset Timers -->
         <hr />
-        <p>
         <h4>Punkte zur&uuml;cksetzen</h4>
-        <form action="post.htm" method="POST" class="form-horizontal">
+        <div class="form-group row">
-          <div class="form-group row">
+          <div class="col text-center">
-            <div class="col text-center">
+            <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">
-              <button name="resetpoints" type="submit" class="btn btn-outline-primary">Reset</button>
+              Timer zurücksetzen
-            </div>
+            </button>
           </div>
-        </form>
-        </p>
-        <!-- Div Group Reset Timers  -->
-        <!-- Div Group EEPROM formatting -->
-        <hr />
-        <p>
-        <h4>EEPROM formatieren</h4>
-        <div class="alert alert-primary alert-dismissable show fade" role="alert">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-          </button>
-          <strong>Achtung!</strong><br>
-          Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
-          Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
-          Folgende Situationen erfordern unter anderem eine Formatierung:
-          - Erstinitialisierung (bei neu aufgebautem Gerät)
-          - Firmware-Update (nur wenn es die Release-Notes fordern)
         </div>
-        <form action="post.htm" method="POST" class="form-horizontal">
+        <!-- Div Group Reset Timers  -->
-          <div class="form-group row">
+        <!-- Div Group LiveDebug -->
-            <div class="offset-4 col-8">
+        <hr />
-              <div class="form-check">
+        <h4>Live Debug</h4>
-                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
+        <div class="form-group row">
-                <label class="form-check-label" for="reset_ee_cfg">
+          <input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control" />
-                  Bereich "CFG"
+        </div>
-                </label>
+        <div class="form-group row">
-              </div>
+          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
-              <div class="form-check">
+        </div>
-                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
+        <div class="form-group row">
-                <label class="form-check-label" for="reset_ee_pds">
+          <div class="col text-center">
-                  Bereich "PDS"
+            <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">
-                </label>
+              Start
-              </div>
+            </button>
-            </div>
+            <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">
+              Stop
+            </button>
           </div>
-          <div class="form-group row">
+        </div>
-            <div class="col text-center">
+        <!-- Div Group LiveDebug -->
-              <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <!-- Div Group EEPROM formatting -->
         <!-- Div Group Device Reboot -->
         <hr />
-        <p>
         <h4>Ger&auml;t neustarten</h4>
-        <form action="post.htm" method="POST" class="form-horizontal">
+        <div class="form-group row">
-          <div class="form-group row">
+          <div class="col text-center">
-            <div class="col text-center">
+            <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">
-              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
+              Reboot
-            </div>
+            </button>
           </div>
-        </form>
+        </div>
-        </p>
         <!-- Div Group Device Reboot -->
       </div>
       <!-- Div Tab Maintenance -->
@@ -200,247 +217,121 @@
         <h3>Einstellungen</h3>
         <!-- Div Group Battery Type -->
         <hr />
-        <p>
+        <h4>Akku</h4>
-        <form action="post.htm" method="POST" class="form-horizontal">
-          <h4>Akku-Variante</h4>
-          <div class="form-group row">
-            <label for="battery_select" class="control-label col-4">Akku</label>
-            <div class="col-8">
-              <select id="battery_select" name="battery_select" class="select form-control">
-                %BATTERY_SELECT_OPTIONS%
-              </select>
-            </div>
-          </div>
-          <h4>Timer-Einstellungen</h4>
-          <div class="form-group row">
-            <label for="factionreboot_cont" class="control-label col-4">active Faction Recovery</label>
-            <div class="col-8">
-              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="factionreboot_cont" id="factionreboot_cont"
-                  %FACTIONREBOOT_CHECKED%>
-                <label class="form-check-label" for="factionreboot_cont">
-                  aktive Faktion beim booten wiederherstellen ?
-                </label>
-              </div>
-            </div>
-          </div>
-          <h4>Faktionsbezeichnungen</h4>
-          <div class="alert alert-primary alert-dismissable show fade" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-              <span aria-hidden="true">×</span>
-            </button>
-            <strong>Achtung!</strong><br>
-            Faktionsbezeichnungen können nur aus ASCII-Zeichen bestehen, also A-Z, a-z und 0-9
-          </div>
-          <div class="form-group row">
-            <label for="faction_1_name" class="control-label col-4">Faktion 1</label>
-            <div class="col-8">
-              <div class="input-group">
-                <input id="faction_1_name" name="faction_1_name" value="%NAME_FAC_1%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
-                <div class="input-group-append">
-                  <span class="input-group-text">max 32 Zeichen</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="form-group row">
-            <label for="faction_2_name" class="control-label col-4">Faktion 2</label>
-            <div class="col-8">
-              <div class="input-group">
-                <input id="faction_2_name" name="faction_2_name" value="%NAME_FAC_2%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
-                <div class="input-group-append">
-                  <span class="input-group-text">max 32 Zeichen</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="form-group row">
-            <label for="faction_3_name" class="control-label col-4">Faktion 3</label>
-            <div class="col-8">
-              <div class="input-group">
-                <input id="faction_3_name" name="faction_3_name" value="%NAME_FAC_3%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
-                <div class="input-group-append">
-                  <span class="input-group-text">max 32 Zeichen</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="form-group row">
-            <div class="col text-center">
-              <button name="settingssave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <!-- Div Group Battery Type -->
-      </div>
-      <!-- Div Tab Settings -->
-
-      <!-- Div Tab SystemInfo -->
-      <div id="tab_sysinfo" class="tab-pane fade" role="tabpanel">
-        <h3>Systeminfo</h3>
-        <!-- Div Group Sysinfo:Geraeteinfo -->
-        <hr />
-        <p>
-        <h4>Ger&auml;t</h4>
-        <table class="table">
-          <tbody>
-            <tr>
-              <th class="col-7" scope="col">Parameter</td>
-              <th class="col-5" scope="col">Value</td>
-            </tr>
-            <tr>
-              <td>Hostname</td>
-              <td>%HOSTNAME%</td>
-            </tr>
-            <tr>
-              <td>Device-ID</td>
-              <td>%DEVICENAME_ID%</td>
-            </tr>
-            <tr>
-              <td>Battery Voltage</td>
-              <td>%BAT_VOLTAGE%V</td>
-            </tr>
-            <tr>
-              <td>Battery Remain</td>
-              <td>%BAT_REMAIN_CAPACITY%&#37;</td>
-            </tr>
-        </table>
-        </p>
-        <!-- Div Group Sysinfo:Geraeteinfo -->
-        <!-- Div Group Sysinfo:Settings -->
-        <hr />
-        <p>
-        <h4>Einstellungen</h4>
-        <table class="table">
-          <tbody>
-            <tr>
-              <th class="col-7" scope="col">Parameter</td>
-              <th class="col-5" scope="col">Value</td>
-            </tr>
-            <tr>
-              <td>Battery_type</td>
-              <td>%BATTERY_TYPE%</td>
-            </tr>
-            <tr>
-              <td>Faction_recovery</td>
-              <td>%FACTION_RECOVERY%</td>
-            </tr>
-            <tr>
-              <td>EEPROM Version</td>
-              <td>%EEPROM_VERSION%</td>
-            </tr>
-            <tr>
-              <td>Checksum</td>
-              <td>%CONFIG_CHECKSUM%</td>
-            </tr>
-          </tbody>
-        </table>
-        </p>
-        <!-- Div Group Sysinfo:Settings -->
-        <!-- Div Group Sysinfo:Persistance -->
-        <hr />
-        <p>
-        <h4>Betriebsdaten</h4>
-        <table class="table">
-          <tbody>
-            <tr>
-              <th class="col-7" scope="col">Parameter</td>
-              <th class="col-5" scope="col">Value</td>
-            </tr>
-            <tr>
-              <td>writeCycleCounter</td>
-              <td>%WRITE_CYCLE_COUNT%</td>
-            </tr>
-            <tr>
-              <td>PersistenceMarker</td>
-              <td>%PERSISTENCE_MARKER%</td>
-            </tr>
-            <tr>
-              <td>activeFaction</td>
-              <td>%ACTIVE_FACTION%</td>
-            </tr>
-            <tr>
-              <td>faction_1_timer</td>
-              <td>%POINTS_FAC_1%</td>
-            </tr>
-            <tr>
-              <td>faction_2_timer</td>
-              <td>%POINTS_FAC_2%</td>
-            </tr>
-            <tr>
-              <td>faction_3_timer</td>
-              <td>%POINTS_FAC_3%</td>
-            </tr>
-            <tr>
-              <td>checksum</td>
-              <td>%PERSISTANCE_CHECKSUM%</td>
-            </tr>
-        </table>
-        </p>
-        <!-- Div Group Sysinfo:Persistance -->
-        <!-- Div Group LiveDebug -->
-        <hr />
-        <p>
-        <h4>Live Debug</h4>
         <div class="form-group row">
-          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
+          <label for="batterytype" class="control-label col-4">Akku-Variante</label>
+          <div class="col-8">
+            <select id="batterytype" class="set-wsevent data-batterytype select form-control">
+              <option value="Undefined">Undefined</option>
+              <option value="LiPo 3S">LiPo 3S</option>
+              <option value="LiPo 2S">LiPo 2S</option>
+            </select>
+          </div>
         </div>
+        <!-- Div Group Battery Type -->
+        <!-- Div Group Timer Settings -->
+        <hr />
+        <h4>Timer Einstellungen</h4>
+        <div class="form-group row">
+          <label for="active_faction_on_reboot" class="control-label col-4">Aktive Fraktion wiederherstellen</label>
+          <div class="col-8">
+            <div class="form-check">
+              <input class="set-wsevent data-active_faction_on_reboot form-check-input" type="checkbox"
+                id="active_faction_on_reboot" />
+              <label class="form-check-label" for="active_faction_on_reboot">
+                aktivieren
+              </label>
+            </div>
+          </div>
+        </div>
+        <div class="form-group row">
+          <label for="name_faction1" class="control-label col-4">Faktion 1</label>
+          <div class="col-8">
+            <div class="input-group">
+              <input id="name_faction1" type="text" class="set-wsevent data-name_faction1 form-control"
+                required="required" />
+              <div class="input-group-append">
+                <span class="input-group-text">max. 32 Zeichen</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form-group row">
+          <label for="name_faction2" class="control-label col-4">Faktion 2</label>
+          <div class="col-8">
+            <div class="input-group">
+              <input id="name_faction2" type="text" class="set-wsevent data-name_faction2 form-control"
+                required="required" />
+              <div class="input-group-append">
+                <span class="input-group-text">max. 32 Zeichen</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form-group row">
+          <label for="name_faction3" class="control-label col-4">Faktion 3</label>
+          <div class="col-8">
+            <div class="input-group">
+              <input id="name_faction3" type="text" class="set-wsevent data-name_faction3 form-control"
+                required="required" />
+              <div class="input-group-append">
+                <span class="input-group-text">max. 32 Zeichen</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- Div Group Timer Settings -->
+        <!-- Div Group Save Button-->
+        <hr />
         <div class="form-group row">
           <div class="col text-center">
-            <button id="btn-ws-start" class="btn btn-outline-primary">Start</button>
+            <button id="settingssave" class="btn-wsevent btn btn-outline-primary">
-            <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
+              Speichern
+            </button>
           </div>
         </div>
-        </p>
-        <!-- Div Group LiveDebug -->
       </div>
-      <!-- Div Tab SystemInfo -->
+      <!-- Div Tab Settings -->
-
       <!-- Div Tab Firmware Update-->
       <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
         <h3>Firmware</h3>
         <!-- Div Group VersionInfo -->
         <hr />
-        <p>
         <h4>Version-Info</h4>
         <table class="table">
           <tbody>
             <tr>
-              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-7" scope="col">Parameter</th>
-              <th class="col-5" scope="col">Value</td>
+              <th class="col-5" scope="col">Value</th>
             </tr>
             <tr>
               <td>Firmware Version</td>
-              <td>%SW_VERSION%</td>
+              <td><span class="data-fw-version"></span></td>
             </tr>
             <tr>
               <td>Flash Version</td>
-              <td>%FS_VERSION%</td>
+              <td><span class="data-flash-version"></span></td>
             </tr>
             <tr>
               <td>Git Revision</td>
-              <td>%GIT_REV%</td>
+              <td><span class="data-git-revision"></span></td>
             </tr>
+          </tbody>
         </table>
-        </p>
         <!-- Div Group VersionInfo -->
         <!-- Div Group EEPROM Backup -->
         <hr />
-        <p>
         <h4>EEPROM-Backup</h4>
         <div class="form-group row">
           <div class="col text-center">
             <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
           </div>
         </div>
-        </p>
         <!-- Div Group EEPROM Backup -->
         <!-- Div Group EEPROM Restore -->
         <hr />
-        <p>
         <h4>EEPROM-Restore</h4>
-        <form method='POST' action='eeRestore' enctype='multipart/form-data'>
+        <form method="POST" action="eeRestore" enctype="multipart/form-data">
           <div class="form-group row">
             <div class="custom-file">
               <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
@@ -450,17 +341,17 @@
           </div>
           <div class="form-group row">
             <div class="col text-center">
-              <button name="submit" type="submit" class="btn btn-outline-primary">Restore starten</button>
+              <button name="submit" type="submit" class="btn btn-outline-primary">
+                Restore starten
+              </button>
             </div>
           </div>
         </form>
-        </p>
         <!-- Div Group EEPROM Restore -->
         <!-- Div Group Firmware Update -->
         <hr />
-        <p>
         <h4>Firmware-Update</h4>
-        <form method='POST' action='doUpdate' enctype='multipart/form-data'>
+        <form method="POST" action="doUpdate" enctype="multipart/form-data">
           <div class="form-group row">
             <div class="custom-file">
               <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
@@ -470,34 +361,29 @@
           </div>
           <div class="form-group row">
             <div class="col text-center">
-              <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
+              <button name="submit" type="submit" class="btn btn-outline-primary">
+                Update starten
+              </button>
             </div>
           </div>
         </form>
-        </p>
         <!-- Div Group Firmware Update -->
       </div>
       <!-- Div Tab Firmware Update-->
     </div>
     <!-- Tabs Content -->
   </main>
-
-
   <!-- Footer -->
-
   <footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
     <div class="container-fluid text-center">
       <div class="footer-copyright text-center py-3">
         <span class="text-muted">© 2023 -
-          <a class="text-reset fw-bold" href="https://hiabuto.de/">Hiabuto Defense Systems</a></span>
+          <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
       </div>
     </div>
   </footer>
-
   <!-- Footer -->
-
   <!-- Modal Dialog -->
-
   <div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
@@ -512,55 +398,14 @@
           <p class="dtc-debugval">DTC DebugVal</p>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
+            Close
+          </button>
         </div>
       </div>
     </div>
   </div>
-
   <!-- Modal Dialog -->
-
-  <script>
-    $('.navbar-nav>li>a').on('click', function () {
-      $('.navbar-collapse').collapse('hide');
-    });
-
-    document.querySelector('.custom-file-input').addEventListener('change', function (e) {
-      var fileName = document.getElementById("fw-update-file").files[0].name;
-      var nextSibling = e.target.nextElementSibling
-      nextSibling.innerText = fileName
-    });
-
-    $(document).ready(function () {
-      $("tr[data-dtc]").each(function (i) {
-        $(this).attr('data-toggle', "modal");
-        $(this).attr('data-target', "#dtcModal");
-      });
-    });
-
-    $('#dtcModal').on('show.bs.modal', function (event) {
-      var dtctr = $(event.relatedTarget)
-      var dtc = dtctr.data('dtc')
-      var debugval = dtctr.data('debugval')
-      var modal = $(this)
-      $.getJSON('static/tt_dtc/dtc_' + dtc + '.json', function (data) {
-        modal.find('.modal-title').text(data.title)
-        modal.find('.dtc-desc').text(data.description)
-        if (debugval > 0) {
-          modal.find('.dtc-debugval').text("Debugvalue: " + debugval)
-        }
-        else {
-          modal.find('.dtc-debugval').remove()
-        }
-      }).fail(function () {
-        console.log("An error has occurred.");
-        modal.find('.modal-title').text("Fehler")
-        modal.find('.dtc-desc').text("DTC-Beschreibung konnte nicht geladen werden")
-      });
-    });
-
-  </script>
-
 </body>
 
 </html>

Software/data_src/post.htm

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8" />
-  <title>KTM CAN Chain Oiler</title>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="static/css/bootstrap.min.css">
-  <link rel="stylesheet" href="static/css/custom.css">
-  <script src="static/js/jquery.min.js"></script>
-  <script src="static/js/bootstrap.min.js"></script>
-  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
-  <link rel="manifest" href="static/img/site.webmanifest">
-  <meta http-equiv="refresh" content="3; url='index.htm'" />
-</head>
-
-<body>
-  <div class="container" style="display: flex; justify-content: center; align-items: center; height: 100vh">
-    <div class="alert alert-success">
-      <strong>Bitte warten!</strong> Änderungen werden übernommen.
-    </div>
-  </div>
-</body>
-
-</html>

Software/data_src/static/css/bootstrap.min.css

@@ -4,7 +4,7 @@
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-:root {
+ :root {
     --blue: #007bff;
     --indigo: #6610f2;
     --purple: #6f42c1;

Software/data_src/static/css/tweaks.css

@@ -25,3 +25,66 @@ hr {
     padding: 10px;
 }
 
+#overlay {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.8); /* Dunkler Hintergrund mit Transparenz */
+    color: white; /* Textfarbe */
+    justify-content: center;
+    align-items: center;
+    z-index: 9999; /* Stellen Sie sicher, dass es über anderen Elementen liegt */
+}
+
+.overlay-content {
+    text-align: center;
+    font-size: 4rem;
+}
+
+.loader {
+    width: 96px;
+    height: 96px;
+    border: 12px solid #FFF;
+    border-radius: 50%;
+    display: inline-block;
+    position: relative;
+    box-sizing: border-box;
+    animation: rotation 1s linear infinite;
+  } 
+  .loader::after {
+    content: '';  
+    box-sizing: border-box;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+    border: 12px solid transparent;
+    border-bottom-color: #FF3D00;
+  }
+  
+  @keyframes rotation {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  } 
+
+  .notification-container {
+    position: fixed;
+    top: 30%;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 1000;
+  }
+  
+  .notification {
+    margin-bottom: 20px; /* Fügen Sie bei Bedarf weitere Stile hinzu */
+  }

Software/data_src/static/js/dtc_table.js

@@ -0,0 +1,221 @@
+const jsonFilePath = "static/dtc_table.json";
+
+var dtcState = {};
+
+async function processDTCNotifications(dtcArray) {
+  // Entferne DTCs aus dtcState, die nicht im dtcArray enthalten sind
+  for (var key in dtcState) {
+    if (!dtcArray.some((dtc) => parseInt(dtc.split(",")[1]) == key)) {
+      delete dtcState[key];
+    }
+  }
+
+  if (dtcArray.length === 0 || dtcArray[0] == "0") {
+    dtcState = {};
+    return;
+  }
+
+  for (var i = 0; i < dtcArray.length; i++) {
+    var dtcInfo = dtcArray[i].split(",");
+    var errorCode = parseInt(dtcInfo[1]);
+    var activity = parseInt(dtcInfo[3]);
+    var severity = parseInt(dtcInfo[2]);
+
+    try {
+      var { title, description } = await getDescriptionForDTCNumber(errorCode);
+
+      switch (severity) {
+        case 1:
+          severity = "info";
+          break;
+        case 2:
+          severity = "warning";
+          break;
+        case 3:
+          severity = "danger";
+          break;
+      }
+
+      if (dtcState[errorCode]) {
+        // Überprüfen, ob sich der Zustand von "previous" auf "active" geändert hat
+        if (activity !== dtcState[errorCode].activity) {
+          dtcState[errorCode].activity = activity;
+          if (activity === 1) showNotification(description, severity);
+        }
+      } else {
+        // DTC ist neu, Zustand speichern und wenn active, Benachrichtigung anzeigen
+        dtcState[errorCode] = { activity: activity };
+        if (activity === 1) showNotification(description, severity);
+      }
+    } catch (error) {
+      console.error("Error processing DTC:", error);
+    }
+  }
+}
+
+function getDescriptionForDTCNumber(number) {
+  return new Promise((resolve, reject) => {
+    fetch(jsonFilePath)
+      .then((response) => response.json())
+      .then((data) => {
+        const dtcList = data.dtc_table_data;
+        const foundEntry = dtcList.find((entry) => entry.num === number);
+
+        if (foundEntry) {
+          const description = foundEntry.description;
+          const title = foundEntry.title;
+          resolve({ title, description });
+        } else {
+          // Wenn die Nummer nicht gefunden wurde, geben Sie einen Fehler zurück
+          reject(`Beschreibung für Nummer ${number} nicht gefunden.`);
+        }
+      })
+      .catch((error) => {
+        // Im Fehlerfall geben Sie den Fehler zurück
+        reject(error);
+      });
+  });
+}
+
+async function showDTCModal(event) {
+  var dtc = parseInt(event.currentTarget.getAttribute("data-dtc"));
+  var debugval = event.currentTarget.getAttribute("data-debugval");
+  var modal = $("#dtcModal");
+
+  try {
+    var { title, description } = await getDescriptionForDTCNumber(dtc);
+
+    modal.find(".modal-title").text(title);
+    modal.find(".dtc-desc").text(description);
+
+    if (debugval > 0) {
+      modal.find(".dtc-debugval").text("Debugvalue: " + debugval);
+    } else {
+      modal.find(".dtc-debugval").remove();
+    }
+  } catch (error) {
+    console.error("Fehler beim Abrufen der Beschreibung:", error);
+    modal.find(".modal-title").text("Fehler");
+    modal
+      .find(".dtc-desc")
+      .text("DTC-Beschreibung konnte nicht geladen werden");
+  }
+
+  // Modal anzeigen
+  modal.modal("show");
+}
+
+function fillDTCTable(dtcArray) {
+  // Referenz auf das Tabellen-Element
+  var table = document.getElementById("dtc_table");
+  var tablediv = document.getElementById("dtc_container");
+
+  // Prüfen, ob DTC vorhanden sind
+  if (dtcArray.length === 0 || dtcArray[0] == "0") {
+    // Verstecke das Tabellen-Div, wenn keine DTC vorhanden sind
+    tablediv.hidden = true;
+    table.innerHTML = "";
+    return;
+  }
+
+  // Prüfen, ob sich der Inhalt der Tabelle geändert hat
+  var tableContentChanged = false;
+  for (var i = 0; i < dtcArray.length; i++) {
+    var dtcInfo = dtcArray[i].split(",");
+    var errorCode = parseInt(dtcInfo[1]);
+    var activity = parseInt(dtcInfo[3]);
+
+    if (!dtcState[errorCode] || dtcState[errorCode].activity !== activity) {
+      tableContentChanged = true;
+      break;
+    }
+  }
+
+  if (!tableContentChanged) {
+    return;
+  }
+
+  // Zeige das Tabellen-Div, wenn DTC vorhanden sind
+  tablediv.hidden = false;
+
+  // Tabelle leeren, bevor sie neu gefüllt wird
+  table.innerHTML = "";
+
+  // Überschriften für die Tabelle erstellen
+  var headerRow = table.insertRow(0);
+
+  // Definition der Klassen und Scopes für die Spalten
+  var columnDefinitions = [
+    { class: "col-6", scope: "Zeitstempel" },
+    { class: "col-2", scope: "Fehlercode" },
+    { class: "col-2", scope: "Schwere" },
+    { class: "col-2", scope: "Aktiv" },
+  ];
+
+  for (var i = 0; i < columnDefinitions.length; i++) {
+    var headerCell = headerRow.insertCell(i);
+    headerCell.className = `th ${columnDefinitions[i].class}`;
+    headerCell.scope = columnDefinitions[i].scope;
+    headerCell.innerHTML = columnDefinitions[i].scope;
+  }
+
+  // DTC-Daten in die Tabelle einfügen
+  for (var i = 0; i < dtcArray.length; i++) {
+    var dtcInfo = dtcArray[i].split(",");
+
+    var row = table.insertRow(i + 1); // +1 wegen der Überschriftenzeile
+
+    // Zeitstempel
+    var timestampCell = row.insertCell(0);
+    timestampCell.innerHTML = formatTimestamp(parseInt(dtcInfo[0]));
+
+    // Fehlercode
+    var errorCodeCell = row.insertCell(1);
+    errorCodeCell.innerHTML = dtcInfo[1];
+
+    // Schwere
+    var severityCell = row.insertCell(2);
+    var severity = parseInt(dtcInfo[2]);
+
+    // Schwere
+    switch (severity) {
+      case 1:
+        severityCell.innerHTML = '<img src="static/img/info.png" alt="Info" />';
+        break;
+      case 2:
+        severityCell.innerHTML =
+          '<img src="static/img/warn.png" alt="Warnung" />';
+        break;
+      case 3:
+        severityCell.innerHTML =
+          '<img src="static/img/critical.png" alt="Kritisch" />';
+        break;
+      default:
+        severityCell.innerHTML =
+          '<img src="static/img/none.png" alt="Unbekannt" />';
+    }
+
+    row.setAttribute("data-dtc", dtcInfo[1]);
+    row.setAttribute("data-debugval", dtcInfo[4]);
+    row.addEventListener("click", showDTCModal);
+
+    // Aktivität
+    var activityCell = row.insertCell(3);
+    activityCell.innerHTML = parseInt(dtcInfo[3]) === 1 ? "active" : "previous";
+  }
+}
+
+function formatTimestamp(milliseconds) {
+  const date = new Date(milliseconds);
+
+  const days = String(date.getUTCDate() - 1).padStart(2, "0");
+  const hours = String(date.getUTCHours()).padStart(2, "0");
+  const minutes = String(date.getUTCMinutes()).padStart(2, "0");
+  const seconds = String(date.getUTCSeconds()).padStart(2, "0");
+  const millisecondsFormatted = String(date.getUTCMilliseconds()).padStart(
+    3,
+    "0"
+  );
+
+  return `${days}-${hours}:${minutes}:${seconds}:${millisecondsFormatted}`;
+}

Software/data_src/static/js/script.js

@@ -0,0 +1,42 @@
+$(document).ready(function () {
+  // Event-Listener für Navbar-Links
+  $(".navbar-nav a").on("click", function () {
+    $(".navbar-collapse").collapse("hide");
+  });
+
+  // Event-Listener für Passwort zeigen/verborgen
+  $("#show_hide_password a").on("click", function (event) {
+    event.preventDefault();
+    var inputField = $("#show_hide_password input");
+    var icon = $("#show_hide_password i");
+    if (inputField.attr("type") == "text") {
+      inputField.attr("type", "password");
+      icon.addClass("fa-eye-slash");
+      icon.removeClass("fa-eye");
+    } else if (inputField.attr("type") == "password") {
+      inputField.attr("type", "text");
+      icon.removeClass("fa-eye-slash");
+      icon.addClass("fa-eye");
+    }
+  });
+
+  // Event-Listener für Datei-Upload
+  $(".custom-file-input").on("change", function (e) {
+    var fileName = document.getElementById("fw-update-file").files[0].name;
+    var nextSibling = e.target.nextElementSibling;
+    nextSibling.innerText = fileName;
+  });
+
+  // Event-Listener für Live-Debug-Eingabe
+  $('#livedebug-in').on('keydown', function(event) {
+    if (event.key === 'Enter' || event.keyCode === 13) {
+      event.preventDefault(); // Verhindert, dass die Enter-Taste die Standardaktion ausführt (z.B. Absenden eines Formulars)
+      
+      const command = $('#livedebug-in').val(); // Den Befehl aus dem Eingabefeld holen
+      websocket_sendDebugCommand(command); // Den Befehl an die Funktion übergeben
+
+      $('#livedebug-in').val(''); // Leert das Eingabefeld
+      $('#livedebug-in').focus(); // Setzt den Fokus zurück auf das Eingabefeld
+    }
+  });
+});

Software/data_src/static/js/websocket.js

@@ -1,7 +1,15 @@
 var gateway = `ws://${window.location.hostname}/ws`;
 var websocket;
 
-window.addEventListener("load", onLoad);
+var statusMapping;
+var staticMapping;
+var overlay;
+
+document.addEventListener("DOMContentLoaded", function () {
+  // Ihr JavaScript-Code hier, einschließlich der onLoad-Funktion
+  overlay = document.getElementById("overlay");
+  onLoad();
+});
 
 function initWebSocket() {
   console.log("Trying to open a WebSocket connection...");
@@ -12,12 +20,27 @@ function initWebSocket() {
 }
 
 function initButtons() {
-  document
+  var elements = document.getElementsByClassName("btn-wsevent");
-    .getElementById("btn-ws-stop")
+
-    .addEventListener("click", livedebug_stop);
+  if (elements.length > 0) {
-  document
+    for (var i = 0; i < elements.length; i++) {
-    .getElementById("btn-ws-start")
+      let element = elements[i];
-    .addEventListener("click", livedebug_start);
+      element.addEventListener("click", sendButton);
+    }
+  }
+}
+
+function initSettingInputs() {
+  var elements = document.getElementsByClassName("set-wsevent");
+
+  if (elements.length > 0) {
+    for (var i = 0; i < elements.length; i++) {
+      let element = elements[i];
+      element.addEventListener("change", function () {
+        websocket_sendevent("set-" + element.id, element.value);
+      });
+    }
+  }
 }
 
 function onOpen(event) {
@@ -26,28 +49,98 @@ function onOpen(event) {
 
 function onClose(event) {
   console.log("Connection closed");
-  setTimeout(initWebSocket, 2000);
+  setTimeout(initWebSocket, 1000);
+  overlay.style.display = "flex";
+}
+
+function sendButton(event) {
+  var targetElement = event.target;
+
+  if (
+    targetElement.classList.contains("confirm") &&
+    window.confirm("Sicher?") == false
+  )
+    return;
+
+  websocket_sendevent("btn-" + targetElement.id, targetElement.value);
 }
 
 function onMessage(event) {
-  var livedebug_out = document.getElementById("livedebug-out");
+  var data = event.data;
-  var textarea_heigth = livedebug_out.scrollHeight;
+
-  livedebug_out.value += event.data;
+  if (data.startsWith("NOTIFY:")) {
-  livedebug_out.scrollTop = livedebug_out.scrollHeight;
+    var notify_data = data.slice(7).split(";")[1];
-  do_resize(livedebug_out);
+    var notify_type = data.slice(7).split(";")[0];
+    showNotification(notify_data, notify_type);
+  } else if (data.startsWith("DEBUG:")) {
+    var addtext = data.slice(6);
+    var livedebug_out = document.getElementById("livedebug-out");
+    livedebug_out.value += addtext;
+    livedebug_out.scrollTop = livedebug_out.scrollHeight;
+    do_resize(livedebug_out);
+  } else if (data.startsWith("DTC:")) {
+    const dtcs = data.slice(4);
+    const dtcArray = dtcs.trim() !== "" ? dtcs.split(";").filter(Boolean) : [];
+
+    processDTCNotifications(dtcArray);
+    fillDTCTable(dtcArray);
+  } else if (data.startsWith("MAPPING_STATUS:")) {
+    const data_sliced = data.slice(15);
+    statusMapping = createMapping(data_sliced);
+  } else if (data.startsWith("MAPPING_STATIC:")) {
+    const data_sliced = data.slice(15);
+    staticMapping = createMapping(data_sliced);
+    console.log(staticMapping);
+  } else if (data.startsWith("STATUS:")) {
+    const data_sliced = data.slice(7);
+    const result = processDataString(data_sliced, statusMapping);
+    fillValuesToHTML(result);
+  } else if (data.startsWith("STATIC:")) {
+    const data_sliced = data.slice(7);
+    const result = processDataString(data_sliced, staticMapping);
+    fillValuesToHTML(result);
+    console.log(result);
+    overlay.style.display = "none";
+  }
+}
+
+function createMapping(mappingString) {
+  const mappingArray = mappingString.split(";");
+  const mapping = [];
+
+  mappingArray.forEach((variable) => {
+    if (variable !== null) mapping.push(variable.trim());
+  });
+  return mapping;
+}
+
+function processDataString(dataString, mapping) {
+  const valuesArray = dataString.split(";");
+  const dataObject = {};
+
+  valuesArray.forEach((value, index) => {
+    const variable = mapping[index];
+    if (variable) {
+      dataObject[variable] = value.trim();
+    }
+  });
+
+  return dataObject;
 }
 
 function onLoad(event) {
   initWebSocket();
   initButtons();
+  initSettingInputs();
+  overlay.style.display = "flex";
 }
 
-function livedebug_start() {
+function websocket_sendevent(element_id, element_value) {
-  websocket.send("start");
+  websocket.send(element_id + ":" + element_value);
 }
 
-function livedebug_stop() {
+function websocket_sendDebugCommand(command) {
-  websocket.send("stop");
+  websocket.send("debug-in:" + command);
 }
 
 function do_resize(textbox) {
@@ -67,18 +160,114 @@ function do_resize(textbox) {
   else textbox.rows = rows;
 }
 
-function notifyMe() {
+function fillValuesToHTML(dataset) {
-  if (!("Notification" in window)) {
+  for (var key in dataset) {
-    alert("This browser does not support desktop notification");
+    var key_prefixed = "data-" + key;
-  } else if (Notification.permission === "granted") {
+    var elements = document.getElementsByClassName(key_prefixed);
-    const notification = new Notification("Hi there!");
+
-    // …
+    if (elements.length > 0) {
-  } else if (Notification.permission !== "denied") {
+      for (var i = 0; i < elements.length; i++) {
-    Notification.requestPermission().then((permission) => {
+        var element = elements[i];
-      if (permission === "granted") {
+
-        const notification = new Notification("Hi there!");
+        if (element.type === "checkbox") {
-        // …
+          // Wenn das Element ein Kontrollkästchen ist
+          element.checked = dataset[key] == 1 ? true : false;
+        } else if (element.tagName === "SELECT") {
+          // Wenn das Element ein Dropdown ist
+          setDropdownValue(element, dataset[key]);
+        } else if (element.classList.contains("progress-bar")) {
+          // Wenn das Element eine Fortschrittsleiste ist
+          updateProgressBar(element, dataset[key]);
+        } else if (element.classList.contains("hideable")) {
+          // Wenn das Element ein Settingsabschnitt-div ist
+          if (dataset[key] == 0) element.style.display = "none";
+          else element.style.display = "";
+        } else if (element.tagName === "DIV" || element.tagName === "SPAN") {
+          if (element.classList.contains("format-time")) {
+            element.innerText = formatTime(dataset[key]);
+          } else if (element.classList.contains("faction-logo")) {
+            // Faction-Logo-Logik
+            updateFactionLogo(element, dataset[key]);
+          } else {
+            element.innerText = dataset[key];
+          }
+        } else {
+          // Standardmäßig für Textfelder und andere Elemente
+          element.value = dataset[key];
+        }
       }
-    });
+    }
+    // Aktualisiere den <title>-Tag, wenn der Schlüssel 'devicename' im dataset vorhanden ist
+    if (key === "devicename") {
+      document.title = dataset[key];
+    }
   }
 }
+
+function formatTime(seconds) {
+  var hrs = Math.floor(seconds / 3600);
+  var mins = Math.floor((seconds % 3600) / 60);
+  var secs = seconds % 60;
+
+  return (
+    String(hrs).padStart(2, "0") +
+    ":" +
+    String(mins).padStart(2, "0") +
+    ":" +
+    String(secs).padStart(2, "0")
+  );
+}
+
+function updateFactionLogo(element, faction) {
+  const glowClass = "glow-active-faction";
+  var factionClass = "faction" + faction;
+  if (element.classList.contains(factionClass)) {
+    element.classList.add(glowClass);
+  } else {
+    element.classList.remove(glowClass);
+  }
+}
+
+// Funktion zum Setzen des ausgewählten Werts für Dropdowns
+function setDropdownValue(selectElement, value) {
+  for (var i = 0; i < selectElement.options.length; i++) {
+    if (selectElement.options[i].value === value) {
+      selectElement.selectedIndex = i;
+      break;
+    }
+  }
+}
+
+// Funktion zum Aktualisieren der Fortschrittsleiste
+function updateProgressBar(progressBar, value) {
+  // Wert in das aria-valuenow-Attribut einfügen
+  progressBar.setAttribute("aria-valuenow", value);
+
+  // Breite des Fortschrittsbalkens und inneren Text aktualisieren
+  progressBar.style.width = value + "%";
+  progressBar.textContent = value + "%";
+}
+
+function showNotification(message, type) {
+  // Erstellen Sie ein Bootstrap-Alert-Element
+  var alertElement = $(
+    '<div class="alert alert-' +
+      type +
+      ' alert-dismissible fade show notification" role="alert">' +
+      "<strong>" +
+      message +
+      "</strong>" +
+      '<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
+      '<span aria-hidden="true">&times;</span>' +
+      "</button>" +
+      "</div>"
+  );
+
+  // Fügen Sie das Alert-Element dem Container hinzu
+  $("#notification-container").append(alertElement);
+
+  // Nach 5 Sekunden das Alert-Element ausblenden
+  setTimeout(function () {
+    alertElement.alert("close");
+  }, 5000);
+}

Software/data_src/static/tt_dtc/dtc_1.json

@@ -1,4 +0,0 @@
-{
-    "title": "kein EEPROM gefunden",
-    "description": "Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten."
-}

Software/data_src/static/tt_dtc/dtc_10.json

@@ -1,4 +0,0 @@
-{
-    "title": "Power-Monitor Fehler",
-    "description": "Es gibt ein Problem mit dem Power-Monitoring. Die Akku-Überwachung ist ohne Funktion! Bitte Hardware prüfen"
-}

Software/data_src/static/tt_dtc/dtc_11.json

@@ -1,4 +0,0 @@
-{
-    "title": "Akku-Spannung niedrig",
-    "description": "Die Akkuspannung ist niedrig. Bitte Akku bald aufladen!"
-}

Software/data_src/static/tt_dtc/dtc_12.json

@@ -1,4 +0,0 @@
-{
-    "title": "Akku-Spannung kritisch",
-    "description": "Die Akkuspannung ist sehr niedrig. Bitte Akku umgehend ersetzen um eine schädliche Tiefentladung zu vermeiden!"
-}

Software/data_src/static/tt_dtc/dtc_13.json

@@ -1,4 +0,0 @@
-{
-    "title": "EEPROM-Migration failed",
-    "description": "Migration of EEPROM-Image from an other FW-Version failed - you need to reset everything manually!"
-}

Software/data_src/static/tt_dtc/dtc_2.json

@@ -1,4 +0,0 @@
-{
-    "title": "EEPROM CFG Checksumme",
-    "description": "Die Checksumme der Config-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück"
-}

Software/data_src/static/tt_dtc/dtc_3.json

@@ -1,4 +0,0 @@
-{
-    "title": "EEPROM PDS Checksumme",
-    "description": "Die Checksumme der Betriebsdaten-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück"
-}

Software/data_src/static/tt_dtc/dtc_4.json

@@ -1,4 +0,0 @@
-{
-    "title": "EEPROM PDS Adresse",
-    "description": "Die Adresse der Betriebsdaten-Partition im EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück"
-}

Software/data_src/static/tt_dtc/dtc_5.json

@@ -1,4 +0,0 @@
-{
-    "title": "EEPROM Version falsch",
-    "description": "Die Layout-Version des EEPROM stimmt nicht mit der Firmware-Version überein. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück"
-}

Software/data_src/static/tt_dtc/dtc_6.json

@@ -1,4 +0,0 @@
-{
-    "title": "Flashstorage Fehler",
-    "description": "Der Flashstorage konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware"
-}

Software/data_src/static/tt_dtc/dtc_7.json

@@ -1,4 +0,0 @@
-{
-    "title": "Flashstorage Version falsch",
-    "description": "Die Version des Flashstorage stimmt nicht mit der Firmware-Version überein. Aktualisieren sie den Flash mit der passenden Update-Datei"
-}

Software/data_src/static/tt_dtc/dtc_8.json

@@ -1,4 +0,0 @@
-{
-    "title": "Config-Validierung",
-    "description": "Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen"
-}

Software/data_src/static/tt_dtc/dtc_9.json

@@ -1,4 +0,0 @@
-{
-    "title": "LoRa-Modul Fehler",
-    "description": "Es gibt ein Problem mit dem LoRa-Modul. Es konnte keine LoRa-Verbindung aufgebaut werden. Bitte Hardware prüfen"
-}

Software/data_src/version

@@ -1 +0,0 @@
-1.04

Software/include/common.h

@@ -12,8 +12,10 @@
 #define TRUE 1
 #define FALSE 0
 
-#ifndef HOST_NAME
+#ifndef DEVICE_NAME
-#define HOST_NAME "AirsoftTimer_%08X"
+#define HOST_NAME "AirsoftTimer"
+#else
+#define HOST_NAME DEVICE_NAME
 #endif
 
 #define SHUTDOWN_DELAY_MS 5000
@@ -50,15 +52,22 @@
 
 typedef enum eSystem_Status
 {
+  sysStat_Init,
   sysStat_Startup,
   sysStat_Normal,
-  sysStat_Rain,
-  sysStat_Purge,
   sysStat_Error,
   sysStat_Shutdown
 } tSystem_Status;
 
-#define STARTUP_DELAY 2500
+typedef enum batteryType_e
-#define SHUTDOWN_DELAY_MS 2500
+{
+  BATTERY_UNDEFINED,
+  BATTERY_LIPO_2S,
+  BATTERY_LIPO_3S
+} batteryType_t;
+
+// String representation of SpeedSource enum
+extern const char *BatteryString[];
+extern const size_t BatteryString_Elements;
 
 #endif

Software/include/debugger.h

@@ -1,9 +1,9 @@
 /**
  * @file debugger.h
  *
- * @brief Header file for debugging functions and status in the DE-Timer application.
+ * @brief Header file for debugging functions and status in the ChainLube application.
  *
- * This file declares functions and status definitions for debugging purposes in the DE-Timer project.
+ * This file declares functions and status definitions for debugging purposes in the ChainLube project.
  * It includes functions to print system information, WiFi information, format EEPROM data,
  * handle debug messages, and manage the status of different debug ports.
  *
@@ -16,19 +16,6 @@
 
 #include <Arduino.h>
 #include "webui.h"
-const char PROGMEM helpCmd[] = "sysinfo     - System Info\n"
-                               "netinfo     - WiFi Info\n"
-                               "formatPDS   - Format Persistence EEPROM Data\n"
-                               "formatCFG   - Format Configuration EEPROM Data\n"
-                               "checkEE     - Check EEPROM with checksum\n"
-                               "dumpEE1k    - dump the first 1kb of EEPROM to Serial\n"
-                               "dumpEE      - dump the whole EPPROM to Serial\n"
-                               "resetPageEE - Reset the PersistenceData Page\n"
-                               "dumpCFG     - print Config struct\n"
-                               "dumpPDS     - print PersistanceStruct\n"
-                               "saveEE      - save EE-Data\n"
-                               "showdtc     - Show all DTCs\n"
-                               "dumpGlobals - print globals\n";
 
 typedef enum DebugStatus_e
 {
@@ -49,10 +36,16 @@ const char sDebugPorts[dbg_cntElements][7] = {
 
 extern DebugStatus_t DebuggerStatus[dbg_cntElements];
 
+enum LogLevel
+{
+    LOG_INFO,
+    LOG_WARN,
+    LOG_ERROR
+};
+
 void initDebugger();
-void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data);
 void Debug_pushMessage(const char *format, ...);
 void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status);
 void Debug_Process();
-
+void Debug_ProcessCommand(uint8_t *command);
 #endif

Software/include/eeprom.h

@@ -57,20 +57,6 @@ typedef struct
   uint32_t checksum;
 } persistenceData_t;
 
-typedef enum
-{
-  BATTERY_UNDEFINED,
-  BATTERY_LIPO_2S,
-  BATTERY_LIPO_3S
-} batteryType_t;
-
-const char BatteryString[][10]{
-    "Undefined",
-    "LiPo 2S",
-    "LiPo 3S"};
-
-const size_t BatteryString_Elements = sizeof(BatteryString) / sizeof(BatteryString[0]);
-
 // Structure for configuration settings stored in EEPROM
 typedef struct
 {
@@ -80,8 +66,6 @@ typedef struct
   char Faction_1_Name[33];
   char Faction_2_Name[33];
   char Faction_3_Name[33];
-  char wifi_ap_ssid[33];
-  char wifi_ap_password[64];
   char wifi_client_ssid[33];
   char wifi_client_password[64];
   bool wifi_autoconnect;
@@ -96,15 +80,13 @@ const configData_t ConfigData_defaults = {
     "FACTION 1",     // Faction_1_Name
     "FACTION 2",     // Faction_2_Name
     "FACTION 3",     // Faction_3_Name
-    "ArisoftTimer",
-    QUOTE(WIFI_AP_PASSWORD),
     QUOTE(WIFI_SSID_CLIENT),
     QUOTE(WIFI_PASSWORD_CLIENT),
     true,
     0 // checksum
 };
 
-void InitEEPROM();
+boolean InitEEPROM();
 void EEPROM_Process();
 void StoreConfig_EEPROM();
 void GetConfig_EEPROM();
@@ -116,7 +98,8 @@ uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
 void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
 void MovePersistencePage_EEPROM(boolean reset);
 uint32_t ConfigSanityCheck(bool autocorrect = false);
-bool validateWiFiString(char *string, size_t size);
+void writeSequentialToEEPROM(uint16_t memoryAddress, uint16_t length);
+void writeZeroToEEPROM(uint16_t memoryAddress, uint16_t length);
 
 extern configData_t ConfigData;
 extern persistenceData_t PersistenceData;

Software/include/globals.h

@@ -10,13 +10,15 @@ typedef struct Globals_s
   tSystem_Status resumeStatus = sysStat_Startup; /**< Status to resume after rain mode */
   char systemStatustxt[16] = "";                 /**< Text representation of system status */
   EERequest_t requestEEAction = EE_IDLE;         /**< EEPROM-related request */
-  char DeviceName[33];                           /**< Device name */
+  char DeviceName[25];                           /**< Device name */
+  char DeviceNameId[sizeof(DeviceName) + 8];     /**< Device name plus 8 chars chipID */
   char FlashVersion[10];                         /**< Flash version */
   uint16_t eePersistanceAdress;                  /**< EEPROM persistence address */
   bool hasDTC;
   int loadvoltage_mV = 0;
   int battery_level = 0;
   bool timer_disabled = false;
+  bool toggle_wifi = false;
 } Globals_t;
 
 extern Globals_t globals; /**< Global variable struct */
@@ -31,8 +33,8 @@ typedef struct Constants_s
 } Constants_t;
 
 const Constants_t constants PROGMEM = {
-    1, 5,   // Firmware_Version
+    FW_MAJOR, FW_MINOR,   // Firmware_Version
-    1, 5,   // Required Flash Version
+    FL_MAJOR, FL_MINOR,   // Required Flash Version
     GIT_REV // Git-Hash-String
 };
 

Software/include/sanitycheck.h

@@ -1,31 +1,75 @@
 #ifndef _SANITYCHECK_H_
 #define _SANITYCHECK_H_
 
+// Utility macros for handling quotes
+#define Q(x) #x
+#define QUOTE(x) Q(x)
+
+// Utility macros for checking string lengths
+#define STRING_LENGTH_CHECK(str, max_length) (sizeof(str) <= (max_length) + 1)
+#define IS_ALPHANUMERIC(c) ((((c) >= '0') && ((c) <= '9')) || (((c) >= 'A') && ((c) <= 'Z')) || (((c) >= 'a') && ((c) <= 'z')))
+#define IS_PRINTABLE_ASCII(c) ((c) >= 32 && (c) <= 126)
+#define IS_VALID_WIFI_CHAR(c) (IS_PRINTABLE_ASCII(c))
+#define IS_ALPHANUMERIC_HELPER(str, i) (i >= sizeof(str) - 1 || IS_ALPHANUMERIC(str[i]))
+#define IS_PRINTABLE_ASCII_HELPER(str, i) (i >= sizeof(str) - 1 || IS_PRINTABLE_ASCII(str[i]))
+#define IS_VALID_WIFI_CHAR_HELPER(str, i) (i >= sizeof(str) - 1 || IS_VALID_WIFI_CHAR(str[i]))
+#define IS_ALPHANUMERIC_IMPL(str, i) (IS_ALPHANUMERIC_HELPER(str, i) && IS_ALPHANUMERIC_HELPER(str, i+1) && IS_ALPHANUMERIC_HELPER(str, i+2) && IS_ALPHANUMERIC_HELPER(str, i+3) && IS_ALPHANUMERIC_HELPER(str, i+4) && IS_ALPHANUMERIC_HELPER(str, i+5) && IS_ALPHANUMERIC_HELPER(str, i+6) && IS_ALPHANUMERIC_HELPER(str, i+7) && IS_ALPHANUMERIC_HELPER(str, i+8) && IS_ALPHANUMERIC_HELPER(str, i+9) && IS_ALPHANUMERIC_HELPER(str, i+10) && IS_ALPHANUMERIC_HELPER(str, i+11) && IS_ALPHANUMERIC_HELPER(str, i+12) && IS_ALPHANUMERIC_HELPER(str, i+13) && IS_ALPHANUMERIC_HELPER(str, i+14) && IS_ALPHANUMERIC_HELPER(str, i+15) && IS_ALPHANUMERIC_HELPER(str, i+16))
+#define IS_PRINTABLE_ASCII_IMPL(str, i) (IS_PRINTABLE_ASCII_HELPER(str, i) && IS_PRINTABLE_ASCII_HELPER(str, i+1) && IS_PRINTABLE_ASCII_HELPER(str, i+2) && IS_PRINTABLE_ASCII_HELPER(str, i+3) && IS_PRINTABLE_ASCII_HELPER(str, i+4) && IS_PRINTABLE_ASCII_HELPER(str, i+5) && IS_PRINTABLE_ASCII_HELPER(str, i+6) && IS_PRINTABLE_ASCII_HELPER(str, i+7) && IS_PRINTABLE_ASCII_HELPER(str, i+8) && IS_PRINTABLE_ASCII_HELPER(str, i+9) && IS_PRINTABLE_ASCII_HELPER(str, i+10) && IS_PRINTABLE_ASCII_HELPER(str, i+11) && IS_PRINTABLE_ASCII_HELPER(str, i+12) && IS_PRINTABLE_ASCII_HELPER(str, i+13) && IS_PRINTABLE_ASCII_HELPER(str, i+14) && IS_PRINTABLE_ASCII_HELPER(str, i+15) && IS_PRINTABLE_ASCII_HELPER(str, i+16) && IS_PRINTABLE_ASCII_HELPER(str, i+17) && IS_PRINTABLE_ASCII_HELPER(str, i+18) && IS_PRINTABLE_ASCII_HELPER(str, i+19) && IS_PRINTABLE_ASCII_HELPER(str, i+20) && IS_PRINTABLE_ASCII_HELPER(str, i+21) && IS_PRINTABLE_ASCII_HELPER(str, i+22) && IS_PRINTABLE_ASCII_HELPER(str, i+23) && IS_PRINTABLE_ASCII_HELPER(str, i+24))
+#define IS_ALPHANUMERIC_STRING(str) (IS_ALPHANUMERIC_IMPL(str, 0))
+#define IS_PRINTABLE_ASCII_STRING(str) (IS_PRINTABLE_ASCII_IMPL(str, 0))
+#define IS_VALID_WIFI_STRING(str) (IS_VALID_WIFI_CHAR_HELPER(str, 0) && IS_VALID_WIFI_CHAR_HELPER(str, 1) && IS_VALID_WIFI_CHAR_HELPER(str, 2) && IS_VALID_WIFI_CHAR_HELPER(str, 3) && IS_VALID_WIFI_CHAR_HELPER(str, 4) && IS_VALID_WIFI_CHAR_HELPER(str, 5) && IS_VALID_WIFI_CHAR_HELPER(str, 6) && IS_VALID_WIFI_CHAR_HELPER(str, 7) && IS_VALID_WIFI_CHAR_HELPER(str, 8) && IS_VALID_WIFI_CHAR_HELPER(str, 9) && IS_VALID_WIFI_CHAR_HELPER(str, 10) && IS_VALID_WIFI_CHAR_HELPER(str, 11) && IS_VALID_WIFI_CHAR_HELPER(str, 12) && IS_VALID_WIFI_CHAR_HELPER(str, 13) && IS_VALID_WIFI_CHAR_HELPER(str, 14) && IS_VALID_WIFI_CHAR_HELPER(str, 15) && IS_VALID_WIFI_CHAR_HELPER(str, 16) && IS_VALID_WIFI_CHAR_HELPER(str, 17) && IS_VALID_WIFI_CHAR_HELPER(str, 18) && IS_VALID_WIFI_CHAR_HELPER(str, 19) && IS_VALID_WIFI_CHAR_HELPER(str, 20) && IS_VALID_WIFI_CHAR_HELPER(str, 21) && IS_VALID_WIFI_CHAR_HELPER(str, 22) && IS_VALID_WIFI_CHAR_HELPER(str, 23) && IS_VALID_WIFI_CHAR_HELPER(str, 24) && IS_VALID_WIFI_CHAR_HELPER(str, 25) && IS_VALID_WIFI_CHAR_HELPER(str, 26) && IS_VALID_WIFI_CHAR_HELPER(str, 27) && IS_VALID_WIFI_CHAR_HELPER(str, 28) && IS_VALID_WIFI_CHAR_HELPER(str, 29) && IS_VALID_WIFI_CHAR_HELPER(str, 30) && IS_VALID_WIFI_CHAR_HELPER(str, 31) && IS_VALID_WIFI_CHAR_HELPER(str, 32))
+
+// ADMIN_PASSWORD check
 #ifndef ADMIN_PASSWORD
     #error "You need to define ADMIN_PASSWORD for OTA-Update"
+#else
+    _Static_assert(STRING_LENGTH_CHECK(QUOTE(ADMIN_PASSWORD), 16), "ADMIN_PASSWORD must be at most 16 characters long");
 #endif
 
+// WIFI_AP_SSID check
 #ifndef WIFI_AP_SSID
     #warning "No WIFI_AP_SSID defined. Using DeviceName"
     #define WIFI_AP_SSID DEVICE_NAME
+#else
+    _Static_assert(STRING_LENGTH_CHECK(QUOTE(WIFI_AP_SSID), 32), "WIFI_AP_SSID must be at most 32 characters long");
+    _Static_assert(IS_VALID_WIFI_STRING(QUOTE(WIFI_AP_SSID)), "WIFI_AP_SSID must contain only valid WiFi characters");
 #endif
 
-#ifndef WIFI_AP_PASSWORD
+// WIFI_PASS_SEED check
-    #error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
+#ifndef WIFI_PASS_SEED
+    #error "You must define an WIFI_PASS_SEED for Standalone AP-Mode"
+#else
+    _Static_assert(STRING_LENGTH_CHECK(QUOTE(WIFI_PASS_SEED), 16), "WIFI_PASS_SEED must be at most 16 characters long");
+    _Static_assert(IS_ALPHANUMERIC_STRING(QUOTE(WIFI_PASS_SEED)), "WIFI_PASS_SEED must contain only alphanumeric characters (a-z, A-Z, 0-9)");
 #endif
 
+// DEVICE_NAME check
+#ifndef DEVICE_NAME
+    #error "You must define DEVICE_NAME"
+#else
+    _Static_assert(STRING_LENGTH_CHECK(QUOTE(DEVICE_NAME), 24), "DEVICE_NAME must be at most 24 characters long");
+    _Static_assert(IS_VALID_WIFI_STRING(QUOTE(DEVICE_NAME)), "DEVICE_NAME must contain only valid WiFi characters");
+#endif
+
+// Mutual exclusion check for LoRa features
 #if defined(FEATURE_ENABLE_UARTLORA) && defined(FEATURE_ENABLE_LORA)
     #error "You cannot enable LoRa and UART-Protocol at the same time!"
 #endif
 
+// WIFI_CLIENT checks
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
-    #ifndef WIFI_CLIENT_PASSWORD
+    #ifndef WIFI_PASSWORD_CLIENT
-        #error "You must define an WIFI_PASSWORD for OTA-Update"
+        #error "You must define an WIFI_PASSWORD_CLIENT for OTA-Update"
+    #else
+        _Static_assert(STRING_LENGTH_CHECK(QUOTE(WIFI_PASSWORD_CLIENT), 63), "WIFI_PASSWORD_CLIENT must be at most 63 characters long");
     #endif
-    #ifndef WIFI_CLIENT_SSID
+
-        #error "You must define an WIFI_SSID for OTA-Update"
+    #ifndef WIFI_SSID_CLIENT
+        #error "You must define an WIFI_SSID_CLIENT for OTA-Update"
+    #else
+        _Static_assert(STRING_LENGTH_CHECK(QUOTE(WIFI_SSID_CLIENT), 32), "WIFI_SSID_CLIENT must be at most 32 characters long");
+        _Static_assert(IS_VALID_WIFI_STRING(QUOTE(WIFI_SSID_CLIENT)), "WIFI_SSID_CLIENT must contain only valid WiFi characters");
     #endif
 #endif
 
-
+#endif // _SANITYCHECK_H_
-#endif //_SANITYCHECK_H_

Software/include/struct2json.h

@@ -3,10 +3,10 @@
  *
  * @brief Header file for converting structs to JSON objects.
  *
- * @note This file is auto-generated by a script on 2024-05-30 22:54:25.
+ * @note This file is auto-generated by a script on 2024-06-06 18:52:33.
  *
  * @author Marcel Peterkau
- * @date   30.05.2024
+ * @date   06.06.2024
  */
 
 #ifndef _STRUCT2JSON_H_
@@ -23,4 +23,4 @@ void generateJsonObject_PersistenceData(JsonObject data);
 
 #endif /* _STRUCT2JSON_H_ */
 
-// CODEGENERATOR_CHECKSUM: 735cd4daf9a46bd773bdf5e6cd5a58d61b0d877196399bc2784a0d0ea7af717d
+// CODEGENERATOR_CHECKSUM: 3a3fd3024dd9dd769ff5d62f61b3ba1b781b7d06e7568a1ddac56d193dba9ee5

Software/include/utilities.h

@@ -0,0 +1,48 @@
+#ifndef UTILITIES_H
+#define UTILITIES_H
+
+#include <Arduino.h>
+
+/**
+ * @brief Validates whether a given string contains only characters allowed in WiFi SSIDs and passwords.
+ *
+ * This function checks each character in the provided string to ensure
+ * that it contains only characters allowed in WiFi SSIDs and passwords.
+ * It considers characters from 'A' to 'Z', 'a' to 'z', '0' to '9', as well as
+ * the following special characters: ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+ *
+ * @param string Pointer to the string to be validated.
+ * @param size Size of the string including the null-terminator.
+ * @return true if the string contains only allowed characters or is NULL,
+ *         false otherwise.
+ */
+bool validateWiFiString(char *string, size_t size);
+
+/**
+ * @brief Copies a string to a buffer, replacing invalid WiFi SSID characters with a placeholder.
+ *
+ * This function checks each character in the provided input string to ensure
+ * that it contains only characters allowed in WiFi SSIDs and passwords. If a character
+ * is invalid, it replaces it with a placeholder character (e.g., '_').
+ * It considers characters from 'A' to 'Z', 'a' to 'z', '0' to '9', as well as
+ * the following special characters: ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+ *
+ * @param input Pointer to the input string to be validated and copied.
+ * @param buffer Pointer to the buffer where the output string will be copied.
+ * @param bufferSize Size of the buffer including the null-terminator.
+ */
+void sanitizeWiFiString(const char *input, char *buffer, size_t bufferSize);
+
+/**
+ * @brief Generates a device-specific password based on a seed and the ESP8266 Chip ID.
+ *
+ * This function combines a given seed with the unique Chip ID of the ESP8266 device to create a device-specific password.
+ * The resulting password is stored in the provided character buffer.
+ *
+ * @param seed The seed string used for password generation. Should be up to 16 characters long.
+ * @param passwordBuffer The character buffer where the generated password will be stored.
+ * @param bufferLength The length of the password buffer. Should be large enough to hold the generated password and null terminator.
+ */
+void GenerateDeviceSpecificPassword(const char* seed, char* passwordBuffer, size_t bufferLength);
+
+#endif // UTILITIES_H

Software/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "pio-build-tools",
+  "private": true,
+  "devDependencies": {
+    "html-minifier": "^4.0.0",
+    "terser": "^5.0.0",
+    "clean-css-cli": "^5.0.0"
+  }
+}

Software/platformio.ini

@@ -17,25 +17,26 @@ platform = espressif8266
 framework = arduino
 board = d1_mini
 
+custom_firmware_version = 1.08
+custom_flash_version = 1.08
+
 upload_protocol = esptool
 upload_speed = 921600
-;upload_port = 10.0.1.48
+;upload_port = 10.0.0.1
-;upload_protocol = espota
+;upload_flags =
-;upload_flags =  
+;  --port=8266
-;   --auth=${wifi_cred.ota_password}
+;  --auth=${wifi_cred.admin_password}
 
 build_flags=
-  !python codegen/git_rev_macro.py
   -DATOMIC_FS_UPDATE
-  -DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
   ;-DFEATURE_ENABLE_LORA
   -DFEATURE_ENABLE_UARTLORA
   -DWIFI_AP_IP_GW=10,0,0,1
-  -DADMIN_PASSWORD=${wifi_cred.ota_password}
+  -DADMIN_PASSWORD=${wifi_cred.admin_password}
-  -DWIFI_CLIENT_SSID=${wifi_cred.wifi_client_ssid}
+  -DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client}
-  -DWIFI_CLIENT_PASSWORD=${wifi_cred.wifi_client_password}
+  -DWIFI_PASSWORD_CLIENT=${wifi_cred.wifi_password_client}
-  -DWIFI_AP_SSID=${wifi_cred.wifi_ap_ssid}
+  -DWIFI_PASS_SEED=${wifi_cred.wifi_pass_seed}
-  -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
   -DDEVICE_NAME='"Dark Emergency Timer"'
 
 ;build_type = debug

Software/src/common.cpp

@@ -0,0 +1,9 @@
+#include "common.h"
+
+const char *BatteryString[] = {
+    "Undefined",
+    "LiPo 2S",
+    "LiPo 3S"
+    };
+
+const size_t BatteryString_Elements = sizeof(BatteryString) / sizeof(BatteryString[0]);

Software/src/debugger.cpp

@@ -12,6 +12,11 @@
  */
 
 #include "debugger.h"
+#include <map>
+#include <functional>
+#include <vector>
+#include "utilities.h"
+#include <pgmspace.h>
 
 DebugStatus_t DebuggerStatus[dbg_cntElements];
 
@@ -26,6 +31,8 @@ void Debug_dumpPersistance();
 void Debug_ShowDTCs();
 void Debug_dumpGlobals();
 void Debug_printHelp();
+void Debug_Reboot();
+void Debug_setBatteryType(int batterytype);
 const char *uint32_to_binary_string(uint32_t num);
 
 /**
@@ -82,7 +89,7 @@ void Debug_Process()
             InputProcessed = CMD_ABORT;
             break;
 
-        case 0x21 ... 0x7E: // it's a real letter or sign and not some control-chars
+        case 0x20 ... 0x7E: // it's a real letter or sign and not some control-chars
             inputBuffer[inputCnt] = inputChar;
             inputCnt++;
             Serial.write(inputChar);
@@ -93,10 +100,10 @@ void Debug_Process()
         }
 
         // Check for input buffer overflow
-        if (inputCnt > sizeof(inputBuffer))
+        if (inputCnt >= sizeof(inputBuffer) - 1)
         {
+            inputBuffer[sizeof(inputBuffer) - 1] = '\0';
             inputCnt = 0;
-            inputBuffer[sizeof(inputBuffer) - 1] = 0; // terminate the String
             InputProcessed = CMD_OVERFLOW;
         }
     }
@@ -146,6 +153,27 @@ void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status)
         Debug_pushMessage("Enabled DebugPort %s\n", sDebugPorts[port]);
 }
 
+void Debug_log(LogLevel level, const char *format, ...)
+{
+    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
+    {
+        char buff[128];
+        va_list arg;
+        va_start(arg, format);
+        vsnprintf(buff, sizeof(buff), format, arg);
+        va_end(arg);
+
+        if (DebuggerStatus[dbg_Serial] == enabled)
+        {
+            Serial.print(buff);
+        }
+        if (DebuggerStatus[dbg_Webui] == enabled)
+        {
+            Websocket_PushLiveDebug(String(buff));
+        }
+    }
+}
+
 /**
  * @brief Pushes a formatted debug message to the enabled debug ports (Serial or WebUI).
  *
@@ -179,65 +207,134 @@ void Debug_pushMessage(const char *format, ...)
     }
 }
 
-
+// === splitArgs Helper ===
-/**
+std::vector<String> splitArgs(const String &input)
- * @brief Processes a debug command and performs corresponding actions.
- *
- * @param command The debug command to be processed.
- */
-void processCmdDebug(String command)
 {
-    // Check the received command and execute corresponding actions
+    std::vector<String> tokens;
-    if (command == "help")
+    int start = 0, end = 0;
-        Debug_printHelp();
+    while ((end = input.indexOf(' ', start)) != -1)
-    else if (command == "sysinfo")
+    {
-        Debug_printSystemInfo();
+        tokens.push_back(input.substring(start, end));
-    else if (command == "netinfo")
+        start = end + 1;
-        Debug_printWifiInfo();
+    }
-    else if (command == "formatCFG")
+    if (start < input.length())
-        Debug_formatCFG();
+        tokens.push_back(input.substring(start));
-    else if (command == "formatPDS")
+    return tokens;
-        Debug_formatPersistence();
+}
-    else if (command == "checkEE")
+
-        Debug_CheckEEPOM(false);
+// === getArg helper ===
-    else if (command == "checkEEfix")
+String getArg(const std::vector<String> &args, size_t index, const String &defaultVal = "")
-        Debug_CheckEEPOM(true);
+{
-    else if (command == "dumpEE1k")
+    if (index < args.size())
-        dumpEEPROM(0, 1024);
+        return args[index];
-    else if (command == "dumpEE")
+    return defaultVal;
-        dumpEEPROM(0, EEPROM_SIZE_BYTES);
+}
-    else if (command == "resetPageEE")
+
-        MovePersistencePage_EEPROM(true);
+// === Command Handler Map ===
-    else if (command == "dumpCFG")
+typedef std::function<void(const String &args)> DebugCmdHandler;
-        Debug_dumpConfig();
+
-    else if (command == "dumpPDS")
+static const std::map<String, DebugCmdHandler> &getCmdMap()
-        Debug_dumpPersistance();
+{
-    else if (command == "saveEE")
+    static const std::map<String, DebugCmdHandler> cmdMap = {
-        globals.requestEEAction = EE_ALL_SAVE;
+        {"help", [](const String &)
-    else if (command == "dumpGlobals")
+         {
-        Debug_dumpGlobals();
+             Debug_log(LOG_INFO, "Available commands:\n");
-    else if (command == "sdbg")
+             for (const auto &entry : getCmdMap())
-        SetDebugportStatus(dbg_Serial, enabled);
+                 Debug_log(LOG_INFO, " - %s\n", entry.first.c_str());
-    else if (command == "dtc_show")
+         }},
-        Debug_ShowDTCs();
+        {"sysinfo", [](const String &)
-    else if (command == "dtc_clear")
+         { Debug_printSystemInfo(); }},
-        ClearAllDTC();
+        {"netinfo", [](const String &)
-    else if (command == "dtc_crit")
+         { Debug_printWifiInfo(); }},
-        MaintainDTC(DTC_FAKE_DTC_CRIT, true, millis());
+        {"formatCFG", [](const String &)
-    else if (command == "dtc_warn")
+         { Debug_formatCFG(); }},
-        MaintainDTC(DTC_FAKE_DTC_WARN, true, millis());
+        {"formatPDS", [](const String &)
-    else if (command == "dtc_info")
+         { Debug_formatPersistence(); }},
-        MaintainDTC(DTC_FAKE_DTC_INFO, true, millis());
+        {"checkEE", [](const String &)
-    else if (command == "notify_error")
+         { Debug_CheckEEPOM(false); }},
-        Websocket_PushNotification("Debug Error Notification", error);
+        {"checkEEfix", [](const String &)
-    else if (command == "notify_warning")
+         { Debug_CheckEEPOM(true); }},
-        Websocket_PushNotification("Debug Warning Notification", warning);
+        {"dumpEE1k", [](const String &)
-    else if (command == "notify_success")
+         { dumpEEPROM(0, 1024); }},
-        Websocket_PushNotification("Debug Success Notification", success);
+        {"dumpEE", [](const String &args)
-    else if (command == "notify_info")
+         {
-        Websocket_PushNotification("Debug Info Notification", info);
+             int start = 0, len = EEPROM_SIZE_BYTES;
+             auto tokens = splitArgs(args);
+             if (tokens.size() >= 2)
+             {
+                 start = tokens[0].toInt();
+                 len = tokens[1].toInt();
+             }
+             dumpEEPROM(start, len);
+         }},
+        {"resetPageEE", [](const String &)
+         { MovePersistencePage_EEPROM(true); }},
+        {"dumpCFG", [](const String &)
+         { Debug_dumpConfig(); }},
+        {"dumpPDS", [](const String &)
+         { Debug_dumpPersistance(); }},
+        {"saveEE", [](const String &)
+         { globals.requestEEAction = EE_ALL_SAVE; }},
+        {"dumpGlobals", [](const String &)
+         { Debug_dumpGlobals(); }},
+        {"sdbg", [](const String &)
+         { SetDebugportStatus(dbg_Serial, enabled); }},
+        {"dtc_show", [](const String &)
+         { Debug_ShowDTCs(); }},
+        {"dtc_clear", [](const String &)
+         { ClearAllDTC(); }},
+        {"dtc_crit", [](const String &)
+         { MaintainDTC(DTC_FAKE_DTC_CRIT, true, millis()); }},
+        {"dtc_warn", [](const String &)
+         { MaintainDTC(DTC_FAKE_DTC_WARN, true, millis()); }},
+        {"dtc_info", [](const String &)
+         { MaintainDTC(DTC_FAKE_DTC_INFO, true, millis()); }},
+        {"notify_error", [](const String &)
+         { Websocket_PushNotification("Debug Error Notification", error); }},
+        {"notify_warning", [](const String &)
+         { Websocket_PushNotification("Debug Warning Notification", warning); }},
+        {"notify_success", [](const String &)
+         { Websocket_PushNotification("Debug Success Notification", success); }},
+        {"notify_info", [](const String &)
+         { Websocket_PushNotification("Debug Info Notification", info); }},
+        {"reboot", [](const String &)
+         { Debug_Reboot(); }},
+        {"toggle_wifi", [](const String &)
+         { globals.toggle_wifi = true; }},
+        {"dtc_add", [](const String &args)
+         {
+             auto tokens = splitArgs(args);
+             if (!tokens.empty())
+             {
+                 int code = tokens[0].toInt();
+                 MaintainDTC((DTCNum_t)code, true, millis());
+             }
+         }},
+        {"set_battery", [](const String &args)
+         {
+             auto tokens = splitArgs(args);
+             if (!tokens.empty())
+             {
+                 int batteryType = tokens[0].toInt();
+                 Debug_setBatteryType(batteryType);
+             }
+         }}};
+    return cmdMap;
+}
+
+void processCmdDebug(String input)
+{
+    input.trim();
+    int splitIndex = input.indexOf(' ');
+    String command = splitIndex == -1 ? input : input.substring(0, splitIndex);
+    String args = splitIndex == -1 ? "" : input.substring(splitIndex + 1);
+
+    auto &cmdMap = getCmdMap();
+    auto it = cmdMap.find(command);
+    if (it != cmdMap.end())
+        it->second(args);
     else
-        Debug_pushMessage("unknown Command\n");
+        Debug_log(LOG_WARN, "Unknown command: '%s'\n", command.c_str());
 }
 
 /**
@@ -265,7 +362,7 @@ void Debug_formatPersistence()
  */
 void Debug_printSystemInfo()
 {
-    Debug_pushMessage("Hostname: %s\n", globals.DeviceName);
+    Debug_pushMessage("Hostname: %s\n", globals.DeviceNameId);
 
     FlashMode_t ideMode = ESP.getFlashChipMode();
     Debug_pushMessage("Sdk version: %s\n", ESP.getSdkVersion());
@@ -283,6 +380,18 @@ void Debug_printSystemInfo()
     Debug_pushMessage("OTA-Pass: %s\n", QUOTE(ADMIN_PASSWORD));
     Debug_pushMessage("Git-Revision: %s\n", constants.GitHash);
     Debug_pushMessage("Sw-Version: %d.%02d\n", constants.FW_Version_major, constants.FW_Version_minor);
+
+    Debug_pushMessage("globals.systemStatus: %d\n", globals.systemStatus);
+    Debug_pushMessage("globals.resumeStatus: %d\n", globals.resumeStatus);
+    Debug_pushMessage("globals.systemStatustxt: %s\n", globals.systemStatustxt);
+    Debug_pushMessage("globals.requestEEAction: %d\n", globals.requestEEAction);
+    Debug_pushMessage("globals.DeviceName: %s\n", globals.DeviceName);
+    Debug_pushMessage("globals.FlashVersion: %s\n", globals.FlashVersion);
+    Debug_pushMessage("globals.eePersistanceAdress: %u\n", globals.eePersistanceAdress);
+    Debug_pushMessage("globals.hasDTC: %d\n", globals.hasDTC);
+    Debug_pushMessage("globals.loadvoltage_mV: %d\n", globals.loadvoltage_mV);
+    Debug_pushMessage("globals.battery_level: %d\n", globals.battery_level);
+    Debug_pushMessage("globals.timer_disabled: %d\n", globals.timer_disabled);
 }
 
 /**
@@ -291,6 +400,13 @@ void Debug_printSystemInfo()
 void Debug_dumpConfig()
 {
     Debug_pushMessage("batteryType: %d\n", ConfigData.batteryType);
+    Debug_pushMessage("Faction_1_Name: %s\n", ConfigData.Faction_1_Name);
+    Debug_pushMessage("Faction_1_Name: %s\n", ConfigData.Faction_2_Name);
+    Debug_pushMessage("Faction_1_Name: %s\n", ConfigData.Faction_3_Name);
+    Debug_pushMessage("active_faction_on_reboot: %d\n", ConfigData.active_faction_on_reboot);
+    Debug_pushMessage("wifi_autoconnect: %d\n", ConfigData.wifi_autoconnect);
+    Debug_pushMessage("wifi_client_ssid: %s\n", ConfigData.wifi_client_ssid);
+    Debug_pushMessage("wifi_client_password: %s\n", ConfigData.wifi_client_password);
     Debug_pushMessage("EEPROM_Version: %d\n", ConfigData.EEPROM_Version);
     Debug_pushMessage("checksum: 0x%08X\n", ConfigData.checksum);
 }
@@ -329,7 +445,30 @@ void Debug_dumpPersistance()
  */
 void Debug_printWifiInfo()
 {
+    char buffer[33];
+    GenerateDeviceSpecificPassword(QUOTE(WIFI_PASS_SEED), buffer, sizeof(buffer));
     Debug_pushMessage("IP Adress: %s\n", WiFi.localIP().toString().c_str());
+    Debug_pushMessage("WiFi AP Pw: %s\n", buffer);
+}
+
+void Debug_setBatteryType(int batterytype)
+{
+
+    switch (batterytype)
+    {
+    case 2:
+        ConfigData.batteryType = BATTERY_LIPO_2S;
+        break;
+    case 3:
+        ConfigData.batteryType = BATTERY_LIPO_3S;
+        break;
+    default:
+        ConfigData.batteryType = BATTERY_UNDEFINED;
+        break;
+    }
+
+    Debug_pushMessage("Set BatteryType to : %d\n", batterytype);
+    globals.requestEEAction = EE_CFG_SAVE;
 }
 
 /**
@@ -419,23 +558,28 @@ void Debug_ShowDTCs()
 }
 
 /**
- * @brief Displays the help commands for debugging through Serial or WebUI.
+ * @brief Initiates a system reboot by setting the system status to shutdown.
- *        Each command is printed individually in a formatted manner.
+ *
+ * This function sets the global system status to `sysStat_Shutdown`,
+ * which will trigger a system reboot sequence.
  */
-void Debug_printHelp()
+void Debug_Reboot()
 {
-    char buff[64];
+    globals.systemStatus = sysStat_Shutdown;
+}
 
-    // Iterate through helpCmd and display each command
+/**
-    for (unsigned int i = 0; i < sizeof(helpCmd) / 63; i++)
+ * @brief Processes a debug command.
-    {
+ *
-        // Copy a portion of helpCmd to buff for display
+ * This function takes a pointer to a debug command and processes it by
-        memcpy_P(buff, (helpCmd + (i * 63)), 63);
+ * passing it to the `processCmdDebug` function. The command is expected
-        buff[63] = 0;
+ * to be a string, so it is cast to `const char *` before being processed.
-
+ *
-        // Display the help command
+ * @param command Pointer to the debug command, expected to be a null-terminated string.
-        Debug_pushMessage(buff);
+ */
-    }
+void Debug_ProcessCommand(uint8_t *command)
+{
+    processCmdDebug((const char *)command);
 }
 
 /**
@@ -451,12 +595,15 @@ void Debug_printHelp()
  * @return A pointer to a const char string containing the binary representation
  * of the input number with nibbles separated by a space.
  */
-const char* uint32_to_binary_string(uint32_t num) {
+const char *uint32_to_binary_string(uint32_t num)
+{
     static char binary_str[65]; // 32 bits + 31 spaces + null terminator
     int i, j;
-    for (i = 31, j = 0; i >= 0; i--, j++) {
+    for (i = 31, j = 0; i >= 0; i--, j++)
+    {
         binary_str[j] = ((num >> i) & 1) ? '1' : '0';
-        if (i % 4 == 0 && i != 0) {
+        if (i % 4 == 0 && i != 0)
+        {
             binary_str[++j] = ' '; // Insert space after every nibble
         }
     }

Software/src/eeprom.cpp

@@ -9,6 +9,7 @@
 #include "eeprom.h"
 #include "debugger.h"
 #include "globals.h"
+#include "utilities.h"
 
 // Instance of I2C_eeprom for EEPROM access
 I2C_eeprom ee(I2C_EE_ADDRESS, EEPROM_SIZE_BYTES);
@@ -18,7 +19,7 @@ configData_t ConfigData;
 persistenceData_t PersistenceData;
 
 // EEPROM version identifier
-const uint16_t eeVersion = EEPROM_STRUCTURE_REVISION; 
+const uint16_t eeVersion = EEPROM_STRUCTURE_REVISION;
 
 // Flag indicating whether EEPROM is available
 boolean eeAvailable = false;
@@ -35,12 +36,13 @@ boolean checkEEPROMavailable();
  *
  * This function initializes the EEPROM using the I2C_eeprom instance and checks if it's available.
  */
-void InitEEPROM()
+boolean InitEEPROM()
 {
+  Wire.begin();
   ConfigData = ConfigData_defaults;
   PersistenceData = {0};
   ee.begin();
-  checkEEPROMavailable();
+  return checkEEPROMavailable();
 }
 
 /**
@@ -113,16 +115,23 @@ void EEPROM_Process()
  */
 void StoreConfig_EEPROM()
 {
+  // Berechnung der Prüfsumme
   ConfigData.checksum = 0;
   ConfigData.checksum = Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData));
 
+  // Überprüfung, ob der EEPROM verfügbar ist
   if (!checkEEPROMavailable())
     return;
 
-  ee.updateBlock(startofConfigData, (uint8_t *)&ConfigData, sizeof(ConfigData));
+  // Byteweise in den EEPROM schreiben
+  uint8_t *dataPtr = (uint8_t *)&ConfigData;
+  for (uint16_t i = 0; i < sizeof(ConfigData); i++)
+  {
+    ee.writeByte(startofConfigData + i, dataPtr[i]);
+  }
 
+  // Sanity Check der Konfiguration
   uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
-
   if (ConfigSanityCheckResult > 0)
   {
     MaintainDTC(DTC_EEPROM_CFG_SANITY, true, ConfigSanityCheckResult);
@@ -149,10 +158,9 @@ void GetConfig_EEPROM()
 
   ConfigData.checksum = checksum;
 
-  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
+  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(true);
 
   MaintainDTC(DTC_EEPROM_CFG_SANITY, (ConfigSanityCheckResult > 0), ConfigSanityCheckResult);
-
 }
 
 /**
@@ -174,7 +182,12 @@ void StorePersistence_EEPROM()
   if (!checkEEPROMavailable())
     return;
 
-  ee.updateBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+  // Byteweise in den EEPROM schreiben
+  uint8_t *dataPtr = (uint8_t *)&PersistenceData;
+  for (uint16_t i = 0; i < sizeof(PersistenceData); i++)
+  {
+    ee.writeByte(globals.eePersistanceAdress + i, dataPtr[i]);
+  }
 }
 
 /**
@@ -306,7 +319,7 @@ void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
   if (!checkEEPROMavailable())
     return;
 
-  char ascii_buf[BLOCK_TO_LENGTH + 1];
+  char ascii_buf[BLOCK_TO_LENGTH + 1] = {0};
   sprintf(ascii_buf, "%*s", BLOCK_TO_LENGTH, "ASCII");
 
   // Print column headers
@@ -326,24 +339,26 @@ void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
     // Print ASCII representation header for each block
     if (blockpoint == 0)
     {
-      ascii_buf[BLOCK_TO_LENGTH] = 0;
+      if (i > 0) // Ensure we don't print an empty ASCII buffer on the first iteration
-      Debug_pushMessage("  %s", ascii_buf);
+      {
+        ascii_buf[BLOCK_TO_LENGTH] = 0;
+        Debug_pushMessage("  %s", ascii_buf);
+      }
       Debug_pushMessage("\n0x%05X:", memoryAddress);
+      memset(ascii_buf, ' ', BLOCK_TO_LENGTH); // Clear the ASCII buffer with spaces
     }
 
     // Read and print each byte
-    ascii_buf[blockpoint] = ee.readByte(memoryAddress);
+    uint8_t byte = ee.readByte(memoryAddress);
-    Debug_pushMessage(" %02X", ascii_buf[blockpoint]);
+    ascii_buf[blockpoint] = (byte >= 0x20 && byte <= 0x7E) ? byte : '.';
-
+    Debug_pushMessage(" %02X", byte);
-    // Replace non-printable characters with dots in ASCII representation
-    if (ascii_buf[blockpoint] < 0x20 || ascii_buf[blockpoint] > 0x7E)
-      ascii_buf[blockpoint] = '.';
 
     memoryAddress++;
   }
 
-  // Print a new line at the end of the dump
+  // Print remaining ASCII buffer
-  Debug_pushMessage("\n");
+  ascii_buf[BLOCK_TO_LENGTH] = 0;
+  Debug_pushMessage("  %s\n", ascii_buf); // Final ASCII line
 }
 
 /**
@@ -385,30 +400,16 @@ uint32_t ConfigSanityCheck(bool autocorrect)
 {
   uint32_t setting_reset_bits = 0;
 
-  if (!validateWiFiString(ConfigData.wifi_ap_ssid, sizeof(ConfigData.wifi_ap_ssid)))
-  {
-    SET_BIT(setting_reset_bits, 1);
-    if (autocorrect)
-      strncpy(ConfigData.wifi_ap_ssid, ConfigData_defaults.wifi_ap_ssid, sizeof(ConfigData.wifi_ap_ssid));
-  }
-
-  if (!validateWiFiString(ConfigData.wifi_ap_password, sizeof(ConfigData.wifi_ap_password)))
-  {
-    SET_BIT(setting_reset_bits, 2);
-    if (autocorrect)
-      strncpy(ConfigData.wifi_ap_password, ConfigData_defaults.wifi_ap_password, sizeof(ConfigData.wifi_ap_password));
-  }
-
   if (!validateWiFiString(ConfigData.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid)))
   {
-    SET_BIT(setting_reset_bits, 3);
+    SET_BIT(setting_reset_bits, 0);
     if (autocorrect)
       strncpy(ConfigData.wifi_client_ssid, ConfigData_defaults.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid));
   }
 
   if (!validateWiFiString(ConfigData.wifi_client_password, sizeof(ConfigData.wifi_client_password)))
   {
-    SET_BIT(setting_reset_bits, 4);
+    SET_BIT(setting_reset_bits, 1);
     if (autocorrect)
       strncpy(ConfigData.wifi_client_password, ConfigData_defaults.wifi_client_password, sizeof(ConfigData.wifi_client_password));
   }
@@ -416,46 +417,44 @@ uint32_t ConfigSanityCheck(bool autocorrect)
   return setting_reset_bits;
 }
 
-/**
- * @brief Validates whether a given string contains only characters allowed in WiFi SSIDs and passwords.
- *
- * This function checks each character in the provided string to ensure
- * that it contains only characters allowed in WiFi SSIDs and passwords.
- * It considers characters from 'A' to 'Z', 'a' to 'z', '0' to '9', as well as
- * the following special characters: ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
- *
- * @param string Pointer to the string to be validated.
- * @param size Size of the string including the null-terminator.
- * @return true if the string contains only allowed characters or is NULL,
- *         false otherwise.
- */
-bool validateWiFiString(char *string, size_t size)
-{
-  if (string == NULL)
-    return false;
 
-  for (size_t i = 0; i < size; i++)
+/**
+ * @brief Write sequential numbers to a portion of EEPROM.
+ *
+ * This function writes sequential numbers starting from 0 to a specified portion of EEPROM.
+ * If the number reaches 255, it wraps around and starts again from 1.
+ *
+ * @param memoryAddress Starting address in EEPROM.
+ * @param length Number of bytes to write.
+ */
+void writeSequentialToEEPROM(uint16_t memoryAddress, uint16_t length)
+{
+  if (!checkEEPROMavailable())
+    return;
+
+  uint8_t value = 0;
+  for (uint16_t i = 0; i < length; i++)
   {
-    char c = string[i];
+    ee.writeByte(memoryAddress + i, value);
-    if (c == '\0')
+    value = (value == 255) ? 1 : value + 1;
-    {
-      // Reached the end of the string, all characters were valid WiFi characters.
-      return true;
-    }
-    if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
-          (c >= '0' && c <= '9') || c == '!' || c == '"' || c == '#' ||
-          c == '$' || c == '%' || c == '&' || c == '\'' || c == '(' ||
-          c == ')' || c == '*' || c == '+' || c == ',' || c == '-' ||
-          c == '.' || c == '/' || c == ':' || c == ';' || c == '<' ||
-          c == '=' || c == '>' || c == '?' || c == '@' || c == '[' ||
-          c == '\\' || c == ']' || c == '^' || c == '_' || c == '`' ||
-          c == '{' || c == '|' || c == '}' || c == '~'))
-    {
-      // Found a character that is not a valid WiFi character.
-      return false;
-    }
   }
-  // If the loop completes without finding a null terminator, the string is invalid.
-  return false;
 }
 
+/**
+ * @brief Write 0 to a portion of EEPROM.
+ *
+ * This function writes 0 to a specified portion of EEPROM.
+ *
+ * @param memoryAddress Starting address in EEPROM.
+ * @param length Number of bytes to write.
+ */
+void writeZeroToEEPROM(uint16_t memoryAddress, uint16_t length)
+{
+  if (!checkEEPROMavailable())
+    return;
+
+  for (uint16_t i = 0; i < length; i++)
+  {
+    ee.writeByte(memoryAddress + i, 0);
+  }
+}

Software/src/globals.cpp

@@ -6,4 +6,6 @@ void initGlobals()
 {
   globals.systemStatus = sysStat_Startup;
   globals.requestEEAction = EE_IDLE;
+  globals.systemStatustxt[0] = 0;
+  globals.toggle_wifi = false;
 }

Software/src/lora_net.cpp

@@ -79,7 +79,7 @@ void LoRa_Process()
     if (e220ttl.available() > 1)
     {
         ResponseContainer rc = e220ttl.receiveMessageRSSI();
-        // Is something goes wrong print error
+        // If something goes wrong, print error
         if (rc.status.code != 1)
         {
             Serial.println(rc.status.getResponseDescription());
@@ -96,34 +96,45 @@ void LoRa_Process()
 #elif defined(FEATURE_ENABLE_UARTLORA)
 
     static char packageInput[32];
-    static bool packageRecieved = false;
+    static bool packageReceived = false;
     static unsigned int bufferPtr = 0;
-    int recievedSize = 0;
+    int receivedSize = 0;
 
-    while (SerialLoRa.available() && packageRecieved == false)
+    while (SerialLoRa.available() && !packageReceived)
     {
         if (bufferPtr < sizeof(packageInput) - 1)
         {
-            packageInput[bufferPtr] = SerialLoRa.read();
+            char c = SerialLoRa.read();
-            packageInput[bufferPtr + 1] = 0; // always terminate String
+            packageInput[bufferPtr] = c;
+            packageInput[bufferPtr + 1] = '\0'; // always terminate string
 
-            if (packageInput[bufferPtr] == '\n')
+            if (c == '\n')
             {
-                packageRecieved = true;
+                packageReceived = true;
-                recievedSize = bufferPtr;
+                receivedSize = bufferPtr;
                 bufferPtr = 0;
                 Debug_pushMessage("Got LoRa UART: %s\n", packageInput);
             }
-            else if ((packageInput[bufferPtr] >= 0x30) || (packageInput[bufferPtr] <= 0x5A)) // only accept Numbers, UpperCase-Letters and some special chars
+            else if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c == ' ' || c == ',' || c == '.')) // Accept numbers, uppercase letters, and some special chars
             {
                 bufferPtr++;
             }
+            else
+            {
+                Debug_pushMessage("Invalid character received: %c\n", c);
+            }
+        }
+        else
+        {
+            Debug_pushMessage("Buffer overflow. Resetting buffer.\n");
+            bufferPtr = 0;
         }
     }
 
-    if (packageRecieved) {
+    if (packageReceived)
-        Parse_LoRa_UartCommand(packageInput, recievedSize);
+    {
-        packageRecieved = false;
+        Parse_LoRa_UartCommand(packageInput, receivedSize);
+        packageReceived = false;
     }
 
 #endif
@@ -238,7 +249,7 @@ void printParameters(struct Configuration configuration)
 void Parse_LoRa_UartCommand(char input[], int size)
 {
 
-    Debug_pushMessage("Start parsing, size: %d", size);
+    Debug_pushMessage("Start parsing, size: %d\n", size);
     char delimiter[] = ";";
     char *ptr;
     char command[8];
@@ -251,14 +262,14 @@ void Parse_LoRa_UartCommand(char input[], int size)
     while (ptr != NULL)
     {
         strncpy(command, ptr, sizeof(command) - 1); // Platz für Nullterminator lassen
-        command[sizeof(command) - 1] = '\0'; // Nullterminator setzen
+        command[sizeof(command) - 1] = '\0';        // Nullterminator setzen
 
         ptr = strtok(NULL, delimiter);
 
         if (ptr != NULL)
         {
             strncpy(value, ptr, sizeof(value) - 1); // Platz für Nullterminator lassen
-            value[sizeof(value) - 1] = '\0'; // Nullterminator setzen
+            value[sizeof(value) - 1] = '\0';        // Nullterminator setzen
         }
         else
         {
@@ -267,7 +278,7 @@ void Parse_LoRa_UartCommand(char input[], int size)
         }
 
         // Hier kannst du den Wert und das Kommando verarbeiten
-        Debug_pushMessage("Command: %s, Value: %s", command, value);
+        Debug_pushMessage("Command: %s, Value: %s\n", command, value);
     }
 
     Debug_pushMessage("Parsed LoRa UART Command:  %s Value: %s\n", command, value);
@@ -275,12 +286,12 @@ void Parse_LoRa_UartCommand(char input[], int size)
     if (!strcmp(command, "ENABLE"))
     {
         globals.timer_disabled = false;
-        Debug_pushMessage("Enabled by LoRa");
+        Debug_pushMessage("Enabled by LoRa\n");
     }
     else if (!strcmp(command, "DISABLE"))
     {
         globals.timer_disabled = true;
-        Debug_pushMessage("Disabled by LoRa");
+        Debug_pushMessage("Disabled by LoRa\n");
     }
     else if (!strcmp(command, "RESET"))
     {
@@ -288,7 +299,7 @@ void Parse_LoRa_UartCommand(char input[], int size)
         PersistenceData.faction_1_timer = 0;
         PersistenceData.faction_2_timer = 0;
         PersistenceData.faction_3_timer = 0;
-        Debug_pushMessage("Reset by LoRa");
+        Debug_pushMessage("Reset by LoRa\n");
     }
     else if (!strcmp(command, "TMRSTP"))
     {

Software/src/main.cpp

@@ -19,6 +19,7 @@
 #include "globals.h"
 #include "dtc.h"
 #include "debugger.h"
+#include "utilities.h"
 #if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 #include "lora_net.h"
 #endif
@@ -84,7 +85,8 @@ void setup()
 	system_update_cpu_freq(SYS_CPU_80MHZ);
 
 	// Generate a unique device name based on ESP chip ID
-	snprintf(globals.DeviceName, 32, HOST_NAME, ESP.getChipId());
+	strncpy(globals.DeviceName, HOST_NAME, sizeof(globals.DeviceName));
+	snprintf(globals.DeviceNameId, sizeof(globals.DeviceNameId), "%s_%08X", globals.DeviceName, ESP.getChipId());
 
 	// Disable WiFi persistent storage
 	WiFi.persistent(false);
@@ -95,7 +97,7 @@ void setup()
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 	// Configure WiFi settings for client mode if enabled
 	WiFi.mode(WIFI_STA);
-	WiFi.setHostname(globals.DeviceName);
+	WiFi.setHostname(globals.DeviceNameId);
 	wifiMulti.addAP(QUOTE(WIFI_SSID_CLIENT), QUOTE(WIFI_PASSWORD_CLIENT));
 	tmrWiFiMaintainConnection.start();
 #else
@@ -108,14 +110,20 @@ void setup()
 	Serial.setDebugOutput(false);
 
 	Serial.print("\n\n-------------------START-------------------\n");
-	Serial.print(globals.DeviceName);
+	Serial.print(globals.DeviceNameId);
-	Serial.print("\nby Hiabuto Defense\n");
+	Serial.print("\nby Hiabuto Defense\n\n");
 
 	// Initialize EEPROM, load configuration, and persistence data from EEPROM
-	InitEEPROM();
+	if (InitEEPROM())
-	GetConfig_EEPROM();
+	{
-	GetPersistence_EEPROM();
+		GetConfig_EEPROM();
-	Serial.print("\nEE-Init done");
+		GetPersistence_EEPROM();
+		Serial.printf("Initialized EEPROM at Address 0x%02X\n", I2C_EE_ADDRESS);
+	}
+	else
+	{
+		Serial.print("EEPROM not Initialized\n");
+	}
 
 	if (i2c_io.begin())
 	{
@@ -150,7 +158,7 @@ void setup()
 
 	// Set up OTA updates
 	ArduinoOTA.setPort(8266);
-	ArduinoOTA.setHostname(globals.DeviceName);
+	ArduinoOTA.setHostname(globals.DeviceNameId);
 	ArduinoOTA.setPassword(QUOTE(ADMIN_PASSWORD));
 
 	ArduinoOTA.onStart([]()
@@ -208,7 +216,6 @@ void setup()
 
 	// Start cyclic EEPROM updates for Persistence Data Structure (PDS)
 	tmrEEPROMCyclicPDS.start();
-	Serial.print("\nSetup Done\n");
 
 	disp_FAC_1.init();
 	disp_FAC_1.setBrightness(5);
@@ -217,7 +224,6 @@ void setup()
 	disp_FAC_3.init();
 	disp_FAC_3.setBrightness(5);
 
-	tmrEEPROMCyclicPDS.start();
 	tmrFactionTicker.start();
 	tmrInputGetter.start();
 
@@ -241,6 +247,13 @@ void loop()
 	DTC_Process();
 	Debug_Process();
 
+	if (globals.toggle_wifi == true)
+	{
+
+		globals.toggle_wifi = false;
+		toggleWiFiAP();
+	}
+
 #if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 	LoRa_Process();
 	tmrStatusSender.update();
@@ -251,7 +264,7 @@ void loop()
 	tmrWiFiMaintainConnection.update();
 #endif
 
-	static tSystem_Status lastStatus = sysStat_Error;
+	static tSystem_Status lastStatus = sysStat_Init;
 
 	// Handle different system statuses
 	switch (globals.systemStatus)
@@ -263,10 +276,11 @@ void loop()
 			lastStatus = globals.systemStatus;
 		}
 		// Transition to Normal status after startup delay
-		if (millis() > STARTUP_DELAY)
+		if (millis() > STARTUP_DELAY_MS)
 		{
 			globals.systemStatus = sysStat_Normal;
 			globals.resumeStatus = sysStat_Normal;
+			Debug_pushMessage("sysstat = Normal");
 		}
 		break;
 
@@ -293,7 +307,12 @@ void loop()
 		}
 		SystemShutdown(false);
 		break;
-
+	case sysStat_Error:
+		if (lastStatus != globals.systemStatus)
+		{
+			strcpy_P(globals.systemStatustxt, PSTR("Error"));
+			lastStatus = globals.systemStatus;
+		}
 	default:
 		break;
 	}
@@ -410,7 +429,7 @@ void tmrCallback_InputGetter()
 
 	if (keysPressed > 1)
 	{
-		Debug_pushMessage("ERROR: More than one Flag active - setting no Faction active");
+		Debug_pushMessage("ERROR: More than one Flag active - setting no Faction active\n");
 		PersistenceData.activeFaction = NONE;
 		return;
 	}
@@ -419,7 +438,7 @@ void tmrCallback_InputGetter()
 	{
 		if (PersistenceData.activeFaction != FACTION_1)
 		{
-			Debug_pushMessage("Faction 1 captured !");
+			Debug_pushMessage("Faction 1 captured !\n");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_1;
@@ -429,7 +448,7 @@ void tmrCallback_InputGetter()
 	{
 		if (PersistenceData.activeFaction != FACTION_2)
 		{
-			Debug_pushMessage("Faction 2 captured !");
+			Debug_pushMessage("Faction 2 captured !\n");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_2;
@@ -439,7 +458,7 @@ void tmrCallback_InputGetter()
 	{
 		if (PersistenceData.activeFaction != FACTION_3)
 		{
-			Debug_pushMessage("Faction 3 captured !");
+			Debug_pushMessage("Faction 3 captured !\n");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_3;
@@ -561,6 +580,8 @@ void wifiMaintainConnectionTicker_callback()
  */
 void toggleWiFiAP(bool shutdown)
 {
+	char buffer[33];
+	char buffer_pass[33];
 	// Check if WiFi is currently active
 	if (WiFi.getMode() != WIFI_OFF)
 	{
@@ -578,7 +599,9 @@ void toggleWiFiAP(bool shutdown)
 		// Start WiFi in Access Point (AP) mode
 		WiFi.mode(WIFI_AP);
 		WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
-		WiFi.softAP(globals.DeviceName, QUOTE(WIFI_AP_PASSWORD));
+		sanitizeWiFiString(globals.DeviceNameId, buffer, sizeof(buffer));
+		GenerateDeviceSpecificPassword(QUOTE(WIFI_PASS_SEED), buffer_pass, sizeof(buffer_pass));
+		WiFi.softAP(buffer, buffer_pass);
 
 		// Stop WiFi maintenance connection ticker if enabled and display debug messages
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
@@ -691,14 +714,14 @@ void ProcessKeyCombos(bool *btnState)
 
 		if (keyCount_Fac2 == 2 && keyCount_Fac3 == 0)
 		{
-			Debug_pushMessage("KeyCombo: WiFi AP ON");
+			Debug_pushMessage("KeyCombo: WiFi AP ON\n");
 			OverrideDisplay(5000, "NET ", "    ", "    ");
 			toggleWiFiAP(false);
 		}
 		else if (keyCount_Fac2 == 4 && keyCount_Fac3 == 0)
 		{
 			Debug_pushMessage("KeyCombo: Reset Timer\n");
-			if (globals.systemStatus == sysStat_Startup)
+			if (millis() < STARTUP_DELAY_MS)
 			{
 				OverrideDisplay(5000, "RST ", "    ", "    ");
 				PersistenceData.faction_1_timer = 0;

Software/src/struct2json.cpp

@@ -3,10 +3,10 @@
  *
  * @brief Implementation file for converting structs to JSON objects.
  *
- * @note This file is auto-generated by a script on 2024-05-30 22:54:25.
+ * @note This file is auto-generated by a script on 2024-06-06 18:52:33.
  *
  * @author Marcel Peterkau
- * @date   30.05.2024
+ * @date   06.06.2024
  */
 
 
@@ -20,8 +20,6 @@ void generateJsonObject_ConfigData(JsonObject data)
     data["Faction_1_Name"] = ConfigData.Faction_1_Name;
     data["Faction_2_Name"] = ConfigData.Faction_2_Name;
     data["Faction_3_Name"] = ConfigData.Faction_3_Name;
-    data["wifi_ap_ssid"] = ConfigData.wifi_ap_ssid;
-    data["wifi_ap_password"] = ConfigData.wifi_ap_password;
     data["wifi_client_ssid"] = ConfigData.wifi_client_ssid;
     data["wifi_client_password"] = ConfigData.wifi_client_password;
     data["wifi_autoconnect"] = ConfigData.wifi_autoconnect;
@@ -40,4 +38,4 @@ void generateJsonObject_PersistenceData(JsonObject data)
 
 
 
-// CODEGENERATOR_CHECKSUM: 735cd4daf9a46bd773bdf5e6cd5a58d61b0d877196399bc2784a0d0ea7af717d
+// CODEGENERATOR_CHECKSUM: 3a3fd3024dd9dd769ff5d62f61b3ba1b781b7d06e7568a1ddac56d193dba9ee5

Software/src/utilities.cpp

@@ -0,0 +1,126 @@
+#include "utilities.h"
+
+/**
+ * @brief Validates whether a given string contains only characters allowed in WiFi SSIDs and passwords.
+ *
+ * This function checks each character in the provided string to ensure
+ * that it contains only characters allowed in WiFi SSIDs and passwords.
+ * It considers characters from 'A' to 'Z', 'a' to 'z', '0' to '9', as well as
+ * the following special characters: ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+ *
+ * @param string Pointer to the string to be validated.
+ * @param size Size of the string including the null-terminator.
+ * @return true if the string contains only allowed characters or is NULL,
+ *         false otherwise.
+ */
+bool validateWiFiString(char *string, size_t size)
+{
+    if (string == NULL)
+        return false;
+
+    for (size_t i = 0; i < size; i++)
+    {
+        char c = string[i];
+        if (c == '\0')
+        {
+            // Reached the end of the string, all characters were valid WiFi characters.
+            return true;
+        }
+        if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
+              (c >= '0' && c <= '9') || c == '!' || c == '"' || c == '#' ||
+              c == '$' || c == '%' || c == '&' || c == '\'' || c == '(' ||
+              c == ')' || c == '*' || c == '+' || c == ',' || c == '-' ||
+              c == '.' || c == '/' || c == ':' || c == ';' || c == '<' ||
+              c == '=' || c == '>' || c == '?' || c == '@' || c == '[' ||
+              c == '\\' || c == ']' || c == '^' || c == '_' || c == '`' ||
+              c == '{' || c == '|' || c == '}' || c == '~' || c == ' '))
+        {
+            // Found a character that is not a valid WiFi character.
+            return false;
+        }
+    }
+    // If the loop completes without finding a null terminator, the string is invalid.
+    return false;
+}
+
+/**
+ * @brief Copies a string to a buffer, replacing invalid WiFi SSID characters with a placeholder.
+ *
+ * This function checks each character in the provided input string to ensure
+ * that it contains only characters allowed in WiFi SSIDs and passwords. If a character
+ * is invalid, it replaces it with a placeholder character (e.g., '_').
+ * It considers characters from 'A' to 'Z', 'a' to 'z', '0' to '9', as well as
+ * the following special characters: ! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
+ *
+ * @param input Pointer to the input string to be validated and copied.
+ * @param buffer Pointer to the buffer where the output string will be copied.
+ * @param bufferSize Size of the buffer including the null-terminator.
+ */
+void sanitizeWiFiString(const char *input, char *buffer, size_t bufferSize)
+{
+    if (input == NULL || buffer == NULL || bufferSize == 0)
+        return;
+
+    size_t i;
+    for (i = 0; i < bufferSize - 1; i++) // Leave space for null-terminator
+    {
+        char c = input[i];
+        if (c == '\0')
+        {
+            // Reached the end of the input string, terminate the buffer
+            buffer[i] = '\0';
+            return;
+        }
+        if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
+              (c >= '0' && c <= '9') || c == '!' || c == '"' || c == '#' ||
+              c == '$' || c == '%' || c == '&' || c == '\'' || c == '(' ||
+              c == ')' || c == '*' || c == '+' || c == ',' || c == '-' ||
+              c == '.' || c == '/' || c == ':' || c == ';' || c == '<' ||
+              c == '=' || c == '>' || c == '?' || c == '@' || c == '[' ||
+              c == '\\' || c == ']' || c == '^' || c == '_' || c == '`' ||
+              c == '{' || c == '|' || c == '}' || c == '~' || c == ' '))
+        {
+            // Replace invalid character with placeholder
+            buffer[i] = '_';
+        }
+        else
+        {
+            // Copy valid character to buffer
+            buffer[i] = c;
+        }
+    }
+    // Null-terminate the buffer
+    buffer[i] = '\0';
+}
+
+/**
+ * @brief Generates a device-specific password based on a seed and the ESP8266 Chip ID.
+ *
+ * This function combines a given seed with the unique Chip ID of the ESP8266 device to create a device-specific password.
+ * The resulting password is stored in the provided character buffer.
+ *
+ * @param seed The seed string used for password generation. Should be up to 16 characters long.
+ * @param passwordBuffer The character buffer where the generated password will be stored.
+ * @param bufferLength The length of the password buffer. Should be large enough to hold the generated password and null terminator.
+ */
+void GenerateDeviceSpecificPassword(const char* seed, char* passwordBuffer, size_t bufferLength) {
+    uint32_t chipId = ESP.getChipId();
+    char chipIdStr[9]; // 8 characters + null terminator
+    snprintf(chipIdStr, sizeof(chipIdStr), "%08X", chipId);
+
+    char combined[33]; // seed (16) + chipId (8) + null terminator (1)
+    strncpy(combined, seed, 16);
+    strncat(combined, chipIdStr, 8);
+
+    // Simple hash function for demonstration
+    unsigned long hash = 5381;
+    int c;
+    char *str = combined;
+
+    while ((c = *str++)) {
+        hash = ((hash << 5) + hash) + c; // hash * 33 + c
+    }
+
+    snprintf(passwordBuffer, bufferLength, "%08X%08X", hash, hash);
+    passwordBuffer[bufferLength - 1] = '\0'; // Ensure null termination
+}

Software/src/webui.cpp

@@ -17,6 +17,8 @@ AsyncWebServer webServer(80);
 
 const char *PARAM_MESSAGE = "message";
 
+batteryType_t batterytypePreselect; /**< Preselect Memory for change Batterytype */
+
 String processor(const String &var);
 void WebserverNotFound_Callback(AsyncWebServerRequest *request);
 void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
@@ -69,7 +71,7 @@ void initWebUI()
   }
 
   // Initialize mDNS and add service
-  MDNS.begin(globals.DeviceName);
+  MDNS.begin(globals.DeviceNameId);
   MDNS.addService("http", "tcp", 80);
 
   // Set up WebSocket event handler and attach to web server
@@ -293,8 +295,6 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
         strncpy(ConfigData.Faction_1_Name, json["config"]["Faction_1_Name"].as<const char *>(), sizeof(ConfigData.Faction_1_Name));
         strncpy(ConfigData.Faction_2_Name, json["config"]["Faction_2_Name"].as<const char *>(), sizeof(ConfigData.Faction_2_Name));
         strncpy(ConfigData.Faction_3_Name, json["config"]["Faction_3_Name"].as<const char *>(), sizeof(ConfigData.Faction_3_Name));
-        strncpy(ConfigData.wifi_ap_ssid, json["config"]["wifi_ap_ssid"].as<const char *>(), sizeof(ConfigData.wifi_ap_ssid));
-        strncpy(ConfigData.wifi_ap_password, json["config"]["wifi_ap_password"].as<const char *>(), sizeof(ConfigData.wifi_ap_password));
         strncpy(ConfigData.wifi_client_ssid, json["config"]["wifi_client_ssid"].as<const char *>(), sizeof(ConfigData.wifi_client_ssid));
         strncpy(ConfigData.wifi_client_password, json["config"]["wifi_client_password"].as<const char *>(), sizeof(ConfigData.wifi_client_password));
 
@@ -340,7 +340,7 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
 
   char buffer[16];
 
-  info["DeviceName"] = globals.DeviceName;
+  info["DeviceNameId"] = globals.DeviceNameId;
   sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
   info["FW-Version"] = buffer;
   info["FS-Version"] = globals.FlashVersion;
@@ -424,6 +424,10 @@ void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len)
     {
       Websocket_HandleSettings(data + strlen("set-"));
     }
+    else if (strncmp((char *)data, "debug", strlen("debug")) == 0)
+    {
+      Debug_ProcessCommand(data - strlen("debug"));
+    }
     else
     {
       Debug_pushMessage("Got unknown Websocket-Message '%s' from client\n", (char *)data);
@@ -446,8 +450,14 @@ void Websocket_HandleButtons(uint8_t *data)
   char value[32];
 
   parseWebsocketString((char *)data, identifier, sizeof(identifier), value, sizeof(value));
-
+  if (strcmp(identifier, "reset-timer") == 0)
-  if (strcmp(identifier, "debugstart") == 0)
+  {
+    PersistenceData.activeFaction = NONE;
+    PersistenceData.faction_1_timer = 0;
+    PersistenceData.faction_2_timer = 0;
+    PersistenceData.faction_3_timer = 0;
+  }
+  else if (strcmp(identifier, "debugstart") == 0)
   {
     SetDebugportStatus(dbg_Webui, enabled);
   }
@@ -457,12 +467,25 @@ void Websocket_HandleButtons(uint8_t *data)
   }
   else if (strcmp(identifier, "settingssave") == 0)
   {
+    ConfigData.batteryType = batterytypePreselect;
     globals.requestEEAction = EE_CFG_SAVE;
   }
   else if (strcmp(identifier, "reboot") == 0)
   {
     globals.systemStatus = sysStat_Shutdown;
   }
+  else if (strcmp(identifier, "faction1") == 0)
+  {
+    PersistenceData.activeFaction = FACTION_1;
+  }
+  else if (strcmp(identifier, "faction2") == 0)
+  {
+    PersistenceData.activeFaction = FACTION_2;
+  }
+  else if (strcmp(identifier, "faction3") == 0)
+  {
+    PersistenceData.activeFaction = FACTION_3;
+  }
   else
   {
     Debug_pushMessage("Got unknown Button-id '%s' from ws-client\n", identifier);
@@ -484,7 +507,28 @@ void Websocket_HandleSettings(uint8_t *data)
 
   parseWebsocketString((char *)data, identifier, sizeof(identifier), value, sizeof(value));
 
-  if (strcmp(identifier, "wifi-ssid") == 0)
+  if (strcmp(identifier, "active_faction_on_reboot") == 0)
+  {
+    ConfigData.active_faction_on_reboot = value[0] == '1' ? true : false;
+  }
+  else if (strcmp(identifier, "name_faction1") == 0)
+  {
+    strncpy(ConfigData.Faction_1_Name, value, sizeof(ConfigData.Faction_1_Name));
+  }
+  else if (strcmp(identifier, "name_faction2") == 0)
+  {
+    strncpy(ConfigData.Faction_2_Name, value, sizeof(ConfigData.Faction_2_Name));
+  }
+  else if (strcmp(identifier, "name_faction3") == 0)
+  {
+    strncpy(ConfigData.Faction_3_Name, value, sizeof(ConfigData.Faction_3_Name));
+  }
+  else if (strcmp(identifier, "batterytype") == 0)
+  {
+    int index = findIndexByString(value, BatteryString, BatteryString_Elements);
+    batterytypePreselect = (batteryType_t)index;
+  }
+  else if (strcmp(identifier, "wifi-ssid") == 0)
   {
     strncpy(ConfigData.wifi_client_ssid, value, sizeof(ConfigData.wifi_client_ssid));
   }
@@ -564,10 +608,10 @@ void Websocket_RefreshClientData_DTCs(uint32_t client_id)
  */
 void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
 {
-
   if (send_mapping)
   {
     const char mapping[] = "MAPPING_STATUS:"
+                           "batterylevel;"
                            "systemstatus;"
                            "activefaction;"
                            "time_faction1;"
@@ -578,23 +622,27 @@ void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
       webSocket.text(client_id, mapping);
     else
       webSocket.textAll(mapping);
+
+    Debug_pushMessage("send MAPPING_STATUS WS-Client Data\n");
   }
 
-  String temp = "STATUS:";
+  char dataString[200] = {0}; // Maximal 200 Zeichen für den Data-String
 
-  temp.concat(String(globals.systemStatustxt) + ";");
+  sprintf(dataString, "STATUS:%d;%s;%d;%ld;%ld;%ld;",
-  temp.concat(String(PersistenceData.activeFaction) + ";");
+          globals.battery_level,
-  temp.concat(String(PersistenceData.faction_1_timer) + ";");
+          globals.systemStatustxt,
-  temp.concat(String(PersistenceData.faction_2_timer) + ";");
+          PersistenceData.activeFaction,
-  temp.concat(String(PersistenceData.faction_3_timer) + ";");
+          PersistenceData.faction_1_timer,
+          PersistenceData.faction_2_timer,
+          PersistenceData.faction_3_timer);
 
   if (client_id > 0)
   {
-    webSocket.text(client_id, temp);
+    webSocket.text(client_id, dataString);
   }
   else
   {
-    webSocket.textAll(temp);
+    webSocket.textAll(dataString);
   }
 }
 
@@ -611,40 +659,53 @@ void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
 void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
 {
 
+  Debug_pushMessage("send STATIC WS-Client Data\n");
   if (send_mapping)
   {
     const char mapping[] = "MAPPING_STATIC:"
+                           "devicename;"
                            "active_faction_on_reboot;"
                            "batteryType;"
                            "name_faction1;"
                            "name_faction2;"
                            "name_faction3;"
                            "wifi-ssid;"
-                           "wifi-pass;";
+                           "wifi-pass;"
+                           "fw-version;"
+                           "flash-version;"
+                           "git-revision;";
 
     if (client_id > 0)
       webSocket.text(client_id, mapping);
     else
       webSocket.textAll(mapping);
+
+    Debug_pushMessage("send MAPPING_STATIC WS-Client Data\n");
   }
 
-  String temp = "STATIC:";
+  char dataString[200] = {0}; // Maximal 200 Zeichen für den Data-String
 
-  temp.concat(String(ConfigData.active_faction_on_reboot) + ";");
+  sprintf(dataString, "STATIC:%s;%d;%d;%s;%s;%s;%s;%s;%d.%02d;%s;%s;",
-  temp.concat(String(ConfigData.batteryType) + ";");
+          globals.DeviceName,
-  temp.concat(String(ConfigData.Faction_1_Name) + ";");
+          ConfigData.active_faction_on_reboot,
-  temp.concat(String(ConfigData.Faction_2_Name) + ";");
+          ConfigData.batteryType,
-  temp.concat(String(ConfigData.Faction_3_Name) + ";");
+          ConfigData.Faction_1_Name,
-  temp.concat(String(ConfigData.wifi_client_ssid) + ";");
+          ConfigData.Faction_2_Name,
-  temp.concat(String(ConfigData.wifi_client_password) + ";");
+          ConfigData.Faction_3_Name,
+          ConfigData.wifi_client_ssid,
+          ConfigData.wifi_client_password,
+          constants.FW_Version_major,
+          constants.FW_Version_minor,
+          globals.FlashVersion,
+          constants.GitHash);
 
   if (client_id > 0)
   {
-    webSocket.text(client_id, temp);
+    webSocket.text(client_id, dataString);
   }
   else
   {
-    webSocket.textAll(temp);
+    webSocket.textAll(dataString);
   }
 }
 

Software/wifi_credentials.example.ini

@@ -1,6 +1,5 @@
 [wifi_cred]
-wifi_ap_ssid = wifi-ap-ssid
+admin_password = chainlube
-wifi_ap_password = wifiappass
+wifi_pass_seed = wifiapseed
-wifi_client_ssid = wifi-ssid
+wifi_ssid_client = wifi-ssid
-wifi_client_password = wifi-pass
+wifi_password_client = ota-password
-ota_password = ota-password