some fixes before DE 2025

Software/.gitignore

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

Software/codegen/prepare_littlefs.py

@@ -1,4 +1,3 @@
-import glob
 import shutil
 import gzip
 import os
@@ -8,23 +7,40 @@ from os import popen
 Import("env")
 Import("projenv")
 
-# Überprüfe die Betriebssystemplattform
+def resolve_tool(name):
+    local_bin = os.path.join(env['PROJECT_DIR'], 'node_modules', '.bin', name)
     if platform.system() == "Windows":
-    # Setze die Pfade zu den Tools für Windows
+        local_bin += ".cmd"
-    html_minifier_path = os.path.join(os.getenv("APPDATA"), "npm", "html-minifier.cmd")
+    if os.path.exists(local_bin):
-    uglifyjs_path = os.path.join(os.getenv("APPDATA"), "npm", "uglifyjs.cmd")
+        return local_bin
-    terser_path = os.path.join(os.getenv("APPDATA"), "npm", "terser.cmd")
-    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])
@@ -33,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)
@@ -152,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)

Software/codegen/run_pre.py

@@ -15,6 +15,11 @@ custom_flash_version = env.GetProjectOption("custom_flash_version", "0.99")
 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)
@@ -23,10 +28,10 @@ with open('data_src/version', 'w') as version_file:
 env.Replace(PROGNAME="firmware_%s_%s.fw" % (custom_firmware_version, git_revision))
 env.Append(CPPDEFINES=[
     ('GIT_REV', '\\"{}\\"'.format(git_revision)),
-    ('FW_MAJOR', fw_major),
+    ('FW_MAJOR', fw_major_int),
-    ('FW_MINOR', fw_minor),
+    ('FW_MINOR', fw_minor_int),
-    ('FL_MAJOR', fl_major),
+    ('FL_MAJOR', fl_major_int),
-    ('FL_MINOR', fl_minor)
+    ('FL_MINOR', fl_minor_int)
 ])
 
 struct2json.struct2json()

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

@@ -4,19 +4,19 @@
 <head>
   <meta charset="utf-8" />
   <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>
   <script src="static/js/dtc_table.js"></script>
   <script src="static/js/script.js"></script>
-  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <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="32x32" href="static/img/favicon-32x32.png" />
-  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png" />
-  <link rel="manifest" href="static/img/site.webmanifest">
+  <link rel="manifest" href="static/img/site.webmanifest" />
 </head>
 
 <body>
@@ -31,93 +31,125 @@
   <!-- 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="" />
       <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_fwupdate">Update</a></li>
+          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a>
-
+        </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"><span class="data-devicename">DE Airsoft Timer</span></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>
         <div class="progress">
-          <div id="battery_level" class="data-battery_level progress-bar text-light" role="progressbar" aria-valuenow="0"
+          <div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0"
             aria-valuemin="0" aria-valuemax="100" style="width: 0%">
             0
           </div>
         </div>
-        </p>
         <!-- Div Group Battery remain -->
         <!-- Div Group current Mode -->
         <hr />
-        <p>
         <h4>aktueller Modus</h4>
-        <input class="data-systemstatus form-control" type="text" id="sysstatus" 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 id="header_faction1" class="col text-center data-name_faction1 text-white p-3">%NAME_FAC_1%</div>
+            <div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">
-            <div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">%NAME_FAC_2%</div>
+              %NAME_FAC_1%
-            <div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">%NAME_FAC_3%</div>
+            </div>
+            <div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">
+              %NAME_FAC_2%
+            </div>
+            <div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">
+              %NAME_FAC_3%
+            </div>
           </div>
           <div class="row">
             <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1">
-              <img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="...">
+              <div class="glow-container">
+                <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 class="col bg-dark text-white p-3 data-activefaction faction-logo faction2">
-              <img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="...">
             </div>
             <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3">
-              <img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="...">
+              <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_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">
-            <div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">0</div>
+              0
-            <div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">0</div>
+            </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 id="dtc_container" hidden>
           <hr />
-          <p>
           <h4>Fehlercodes</h4>
           <table class="table" id="dtc_table">
             <tbody>
@@ -129,61 +161,62 @@
               </tr>
             </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>
         <div class="form-group row">
           <div class="col text-center">
-            <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">Timer zurücksetzen</button>
+            <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">
+              Timer zurücksetzen
+            </button>
           </div>
         </div>
-        </p>
         <!-- Div Group Reset Timers  -->
         <!-- Div Group LiveDebug -->
         <hr />
-     <p>
         <h4>Live Debug</h4>
+        <div class="form-group row">
+          <input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control" />
+        </div>
         <div class="form-group row">
           <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
         </div>
         <div class="form-group row">
           <div class="col text-center">
-         <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">Start</button>
+            <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">
-         <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">Stop</button>
+              Start
+            </button>
+            <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">
+              Stop
+            </button>
           </div>
         </div>
-     </p>
         <!-- Div Group LiveDebug -->
         <!-- Div Group Device Reboot -->
         <hr />
-     <p>
         <h4>Ger&auml;t neustarten</h4>
         <div class="form-group row">
           <div class="col text-center">
-           <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">Reboot</button>
+            <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">
+              Reboot
+            </button>
           </div>
         </div>
-     </p>
         <!-- Div Group Device Reboot -->
       </div>
       <!-- Div Tab Maintenance -->
-
       <!-- Div Tab Settings-->
       <div id="tab_source" class="tab-pane fade" role="tabpanel">
         <h3>Einstellungen</h3>
         <!-- Div Group Battery Type -->
         <hr />
-          <p>
         <h4>Akku</h4>
         <div class="form-group row">
           <label for="batterytype" class="control-label col-4">Akku-Variante</label>
@@ -195,17 +228,16 @@
             </select>
           </div>
         </div>
-          </p>
         <!-- Div Group Battery Type -->
         <!-- Div Group Timer Settings -->
         <hr />
-          <p>
         <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">
+              <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>
@@ -216,7 +248,8 @@
           <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">
+              <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>
@@ -227,7 +260,8 @@
           <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">
+              <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>
@@ -238,7 +272,8 @@
           <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">
+              <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>
@@ -248,28 +283,26 @@
         <!-- Div Group Timer Settings -->
         <!-- Div Group Save Button-->
         <hr />
-        <p>
         <div class="form-group row">
           <div class="col text-center">
-              <button id="settingssave" class="btn-wsevent btn btn-outline-primary">Speichern</button>
+            <button id="settingssave" class="btn-wsevent btn btn-outline-primary">
+              Speichern
+            </button>
           </div>
         </div>
-        </p>
       </div>
       <!-- 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>
@@ -283,25 +316,22 @@
               <td>Git Revision</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"
@@ -311,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"
@@ -331,20 +361,19 @@
           </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">
@@ -353,11 +382,8 @@
       </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">
@@ -372,16 +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 -->
-
-
-
 </body>
 
 </html>

Software/data_src/static/js/script.js

@@ -1,27 +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();
-      if ($("#show_hide_password input").attr("type") == "text") {
+    var inputField = $("#show_hide_password input");
-        $("#show_hide_password input").attr("type", "password");
+    var icon = $("#show_hide_password i");
-        $("#show_hide_password i").addClass("fa-eye-slash");
+    if (inputField.attr("type") == "text") {
-        $("#show_hide_password i").removeClass("fa-eye");
+      inputField.attr("type", "password");
-      } else if ($("#show_hide_password input").attr("type") == "password") {
+      icon.addClass("fa-eye-slash");
-        $("#show_hide_password input").attr("type", "text");
+      icon.removeClass("fa-eye");
-        $("#show_hide_password i").removeClass("fa-eye-slash");
+    } else if (inputField.attr("type") == "password") {
-        $("#show_hide_password i").addClass("fa-eye");
+      inputField.attr("type", "text");
+      icon.removeClass("fa-eye-slash");
+      icon.addClass("fa-eye");
     }
   });
-  });
 
-  document
+  // Event-Listener für Datei-Upload
-    .querySelector(".custom-file-input")
+  $(".custom-file-input").on("change", function (e) {
-    .addEventListener("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

@@ -139,6 +139,10 @@ function websocket_sendevent(element_id, element_value) {
   websocket.send(element_id + ":" + element_value);
 }
 
+function websocket_sendDebugCommand(command) {
+  websocket.send("debug-in:" + command);
+}
+
 function do_resize(textbox) {
   var maxrows = 15;
   var minrows = 3;
@@ -216,18 +220,12 @@ function formatTime(seconds) {
 
 function updateFactionLogo(element, faction) {
   const glowClass = "glow-active-faction";
-  const factionClasses = ["faction1", "faction2", "faction3"];
+  var factionClass = "faction" + faction;
-
+  if (element.classList.contains(factionClass)) {
-  factionClasses.forEach((factionClass) => {
-    if (
-      factionClass === "faction" + faction &&
-      element.classList.contains(factionClass)
-    ) {
     element.classList.add(glowClass);
   } else {
     element.classList.remove(glowClass);
   }
-  });
 }
 
 // Funktion zum Setzen des ausgewählten Werts für Dropdowns

Software/include/common.h

@@ -70,7 +70,4 @@ typedef enum batteryType_e
 extern const char *BatteryString[];
 extern const size_t BatteryString_Elements;
 
-#define STARTUP_DELAY 2500
-#define SHUTDOWN_DELAY_MS 2500
-
 #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,22 +16,6 @@
 
 #include <Arduino.h>
 #include "webui.h"
-const char PROGMEM helpCmd[] = "sysinfo     - System Info\n"
-                               "reboot      - System Reboot\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"
-                               "killEE      - kill the first 1024 byte of EEPROM\n"
-                               "zeroEE      - zero the first 1024 byte of EEPROM\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
 {
@@ -52,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

@@ -66,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;
@@ -82,8 +80,6 @@ const configData_t ConfigData_defaults = {
     "FACTION 1",     // Faction_1_Name
     "FACTION 2",     // Faction_2_Name
     "FACTION 3",     // Faction_3_Name
-    HOST_NAME,
-    QUOTE(WIFI_AP_PASSWORD),
     QUOTE(WIFI_SSID_CLIENT),
     QUOTE(WIFI_PASSWORD_CLIENT),
     true,

Software/include/globals.h

@@ -18,6 +18,7 @@ typedef struct Globals_s
   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 */

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_PASSWORD_CLIENT
-        #error "You must define an WIFI_PASSWORD for OTA-Update"
+        #error "You must define an WIFI_PASSWORD_CLIENT for OTA-Update"
-    #endif
+    #else
-    #ifndef WIFI_SSID_CLIENT
+        _Static_assert(STRING_LENGTH_CHECK(QUOTE(WIFI_PASSWORD_CLIENT), 63), "WIFI_PASSWORD_CLIENT must be at most 63 characters long");
-        #error "You must define an WIFI_SSID for OTA-Update"
-    #endif
     #endif
 
+    #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_

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

@@ -33,4 +33,16 @@ bool validateWiFiString(char *string, size_t size);
  */
 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,12 +17,12 @@ platform = espressif8266
 framework = arduino
 board = d1_mini
 
-custom_firmware_version = 1.07
+custom_firmware_version = 1.08
-custom_flash_version = 1.07
+custom_flash_version = 1.08
 
 upload_protocol = esptool
 upload_speed = 921600
-;upload_port = 10.0.1.48
+;upload_port = 10.0.0.1
 ;upload_flags =
 ;  --port=8266
 ;  --auth=${wifi_cred.admin_password}
@@ -36,8 +36,7 @@ build_flags=
   -DADMIN_PASSWORD=${wifi_cred.admin_password}
   -DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client}
   -DWIFI_PASSWORD_CLIENT=${wifi_cred.wifi_password_client}
-  -DADMIN_PASSWORD=${wifi_cred.admin_password}
+  -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/debugger.cpp

@@ -12,20 +12,15 @@
  */
 
 #include "debugger.h"
+#include <map>
+#include <functional>
+#include <vector>
+#include "utilities.h"
+#include <pgmspace.h>
 
 DebugStatus_t DebuggerStatus[dbg_cntElements];
 
-// Funktionszeiger
+void processCmdDebug(String command);
-typedef void (*CommandFunction)();
-
-// Struktur zur Zuordnung von Commands zu Funktionen
-struct CommandMapping
-{
-    const char *command;
-    CommandFunction function;
-};
-
-void processCmdDebug(const char *command);
 void Debug_formatCFG();
 void Debug_formatPersistence();
 void Debug_printSystemInfo();
@@ -37,96 +32,9 @@ 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);
 
-// Adapter-Functions for Debug-Commands
-void adapterCheckEEPOM() { Debug_CheckEEPOM(false); }
-void adapterCheckEEPOMFix() { Debug_CheckEEPOM(true); }
-void adapterDumpEEPROM1k() { dumpEEPROM(0, 1024); }
-void adapterDumpEEPROMAll() { dumpEEPROM(0, EEPROM_SIZE_BYTES); }
-void adapterKillEEPROM() { writeSequentialToEEPROM(0, 1024); }
-void adapterZeroEEPROM() { writeZeroToEEPROM(0, 1024); }
-void adapterResetPageEEPROM() { MovePersistencePage_EEPROM(true); }
-void adapterSaveEEPROM() { globals.requestEEAction = EE_ALL_SAVE; }
-void adapterSetDebugPort() { SetDebugportStatus(dbg_Serial, enabled); }
-void adapterCritDTC() { MaintainDTC(DTC_FAKE_DTC_CRIT, true, millis()); }
-void adapterWarnDTC() { MaintainDTC(DTC_FAKE_DTC_WARN, true, millis()); }
-void adapterInfoDTC() { MaintainDTC(DTC_FAKE_DTC_INFO, true, millis()); }
-void adapterNotifyError() { Websocket_PushNotification("Debug Error Notification", error); }
-void adapterNotifyWarning() { Websocket_PushNotification("Debug Warning Notification", warning); }
-void adapterNotifySuccess() { Websocket_PushNotification("Debug Success Notification", success); }
-void adapterNotifyInfo() { Websocket_PushNotification("Debug Info Notification", info); }
-
-// Definition der Command-Mapping-Tabelle
-const CommandMapping commandMappings[] = {
-    {"help", Debug_printHelp},
-    {"reboot", Debug_Reboot},
-    {"sysinfo", Debug_printSystemInfo},
-    {"netinfo", Debug_printWifiInfo},
-    {"formatCFG", Debug_formatCFG},
-    {"formatPDS", Debug_formatPersistence},
-    {"checkEE", adapterCheckEEPOM},
-    {"checkEEfix", adapterCheckEEPOMFix},
-    {"dumpEE1k", adapterDumpEEPROM1k},
-    {"dumpEE", adapterDumpEEPROMAll},
-    {"killEE", adapterKillEEPROM},
-    {"zeroEE", adapterZeroEEPROM},
-    {"resetPageEE", adapterResetPageEEPROM},
-    {"dumpCFG", Debug_dumpConfig},
-    {"dumpPDS", Debug_dumpPersistance},
-    {"saveEE", adapterSaveEEPROM},
-    {"dumpGlobals", Debug_dumpGlobals},
-    {"sdbg", adapterSetDebugPort},
-    {"dtc_show", Debug_ShowDTCs},
-    {"dtc_clear", ClearAllDTC},
-    {"dtc_crit", adapterCritDTC},
-    {"dtc_warn", adapterWarnDTC},
-    {"dtc_info", adapterInfoDTC},
-    {"notify_error", adapterNotifyError},
-    {"notify_warning", adapterNotifyWarning},
-    {"notify_success", adapterNotifySuccess},
-    {"notify_info", adapterNotifyInfo},
-};
-
-const size_t NUM_COMMANDS = sizeof(commandMappings) / sizeof(commandMappings[0]);
-
-const char helpText[][64] PROGMEM = {
-    "help           - Print this help text",
-    "sysinfo        - System Info",
-    "reboot         - System Reboot",
-    "netinfo        - WiFi Info",
-    "formatPDS      - Format Persistence EEPROM Data",
-    "formatCFG      - Format Configuration EEPROM Data",
-    "checkEE        - Check EEPROM with checksum",
-    "checkEEfix     - Check and fix EEPROM with checksum",
-    "dumpEE1k       - Dump the first 1kb of EEPROM to Serial",
-    "dumpEE         - Dump the whole EEPROM to Serial",
-    "killEE         - Kill the first 1024 bytes of EEPROM",
-    "zeroEE         - Zero the first 1024 bytes of EEPROM",
-    "resetPageEE    - Reset the PersistenceData Page",
-    "dumpCFG        - Print Config struct",
-    "dumpPDS        - Print PersistenceStruct",
-    "saveEE         - Save EE-Data",
-    "dumpGlobals    - Print globals",
-    "sdbg           - Set debug port status",
-    "dtc_show       - Show all DTCs",
-    "dtc_clear      - Clear all DTCs",
-    "dtc_crit       - Maintain critical DTC",
-    "dtc_warn       - Maintain warning DTC",
-    "dtc_info       - Maintain info DTC",
-    "notify_error   - Send error notification",
-    "notify_warning - Send warning notification",
-    "notify_success - Send success notification",
-    "notify_info    - Send info notification"
-};
-
-const size_t NUM_HELP_LINES = sizeof(helpText) / sizeof(helpText[0]);
-
-// Überprüfen, ob die Anzahl der Commands und Hilfetext-Zeilen übereinstimmen
-static_assert(NUM_COMMANDS == NUM_HELP_LINES, "Number of commands and help text lines do not match!");
-
-
-
 /**
  * @brief Initializes the debugger by setting the initial status for different debug ports.
  *        Serial debug output is turned off.
@@ -181,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);
@@ -192,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;
         }
     }
@@ -208,7 +116,7 @@ void Debug_Process()
         break;
 
     case CMD_COMPLETE:
-        processCmdDebug(inputBuffer);
+        processCmdDebug(String(inputBuffer));
         break;
 
     case CMD_OVERFLOW:
@@ -245,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).
  *
@@ -278,27 +207,134 @@ void Debug_pushMessage(const char *format, ...)
     }
 }
 
-/**
+// === splitArgs Helper ===
- * @brief Processes a debug command and performs corresponding actions.
+std::vector<String> splitArgs(const String &input)
- *
- * @param command The debug command to be processed.
- */
-void processCmdDebug(const char *command)
 {
-    bool commandFound = false;
+    std::vector<String> tokens;
-    for (size_t i = 0; i < NUM_COMMANDS; ++i)
+    int start = 0, end = 0;
+    while ((end = input.indexOf(' ', start)) != -1)
     {
-        if (strcmp(command, commandMappings[i].command) == 0)
+        tokens.push_back(input.substring(start, end));
-        {
+        start = end + 1;
-            commandMappings[i].function();
-            commandFound = true;
-            break;
     }
+    if (start < input.length())
+        tokens.push_back(input.substring(start));
+    return tokens;
 }
-    if (!commandFound)
+
+// === getArg helper ===
+String getArg(const std::vector<String> &args, size_t index, const String &defaultVal = "")
 {
-        Debug_pushMessage("unknown Command\n");
+    if (index < args.size())
+        return args[index];
+    return defaultVal;
 }
+
+// === Command Handler Map ===
+typedef std::function<void(const String &args)> DebugCmdHandler;
+
+static const std::map<String, DebugCmdHandler> &getCmdMap()
+{
+    static const std::map<String, DebugCmdHandler> cmdMap = {
+        {"help", [](const String &)
+         {
+             Debug_log(LOG_INFO, "Available commands:\n");
+             for (const auto &entry : getCmdMap())
+                 Debug_log(LOG_INFO, " - %s\n", entry.first.c_str());
+         }},
+        {"sysinfo", [](const String &)
+         { Debug_printSystemInfo(); }},
+        {"netinfo", [](const String &)
+         { Debug_printWifiInfo(); }},
+        {"formatCFG", [](const String &)
+         { Debug_formatCFG(); }},
+        {"formatPDS", [](const String &)
+         { Debug_formatPersistence(); }},
+        {"checkEE", [](const String &)
+         { Debug_CheckEEPOM(false); }},
+        {"checkEEfix", [](const String &)
+         { Debug_CheckEEPOM(true); }},
+        {"dumpEE1k", [](const String &)
+         { dumpEEPROM(0, 1024); }},
+        {"dumpEE", [](const String &args)
+         {
+             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_log(LOG_WARN, "Unknown command: '%s'\n", command.c_str());
 }
 
 /**
@@ -326,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());
@@ -369,8 +405,6 @@ void Debug_dumpConfig()
     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_ap_password: %s\n", ConfigData.wifi_ap_password);
-    Debug_pushMessage("wifi_ap_ssid: %s\n", ConfigData.wifi_ap_ssid);
     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);
@@ -411,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;
 }
 
 /**
@@ -471,7 +528,7 @@ void Debug_ShowDTCs()
     char buff_active[9];
 
     // Header for the DTC display
-    Debug_pushMessage("\n      timestamp | DTC-Nr. |   status | debugval\n");
+    Debug_pushMessage("\n      timestamp | DTC-Nr. |   status | severity\n");
 
     // Iterate through DTCStorage and display each entry
     for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
@@ -495,26 +552,11 @@ void Debug_ShowDTCs()
                 strcpy(buff_active, "none");
 
             // Display DTC information
-            Debug_pushMessage("%s   %7d   %8s   %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].debugVal);
+            Debug_pushMessage("%s   %7d   %8s   %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active);
         }
     }
 }
 
-/**
- * @brief Prints the help information stored in PROGMEM.
- */
-void Debug_printHelp()
-{
-    char buffer[64];
-    for (size_t i = 0; i < NUM_HELP_LINES; ++i)
-    {
-        strcpy_P(buffer, (PGM_P)pgm_read_word(&(helpText[i])));
-
-        // Display the help command
-        Debug_pushMessage(buffer);
-    }
-}
-
 /**
  * @brief Initiates a system reboot by setting the system status to shutdown.
  *
@@ -526,6 +568,20 @@ void Debug_Reboot()
     globals.systemStatus = sysStat_Shutdown;
 }
 
+/**
+ * @brief Processes a debug command.
+ *
+ * This function takes a pointer to a debug command and processes it by
+ * passing it to the `processCmdDebug` function. The command is expected
+ * to be a string, so it is cast to `const char *` before being processed.
+ *
+ * @param command Pointer to the debug command, expected to be a null-terminated string.
+ */
+void Debug_ProcessCommand(uint8_t *command)
+{
+    processCmdDebug((const char *)command);
+}
+
 /**
  * @brief Convert a uint32_t value to a binary string with nibbles separated by a space.
  *

Software/src/eeprom.cpp

@@ -400,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));
   }

Software/src/globals.cpp

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

Software/src/main.cpp

@@ -247,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();
@@ -269,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;
 
@@ -573,6 +581,7 @@ 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)
 	{
@@ -591,7 +600,8 @@ void toggleWiFiAP(bool shutdown)
 		WiFi.mode(WIFI_AP);
 		WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
 		sanitizeWiFiString(globals.DeviceNameId, buffer, sizeof(buffer));
-		WiFi.softAP(buffer, QUOTE(WIFI_AP_PASSWORD));
+		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
@@ -711,7 +721,7 @@ void ProcessKeyCombos(bool *btnState)
 		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

@@ -33,7 +33,7 @@ bool validateWiFiString(char *string, size_t size)
               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;
@@ -78,7 +78,7 @@ void sanitizeWiFiString(const char *input, char *buffer, size_t bufferSize)
               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] = '_';
@@ -92,3 +92,35 @@ void sanitizeWiFiString(const char *input, char *buffer, size_t bufferSize)
     // 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

@@ -295,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));
 
@@ -426,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);
@@ -472,6 +474,18 @@ void Websocket_HandleButtons(uint8_t *data)
   {
     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);
@@ -632,7 +646,6 @@ void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
   }
 }
 
-
 /**
  * @brief Refreshes client data related to static configuration parameters on WebSocket clients.
  *
@@ -660,7 +673,7 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
                            "wifi-pass;"
                            "fw-version;"
                            "flash-version;"
-                           "git-revison;";
+                           "git-revision;";
 
     if (client_id > 0)
       webSocket.text(client_id, mapping);

Software/wifi_credentials.example.ini

@@ -1,5 +1,5 @@
 [wifi_cred]
 admin_password = chainlube
-wifi_ap_password = wifiappass
+wifi_pass_seed = wifiapseed
 wifi_ssid_client = wifi-ssid
 wifi_password_client = ota-password