first Values updated by websockets!

fixed css minifying
removed feature-defines for CAN and Websockets
2023-12-25 02:05:22 +01:00 · 2023-12-25 02:04:31 +01:00 · 2023-12-25 00:44:24 +01:00 · 2023-12-11 21:34:40 +01:00 · 2023-12-11 19:09:51 +01:00 · 2023-12-11 19:09:29 +01:00
52 changed files with 1984 additions and 775 deletions
--- a/Documentation/Anschluss
+++ b/Documentation/Anschluss
--- a/Documentation/Anschluss
+++ b/Documentation/Anschluss
--- a/Documentation/PCB_rev_1.2
+++ b/Documentation/PCB_rev_1.2
--- a/Documentation/PCB_rev_1.3
+++ b/Documentation/PCB_rev_1.3
--- a/Software/build_dtcs.py
+++ b/Software/build_dtcs.py
@@ -0,0 +1,127 @@
+Import("env")  # pylint: disable=undefined-variable
+env.Execute("\"$PYTHONEXE\" -m pip install jinja2")
+
+import os
+import time
+from jinja2 import Environment, FileSystemLoader
+import json
+
+# Pfad zur Eingabedatei und Ausgabedatei
+input_file = "src/dtc_defs.txt"
+output_file = "include/dtc_defs.h"
+json_output_file = "data_src/static/dtc_table.json"
+
+# Überprüfen, ob das Verzeichnis existiert, andernfalls erstellen
+json_output_dir = os.path.dirname(json_output_file)
+if not os.path.exists(json_output_dir):
+    os.makedirs(json_output_dir)
+
+# Mehrdimensionales Array zum Speichern der Zeilen aus der Eingabedatei
+dtc_lines = []
+
+# Lesen und analysieren der Eingabedatei
+with open(input_file, "r", encoding="utf-8") as f:
+    for line in f:
+        line = line.strip()
+        if not line or line.startswith("#"):
+            continue
+
+        parts = line.split(";")
+        if len(parts) == 5:
+            num, dtc_name, dtc_severity, title, description = [part.strip() for part in parts]
+            dtc_lines.append([int(num), dtc_name, dtc_severity, title, description])
+
+# Überprüfen auf Duplikate in den DTC-Nummern und DTC-Namen
+num_set = set()
+dtc_name_set = set()
+duplicates = []
+
+for line in dtc_lines:
+    num, dtc_name, _, _, _ = line
+    if num in num_set:
+        duplicates.append(f"DTC-Nummer {num} ist ein Duplikat.")
+    else:
+        num_set.add(num)
+
+    if dtc_name in dtc_name_set:
+        duplicates.append(f"DTC-Name '{dtc_name}' ist ein Duplikat.")
+    else:
+        dtc_name_set.add(dtc_name)
+
+if duplicates:
+    for duplicate in duplicates:
+        print(f"Fehler: {duplicate}")
+    raise ValueError("Duplicate DTC Data detected")
+
+# Suchen nach DTC_NO_DTC und DTC_LAST_DTC
+dtc_no_dtc_added = False
+dtc_last_dtc_line = None
+
+for line in dtc_lines:
+    _, dtc_name, _, _, _ = line
+    if dtc_name == "DTC_NO_DTC":
+        dtc_no_dtc_added = True
+    elif dtc_name == "DTC_LAST_DTC":
+        dtc_last_dtc_line = line
+
+# Einen DTC für DTC_NO_DTC hinzufügen (wenn nicht vorhanden)
+if not dtc_no_dtc_added:
+    dtc_lines.insert(0, [0, "DTC_NO_DTC", "DTC_NONE", "No Error", "No Error"])
+
+# Falls DTC_LAST_DTC existiert, lösche es
+if dtc_last_dtc_line:
+    dtc_lines.remove(dtc_last_dtc_line)
+
+# Einen DTC für DTC_LAST_DTC hinzufügen (mit der höchsten Nummer)
+if dtc_lines:
+    highest_num = max([line[0] for line in dtc_lines])
+else:
+    highest_num = 0
+
+dtc_lines.append([highest_num + 1, "DTC_LAST_DTC", "DTC_NONE", "Last Error", "Last Error"])
+
+# Sortieren der Zeilen nach der Nummer aufsteigend
+dtc_lines.sort(key=lambda x: x[0])
+
+# DTC_NAME_CONSTANT-Makros initialisieren
+dtc_macros = []
+dtc_structs = []
+dtc_table_data = []
+
+# Verarbeiten der sortierten Zeilen
+for i, line in enumerate(dtc_lines):
+    num, dtc_name, dtc_severity, title, description = line
+    dtc_macros.append(f"#define {dtc_name:<30} {num}")
+    comma = "," if i < len(dtc_lines) - 1 else " "
+    dtc_structs.append(f"    {{ {dtc_name:<30}, {dtc_severity:<12} }}{comma} // {description}")
+    dtc_table_data.append({"num": num, "title": title, "description": description})
+
+# Unix-Zeitstempel hinzufügen
+timestamp = int(time.time())
+
+env = Environment(loader=FileSystemLoader('include', encoding='utf-8'))
+# Lade das Jinja2-Template aus der Datei
+template = env.get_template('dtc_defs.h.j2')
+
+# Erstelle ein Context-Dictionary mit den erforderlichen Daten
+context = {
+    'timestamp_unix': timestamp,
+    'timestamp' : time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(timestamp)),
+    'dtc_macros': dtc_macros,  # Übergebe die dtc_macros-Liste direkt
+    'dtc_structs': dtc_structs,  # Übergebe die dtc_structs-Liste direkt
+}
+
+# Rendere das Template mit den Werten und erhalte den Header-Text
+header_text = template.render(context)
+
+# Schreibe den generierten Header-Text in die Header-Datei
+with open(output_file, "w", encoding='utf-8') as f:
+    f.write(header_text)
+
+print(f"Header-Datei wurde erstellt: {output_file}")
+
+# JSON-Datei mit UTF-8-Zeichencodierung erstellen
+with open(json_output_file, 'w', encoding='utf-8') as json_f:
+    json.dump(dtc_table_data, json_f, ensure_ascii=False, indent=4, separators=(',', ': '))
+
+print(f"JSON-Datei wurde erstellt: {json_output_file}")
--- a/Software/data_src/index.htm
+++ b/Software/data_src/index.htm
@@ -11,6 +11,8 @@
  <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" type="text/javascript"></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">
@@ -33,9 +35,8 @@
      <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">

        <li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Wegstrecke</a></li>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_lube">Schmierung</a></li>
        <li class="nav-item"><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_sysinfo">Systeminfo</a></li>
        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li>

@@ -55,6 +56,7 @@
            <h3 class="pt-3">KTM CAN Chain Lube</h3>
          </div>
        </div>
+        <!-- Div Group Tank remain -->
        <hr />
        <p>
        <h4>Tankinhalt verbleibend</h4>
@@ -65,16 +67,20 @@
          </div>
        </div>
        </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group current Mode -->
        <hr />
        <p>
        <h4>aktueller Modus</h4>
-        <input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
+        <input class="form-control" type="text" id="SystemStatus" readonly>
        </p>
-        <hr />
-        <div %SHOW_DTC_TABLE%>
+        <!-- Div Group current Mode -->
+        <!-- Div Group 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>
@@ -82,17 +88,155 @@
                <th class="col-2" scope="col">Schwere</th>
                <th class="col-2" scope="col">Aktiv</th>
              </tr>
-              %DTC_TABLE%
            </tbody>
          </table>
          </p>
-          <hr />
        </div>
+        <!-- Div Group DTC Table -->
      </div>
      <!-- Div Tab Home-->
-      <!-- Div Tab Source Settings-->
+
+      <!-- Div Tab Maintenance -->
+      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
+        <h3>Wartung</h3>
+        <!-- Div Group Tank remain -->
+        <hr />
+        <p>
+        <h4>&Ouml;lvorrat</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
+            <div class="col-8">
+              <div class="progress">
+                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
+                  aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
+                  style="width: %TANK_REMAIN_CAPACITY%&#37;">
+                  %TANK_REMAIN_CAPACITY%&#37;
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group Purging -->
+        <hr />
+        <p>
+        <h4>Entl&uuml;ftung</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="BleedingPulses" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="BleedingPulses" name="BleedingPulses" value="0" type="text" class="form-control">
+                <div class="input-group-append">
+                  <span class="input-group-text">Pulse</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Purging -->
+        <!-- Div Group Measure -->
+        <div %SHOW_IMPULSE_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einmessen</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+            <div class="form-group row">
+              <label for="measuredpulses" class="control-label col-4">erfasste Pulse</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="measuredpulses" name="measuredpulses" value="%MEASURED_PULSES%" type="text" readonly
+                    class="form-control">
+                  <div class="input-group-append">
+                    <span class="input-group-text">Pulse</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="measurestartstop" type="submit" class="btn btn-outline-primary">%MEASURE_BTN%</button>
+                <button name="measurereset" type="submit" class="btn btn-outline-primary ml-2">Reset</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Purging -->
+        <!-- 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 class="form-group row">
+            <div class="offset-4 col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
+                <label class="form-check-label" for="reset_ee_cfg">
+                  Bereich "CFG"
+                </label>
+              </div>
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
+                <label class="form-check-label" for="reset_ee_pds">
+                  Bereich "PDS"
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <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="col text-center">
+              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Device Reboot -->
+      </div>
+      <!-- Div Tab Maintenance -->
+
+      <!-- Div Tab Settings-->
      <div id="tab_source" class="tab-pane fade" role="tabpanel">
-        <h3>Wegstreckenerfassung</h3>
+        <h3>Einstellungen</h3>
+        <!-- Div Group Signal Source -->
        <hr />
        <p>
        <h4>Signalquelle</h4>
@@ -120,7 +264,8 @@
          </div>
        </form>
        </p>
-        <!-- Div Source:Impulse Settings-->
+        <!-- Div Group Signal Source -->
+        <!-- Div Group Source:Impulse Settings-->
        <div %SHOW_IMPULSE_SETTINGS%>
          <hr />
          <p>
@@ -181,10 +326,9 @@
            </div>
          </form>
          </p>
-          <hr />
        </div>
-        <!-- Div Source:Impulse Settings-->
-        <!-- Div Source:CAN Settings-->
+        <!-- Div Group Source:Impulse Settings-->
+        <!-- Div Group Source:CAN Settings-->
        <div %SHOW_CAN_SETTINGS%>
          <hr />
          <p>
@@ -205,10 +349,9 @@
            </div>
          </form>
          </p>
-          <hr />
        </div>
-        <!-- Div Source:CAN Settings-->
-        <!-- Div Source:GPS Settings-->
+        <!-- Div Group Source:CAN Settings-->
+        <!-- Div Group Source:GPS Settings-->
        <div %SHOW_GPS_SETTINGS%>
          <hr />
          <p>
@@ -229,14 +372,9 @@
            </div>
          </form>
          </p>
-          <hr />
        </div>
-        <!-- Div Source:GPS Settings-->
-      </div>
-      <!-- Div Tab Source Settings-->
-      <!-- Div Tab Lube -->
-      <div id="tab_lube" class="tab-pane fade" role="tabpanel">
-        <h3>Schmierung</h3>
+        <!-- Div Group Source:GPS Settings-->
+        <!-- Div Group Lube Settings-->
        <hr />
        <p>
        <h4>Dosierung</h4>
@@ -272,15 +410,11 @@
          </div>
        </form>
        </p>
-        <hr />
-      </div>
-      <!-- Div Tab Lube -->
-      <!-- Div Tab Maintenance -->
-      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
-        <h3>Wartung</h3>
+        <!-- Div Group Lube Settings-->
+        <!-- Div Group Oiltank Settings -->
        <hr />
        <p>
-        <h4>&Ouml;lvorrat</h4>
+        <h4>&Ouml;ltank</h4>
        <form action="post.htm" method="POST" class="form-horizontal">
          <div class="form-group row">
            <label for="tankcap" class="control-label col-4">Tankkapazität</label>
@@ -318,104 +452,80 @@
              </div>
            </div>
          </div>
-          <div class="form-group row">
-            <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
-            <div class="col-8">
-              <div class="progress">
-                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
-                  aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
-                  style="width: %TANK_REMAIN_CAPACITY%&#37;">
-                  %TANK_REMAIN_CAPACITY%&#37;
-                </div>
-              </div>
-            </div>
-          </div>
          <div class="form-group row">
            <div class="col text-center">
              <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
-              <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
            </div>
          </div>
        </form>
        </p>
+        <!-- Div Group Oiltank Settings -->
+        <!-- Div Group LED Settings-->
        <hr />
        <p>
-        <h4>Entl&uuml;ftung</h4>
+        <h4>LED Einstellungen</h4>
        <form action="post.htm" method="POST" class="form-horizontal">
          <div class="form-group row">
-            <label for="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
+            <label for="ledmodeflash" class="control-label col-4">LED Modus blinken</label>
+            <div class="col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="ledmodeflash" id="ledmodeflash" %LEDFLASHCHECKED%>
+                <label class="form-check-label" for="ledmodeflash">
+                  LED blinken
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
            <div class="col-8">
              <div class="input-group">
-                <input id="purgepulse" name="purgepulse" value="%BLEEDING_PULSES%" type="text" class="form-control">
-                <div class="input-group-append">
-                  <span class="input-group-text">Pulse</span>
-                </div>
+                <input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledminbrightness" class="control-label col-4">Min Helligkeit</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
              </div>
            </div>
          </div>
          <div class="form-group row">
            <div class="col text-center">
-              <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
-              <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
+              <button name="ledsave" type="submit" class="btn btn-outline-primary">Speichern</button>
            </div>
          </div>
        </form>
        </p>
-        <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 class="form-group row">
-            <div class="offset-4 col-8">
-              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
-                <label class="form-check-label" for="reset_ee_cfg">
-                  Bereich "CFG"
-                </label>
-              </div>
-              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
-                <label class="form-check-label" for="reset_ee_pds">
-                  Bereich "PDS"
-                </label>
-              </div>
-            </div>
-          </div>
-          <div class="form-group row">
-            <div class="col text-center">
-              <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <hr />
-        <p>
-        <h4>Ger&auml;t neustarten</h4>
-        <form action="post.htm" method="POST" class="form-horizontal">
-          <div class="form-group row">
-            <div class="col text-center">
-              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <hr />
+        <!-- Div Group Lube Settings-->
      </div>
-      <!-- Div Tab Maintenance -->
+      <!-- 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>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Geraeteinfo -->
+        <!-- Div Group Sysinfo:Settings -->
        <hr />
        <p>
        <h4>Einstellungen</h4>
@@ -481,6 +591,22 @@
              <td>CANSource</td>
              <td>%CAN_SOURCE%</td>
            </tr>
+            <tr>
+              <td>LED Mode Flash</td>
+              <td>%LED_MODE_FLASH%</td>
+            </tr>
+            <tr>
+              <td>LED Max Brightness</td>
+              <td>%LED_MAX_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>LED Min Brightness</td>
+              <td>%LED_MIN_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>EEPROM Version</td>
+              <td>%EEPROM_VERSION%</td>
+            </tr>
            <tr>
              <td>Checksum</td>
              <td>%CONFIG_CHECKSUM%</td>
@@ -488,6 +614,8 @@
          </tbody>
        </table>
        </p>
+        <!-- Div Group Sysinfo:Settings -->
+        <!-- Div Group Sysinfo:Persistance -->
        <hr />
        <p>
        <h4>Betriebsdaten</h4>
@@ -523,25 +651,29 @@
            </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>
-            </div>
-            <div class="form-group row">
-              <div class="col text-center">
-                <button id="btn-ws-start" class="btn btn-outline-primary">Start</button>
-                <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
-              </div>
-            </div>
-          </p>
-          <hr />
+        <h4>Live Debug</h4>
+        <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="btn-ws-start" class="btn btn-outline-primary">Start</button>
+            <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
+          </div>
+        </div>
+        </p>
+        <!-- Div Group LiveDebug -->
      </div>
      <!-- Div Tab SystemInfo -->
+
      <!-- 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>
@@ -559,8 +691,14 @@
              <td>Flash Version</td>
              <td>%FS_VERSION%</td>
            </tr>
+            <tr>
+              <td>Git Revision</td>
+              <td>%GIT_REV%</td>
+            </tr>
        </table>
        </p>
+        <!-- Div Group VersionInfo -->
+        <!-- Div Group EEPROM Backup -->
        <hr />
        <p>
        <h4>EEPROM-Backup</h4>
@@ -570,6 +708,8 @@
          </div>
        </div>
        </p>
+        <!-- Div Group EEPROM Backup -->
+        <!-- Div Group EEPROM Restore -->
        <hr />
        <p>
        <h4>EEPROM-Restore</h4>
@@ -588,6 +728,8 @@
          </div>
        </form>
        </p>
+        <!-- Div Group EEPROM Restore -->
+        <!-- Div Group Firmware Update -->
        <hr />
        <p>
        <h4>Firmware-Update</h4>
@@ -606,7 +748,7 @@
          </div>
        </form>
        </p>
-        <hr />
+        <!-- Div Group Firmware Update -->
      </div>
      <!-- Div Tab Firmware Update-->
    </div>
@@ -618,7 +760,7 @@
  <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">© 2022 -
+        <span class="text-muted">© 2023 -
          <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
      </div>
    </div>
@@ -650,47 +792,8 @@

  <!-- 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>
--- a/Software/data_src/static/dtc_table.json
+++ b/Software/data_src/static/dtc_table.json
@@ -0,0 +1,92 @@
+[
+    {
+        "num": 0,
+        "title": "No Error",
+        "description": "No Error"
+    },
+    {
+        "num": 1,
+        "title": "Ölvorrat leer",
+        "description": "Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen"
+    },
+    {
+        "num": 2,
+        "title": "Ölvorrat niedrig",
+        "description": "Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen"
+    },
+    {
+        "num": 3,
+        "title": "kein EEPROM erkannt",
+        "description": "Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten."
+    },
+    {
+        "num": 4,
+        "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"
+    },
+    {
+        "num": 5,
+        "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"
+    },
+    {
+        "num": 6,
+        "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"
+    },
+    {
+        "num": 7,
+        "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"
+    },
+    {
+        "num": 8,
+        "title": "Flashspeicher Fehler",
+        "description": "Der Flashspeicher konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware"
+    },
+    {
+        "num": 9,
+        "title": "Flashversion falsch",
+        "description": "Die Version des Flashspeicher stimmt nicht mit der Firmware-Version überein. Aktualisieren sie den Flash mit der passenden Update-Datei"
+    },
+    {
+        "num": 10,
+        "title": "Keine GPS-Verbindung",
+        "description": "Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul"
+    },
+    {
+        "num": 11,
+        "title": "CAN-Transceiver Error",
+        "description": "Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte"
+    },
+    {
+        "num": 12,
+        "title": "Keine CAN-Verbindung",
+        "description": "Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen"
+    },
+    {
+        "num": 13,
+        "title": "Config-Validierung",
+        "description": "Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen"
+    },
+    {
+        "num": 14,
+        "title": "Dummy-DTC Info",
+        "description": "Ein Dummy-DTC der Schwere \"Info\" für Debugging-Zwecke"
+    },
+    {
+        "num": 15,
+        "title": "Dummy-DTC Warnung",
+        "description": "Ein Dummy-DTC der Schwere \"Warnung\" für Debugging-Zwecke"
+    },
+    {
+        "num": 16,
+        "title": "Dummy-DTC Kritisch",
+        "description": "Ein Dummy-DTC der Schwere \"Kritisch\" für Debugging-Zwecke"
+    },
+    {
+        "num": 17,
+        "title": "Last Error",
+        "description": "Last Error"
+    }
+]
--- a/Software/data_src/static/js/dtc_table.js
+++ b/Software/data_src/static/js/dtc_table.js
@@ -0,0 +1,199 @@
+const jsonFilePath = "static/dtc_table.json";
+
+var dtcState = {};
+
+function processDTCNotifications(dtcArray) {
+  for (var i = 0; i < dtcArray.length; i++) {
+    var dtcInfo = dtcArray[i].split(",");
+    var errorCode = dtcInfo[1];
+    var activity = parseInt(dtcInfo[3]);
+
+    if (dtcState[errorCode]) {
+      // Überprüfen, ob sich der Zustand von "previous" auf "active" geändert hat
+      if (activity !== dtcState[errorCode]) {
+        dtcState[errorCode] = activity;
+        if (activity === 1) showDTCNotification(errorCode);
+      }
+    } else {
+      // DTC ist neu, Zustand speichern und Benachrichtigung anzeigen
+      dtcState[errorCode] = activity;
+      showDTCNotification(errorCode);
+    }
+  }
+}
+
+function showDTCNotification(dtctext, severity) {
+  // Überprüfen, ob der Browser die Notification API unterstützt
+  if ("Notification" in window) {
+    // Überprüfen, ob der Benutzer bereits Berechtigungen erteilt hat
+    if (Notification.permission === "granted") {
+      // Benachrichtigung anzeigen
+      showNotification(dtctext, severity);
+    } else if (Notification.permission !== "denied") {
+      // Aufforderung zur Erlaubnis einholen
+      Notification.requestPermission().then(function (permission) {
+        if (permission === "granted") {
+          // Benachrichtigung anzeigen
+          showNotification(dtctext, severity);
+        } else {
+          // Der Benutzer hat die Berechtigung abgelehnt oder das Dialogfeld geschlossen
+          console.log("Benachrichtigungsberechtigung wurde verweigert.");
+        }
+      });
+    } else {
+      // Der Benutzer hat die Berechtigung bereits verweigert
+      console.log("Benachrichtigungsberechtigung wurde bereits verweigert.");
+    }
+  }
+}
+
+// Funktion zum Anzeigen der Benachrichtigung
+function showNotification(dtctext, severity) {
+  var severityIcon;
+  switch (severity) {
+    case 1:
+      severityIcon = "static/img/info.png";
+      break;
+    case 2:
+      severityIcon = "static/img/warn.png";
+      break;
+    case 3:
+      severityIcon = "static/img/critical.png";
+      break;
+    default:
+      severityIcon = "static/img/none.png";
+  }
+
+  var options = {
+    body: dtctext,
+    icon: severityIcon,
+  };
+
+  var notification = new Notification("KTM Chain Oiler DTC", options);
+
+  // Optional: Handle Click-Event
+  notification.onclick = function () {
+    console.log("Benachrichtigung wurde angeklickt.");
+  };
+}
+
+function getDescriptionForDTCNumber(number, callback) {
+  fetch(jsonFilePath)
+    .then((response) => response.json())
+    .then((data) => {
+      const foundEntry = data.find((entry) => entry.num === number);
+
+      if (foundEntry) {
+        const description = foundEntry.description;
+        const title = foundEntry.title;
+        callback(null, title, description);
+      } else {
+        // Wenn die Nummer nicht gefunden wurde, geben Sie einen Fehler zurück
+        callback(
+          `Beschreibung für Nummer ${number} nicht gefunden.`,
+          null,
+          null
+        );
+      }
+    })
+    .catch((error) => {
+      // Im Fehlerfall geben Sie den Fehler zurück
+      callback(error, null, null);
+    });
+}
+
+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) {
+    // Verstecke das Tabellen-Div, wenn keine DTC vorhanden sind
+    tablediv.hidden = true;
+    return;
+  } else {
+    // 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]);
+
+    // 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}`;
+}
--- a/Software/data_src/static/js/script.js
+++ b/Software/data_src/static/js/script.js
@@ -0,0 +1,37 @@
+$(".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;
+  });
+
+$("table").on("click", "tr[data-dtc]", function () {
+  var dtc = $(this).data("dtc");
+  var debugval = $(this).data("debugval");
+  var modal = $("#dtcModal");
+
+  getDescriptionForDTCNumber(dtc, function (error, title, description) {
+    if (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");
+    } else {
+      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();
+      }
+    }
+  });
+  // Modal anzeigen
+  modal.modal("show");
+});
--- a/Software/data_src/static/js/websocket.js
+++ b/Software/data_src/static/js/websocket.js
@@ -1,6 +1,9 @@
 var gateway = `ws://${window.location.hostname}/ws`;
 var websocket;

+var statusMapping;
+var staticMapping;
+
 window.addEventListener("load", onLoad);

 function initWebSocket() {
@@ -30,11 +33,80 @@ function onClose(event) {
 }

 function onMessage(event) {
-  var livedebug_out = document.getElementById("livedebug-out");
-  var textarea_heigth = livedebug_out.scrollHeight;
-  livedebug_out.value += event.data;
-  livedebug_out.scrollTop = livedebug_out.scrollHeight;
-  do_resize(livedebug_out);
+  var data = event.data;
+  console.log("ws_msg:" + event.data + "\n");
+
+  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);
+    return;
+  }
+
+  if (data.startsWith("DTC:")) {
+    const dtcs = data.slice(4);
+    const dtcArray = dtcs.trim() !== "" ? dtcs.split(";").filter(Boolean) : [];
+
+    if (dtcArray[0] != "0") {
+      processDTCNotifications(dtcArray);
+      fillDTCTable(dtcArray);
+    }
+    return;
+  }
+
+  if (data.startsWith("MAPPING_STATUS:")) {
+    const data_sliced = data.slice(15);
+    statusMapping = createMapping(data_sliced);
+  }
+
+  if (data.startsWith("MAPPING_STATIC:")) {
+    const data_sliced = data.slice(15);
+    staticMapping = createMapping(data_sliced);
+  }
+
+  if (data.startsWith("STATUS:")) {
+    const data_sliced = data.slice(7);
+    const result = processDataString(data_sliced, statusMapping);
+    console.log("STATUS:");
+    console.log(JSON.stringify(result, null, 2));
+    fillValuestoHTML(result);
+    return;
+  }
+
+  if (data.startsWith("STATIC:")) {
+    const data_sliced = data.slice(7);
+    const result = processDataString(data_sliced, staticMapping);
+    console.log("STATIC:");
+    console.log(JSON.stringify(result, null, 2));
+    fillValuestoHTML(result);
+    return;
+  }
+}
+
+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) {
@@ -66,3 +138,12 @@ function do_resize(textbox) {
  else if (rows < minrows) textbox.rows = minrows;
  else textbox.rows = rows;
 }
+
+function fillValuestoHTML(dataset) {
+  for (var key in dataset) {
+    var inputElement = document.getElementById(key);
+    if (inputElement) {
+      inputElement.value = dataset[key];
+    }
+  }
+}
--- a/Software/data_src/static/tt_dtc/dtc_1.json
+++ b/Software/data_src/static/tt_dtc/dtc_1.json
@@ -1,4 +0,0 @@
-{
-    "title": "Ölvorrat leer",
-    "description": "Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen"
-}
--- a/Software/data_src/static/tt_dtc/dtc_10.json
+++ b/Software/data_src/static/tt_dtc/dtc_10.json
@@ -1,4 +0,0 @@
-{
-    "title": "Keine GPS-Verbindung",
-    "description": "Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul"
-}
--- a/Software/data_src/static/tt_dtc/dtc_11.json
+++ b/Software/data_src/static/tt_dtc/dtc_11.json
@@ -1,4 +0,0 @@
-{
-    "title": "CAN-Transceiver Error",
-    "description": "Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte"
-}
--- a/Software/data_src/static/tt_dtc/dtc_12.json
+++ b/Software/data_src/static/tt_dtc/dtc_12.json
@@ -1,4 +0,0 @@
-{
-    "title": "Keine CAN-Verbindung",
-    "description": "Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen"
-}
--- a/Software/data_src/static/tt_dtc/dtc_13.json
+++ b/Software/data_src/static/tt_dtc/dtc_13.json
@@ -1,4 +0,0 @@
-{
-    "title": "Config-Validierung",
-    "description": "Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen"
-}
--- a/Software/data_src/static/tt_dtc/dtc_2.json
+++ b/Software/data_src/static/tt_dtc/dtc_2.json
@@ -1,4 +0,0 @@
-{
-    "title": "Ölvorrat niedrig",
-    "description": "Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen"
-}
--- a/Software/data_src/static/tt_dtc/dtc_3.json
+++ b/Software/data_src/static/tt_dtc/dtc_3.json
@@ -1,4 +0,0 @@
-{
-    "title": "kein EEPROM gefunden",
-    "description": "Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten."
-}
--- a/Software/data_src/static/tt_dtc/dtc_4.json
+++ b/Software/data_src/static/tt_dtc/dtc_4.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"
-}
--- a/Software/data_src/static/tt_dtc/dtc_5.json
+++ b/Software/data_src/static/tt_dtc/dtc_5.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"
-}
--- a/Software/data_src/static/tt_dtc/dtc_6.json
+++ b/Software/data_src/static/tt_dtc/dtc_6.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"
-}
--- a/Software/data_src/static/tt_dtc/dtc_7.json
+++ b/Software/data_src/static/tt_dtc/dtc_7.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"
-}
--- a/Software/data_src/static/tt_dtc/dtc_8.json
+++ b/Software/data_src/static/tt_dtc/dtc_8.json
@@ -1,4 +0,0 @@
-{
-    "title": "Flashstorage Fehler",
-    "description": "Der Flashstorage konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware"
-}
--- a/Software/data_src/static/tt_dtc/dtc_9.json
+++ b/Software/data_src/static/tt_dtc/dtc_9.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"
-}
--- a/Software/data_src/version
+++ b/Software/data_src/version
@@ -1 +1 @@
-1.3
+1.04
--- a/Software/include/can.h
+++ b/Software/include/can.h
@@ -7,6 +7,7 @@
 #include "common.h"
 #include "globals.h"
 #include "dtc.h"
+#include "debugger.h"

 struct can_frame
 {
@@ -16,6 +17,7 @@ struct can_frame
 };

 void Init_CAN();
+void CAN_Process();
 uint32_t Process_CAN_WheelSpeed();

 #endif
--- a/Software/include/common.h
+++ b/Software/include/common.h
@@ -3,17 +3,24 @@

 #define Q(x) #x
 #define QUOTE(x) Q(x)
+#define SET_BIT(value, bitPosition) ((value) |= (1U << (bitPosition)))

-#if PCB_REV == 2
+#if PCB_REV == 1
    #define GPIO_BUTTON D7
    #define GPIO_LED D8
    #define GPIO_TRIGGER D6
    #define GPIO_PUMP D5
-#elif PCB_REV == 1 || PCB_REV == 3
-    #define GPIO_BUTTON D5
-    #define GPIO_LED D6
-    #define GPIO_TRIGGER D4
-    #define GPIO_PUMP D3
+#elif PCB_REV == 2
+    #define GPIO_BUTTON D7
+    #define GPIO_LED D8
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D5
+#elif PCB_REV == 3
+    #define GPIO_BUTTON D4
+    #define GPIO_LED D3
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D0
+    #define GPIO_CS_CAN D8
 #elif PCB_REV == 4
    #define GPIO_BUTTON D4
    #define GPIO_LED D3
@@ -26,9 +33,6 @@
 #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
 #endif

-#define SW_VERSION 1.4
-#define FLASH_FS_VERSION 1.4
-
 #ifndef OTA_DELAY
 #define OTA_DELAY 50 // ticks -> 10ms / tick
 #endif
--- a/Software/include/config.h
+++ b/Software/include/config.h
@@ -16,28 +16,23 @@

 typedef enum SpeedSource_e
 {
+#ifdef FEATURE_ENABLE_TIMER
  SOURCE_TIME,
+#endif
  SOURCE_IMPULSE,
-#ifdef FEATURE_ENABLE_GPS
  SOURCE_GPS,
-#endif
-#if FEATURE_ENABLE_CAN
  SOURCE_CAN
-#endif
 } SpeedSource_t;

 const char SpeedSourceString[][8] = {
+#ifdef FEATURE_ENABLE_TIMER
    "Timer",
+#endif
    "Impuls",
-#ifdef FEATURE_ENABLE_GPS
    "GPS",
-#endif
-#if FEATURE_ENABLE_CAN
    "CAN-Bus"
-#endif
 };

-#ifdef FEATURE_ENABLE_GPS
 typedef enum GPSBaudRate_e
 {
  BAUD_9600,
@@ -49,19 +44,18 @@ const char GPSBaudRateString[][7] = {
    "115200"};

 const size_t GPSBaudRateString_Elements = sizeof(GPSBaudRateString) / sizeof(GPSBaudRateString[0]);
-#endif

-#ifdef FEATURE_ENABLE_CAN
 typedef enum CANSource_e
 {
-  KTM_890_ADV_R_2021
+  KTM_890_ADV_R_2021,
+  KTM_1290_SD_R_2023
 } CANSource_t;

-const char CANSourceString[][28] = {
-    "KTM 890 Adventure R (2021)"};
+const char CANSourceString[][30] = {
+    "KTM 890 Adventure R (2021)",
+    "KTM 1290 Superduke R (2023)"};

-const char CANSourceString_Elements = sizeof(CANSourceString) / sizeof(CANSourceString[0]);
-#endif
+const size_t CANSourceString_Elements = sizeof(CANSourceString) / sizeof(CANSourceString[0]);

 const size_t SpeedSourceString_Elements = sizeof(SpeedSourceString) / sizeof(SpeedSourceString[0]);

@@ -90,23 +84,21 @@ typedef struct
  uint32_t DistancePerRevolution_mm = 2000;
  uint16_t BleedingPulses = 25;
  SpeedSource_t SpeedSource = SOURCE_IMPULSE;
-#ifdef FEATURE_ENABLE_GPS
  GPSBaudRate_t GPSBaudRate = BAUD_115200;
-#endif
-#ifdef FEATURE_ENABLE_CAN
  CANSource_t CANSource = KTM_890_ADV_R_2021;
-#endif
+  bool LED_Mode_Flash = false;
+  uint8_t LED_Max_Brightness = 255;
+  uint8_t LED_Min_Brightness = 5;
  uint32_t checksum = 0;
 } LubeConfig_t;

 const LubeConfig_t LubeConfig_defaults = {
    0, 8000, 4000, 320, DEFAULT_PUMP_DOSE, 30, 1, 150, 70, 18, 2000, 25, SOURCE_IMPULSE,
-#ifdef FEATURE_ENABLE_GPS
    BAUD_115200,
-#endif
-#ifdef FEATURE_ENABLE_CAN
    KTM_890_ADV_R_2021,
-#endif
+    false,
+    255,
+    5,
    0};

 void InitEEPROM();
--- a/Software/include/debugger.h
+++ b/Software/include/debugger.h
@@ -0,0 +1,46 @@
+#ifndef _DEBUGGER_H_
+#define _DEBUGGER_H_
+
+#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
+{
+    disabled,
+    enabled
+} DebugStatus_t;
+
+typedef enum DebugPorts_e
+{
+    dbg_Serial,
+    dbg_Webui,
+    dbg_cntElements
+} DebugPorts_t;
+
+const char sDebugPorts[dbg_cntElements][7] = {
+    "Serial",
+    "WebUI"};
+
+extern DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+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();
+
+#endif
--- a/Software/include/dtc.h
+++ b/Software/include/dtc.h
@@ -0,0 +1,26 @@
+#ifndef _DTC_H_
+#define _DTC_H_
+
+#include <Arduino.h>
+#include "dtc_defs.h"
+
+#define MAX_DTC_STORAGE 6
+
+typedef struct
+{
+  DTCNum_t Number;
+  uint32_t timestamp;
+  DTCActive_t active;
+  uint32_t debugVal;
+} DTCEntry_t;
+
+void MaintainDTC(DTCNum_t DTC_no, boolean active, uint32_t DebugValue = 0);
+void ClearDTC(DTCNum_t DTC_no);
+void ClearAllDTC();
+DTCNum_t getlastDTC(boolean only_active);
+DTCNum_t ActiveDTCseverity(DTCSeverity_t severity);
+DTCSeverity_t getSeverityForDTC(DTCNum_t targetCode);
+void DTC_Process();
+
+extern DTCEntry_t DTCStorage[MAX_DTC_STORAGE];
+#endif
--- a/Software/include/dtc_defs.h
+++ b/Software/include/dtc_defs.h
@@ -0,0 +1,71 @@
+// Auto-generated by script on 2023-12-04 02:10:49
+#ifndef DTC_DEFS_H
+#define DTC_DEFS_H
+
+#include <stdint.h>
+
+typedef uint32_t DTCNum_t;
+
+typedef enum
+{
+  DTC_INACTIVE,
+  DTC_ACTIVE,
+  DTC_PREVIOUS
+} DTCActive_t;
+
+typedef enum
+{
+  DTC_NONE,
+  DTC_INFO,
+  DTC_WARN,
+  DTC_CRITICAL
+} DTCSeverity_t;
+
+typedef struct {
+  DTCNum_t code;
+  DTCSeverity_t severity;
+} DTC_t;
+
+#define DTC_NO_DTC                     0
+#define DTC_TANK_EMPTY                 1
+#define DTC_TANK_LOW                   2
+#define DTC_NO_EEPROM_FOUND            3
+#define DTC_EEPROM_CFG_BAD             4
+#define DTC_EEPROM_PDS_BAD             5
+#define DTC_EEPROM_PDSADRESS_BAD       6
+#define DTC_EEPROM_VERSION_BAD         7
+#define DTC_FLASHFS_ERROR              8
+#define DTC_FLASHFS_VERSION_ERROR      9
+#define DTC_NO_GPS_SERIAL              10
+#define DTC_CAN_TRANSCEIVER_FAILED     11
+#define DTC_NO_CAN_SIGNAL              12
+#define DTC_EEPROM_CFG_SANITY          13
+#define DTC_FAKE_DTC_INFO              14
+#define DTC_FAKE_DTC_WARN              15
+#define DTC_FAKE_DTC_CRIT              16
+#define DTC_LAST_DTC                   17
+
+const DTC_t dtc_definitions[] = {
+    { DTC_NO_DTC                    , DTC_NONE     }, // No Error
+    { DTC_TANK_EMPTY                , DTC_CRITICAL }, // Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen
+    { DTC_TANK_LOW                  , DTC_WARN     }, // Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen
+    { DTC_NO_EEPROM_FOUND           , DTC_CRITICAL }, // Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten.
+    { DTC_EEPROM_CFG_BAD            , DTC_CRITICAL }, // Die Checksumme der Config-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück
+    { DTC_EEPROM_PDS_BAD            , DTC_CRITICAL }, // Die Checksumme der Betriebsdaten-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück
+    { DTC_EEPROM_PDSADRESS_BAD      , DTC_CRITICAL }, // Die Adresse der Betriebsdaten-Partition im EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück
+    { DTC_EEPROM_VERSION_BAD        , DTC_CRITICAL }, // Die Layout-Version des EEPROM stimmt nicht mit der Firmware-Version überein. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück
+    { DTC_FLASHFS_ERROR             , DTC_CRITICAL }, // Der Flashspeicher konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware
+    { DTC_FLASHFS_VERSION_ERROR     , DTC_CRITICAL }, // Die Version des Flashspeicher stimmt nicht mit der Firmware-Version überein. Aktualisieren sie den Flash mit der passenden Update-Datei
+    { DTC_NO_GPS_SERIAL             , DTC_CRITICAL }, // Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul
+    { DTC_CAN_TRANSCEIVER_FAILED    , DTC_CRITICAL }, // Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte
+    { DTC_NO_CAN_SIGNAL             , DTC_WARN     }, // Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen
+    { DTC_EEPROM_CFG_SANITY         , DTC_WARN     }, // Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen
+    { DTC_FAKE_DTC_INFO             , DTC_INFO     }, // Ein Dummy-DTC der Schwere "Info" für Debugging-Zwecke
+    { DTC_FAKE_DTC_WARN             , DTC_WARN     }, // Ein Dummy-DTC der Schwere "Warnung" für Debugging-Zwecke
+    { DTC_FAKE_DTC_CRIT             , DTC_CRITICAL }, // Ein Dummy-DTC der Schwere "Kritisch" für Debugging-Zwecke
+    { DTC_LAST_DTC                  , DTC_NONE     }  // Last Error
+};
+
+const uint32_t dtc_generation_timestamp = 1701652249;
+
+#endif // DTC_DEFS_H
--- a/Software/include/dtc_defs.h.j2
+++ b/Software/include/dtc_defs.h.j2
@@ -0,0 +1,40 @@
+// Auto-generated by script on {{ timestamp }}
+#ifndef DTC_DEFS_H
+#define DTC_DEFS_H
+
+#include <stdint.h>
+
+typedef uint32_t DTCNum_t;
+
+typedef enum
+{
+  DTC_INACTIVE,
+  DTC_ACTIVE,
+  DTC_PREVIOUS
+} DTCActive_t;
+
+typedef enum
+{
+  DTC_NONE,
+  DTC_INFO,
+  DTC_WARN,
+  DTC_CRITICAL
+} DTCSeverity_t;
+
+typedef struct {
+  DTCNum_t code;
+  DTCSeverity_t severity;
+} DTC_t;
+
+{% for dtc in dtc_macros -%}
+{{ dtc }}
+{% endfor %}
+const DTC_t dtc_definitions[] = {
+{% for struct in dtc_structs -%}
+{{ struct }}
+{% endfor -%}
+};
+
+const uint32_t dtc_generation_timestamp = {{ timestamp_unix }};
+
+#endif // DTC_DEFS_H
--- a/Software/include/globals.h
+++ b/Software/include/globals.h
@@ -39,10 +39,27 @@ typedef struct Globals_s
  uint16_t eePersistanceAdress;
  uint8_t TankPercentage;
  bool hasDTC;
+  bool measurementActive;
+  uint32_t measuredPulses;
 } Globals_t;

 extern Globals_t globals;

+typedef struct Constants_s
+{
+  uint8_t FW_Version_major;
+  uint8_t FW_Version_minor;
+  uint8_t Required_Flash_Version_major;
+  uint8_t Required_Flash_Version_minor;
+  char GitHash[11];
+} Constants_t;
+
+const Constants_t constants PROGMEM = {
+ 1,4,     // Firmware_Version
+ 1,4,     // Required Flash Version
+ GIT_REV  // Git-Hash-String
+};
+
 void initGlobals();

 #endif
--- a/Software/include/gps.h
+++ b/Software/include/gps.h
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "common.h"
 #include "dtc.h"
+#include "debugger.h"

 void Init_GPS();
 uint32_t Process_GPS_WheelSpeed();
--- a/Software/include/led_colors.h
+++ b/Software/include/led_colors.h
@@ -0,0 +1,35 @@
+#ifndef _LED_COLORS_H_
+#define _LED_COLORS_H_
+
+#define COLOR_RED           0xFF0000
+#define COLOR_GREEN         0x00FF00
+#define COLOR_BLUE          0x0000FF
+#define COLOR_YELLOW        0xFF9600
+#define COLOR_ORANGE        0xFF2800
+#define COLOR_TEAL          0x00FF78
+#define COLOR_CYAN          0x00FFFF
+#define COLOR_PURPLE        0xB400FF
+#define COLOR_MAGENTA       0xFF0014
+#define COLOR_WHITE         0xFFFFFF
+#define COLOR_BLACK         0x000000
+#define COLOR_GOLD          0xFFDE1E
+#define COLOR_PINK          0xF25AFF
+#define COLOR_AQUA          0x32FFFF
+#define COLOR_JADE          0x00FF28
+#define COLOR_AMBER         0xFF6400
+#define COLOR_WARM_WHITE    0xFDF5E6
+
+
+#define LED_DEFAULT_COLOR       COLOR_WARM_WHITE
+#define LED_STARTUP_NORMAL      COLOR_WARM_WHITE
+#define LED_STARTUP_TANKWARN    COLOR_AMBER
+#define LED_NORMAL_COLOR        COLOR_GREEN 
+#define LED_RAIN_COLOR          COLOR_BLUE 
+#define LED_WIFI_BLINK          COLOR_YELLOW
+#define LED_PURGE_COLOR         COLOR_MAGENTA
+#define LED_ERROR_BLINK         COLOR_RED
+#define LED_SHUTDOWN_BLINK      COLOR_CYAN
+
+
+
+#endif /* _LED_COLORS_H_ */
--- a/Software/include/lubeapp.h
+++ b/Software/include/lubeapp.h
@@ -7,6 +7,7 @@
 #include "common.h"
 #include "globals.h"
 #include "dtc.h"
+#include "debugger.h"

 void RunLubeApp(uint32_t add_milimeters);
 void LubePulse();
--- a/Software/include/sanitycheck.h
+++ b/Software/include/sanitycheck.h
@@ -8,11 +8,11 @@
        #error "Unsupported PCB-Revision"
    #endif

-    #if PCB_REV < 4 && defined(FEATURE_ENABLE_CAN)
+    #if PCB_REV < 3 && defined(FEATURE_ENABLE_CAN)
        #error "CAN-Feature unsupported with this PCB-Rev"
    #endif
    #if PCB_REV < 4 && defined(DFEATURE_ENABLE_GPS)
-        #error "CAN-Feature unsupported with this PCB-Rev"
+        #error "GPS-Feature unsupported with this PCB-Rev"
    #endif
 #endif

--- a/Software/include/webui.h
+++ b/Software/include/webui.h
@@ -20,8 +20,6 @@
 void initWebUI();
 void Webserver_Process();

-#ifdef FEATURE_ENABLE_WEBSOCKETS
 void Websocket_PushLiveDebug(String Message);
-#endif

 #endif
--- a/Software/platformio.ini
+++ b/Software/platformio.ini
@@ -11,18 +11,21 @@
 [platformio]
 extra_configs =
  wifi_credentials.ini
+default_envs = pcb_rev_1-3, pcb_rev_1-2

-[env:d1_mini]
+[env]
 platform = espressif8266
 board = d1_mini
 framework = arduino

-upload_protocol = esptool
-upload_speed = 921600
-;upload_port = ChainLube_DDEFB2
-;upload_protocol = espota
-;upload_flags =  
-;    --auth=${wifi_cred.admin_password}
+upload_speed = 921600 
+
+upload_protocol = espota
+upload_port = 10.0.1.14
+upload_flags =
+  --port=8266
+  --auth=${wifi_cred.admin_password}
+

 build_flags =
  !python git_rev_macro.py
@@ -32,30 +35,55 @@ build_flags =
  -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
  -DWIFI_AP_IP_GW=10,0,0,1
  -DATOMIC_FS_UPDATE
-  -DFEATURE_ENABLE_WIFI_CLIENT
-  -DFEATURE_ENABLE_OLED
-  -DFEATURE_ENABLE_CAN
-  ;-DFEATURE_ENABLE_GPS
-  -DFEATURE_ENABLE_WEBSOCKETS
-  -DPCB_REV=4
-  ;-DNO_MODE_FLASH
-
-;build_type = debug

 board_build.filesystem = littlefs
-extra_scripts = post:prepare_littlefs.py
+extra_scripts = 
+  post:prepare_littlefs.py
+  pre:build_dtcs.py
+  pre:prepare_fwfiles.py

 monitor_filters = esp8266_exception_decoder
 monitor_speed = 115200

-board_build.ldscript = eagle.flash.4m1m.ld
 lib_ldf_mode = deep
 lib_deps = 
    olikraus/U8g2 @ ^2.28.8
-    https://github.com/FastLED/FastLED.git#3d2ab78 ;fastled/FastLED @ ^3.5.0
+    adafruit/Adafruit NeoPixel @ ^1.11.0
    sstaub/Ticker @ ^4.2.0
-    coryjfowler/mcp_can @ ^1.5.0
    robtillaart/I2C_EEPROM @ ^1.5.2
-    mikalhart/TinyGPSPlus @ ^1.0.3
    me-no-dev/ESP Async WebServer @ ^1.2.3
-    bblanchon/ArduinoJson @ ^6.19.4
+    bblanchon/ArduinoJson @ ^6.19.4
+
+[env:pcb_rev_1-3]
+;build_type = debug
+custom_pcb_revision = 3
+build_flags =
+  ${env.build_flags}
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_TIMER
+  -DFEATURE_ENABLE_OLED
+  -DCAN_DEBUG_MESSAGE
+  -DPCB_REV=${this.custom_pcb_revision}
+
+board_build.ldscript = eagle.flash.4m1m.ld
+
+lib_deps = 
+    ${env.lib_deps}
+    coryjfowler/mcp_can @ ^1.5.0
+    mikalhart/TinyGPSPlus @ ^1.0.3
+    
+[env:pcb_rev_1-2]
+;build_type = debug
+custom_pcb_revision = 2
+build_flags =
+  ${env.build_flags}
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_TIMER
+  -DFEATURE_ENABLE_OLED
+  -DFEATURE_ENABLE_WEBSOCKETS
+  -DPCB_REV=${this.custom_pcb_revision}
+
+board_build.ldscript = eagle.flash.4m1m.ld
+
+lib_deps = 
+    ${env.lib_deps}
--- a/Software/prepare_fwfiles.py
+++ b/Software/prepare_fwfiles.py
@@ -0,0 +1,3 @@
+Import("env")
+
+env.Replace(PROGNAME="firmware_pcb_1.%s.fw" % env.GetProjectOption("custom_pcb_revision"))
--- a/Software/prepare_littlefs.py
+++ b/Software/prepare_littlefs.py
@@ -6,9 +6,59 @@ import glob
 import shutil
 import gzip
 import os
+import subprocess
 Import("env")
 Import("projenv")

+# Setze die Pfade zu den Tools als Variablen
+html_minifier_path = os.path.join(os.getenv("APPDATA"), "npm", "html-minifier.cmd")
+uglifyjs_path = os.path.join(os.getenv("APPDATA"), "npm", "uglifyjs.cmd")
+terser_path = os.path.join(os.getenv("APPDATA"), "npm", "terser.cmd")
+cssnano_path = os.path.join(os.getenv("APPDATA"), "npm", "cssnano.cmd")
+
+
+def minify_html(input_path, output_path):
+    subprocess.run([html_minifier_path, '--collapse-whitespace', '--remove-comments', input_path, '-o', output_path])
+
+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])
+
+def process_file(src_path, dest_path):
+    _, file_extension = os.path.splitext(src_path)
+
+    # Extrahiere den Ordnerpfad im Zielverzeichnis
+    dest_dir = os.path.dirname(dest_path)
+
+    # Erstelle den Ordner und alle dazugehörigen Unterordner, falls sie nicht existieren
+    os.makedirs(dest_dir, exist_ok=True)
+
+    if file_extension.lower() == '.js':
+        minify_js(src_path, dest_path)
+    elif file_extension.lower() == '.css':
+        minify_css(src_path, dest_path)
+    elif file_extension.lower() in ['.html', '.htm']:
+        minify_html(src_path, dest_path)
+    else:
+        # Kopiere nicht bearbeitbare Dateien direkt in den Zielordner
+        shutil.copy2(src_path, dest_path)
+
+def strip_files(src_dir, dest_dir):
+    # Erstelle den Zielordner und alle dazugehörigen Unterordner, falls sie nicht existieren
+    os.makedirs(dest_dir, exist_ok=True)
+
+    # Durchlaufe alle Dateien und Unterverzeichnisse im Quellordner
+    for root, _, files in os.walk(src_dir):
+        for filename in files:
+            src_path = os.path.join(root, filename)
+            dest_path = os.path.relpath(src_path, src_dir)
+            dest_path = os.path.join(dest_dir, dest_path)
+
+            # Verarbeite nur Dateien (keine Unterverzeichnisse)
+            process_file(src_path, dest_path)
+

 def gzip_file(src_path, dst_path):

@@ -47,14 +97,16 @@ def gzip_webfiles(source, target, env):
    filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2', '.json']
    print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n')
    data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src')
+    data_temp_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_stripped')
+    strip_files(data_src_dir_path, data_temp_dir_path)
    data_dir_path = env.get('PROJECT_DATA_DIR')
    # check if data and datasrc exist. If the first exists and not the second, it renames it
-    if(os.path.exists(data_dir_path) and not os.path.exists(data_src_dir_path)):
+    if(os.path.exists(data_dir_path) and not os.path.exists(data_temp_dir_path)):
        print('GZIP: Directory "'+data_dir_path +
-              '" exists, "'+data_src_dir_path+'" is not found.')
+              '" exists, "'+data_temp_dir_path+'" is not found.')
        print('GZIP: Renaming "' + data_dir_path +
-              '" to "' + data_src_dir_path + '"')
-        os.rename(data_dir_path, data_src_dir_path)
+              '" to "' + data_temp_dir_path + '"')
+        os.rename(data_dir_path, data_temp_dir_path)
    # Delete the 'data' directory
    if(os.path.exists(data_dir_path)):
        print('GZIP: Deleting the "data" directory ' + data_dir_path)
@@ -67,27 +119,27 @@ def gzip_webfiles(source, target, env):
    files_to_copy = []
    files_to_gzip = []

-    all_data_src = getListOfFiles(data_src_dir_path)
+    all_data_src = getListOfFiles(data_temp_dir_path)
    for file in all_data_src:
        file_name, file_extension = os.path.splitext(file)
        print(file_name + " has filetype " + file_extension)
        if file_extension in filetypes_to_gzip:
            files_to_gzip.append(file)
        else:
-            filename_subdir = remove_prefix(file, data_src_dir_path)
+            filename_subdir = remove_prefix(file, data_temp_dir_path)
            files_to_copy.append(filename_subdir)

    for file in files_to_copy:
-        print('GZIP: Copying file from: ' + data_src_dir_path + file + ' to: ' + data_dir_path + file)
+        print('GZIP: Copying file from: ' + data_temp_dir_path + file + ' to: ' + data_dir_path + file)
        os.makedirs(os.path.dirname(data_dir_path + file), exist_ok=True)
-        shutil.copy(data_src_dir_path + file, data_dir_path + file)
+        shutil.copy(data_temp_dir_path + file, data_dir_path + file)
    # Compress and move files
    
    was_error = False
    try:
        for source_file_path in files_to_gzip:
            print('GZIP: compressing... ' + source_file_path)
-            filename_subdir = remove_prefix(source_file_path, data_src_dir_path)
+            filename_subdir = remove_prefix(source_file_path, data_temp_dir_path)
            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)
@@ -100,6 +152,7 @@ def gzip_webfiles(source, target, env):
        print('GZIP: Failure/Incomplete.\n')
    else:
        print('GZIP: Compressed correctly.\n')
+        shutil.rmtree(data_temp_dir_path)

    return
 
--- a/Software/src/can.cpp
+++ b/Software/src/can.cpp
@@ -1,37 +1,76 @@
-#ifdef FEATURE_ENABLE_CAN
 #include "can.h"

 MCP_CAN CAN0(GPIO_CS_CAN);
+#ifdef CAN_DEBUG_MESSAGE
+#define MAX_DEBUG_RETRIES 100
+void sendCANDebugMessage();
+#endif

 void Init_CAN()
 {

    if (CAN0.begin(MCP_STDEXT, CAN_500KBPS, MCP_16MHZ) != CAN_OK)
-        MaintainDTC(DTC_CAN_TRANSCEIVER_FAILED, DTC_CRITICAL, true);
+        MaintainDTC(DTC_CAN_TRANSCEIVER_FAILED, true);

    CAN0.init_Mask(0, 0, 0x07FF0000); // Init first mask...
    CAN0.init_Mask(1, 0, 0x07FF0000); // Init second mask...
-    CAN0.init_Filt(0, 0, 0x012D0000); // Init first filter...
+
+    switch (LubeConfig.CANSource)
+    {
+    case KTM_890_ADV_R_2021:
+        CAN0.init_Filt(0, 0, 0x012D0000); // Init first filter...
+        break;
+    case KTM_1290_SD_R_2023:
+        CAN0.init_Filt(0, 0, 0x012D0000); // Init first filter...
+        break;
+    default:
+        break;
+    }

    CAN0.setMode(MCP_NORMAL);
 }

+void CAN_Process()
+{
+    static uint32_t previousMillis = 0;
+
+    if (millis() - previousMillis >= 100)
+    {
+        sendCANDebugMessage();
+        previousMillis = millis();
+    }
+}
+
 uint32_t Process_CAN_WheelSpeed()
 {
 #define FACTOR_RWP_KMH_890ADV 18 // Divider to convert Raw Data to km/h
-
+#define FACTOR_RWP_KMH_1290SD 18 // Divider to convert Raw Data to km/h
    can_frame canMsg;
    static uint32_t lastRecTimestamp = 0;
    uint16_t RearWheelSpeed_raw;
    uint32_t milimeters_to_add = 0;
+    uint32_t RWP_millimeter_per_second = 0;

    if (CAN0.readMsgBuf(&canMsg.can_id, &canMsg.can_dlc, canMsg.data) == CAN_OK)
    {

-        RearWheelSpeed_raw = (uint16_t)canMsg.data[5] << 8 | canMsg.data[6];
-        // raw / FACTOR_RWP_KMH_890ADV -> km/h * 100000 -> cm/h / 3600 -> cm/s
-        // raw * 500 -> cm/s
-        uint32_t RWP_millimeter_per_second = (((uint32_t)RearWheelSpeed_raw * 1000000) / FACTOR_RWP_KMH_890ADV) / 3600;
+        switch (LubeConfig.CANSource)
+        {
+        case KTM_890_ADV_R_2021:
+            // raw / FACTOR_RWP_KMH_890ADV -> km/h * 100000 -> cm/h / 3600 -> cm/s
+            // raw * 500 -> cm/s
+            RearWheelSpeed_raw = (uint16_t)canMsg.data[5] << 8 | canMsg.data[6];
+            RWP_millimeter_per_second = (((uint32_t)RearWheelSpeed_raw * 1000000) / FACTOR_RWP_KMH_890ADV) / 3600;
+            break;
+        case KTM_1290_SD_R_2023:
+            // raw / FACTOR_RWP_KMH_1290SD -> km/h * 100000 -> cm/h / 3600 -> cm/s
+            // raw * 500 -> cm/s
+            RearWheelSpeed_raw = (uint16_t)canMsg.data[5] << 8 | canMsg.data[6];
+            RWP_millimeter_per_second = (((uint32_t)RearWheelSpeed_raw * 1000000) / FACTOR_RWP_KMH_1290SD) / 3600;
+            break;
+        default:
+            break;
+        }

        uint32_t timesincelast = millis() - lastRecTimestamp;
        lastRecTimestamp = millis();
@@ -39,11 +78,73 @@ uint32_t Process_CAN_WheelSpeed()
        milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
    }

-    if (lastRecTimestamp != 0)
+    if (lastRecTimestamp > 1000)
    {
-        MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false));
+        MaintainDTC(DTC_NO_CAN_SIGNAL, (millis() > lastRecTimestamp + 10000 ? true : false));
    }

    return milimeters_to_add;
 }
+
+#ifdef CAN_DEBUG_MESSAGE
+void sendCANDebugMessage()
+{
+#define MAX_DEBUG_MULTIPLEXER 6
+    static uint16_t DebugSendFailTimeout = 0;
+    static uint8_t debugMultiplexer = 0;
+    byte data[8] = {debugMultiplexer, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+    uint32_t millisValue = millis();
+
+    switch (debugMultiplexer)
+    {
+    case 0:
+        memcpy(&data[1], &millisValue, sizeof(millisValue));
+        memcpy(&data[5], &globals.purgePulses, sizeof(globals.purgePulses));
+        break;
+    case 1:
+        data[1] = (uint8_t)globals.systemStatus;
+        data[2] = (uint8_t)globals.resumeStatus;
+        data[3] = (uint8_t)globals.requestEEAction;
+        data[4] = globals.TankPercentage;
+        data[5] = (0x01 & globals.hasDTC) | ((0x01 & globals.measurementActive) << 1);
+        break;
+    case 2:
+        memcpy(&data[1], &globals.eePersistanceAdress, sizeof(globals.eePersistanceAdress));
+        memcpy(&data[3], &PersistenceData.tankRemain_microL, sizeof(PersistenceData.tankRemain_microL));
+        break;
+    case 3:
+        memcpy(&data[1], &PersistenceData.writeCycleCounter, sizeof(PersistenceData.writeCycleCounter));
+        memcpy(&data[3], &PersistenceData.TravelDistance_highRes_mm, sizeof(PersistenceData.TravelDistance_highRes_mm));
+        break;
+    case 4:
+        memcpy(&data[1], &PersistenceData.odometer_mm, sizeof(PersistenceData.odometer_mm));
+        break;
+    case 5:
+        memcpy(&data[1], &PersistenceData.odometer, sizeof(PersistenceData.odometer));
+        break;
+    case 6:
+        memcpy(&data[1], &PersistenceData.checksum, sizeof(PersistenceData.checksum));
+        break;
+    default:
+        break;
+    }
+
+    debugMultiplexer++;
+    debugMultiplexer = debugMultiplexer > MAX_DEBUG_MULTIPLEXER ? 0 : debugMultiplexer;
+
+    if (DebugSendFailTimeout < MAX_DEBUG_RETRIES)
+    {
+        byte sndStat = CAN0.sendMsgBuf(0x7FF, 0, 8, data);
+        if (sndStat != CAN_OK)
+        {
+            Debug_pushMessage("failed sending CAN-DbgMsg: %d, %d\n", sndStat, DebugSendFailTimeout);
+            DebugSendFailTimeout++;
+        }
+    }
+    else if (DebugSendFailTimeout == MAX_DEBUG_RETRIES)
+    {
+        Debug_pushMessage("disable CAN-DbgMsg due to timeout");
+        DebugSendFailTimeout++;
+    }
+}
 #endif
--- a/Software/src/config.cpp
+++ b/Software/src/config.cpp
@@ -36,7 +36,7 @@ void EEPROM_Process()
  case EE_CFG_FORMAT:
    FormatConfig_EEPROM();
    globals.requestEEAction = EE_IDLE;
-    globals.systemStatus = sysStat_Shutdown;
+    GetConfig_EEPROM();
    Debug_pushMessage("Formated EEPROM CFG\n");
    break;
  case EE_PDS_SAVE:
@@ -52,11 +52,14 @@ void EEPROM_Process()
  case EE_PDS_FORMAT:
    FormatPersistence_EEPROM();
    globals.requestEEAction = EE_IDLE;
+    GetPersistence_EEPROM();
    Debug_pushMessage("Formated EEPROM PDS\n");
    break;
  case EE_FORMAT_ALL:
    FormatConfig_EEPROM();
    FormatPersistence_EEPROM();
+    GetConfig_EEPROM();
+    GetPersistence_EEPROM();
    globals.requestEEAction = EE_IDLE;
    Debug_pushMessage("Formated EEPROM ALL\n");
    break;
@@ -80,6 +83,12 @@ void StoreConfig_EEPROM()
    return;

  ee.updateBlock(startofLubeConfig, (uint8_t *)&LubeConfig, sizeof(LubeConfig));
+
+  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
+  if (ConfigSanityCheckResult > 0)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_SANITY, true, ConfigSanityCheckResult);
+  }
 }

 void GetConfig_EEPROM()
@@ -94,16 +103,14 @@ void GetConfig_EEPROM()

  if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) != checksum)
  {
-    MaintainDTC(DTC_EEPROM_CFG_BAD, DTC_CRITICAL, true);
+    MaintainDTC(DTC_EEPROM_CFG_BAD, true);
  }
  LubeConfig.checksum = checksum;

  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
-
  if (ConfigSanityCheckResult > 0)
  {
-    MaintainDTC(DTC_EEPROM_CFG_SANITY, DTC_WARN, true, ConfigSanityCheckResult);
-    globals.requestEEAction = EE_CFG_SAVE;
+    MaintainDTC(DTC_EEPROM_CFG_SANITY, true, ConfigSanityCheckResult);
  }
 }

@@ -135,7 +142,7 @@ void GetPersistence_EEPROM()
  {
    MovePersistencePage_EEPROM(true);
    FormatPersistence_EEPROM();
-    MaintainDTC(DTC_EEPROM_PDSADRESS_BAD, DTC_CRITICAL, true);
+    MaintainDTC(DTC_EEPROM_PDSADRESS_BAD, true);
  }
  else
  {
@@ -146,7 +153,7 @@ void GetPersistence_EEPROM()

    if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
    {
-      MaintainDTC(DTC_EEPROM_PDS_BAD, DTC_CRITICAL, true);
+      MaintainDTC(DTC_EEPROM_PDS_BAD, true);
    }
    PersistenceData.checksum = checksum;
  }
@@ -242,10 +249,10 @@ boolean checkEEPROMavailable()
 {
  if (!ee.isConnected())
  {
-    MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, true);
+    MaintainDTC(DTC_NO_EEPROM_FOUND, true);
    return false;
  }
-  MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, false);
+  MaintainDTC(DTC_NO_EEPROM_FOUND, false);
  return true;
 }

@@ -255,104 +262,103 @@ uint32_t ConfigSanityCheck(bool autocorrect)

  if (!(LubeConfig.DistancePerLube_Default > 0) || !(LubeConfig.DistancePerLube_Default < 50000))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 0);
+    SET_BIT(setting_reset_bits, 0);
    if (autocorrect)
      LubeConfig.DistancePerLube_Default = LubeConfig_defaults.DistancePerLube_Default;
  }

  if (!(LubeConfig.DistancePerLube_Rain > 0) || !(LubeConfig.DistancePerLube_Rain < 50000))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 1);
+    SET_BIT(setting_reset_bits, 1);
    if (autocorrect)
      LubeConfig.DistancePerLube_Rain = LubeConfig_defaults.DistancePerLube_Rain;
  }

  if (!(LubeConfig.tankCapacity_ml > 0) || !(LubeConfig.tankCapacity_ml < 5000))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 2);
+    SET_BIT(setting_reset_bits, 2);
    if (autocorrect)
      LubeConfig.tankCapacity_ml = LubeConfig_defaults.tankCapacity_ml;
  }

  if (!(LubeConfig.amountPerDose_microL > 0) || !(LubeConfig.amountPerDose_microL < 100))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 3);
+    SET_BIT(setting_reset_bits, 3);
    if (autocorrect)
      LubeConfig.amountPerDose_microL = LubeConfig_defaults.amountPerDose_microL;
  }

  if (!(LubeConfig.TankRemindAtPercentage >= 0) || !(LubeConfig.TankRemindAtPercentage <= 100))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 4);
+    SET_BIT(setting_reset_bits, 4);
    if (autocorrect)
      LubeConfig.TankRemindAtPercentage = LubeConfig_defaults.TankRemindAtPercentage;
  }

-  if (!(LubeConfig.PulsePerRevolution > 0) || !(LubeConfig.PulsePerRevolution < 1000))
+  if (LubeConfig.SpeedSource == SOURCE_IMPULSE)
  {
-    setting_reset_bits = setting_reset_bits | (1 << 5);
-    if (autocorrect)
-      LubeConfig.PulsePerRevolution = LubeConfig_defaults.PulsePerRevolution;
-  }
+    if (!(LubeConfig.PulsePerRevolution > 0) || !(LubeConfig.PulsePerRevolution < 1000))
+    {
+      SET_BIT(setting_reset_bits, 5);
+      if (autocorrect)
+        LubeConfig.PulsePerRevolution = LubeConfig_defaults.PulsePerRevolution;
+    }

-  if (!(LubeConfig.TireWidth_mm > 0) || !(LubeConfig.TireWidth_mm < 500))
-  {
-    setting_reset_bits = setting_reset_bits | (1 << 6);
-    if (autocorrect)
-      LubeConfig.TireWidth_mm = LubeConfig_defaults.TireWidth_mm;
-  }
+    if (!(LubeConfig.TireWidth_mm > 0) || !(LubeConfig.TireWidth_mm < 500))
+    {
+      SET_BIT(setting_reset_bits, 6);
+      if (autocorrect)
+        LubeConfig.TireWidth_mm = LubeConfig_defaults.TireWidth_mm;
+    }

-  if (!(LubeConfig.TireWidthHeight_Ratio > 0) || !(LubeConfig.TireWidthHeight_Ratio < 150))
-  {
-    setting_reset_bits = setting_reset_bits | (1 << 7);
-    if (autocorrect)
-      LubeConfig.TireWidthHeight_Ratio = LubeConfig_defaults.TireWidthHeight_Ratio;
-  }
+    if (!(LubeConfig.TireWidthHeight_Ratio > 0) || !(LubeConfig.TireWidthHeight_Ratio < 150))
+    {
+      SET_BIT(setting_reset_bits, 7);
+      if (autocorrect)
+        LubeConfig.TireWidthHeight_Ratio = LubeConfig_defaults.TireWidthHeight_Ratio;
+    }

-  if (!(LubeConfig.RimDiameter_Inch > 0) || !(LubeConfig.RimDiameter_Inch < 30))
-  {
-    setting_reset_bits = setting_reset_bits | (1 << 8);
-    if (autocorrect)
-      LubeConfig.RimDiameter_Inch = LubeConfig_defaults.RimDiameter_Inch;
-  }
+    if (!(LubeConfig.RimDiameter_Inch > 0) || !(LubeConfig.RimDiameter_Inch < 30))
+    {
+      SET_BIT(setting_reset_bits, 8);
+      if (autocorrect)
+        LubeConfig.RimDiameter_Inch = LubeConfig_defaults.RimDiameter_Inch;
+    }

-  if (!(LubeConfig.DistancePerRevolution_mm > 0) || !(LubeConfig.DistancePerRevolution_mm < 10000))
-  {
-    setting_reset_bits = setting_reset_bits | (1 << 9);
-    if (autocorrect)
-      LubeConfig.DistancePerRevolution_mm = LubeConfig_defaults.DistancePerRevolution_mm;
+    if (!(LubeConfig.DistancePerRevolution_mm > 0) || !(LubeConfig.DistancePerRevolution_mm < 10000))
+    {
+      SET_BIT(setting_reset_bits, 9);
+      if (autocorrect)
+        LubeConfig.DistancePerRevolution_mm = LubeConfig_defaults.DistancePerRevolution_mm;
+    }
  }
-
+  
  if (!(LubeConfig.BleedingPulses > 0) || !(LubeConfig.BleedingPulses < 1001))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 10);
+    SET_BIT(setting_reset_bits, 10);
    if (autocorrect)
      LubeConfig.BleedingPulses = LubeConfig_defaults.BleedingPulses;
  }

  if (!(LubeConfig.SpeedSource >= 0) || !(LubeConfig.SpeedSource < SpeedSourceString_Elements))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 11);
+    SET_BIT(setting_reset_bits, 11);
    if (autocorrect)
      LubeConfig.SpeedSource = LubeConfig_defaults.SpeedSource;
  }

-#ifdef FEATURE_ENABLE_GPS
  if (!(LubeConfig.GPSBaudRate >= 0) || !(LubeConfig.GPSBaudRate < GPSBaudRateString_Elements))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 12);
+    SET_BIT(setting_reset_bits, 12);
    if (autocorrect)
      LubeConfig.GPSBaudRate = LubeConfig_defaults.GPSBaudRate;
  }
-#endif

-#ifdef FEATURE_ENABLE_CAN
  if (!(LubeConfig.CANSource >= 0) || !(LubeConfig.CANSource < CANSourceString_Elements))
  {
-    setting_reset_bits = setting_reset_bits | (1 << 13);
+    SET_BIT(setting_reset_bits, 13);
    if (autocorrect)
      LubeConfig.CANSource = LubeConfig_defaults.CANSource;
  }
-#endif
  return setting_reset_bits;
 }
--- a/Software/src/debugger.cpp
+++ b/Software/src/debugger.cpp
@@ -3,7 +3,7 @@
 DebugStatus_t DebuggerStatus[dbg_cntElements];

 String IpAddress2String(const IPAddress &ipAddress);
-void processCmdDebug();
+void processCmdDebug(String command);
 void Debug_formatCFG();
 void Debug_formatPersistence();
 void Debug_printSystemInfo();
@@ -13,6 +13,7 @@ void Debug_dumpConfig();
 void Debug_dumpPersistance();
 void Debug_ShowDTCs();
 void Debug_dumpGlobals();
+void Debug_printHelp();

 void initDebugger()
 {
@@ -22,15 +23,84 @@ void initDebugger()
    Serial.setDebugOutput(false);
 }

+void Debug_Process()
+{
+    typedef enum InputProcessed_e
+    {
+        IDLE,
+        CMD_COMPLETE,
+        CMD_ABORT,
+        CMD_OVERFLOW
+    } InputProcessed_t;
+
+    static unsigned int inputCnt = 0;
+    static char inputBuffer[32];
+    InputProcessed_t InputProcessed = IDLE;
+
+    if (Serial.available())
+    {
+        char inputChar = Serial.read();
+
+        switch (inputChar)
+        {
+        case '\n':
+            inputBuffer[inputCnt] = 0; // terminate the String
+            inputCnt = 0;
+            InputProcessed = CMD_COMPLETE;
+            break;
+
+        case 0x1B: // Esc
+            inputBuffer[0] = 0;
+            inputCnt = 0;
+            InputProcessed = CMD_ABORT;
+            break;
+
+        case 0x21 ... 0x7E: // its a real letter or sign and not some control-chars
+            inputBuffer[inputCnt] = inputChar;
+            inputCnt++;
+            break;
+
+        default:
+            break;
+        }
+
+        if (inputCnt > sizeof(inputBuffer))
+        {
+            inputCnt = 0;
+            inputBuffer[sizeof(inputBuffer) - 1] = 0; // terminate the String
+            InputProcessed = CMD_OVERFLOW;
+        }
+    }
+
+    switch (InputProcessed)
+    {
+    case CMD_ABORT:
+        Debug_pushMessage("Abort\n");
+        break;
+
+    case CMD_COMPLETE:
+        processCmdDebug(String(inputBuffer));
+        break;
+
+    case CMD_OVERFLOW:
+        Debug_pushMessage("input Buffer overflow\n");
+        break;
+
+    default:
+        break;
+    }
+    InputProcessed = IDLE;
+}
+
 void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status)
 {
    if (status == disabled)
-        Debug_pushMessage("disable DebugPort %s", sDebugPorts[port]);
+        Debug_pushMessage("disable DebugPort %s\n", sDebugPorts[port]);

    DebuggerStatus[port] = status;

    if (status == enabled)
-        Debug_pushMessage("enabled DebugPort %s", sDebugPorts[port]);
+        Debug_pushMessage("enabled DebugPort %s\n", sDebugPorts[port]);
 }

 void Debug_pushMessage(const char *format, ...)
@@ -81,7 +151,9 @@ void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data)

 void processCmdDebug(String command)
 {
-    if (command == "sysinfo")
+    if (command == "help")
+        Debug_printHelp();
+    else if (command == "sysinfo")
        Debug_printSystemInfo();
    else if (command == "netinfo")
        Debug_printWifiInfo();
@@ -103,91 +175,99 @@ void processCmdDebug(String command)
        Debug_dumpPersistance();
    else if (command == "saveEE")
        globals.requestEEAction = EE_ALL_SAVE;
-    else if (command == "showdtc")
-        Debug_ShowDTCs();
    else if (command == "dumpGlobals")
        Debug_dumpGlobals();
+    else if (command == "sdbg")
+        SetDebugportStatus(dbg_Serial, enabled);
+    else if (command == "dtc_show")
+        Debug_ShowDTCs();
+    else if (command == "dtc_clear")
+        ClearAllDTC();
+    else if (command == "dtc_crit")
+        MaintainDTC(DTC_FAKE_DTC_CRIT, true, millis());
+    else if (command == "dtc_warn")
+        MaintainDTC(DTC_FAKE_DTC_WARN, true, millis());
+    else if (command == "dtc_info")
+        MaintainDTC(DTC_FAKE_DTC_INFO, true, millis());
+    else
+        Debug_pushMessage("unknown Command\n");
 }

 void Debug_formatCFG()
 {
-    Debug_pushMessage("Formatting Config-EEPROM and reseting to default");
+    Debug_pushMessage("Formatting Config-EEPROM and reseting to default\n");
    FormatConfig_EEPROM();
 }

 void Debug_formatPersistence()
 {
-    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default");
+    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default\n");
    FormatPersistence_EEPROM();
 }

-void RemotDebug_printSystemInfo()
+void Debug_printSystemInfo()
 {
-    Debug_pushMessage("Souko's ChainOiler Mk1");
-    Debug_pushMessage("Hostname: %s", globals.DeviceName);
+    Debug_pushMessage("Souko's ChainOiler Mk1\n");
+    Debug_pushMessage("Hostname: %s\n", globals.DeviceName);

    FlashMode_t ideMode = ESP.getFlashChipMode();
-    Debug_pushMessage("Sdk version: %s", ESP.getSdkVersion());
-    Debug_pushMessage("Core Version: %s", ESP.getCoreVersion().c_str());
-    Debug_pushMessage("Boot Version: %u", ESP.getBootVersion());
-    Debug_pushMessage("Boot Mode: %u", ESP.getBootMode());
-    Debug_pushMessage("CPU Frequency: %u MHz", ESP.getCpuFreqMHz());
-    Debug_pushMessage("Reset reason: %s", ESP.getResetReason().c_str());
-    Debug_pushMessage("Flash Size: %d", ESP.getFlashChipRealSize());
-    Debug_pushMessage("Flash Size IDE: %d", ESP.getFlashChipSize());
-    Debug_pushMessage("Flash ide mode:  %s", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
-                                                           : ideMode == FM_DIO    ? "DIO"
-                                                           : ideMode == FM_DOUT   ? "DOUT"
-                                                                                  : "UNKNOWN"));
-    Debug_pushMessage("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
-    Debug_pushMessage("Git-Revison: %s", GIT_REV);
-    Debug_pushMessage("Sw-Version: %s", QUOTE(SW_VERSION));
+    Debug_pushMessage("Sdk version: %s\n", ESP.getSdkVersion());
+    Debug_pushMessage("Core Version: %s\n", ESP.getCoreVersion().c_str());
+    Debug_pushMessage("Boot Version: %u\n", ESP.getBootVersion());
+    Debug_pushMessage("Boot Mode: %u\n", ESP.getBootMode());
+    Debug_pushMessage("CPU Frequency: %u MHz\n", ESP.getCpuFreqMHz());
+    Debug_pushMessage("Reset reason: %s\n", ESP.getResetReason().c_str());
+    Debug_pushMessage("Flash Size: %d\n", ESP.getFlashChipRealSize());
+    Debug_pushMessage("Flash Size IDE: %d\n", ESP.getFlashChipSize());
+    Debug_pushMessage("Flash ide mode:  %s\n", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
+                                                                        : ideMode == FM_DIO    ? "DIO"
+                                                                        : ideMode == FM_DOUT   ? "DOUT"
+                                                                                               : "UNKNOWN"));
+    Debug_pushMessage("OTA-Pass: %s\n", QUOTE(ADMIN_PASSWORD));
+    Debug_pushMessage("Git-Revison: %s\n", constants.GitHash);
+    Debug_pushMessage("Sw-Version: %d.%02d\n", constants.FW_Version_major, constants.FW_Version_minor);
 }

 void Debug_dumpConfig()
 {
-    Debug_pushMessage("DistancePerLube_Default: %d", LubeConfig.DistancePerLube_Default);
-    Debug_pushMessage("DistancePerLube_Rain: %d", LubeConfig.DistancePerLube_Rain);
-    Debug_pushMessage("tankCapacity_ml: %d", LubeConfig.tankCapacity_ml);
-    Debug_pushMessage("amountPerDose_microL: %d", LubeConfig.amountPerDose_microL);
-    Debug_pushMessage("TankRemindAtPercentage: %d", LubeConfig.TankRemindAtPercentage);
-    Debug_pushMessage("PulsePerRevolution: %d", LubeConfig.PulsePerRevolution);
-    Debug_pushMessage("TireWidth_mm: %d", LubeConfig.TireWidth_mm);
-    Debug_pushMessage("TireWidthHeight_Ratio: %d", LubeConfig.TireWidth_mm);
-    Debug_pushMessage("RimDiameter_Inch: %d", LubeConfig.RimDiameter_Inch);
-    Debug_pushMessage("DistancePerRevolution_mm: %d", LubeConfig.DistancePerRevolution_mm);
-    Debug_pushMessage("BleedingPulses: %d", LubeConfig.BleedingPulses);
-    Debug_pushMessage("SpeedSource: %d", LubeConfig.SpeedSource);
-#ifdef FEATURE_ENABLE_GPS
-    Debug_pushMessage("GPSBaudRate: %d", LubeConfig.GPSBaudRate);
-#endif
-#ifdef FEATURE_ENABLE_CAN
-    Debug_pushMessage("CANSource: %d", LubeConfig.CANSource);
-#endif
-    Debug_pushMessage("checksum: 0x%08X", LubeConfig.checksum);
+    Debug_pushMessage("DistancePerLube_Default: %d\n", LubeConfig.DistancePerLube_Default);
+    Debug_pushMessage("DistancePerLube_Rain: %d\n", LubeConfig.DistancePerLube_Rain);
+    Debug_pushMessage("tankCapacity_ml: %d\n", LubeConfig.tankCapacity_ml);
+    Debug_pushMessage("amountPerDose_microL: %d\n", LubeConfig.amountPerDose_microL);
+    Debug_pushMessage("TankRemindAtPercentage: %d\n", LubeConfig.TankRemindAtPercentage);
+    Debug_pushMessage("PulsePerRevolution: %d\n", LubeConfig.PulsePerRevolution);
+    Debug_pushMessage("TireWidth_mm: %d\n", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("TireWidthHeight_Ratio: %d\n", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("RimDiameter_Inch: %d\n", LubeConfig.RimDiameter_Inch);
+    Debug_pushMessage("DistancePerRevolution_mm: %d\n", LubeConfig.DistancePerRevolution_mm);
+    Debug_pushMessage("BleedingPulses: %d\n", LubeConfig.BleedingPulses);
+    Debug_pushMessage("SpeedSource: %d\n", LubeConfig.SpeedSource);
+    Debug_pushMessage("GPSBaudRate: %d\n", LubeConfig.GPSBaudRate);
+    Debug_pushMessage("CANSource: %d\n", LubeConfig.CANSource);
+    Debug_pushMessage("checksum: 0x%08X\n", LubeConfig.checksum);
 }

 void Debug_dumpGlobals()
 {
-    Debug_pushMessage("systemStatus: %d", globals.systemStatus);
-    Debug_pushMessage("resumeStatus: %d", globals.resumeStatus);
-    Debug_pushMessage("systemStatustxt: %s", globals.systemStatustxt);
-    Debug_pushMessage("purgePulses: %d", globals.purgePulses);
-    Debug_pushMessage("requestEEAction: %d", globals.requestEEAction);
-    Debug_pushMessage("DeviceName: %s", globals.DeviceName);
-    Debug_pushMessage("FlashVersion: %s", globals.FlashVersion);
-    Debug_pushMessage("eePersistanceAdress: %d", globals.eePersistanceAdress);
-    Debug_pushMessage("TankPercentage: %d", globals.TankPercentage);
-    Debug_pushMessage("hasDTC: %d", globals.hasDTC);
+    Debug_pushMessage("systemStatus: %d\n", globals.systemStatus);
+    Debug_pushMessage("resumeStatus: %d\n", globals.resumeStatus);
+    Debug_pushMessage("systemStatustxt: %s\n", globals.systemStatustxt);
+    Debug_pushMessage("purgePulses: %d\n", globals.purgePulses);
+    Debug_pushMessage("requestEEAction: %d\n", globals.requestEEAction);
+    Debug_pushMessage("DeviceName: %s\n", globals.DeviceName);
+    Debug_pushMessage("FlashVersion: %s\n", globals.FlashVersion);
+    Debug_pushMessage("eePersistanceAdress: %d\n", globals.eePersistanceAdress);
+    Debug_pushMessage("TankPercentage: %d\n", globals.TankPercentage);
+    Debug_pushMessage("hasDTC: %d\n", globals.hasDTC);
 }

 void Debug_dumpPersistance()
 {
-    Debug_pushMessage("writeCycleCounter: %d", PersistenceData.writeCycleCounter);
-    Debug_pushMessage("tankRemain_microL: %d", PersistenceData.tankRemain_microL);
-    Debug_pushMessage("TravelDistance_highRes_mm: %d", PersistenceData.TravelDistance_highRes_mm);
-    Debug_pushMessage("checksum: %d", PersistenceData.checksum);
-    Debug_pushMessage("PSD Adress: 0x%04X", globals.eePersistanceAdress);
+    Debug_pushMessage("writeCycleCounter: %d\n", PersistenceData.writeCycleCounter);
+    Debug_pushMessage("tankRemain_microL: %d\n", PersistenceData.tankRemain_microL);
+    Debug_pushMessage("TravelDistance_highRes_mm: %d\n", PersistenceData.TravelDistance_highRes_mm);
+    Debug_pushMessage("checksum: %d\n", PersistenceData.checksum);
+    Debug_pushMessage("PSD Adress: 0x%04X\n", globals.eePersistanceAdress);
 }

 void Debug_printWifiInfo()
@@ -229,6 +309,8 @@ void Debug_ShowDTCs()
    char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
    char buff_active[9];

+    Debug_pushMessage("\n      timestamp | DTC-Nr. |   status | severity\n");
+
    for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
    {
        if (DTCStorage[i].Number < DTC_LAST_DTC)
@@ -247,7 +329,19 @@ void Debug_ShowDTCs()
            else
                strcpy(buff_active, "none");

-            Debug_pushMessage("%s \t %6d \t %s \t %d", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
+            Debug_pushMessage("%s   %7d   %8s   %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active);
        }
    }
+}
+
+void Debug_printHelp()
+{
+    char buff[64];
+
+    for (unsigned int i = sizeof(helpCmd) / 63; i < sizeof(helpCmd) / 63; i++)
+    {
+        memcpy_P(buff, (helpCmd + (i * 63)), 63);
+        buff[63] = 0;
+        Debug_pushMessage(buff);
+    }
 }
--- a/Software/src/debugger.h
+++ b/Software/src/debugger.h
@@ -1,45 +0,0 @@
-#ifndef _DEBUGGER_H_
-#define _DEBUGGER_H_
-
-#include <Arduino.h>
-#include "webui.h"
-
-const char helpCmd[] = "sysinfo     - System Info\r\n"
-                       "netinfo     - WiFi Info\r\n"
-                       "formatPDS   - Format Persistence EEPROM Data\r\n"
-                       "formatCFG   - Format Configuration EEPROM Data\r\n"
-                       "checkEE     - Check EEPROM with checksum\r\n"
-                       "dumpEE1k    - dump the first 1kb of EEPROM to Serial\r\n"
-                       "dumpEE      - dump the whole EPPROM to Serial\r\n"
-                       "resetPageEE - Reset the PersistenceData Page\r\n"
-                       "dumpCFG     - print Config struct\r\n"
-                       "dumpPDS     - print PersistanceStruct\r\n"
-                       "saveEE      - save EE-Data\r\n"
-                       "showdtc     - Show all DTCs\r\n"
-                       "dumpGlobals - print globals\r\n";
-
-typedef enum DebugStatus_e
-{
-    disabled,
-    enabled
-} DebugStatus_t;
-
-typedef enum DebugPorts_e
-{
-    dbg_Serial,
-    dbg_Webui,
-    dbg_cntElements
-} DebugPorts_t;
-
-const char sDebugPorts[dbg_cntElements][7] = {
-    "Serial",
-    "WebUI"};
-
-extern DebugStatus_t DebuggerStatus[dbg_cntElements];
-
-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);
-
-#endif
--- a/Software/src/dtc.cpp
+++ b/Software/src/dtc.cpp
@@ -1,9 +1,9 @@
 #include "dtc.h"
 #include "debugger.h"

-DTCEntry_s DTCStorage[MAX_DTC_STORAGE];
+DTCEntry_t DTCStorage[MAX_DTC_STORAGE];

-void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, uint32_t DebugValue)
+void MaintainDTC(DTCNum_t DTC_no, boolean active, uint32_t DebugValue)
 {
    for (int i = 0; i < MAX_DTC_STORAGE; i++)
    {
@@ -14,7 +14,6 @@ void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, u
                Debug_pushMessage("DTC gone active: %d, DebugVal: %d\n", DTC_no, DebugValue);
                DTCStorage[i].timestamp = millis();
                DTCStorage[i].active = DTC_ACTIVE;
-                DTCStorage[i].severity = DTC_severity;
                DTCStorage[i].debugVal = DebugValue;
            }
            if (!active && DTCStorage[i].active == DTC_ACTIVE)
@@ -39,21 +38,20 @@ void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, u
                DTCStorage[i].timestamp = millis();
                DTCStorage[i].active = DTC_ACTIVE;
                DTCStorage[i].debugVal = DebugValue;
-                DTCStorage[i].severity = DTC_severity;
                return;
            }
        }
    }
 }

-void ClearDTC(DTCNums_t DTC_no)
+void ClearDTC(DTCNum_t DTC_no)
 {
    for (int i = 0; i < MAX_DTC_STORAGE; i++)
    {
        if (DTCStorage[i].Number == DTC_no)
        {
            DTCStorage[i].Number = DTC_LAST_DTC;
-            DTCStorage[i].active = DTC_NONE;
+            DTCStorage[i].active = DTC_INACTIVE;
            DTCStorage[i].timestamp = 0;
        }
    }
@@ -64,12 +62,12 @@ void ClearAllDTC()
    for (int i = 0; i < MAX_DTC_STORAGE; i++)
    {
        DTCStorage[i].Number = DTC_LAST_DTC;
-        DTCStorage[i].active = DTC_NONE;
+        DTCStorage[i].active = DTC_INACTIVE;
        DTCStorage[i].timestamp = 0;
    }
 }

-DTCNums_t getlastDTC(boolean only_active)
+DTCNum_t getlastDTC(boolean only_active)
 {
    int8_t pointer = -1;
    uint32_t lasttimestamp = 0;
@@ -89,34 +87,28 @@ DTCNums_t getlastDTC(boolean only_active)
    return pointer >= 0 ? DTCStorage[pointer].Number : DTC_LAST_DTC;
 }

-DTCNums_t getlastDTC_Severity(boolean only_active, DTCSeverity_t severity)
+DTCSeverity_t getSeverityForDTC(DTCNum_t targetCode)
 {
-    int8_t pointer = -1;
-    uint32_t lasttimestamp = 0;
-
-    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    for (int i = 0; i < DTC_LAST_DTC; i++)
    {
-        if (DTCStorage[i].Number > 0 && DTCStorage[i].timestamp > lasttimestamp)
+        if (dtc_definitions[i].code == targetCode)
        {
-            if ((only_active == false || DTCStorage[i].active == DTC_ACTIVE) && DTCStorage[i].severity == severity)
-            {
-                pointer = i;
-                lasttimestamp = DTCStorage[i].timestamp;
-            }
+            return dtc_definitions[i].severity;
        }
    }
-
-    return pointer >= 0 ? DTCStorage[pointer].Number : DTC_LAST_DTC;
+    return DTC_NONE;
 }

 void DTC_Process()
 {
    static tSystem_Status preserverSysStatusError;
+    DTCNum_t lastDTC = getlastDTC(true);

-    if (getlastDTC(false) < DTC_LAST_DTC)
+    if (lastDTC < DTC_LAST_DTC)
    {
        globals.hasDTC = true;
-        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC)
+
+        if (getSeverityForDTC(lastDTC) == DTC_CRITICAL && globals.systemStatus != sysStat_Shutdown)
        {
            if (globals.systemStatus != sysStat_Error)
            {
@@ -124,16 +116,14 @@ void DTC_Process()
            }
            globals.systemStatus = sysStat_Error;
        }
-        else
-        {
-            if (globals.systemStatus == sysStat_Error)
-            {
-                globals.systemStatus = preserverSysStatusError;
-            }
-        }
    }
    else
    {
        globals.hasDTC = false;
+        
+        if (globals.systemStatus == sysStat_Error)
+        {
+            globals.systemStatus = preserverSysStatusError;
+        }
    }
 }
--- a/Software/src/dtc.h
+++ b/Software/src/dtc.h
@@ -1,61 +0,0 @@
-#ifndef _DTC_H_
-#define _DTC_H_
-
-#include <Arduino.h>
-
-#define MAX_DTC_STORAGE 6
-
-typedef enum DTCNums_e
-{
-  DTC_TANK_EMPTY = 1,
-  DTC_TANK_LOW,
-  DTC_NO_EEPROM_FOUND,
-  DTC_EEPROM_CFG_BAD,
-  DTC_EEPROM_PDS_BAD,
-  DTC_EEPROM_PDSADRESS_BAD,
-  DTC_EEPROM_VERSION_BAD,
-  DTC_FLASHFS_ERROR,
-  DTC_FLASHFS_VERSION_ERROR,
-#ifdef FEATURE_ENABLE_GPS
-  DTC_NO_GPS_SERIAL,
-#endif
-#ifdef FEATURE_ENABLE_CAN
-  DTC_CAN_TRANSCEIVER_FAILED,
-  DTC_NO_CAN_SIGNAL,
-#endif
-  DTC_EEPROM_CFG_SANITY,
-  DTC_LAST_DTC
-} DTCNums_t;
-
-typedef enum DTCActive_e
-{
-  DTC_NONE,
-  DTC_ACTIVE,
-  DTC_PREVIOUS
-} DTCActive_t;
-
-typedef enum DTCSeverity_e
-{
-  DTC_INFO,
-  DTC_WARN,
-  DTC_CRITICAL
-} DTCSeverity_t;
-
-typedef struct DTCEntry_s
-{
-  DTCNums_t Number;
-  uint32_t timestamp;
-  DTCActive_t active;
-  DTCSeverity_t severity;
-  uint32_t debugVal;
-} DTCEntry_t;
-
-void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, uint32_t DebugValue = 0);
-void ClearDTC(DTCNums_t DTC_no);
-void ClearAllDTC();
-DTCNums_t getlastDTC(boolean only_active);
-DTCNums_t getlastDTC_Severity(boolean only_active, DTCSeverity_t severity);
-void DTC_Process();
-
-extern DTCEntry_s DTCStorage[MAX_DTC_STORAGE];
-#endif
--- a/Software/src/dtc_defs.txt
+++ b/Software/src/dtc_defs.txt
@@ -0,0 +1,18 @@
+# No. |                 DTC-Constant |      Severity |                 Title | Description     
+#-----|------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------
+    1;                DTC_TANK_EMPTY;   DTC_CRITICAL;          Ölvorrat leer;  Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen
+    2;                  DTC_TANK_LOW;       DTC_WARN;       Ölvorrat niedrig;  Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen
+    3;           DTC_NO_EEPROM_FOUND;   DTC_CRITICAL;    kein EEPROM erkannt;  Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten.
+    4;            DTC_EEPROM_CFG_BAD;   DTC_CRITICAL;  EEPROM CFG Checksumme;  Die Checksumme der Config-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück
+    5;            DTC_EEPROM_PDS_BAD;   DTC_CRITICAL;  EEPROM PDS Checksumme;  Die Checksumme der Betriebsdaten-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück
+    6;      DTC_EEPROM_PDSADRESS_BAD;   DTC_CRITICAL;     EEPROM PDS Adresse;  Die Adresse der Betriebsdaten-Partition im EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück
+    7;        DTC_EEPROM_VERSION_BAD;   DTC_CRITICAL;  EEPROM Version falsch;  Die Layout-Version des EEPROM stimmt nicht mit der Firmware-Version überein. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück
+    8;             DTC_FLASHFS_ERROR;   DTC_CRITICAL;   Flashspeicher Fehler;  Der Flashspeicher konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware
+    9;     DTC_FLASHFS_VERSION_ERROR;   DTC_CRITICAL;    Flashversion falsch;  Die Version des Flashspeicher stimmt nicht mit der Firmware-Version überein. Aktualisieren sie den Flash mit der passenden Update-Datei
+   10;             DTC_NO_GPS_SERIAL;   DTC_CRITICAL;   Keine GPS-Verbindung;  Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul
+   11;    DTC_CAN_TRANSCEIVER_FAILED;   DTC_CRITICAL;  CAN-Transceiver Error;  Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte
+   12;             DTC_NO_CAN_SIGNAL;       DTC_WARN;   Keine CAN-Verbindung;  Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen
+   13;         DTC_EEPROM_CFG_SANITY;       DTC_WARN;     Config-Validierung;  Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen
+   14;             DTC_FAKE_DTC_INFO;       DTC_INFO;         Dummy-DTC Info;  Ein Dummy-DTC der Schwere "Info" für Debugging-Zwecke
+   15;             DTC_FAKE_DTC_WARN;       DTC_WARN;      Dummy-DTC Warnung;  Ein Dummy-DTC der Schwere "Warnung" für Debugging-Zwecke
+   16;             DTC_FAKE_DTC_CRIT;   DTC_CRITICAL;     Dummy-DTC Kritisch;  Ein Dummy-DTC der Schwere "Kritisch" für Debugging-Zwecke
--- a/Software/src/globals.cpp
+++ b/Software/src/globals.cpp
@@ -8,4 +8,6 @@ void initGlobals()
  globals.requestEEAction = EE_IDLE;
  globals.resumeStatus = sysStat_Normal;
  globals.systemStatus = sysStat_Startup;
+  globals.measurementActive = false;
+  globals.measuredPulses = 0;
 }
--- a/Software/src/gps.cpp
+++ b/Software/src/gps.cpp
@@ -1,4 +1,3 @@
-#ifdef FEATURE_ENABLE_GPS
 #include "gps.h"

 TinyGPSPlus gps;
@@ -50,10 +49,7 @@ uint32_t Process_GPS_WheelSpeed()
            lastRecTimestamp = millis();
        }
    }
-
-    MaintainDTC(DTC_NO_GPS_SERIAL,DTC_CRITICAL, (millis() > lastRecTimestamp + 10000));
+    MaintainDTC(DTC_NO_GPS_SERIAL, (millis() > lastRecTimestamp + 10000));

    return 0;
-}
-
-#endif
+}
--- a/Software/src/lubeapp.cpp
+++ b/Software/src/lubeapp.cpp
@@ -7,8 +7,8 @@ void RunLubeApp(uint32_t add_milimeters)

    globals.TankPercentage = PersistenceData.tankRemain_microL / (LubeConfig.tankCapacity_ml * 10);

-    MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL));
-    MaintainDTC(DTC_TANK_LOW, DTC_WARN, (globals.TankPercentage < LubeConfig.TankRemindAtPercentage));
+    MaintainDTC(DTC_TANK_EMPTY, (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL));
+    MaintainDTC(DTC_TANK_LOW, (globals.TankPercentage < LubeConfig.TankRemindAtPercentage));

    // Add traveled Distance in mm
    PersistenceData.TravelDistance_highRes_mm += add_milimeters;
@@ -22,6 +22,7 @@ void RunLubeApp(uint32_t add_milimeters)
    switch (globals.systemStatus)
    {
    case sysStat_Startup:
+        strcpy_P(globals.systemStatustxt, PSTR("Startup"));
        if (millis() > STARTUP_DELAY)
        {
            globals.systemStatus = sysStat_Normal;
@@ -30,6 +31,7 @@ void RunLubeApp(uint32_t add_milimeters)
        break;

    case sysStat_Normal:
+        strcpy_P(globals.systemStatustxt, PSTR("Normal"));
        if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Default)
        {
            LubePulse();
@@ -38,6 +40,7 @@ void RunLubeApp(uint32_t add_milimeters)
        break;

    case sysStat_Rain:
+        strcpy_P(globals.systemStatustxt, PSTR("Rain"));
        if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Rain)
        {
            LubePulse();
@@ -45,12 +48,14 @@ void RunLubeApp(uint32_t add_milimeters)
        }
        break;
    case sysStat_Purge:
+        strcpy_P(globals.systemStatustxt, PSTR("Purge"));
        if (globals.purgePulses > 0)
        {
            if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis())
            {
                LubePulse();
                globals.purgePulses--;
+                Debug_pushMessage("Purge remain: %d\n", globals.purgePulses);
            }
        }
        else
@@ -58,32 +63,14 @@ void RunLubeApp(uint32_t add_milimeters)
            globals.systemStatus = globals.resumeStatus;
        }
        break;
-    case sysStat_Error:
-    case sysStat_Shutdown:
-    default:
-        break;
-    }
-
-    switch (globals.systemStatus)
-    {
-    case sysStat_Normal:
-        strcpy_P(globals.systemStatustxt, PSTR("Normal"));
-        break;
-    case sysStat_Purge:
-        strcpy_P(globals.systemStatustxt, PSTR("Purge"));
-        break;
-    case sysStat_Rain:
-        strcpy_P(globals.systemStatustxt, PSTR("Rain"));
-        break;
-    case sysStat_Startup:
-        strcpy_P(globals.systemStatustxt, PSTR("Startup"));
-        break;
    case sysStat_Error:
        strcpy_P(globals.systemStatustxt, PSTR("Error"));
        break;
    case sysStat_Shutdown:
        strcpy_P(globals.systemStatustxt, PSTR("Shutdown"));
        break;
+    default:
+        break;
    }

    // maintain Pin-State of Lube-Pump
--- a/Software/src/main.cpp
+++ b/Software/src/main.cpp
@@ -6,7 +6,7 @@
 #include <ESP8266WiFi.h>
 #include <ArduinoOTA.h>

-#include <FastLED.h>
+#include <Adafruit_NeoPixel.h>
 #include <Ticker.h>

 #include "common.h"
@@ -18,13 +18,10 @@
 #include "config.h"
 #include "globals.h"
 #include "debugger.h"
-#ifdef FEATURE_ENABLE_CAN
 #include "can.h"
-#endif
-#ifdef FEATURE_ENABLE_GPS
 #include "gps.h"
-#endif
 #include "dtc.h"
+#include "led_colors.h"

 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 #include <ESP8266WiFiMulti.h>
@@ -39,11 +36,11 @@ ESP8266WiFiMulti wifiMulti;
 bool startSetupMode = false;
 volatile uint32_t wheel_pulse = 0;

-CRGB leds[1];
+Adafruit_NeoPixel leds(1, GPIO_LED, NEO_RGB + NEO_KHZ800);

 // Function-Prototypes
 void IRAM_ATTR trigger_ISR();
-void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White);
+void LED_Process(uint8_t override = false, uint32_t setColor = LED_DEFAULT_COLOR);
 #ifdef FEATURE_ENABLE_OLED
 U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
 void Display_Process();
@@ -78,42 +75,46 @@ void setup()
 #endif

  Serial.begin(115200);
-  Serial.println("\n\nSouko's ChainLube Mk1");
-  Serial.println(globals.DeviceName);
+  Serial.print("\n\nSouko's ChainLube Mk1\n");
+  Serial.print(globals.DeviceName);
+
+#ifdef FEATURE_ENABLE_OLED
+  u8x8.begin();
+  u8x8.setFont(u8x8_font_chroma48medium8_r);
+  u8x8.clearDisplay();
+  u8x8.drawString(0, 0, "KTM ChainLube V1");
+  u8x8.refreshDisplay();
+  Serial.print("\nDisplay-Init done");
+#endif

  InitEEPROM();
  GetConfig_EEPROM();
  GetPersistence_EEPROM();
-#ifdef FEATURE_ENABLE_OLED
-  u8x8.begin();
-  u8x8.setFont(u8x8_font_chroma48medium8_r);
-#endif
-  FastLED.addLeds<WS2811, GPIO_LED, RGB>(leds, 1); // GRB ordering is assumed
+  Serial.print("\nEE-Init done");
+
+  leds.begin();
+  Serial.print("\nLED-Init done");

  switch (LubeConfig.SpeedSource)
  {
+  case SOURCE_CAN:
+    Init_CAN();
+    Serial.print("\nCAN-Init done");
+    break;
+  case SOURCE_GPS:
+    Init_GPS();
+    Serial.print("\nGPS-Init done");
+    break;
  case SOURCE_IMPULSE:
    pinMode(GPIO_TRIGGER, INPUT_PULLUP);
    attachInterrupt(digitalPinToInterrupt(GPIO_TRIGGER), trigger_ISR, FALLING);
+    Serial.print("\nPulse-Input Init done");
    break;
-#ifdef FEATURE_ENABLE_GPS
-  case SOURCE_GPS:
-    Init_GPS();
-    break;
-#endif
-  case SOURCE_TIME:
-
-    break;
-#ifdef FEATURE_ENABLE_CAN
-  case SOURCE_CAN:
-    Init_CAN();
-    break;
-#endif
  default:
-    Debug_pushMessage("Source Setting N/A");
    break;
  }

+  Serial.print("\nSource-Init done");
  pinMode(GPIO_BUTTON, INPUT_PULLUP);
  pinMode(GPIO_PUMP, OUTPUT);

@@ -148,17 +149,13 @@ void setup()
                     u8x8.refreshDisplay(); });
 #endif
  ArduinoOTA.begin();
-
-#ifdef FEATURE_ENABLE_OLED
-  u8x8.clearDisplay();
-  u8x8.drawString(0, 0, "KTM ChainLube V1");
-  u8x8.refreshDisplay();
-#endif
-
+  Serial.print("\nOTA-Init done");
  initWebUI();
+  Serial.print("\nWebUI-Init done");
  initGlobals();
+  Serial.print("\nglobals-Init done");
  EEPROMCyclicPDSTicker.start();
-  Serial.println("Setup Done");
+  Serial.print("\nSetup Done\n");
 }

 void loop()
@@ -170,29 +167,33 @@ void loop()
  case SOURCE_IMPULSE:
    wheelDistance = Process_Impulse_WheelSpeed();
    break;
-#ifdef FEATURE_ENABLE_CAN
  case SOURCE_CAN:
    wheelDistance = Process_CAN_WheelSpeed();
    break;
-#endif
+
+#ifdef FEATURE_ENABLE_TIMER
  case SOURCE_TIME:
    break;
-#ifdef FEATURE_ENABLE_GPS
+#endif
  case SOURCE_GPS:
    wheelDistance = Process_GPS_WheelSpeed();
    break;
-#endif
  }

  RunLubeApp(wheelDistance);
 #ifdef FEATURE_ENABLE_OLED
  Display_Process();
 #endif
+  if (LubeConfig.SpeedSource != SOURCE_IMPULSE)
+  {
+    CAN_Process();
+  }
  Button_Process();
  LED_Process();
  EEPROM_Process();
  Webserver_Process();
  DTC_Process();
+  Debug_Process();

  ArduinoOTA.handle();
  EEPROMCyclicPDSTicker.update();
@@ -247,7 +248,7 @@ void trigger_ISR()
  wheel_pulse++;
 }

-void LED_Process(uint8_t override, CRGB SetColor)
+void LED_Process(uint8_t override, uint32_t SetColor)
 {
  typedef enum
  {
@@ -258,16 +259,18 @@ void LED_Process(uint8_t override, CRGB SetColor)
    LED_Confirm_Rain,
    LED_Purge,
    LED_Error,
+    LED_Shutdown,
    LED_Override
  } tLED_Status;

  static tSystem_Status oldSysStatus = sysStat_Startup;
  static tLED_Status LED_Status = LED_Startup;
-  static CRGB LED_override_color = 0;
+  static uint32_t LED_override_color = 0;
  static tLED_Status LED_ResumeOverrideStatus = LED_Startup;

  uint8_t color = 0;
  uint32_t timer = 0;
+  uint32_t animtimer = 0;
  static uint32_t timestamp = 0;
  timer = millis();

@@ -276,7 +279,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
    if (LED_Status != LED_Override)
    {
      LED_ResumeOverrideStatus = LED_Status;
-      Debug_pushMessage("Override LED_Status");
+      Debug_pushMessage("Override LED_Status\n");
    }
    LED_Status = LED_Override;
    LED_override_color = SetColor;
@@ -287,7 +290,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
    if (LED_Status == LED_Override)
    {
      LED_Status = LED_ResumeOverrideStatus;
-      Debug_pushMessage("Resume LED_Status");
+      Debug_pushMessage("Resume LED_Status\n");
    }
  }

@@ -297,27 +300,30 @@ void LED_Process(uint8_t override, CRGB SetColor)
    {
    case sysStat_Startup:
      LED_Status = LED_Startup;
-      Debug_pushMessage("sysStat: Startup");
+      Debug_pushMessage("sysStat: Startup\n");
      break;
    case sysStat_Normal:
      timestamp = timer + 3500;
      LED_Status = LED_Confirm_Normal;
-      Debug_pushMessage("sysStat: Normal");
+      Debug_pushMessage("sysStat: Normal\n");
      break;
    case sysStat_Rain:
      timestamp = timer + 3500;
      LED_Status = LED_Confirm_Rain;
-      Debug_pushMessage("sysStat: Rain");
+      Debug_pushMessage("sysStat: Rain\n");
      break;
    case sysStat_Purge:
      LED_Status = LED_Purge;
-      Debug_pushMessage("sysStat: Purge");
+      Debug_pushMessage("sysStat: Purge\n");
      break;
    case sysStat_Error:
      LED_Status = LED_Error;
-      Debug_pushMessage("sysStat: Error");
+      Debug_pushMessage("sysStat: Error\n");
      break;
    case sysStat_Shutdown:
+      LED_Status = LED_Shutdown;
+      Debug_pushMessage("sysStat: Shutdown\n");
+      break;
    default:
      break;
    }
@@ -327,84 +333,105 @@ void LED_Process(uint8_t override, CRGB SetColor)
  switch (LED_Status)
  {
  case LED_Startup:
-    FastLED.setBrightness(255);
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);

    if (globals.TankPercentage < LubeConfig.TankRemindAtPercentage)
-      leds[0] = CRGB::OrangeRed;
+      leds.setPixelColor(0, LED_STARTUP_TANKWARN);
    else
-      leds[0] = CRGB::White;
+      leds.setPixelColor(0, LED_STARTUP_NORMAL);
    break;

  case LED_Confirm_Normal:
-    FastLED.setBrightness(255);
-    leds[0] = timer % 250 > 125 ? CRGB(0, 255, 0) : CRGB(0, 4, 0);
+    animtimer = timer % 500;
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
+
    if (timestamp < timer)
    {
      LED_Status = LED_Normal;
-      FastLED.setBrightness(64);
-      Debug_pushMessage("LED_Status: Confirm -> Normal");
+      Debug_pushMessage("LED_Status: Confirm -> Normal\n");
    }
    break;

  case LED_Normal:
-#ifndef NO_MODE_FLASH
-    if (timer % 2000 > 1950)
-      leds[0] = CRGB(0, 255, 0);
-    else if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1800 && timer % 2000 < 1850)
-#else
-    if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1950)
-#endif
-      leds[0] = CRGB(255, 128, 0);
-    else
-      leds[0] = CRGB(0, 4, 0);
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
+
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
+      leds.setPixelColor(0, LED_WIFI_BLINK);
+
    break;

  case LED_Confirm_Rain:
-    FastLED.setBrightness(255);
-    leds[0] = timer % 250 > 125 ? CRGB(0, 0, 255) : CRGB(0, 0, 4);
+    animtimer = timer % 500;
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_RAIN_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
    if (timestamp < timer)
    {
      LED_Status = LED_Rain;
-      FastLED.setBrightness(64);
-      Debug_pushMessage("LED_Status: Confirm -> Rain");
+      Debug_pushMessage("LED_Status: Confirm -> Rain\n");
    }
    break;

  case LED_Rain:
-#ifndef NO_MODE_FLASH
-    if (timer % 2000 > 1950)
-      leds[0] = CRGB(0, 0, 255);
-    else if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1800 && timer % 2000 < 1850)
-#else
-    if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1950)
-#endif
-      leds[0] = CRGB(255, 128, 0);
-    else
-      leds[0] = CRGB(0, 0, 4);
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    leds.setPixelColor(0, LED_RAIN_COLOR);
+
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
+      leds.setPixelColor(0, LED_WIFI_BLINK);
+
    break;

  case LED_Purge:
    timer = timer % 500;
-    color = timer / 2;
-    leds[0] = CRGB::DeepPink;
+    color = map(timer / 2, 0, 250, LubeConfig.LED_Min_Brightness, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_PURGE_COLOR);
    if (timer < 250)
-      FastLED.setBrightness(color);
+      leds.setBrightness(color);
    else
-      FastLED.setBrightness(250 - color);
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
    break;

  case LED_Error:
-    leds[0] = timer % 500 > 250 ? CRGB::Red : CRGB::Black;
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, timer % 500 > 250 ? LED_ERROR_BLINK : 0);
+    break;
+
+  case LED_Shutdown:
+    timer = timer % 600;
+    leds.setPixelColor(0, LED_SHUTDOWN_BLINK);
+    if (timer < 500)
+    {
+      color = map(timer, 0, 500, LubeConfig.LED_Max_Brightness, LubeConfig.LED_Min_Brightness);
+      leds.setBrightness(color);
+    }
+    else
+    {
+      leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    }
    break;

  case LED_Override:
-    leds[0] = LED_override_color;
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_override_color);
    break;

  default:
    break;
  }
-  FastLED.show();
+  leds.show();
 }
 #ifdef FEATURE_ENABLE_OLED
 void Display_Process()
@@ -468,22 +495,22 @@ void Button_Process()

    if (buttonTimestamp + BUTTON_ACTION_DELAY_NOTHING < millis())
    {
-      LED_Process(1, CRGB::White);
+      LED_Process(1, COLOR_WARM_WHITE);
      buttonAction = BTN_NOTHING;
    }
    else if (buttonTimestamp + BUTTON_ACTION_DELAY_WIFI < millis())
    {
-      LED_Process(1, CRGB::Yellow);
+      LED_Process(1, LED_WIFI_BLINK);
      buttonAction = BTN_TOGGLEWIFI;
    }
    else if (buttonTimestamp + BUTTON_ACTION_DELAY_PURGE < millis())
    {
-      LED_Process(1, CRGB::DeepPink);
+      LED_Process(1, LED_PURGE_COLOR);
      buttonAction = BTN_STARTPURGE;
    }
    else if (buttonTimestamp + BUTTON_ACTION_DELAY_TOGGLEMODE < millis())
    {
-      CRGB color = globals.systemStatus == sysStat_Normal ? CRGB::Blue : CRGB::Green;
+      uint32_t color = globals.systemStatus == sysStat_Normal ? LED_RAIN_COLOR : LED_NORMAL_COLOR;
      LED_Process(1, color);
      buttonAction = BTN_TOGGLEMODE;
    }
@@ -496,13 +523,13 @@ void Button_Process()
      {
      case BTN_TOGGLEWIFI:
        toggleWiFiAP();
-        Debug_pushMessage("Starting WiFi AP");
+        Debug_pushMessage("Starting WiFi AP\n");
        break;

      case BTN_STARTPURGE:
        globals.systemStatus = sysStat_Purge;
        globals.purgePulses = LubeConfig.BleedingPulses;
-        Debug_pushMessage("Starting Purge");
+        Debug_pushMessage("Starting Purge\n");
        break;

      case BTN_TOGGLEMODE:
@@ -520,12 +547,12 @@ void Button_Process()
        default:
          break;
        }
-        Debug_pushMessage("Toggling Mode");
+        Debug_pushMessage("Toggling Mode\n");
        break;

      case BTN_NOTHING:
      default:
-        Debug_pushMessage("Nothing or invalid");
+        Debug_pushMessage("Nothing or invalid\n");
        break;
      }
      LED_Process(2);
@@ -540,7 +567,7 @@ void toggleWiFiAP(boolean shutdown)
  if (WiFi.getMode() != WIFI_OFF)
  {
    WiFi.mode(WIFI_OFF);
-    Debug_pushMessage("WiFi turned off");
+    Debug_pushMessage("WiFi turned off\n");
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
    WiFiMaintainConnectionTicker.stop();
 #endif
@@ -552,9 +579,9 @@ void toggleWiFiAP(boolean shutdown)
    WiFi.softAP(globals.DeviceName, QUOTE(WIFI_AP_PASSWORD));
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
    WiFiMaintainConnectionTicker.stop();
-    Debug_pushMessage("WiFi AP started, stopped Maintain-Timer");
+    Debug_pushMessage("WiFi AP started, stopped Maintain-Timer\n");
 #else
-    Debug_pushMessage("WiFi AP started");
+    Debug_pushMessage("WiFi AP started\n");
 #endif
  }
 }
@@ -578,11 +605,15 @@ void SystemShutdown()

 uint32_t Process_Impulse_WheelSpeed()
 {
-  uint32_t add_milimeters;
+  uint32_t add_milimeters = 0;
  // Calculate traveled Distance in mm
-  add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
+  if (LubeConfig.PulsePerRevolution != 0)
+    add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
+
+  if (globals.measurementActive == true)
+    globals.measuredPulses = globals.measuredPulses + wheel_pulse;
+
  wheel_pulse = 0;

  return add_milimeters;
 }
-
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -13,38 +13,37 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
 void WebServerEEJSON_Callback(AsyncWebServerRequest *request);
 void GetFlashVersion(char *buff, size_t buff_size);

-#ifdef FEATURE_ENABLE_WEBSOCKETS
-
 AsyncWebSocket webSocket("/ws");

 void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
 void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len);
-
-#endif
+void Websocket_RefreshClientData_DTCs(uint32_t client_id);
+void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping = false);
+void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping = false);

 void initWebUI()
 {
  if (!LittleFS.begin())
  {
    Debug_pushMessage("An Error has occurred while mounting LittleFS\n");
-    MaintainDTC(DTC_FLASHFS_ERROR, DTC_CRITICAL, true);
+    MaintainDTC(DTC_FLASHFS_ERROR, true);
    return;
  }

  GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));

-  if (strcmp(globals.FlashVersion, QUOTE(FLASH_FS_VERSION)))
+  char buffer[6];
+  snprintf(buffer, sizeof(buffer), "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  if (strcmp(globals.FlashVersion, buffer))
  {
-    MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
+    MaintainDTC(DTC_FLASHFS_VERSION_ERROR, true);
  }

  MDNS.begin(globals.DeviceName);
  MDNS.addService("http", "tcp", 80);

-#ifdef FEATURE_ENABLE_WEBSOCKETS
  webSocket.onEvent(WebsocketEvent_Callback);
  webServer.addHandler(&webSocket);
-#endif

  webServer.serveStatic("/static/", LittleFS, "/static/").setCacheControl("max-age=360000");
  webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
@@ -63,13 +62,22 @@ void initWebUI()

 void Webserver_Process()
 {
-#ifdef FEATURE_ENABLE_WEBSOCKETS
+  static uint32_t previousMillis = 0;
+
  webSocket.cleanupClients();
-#endif
+
+  if ((webSocket.count() > 0) && (millis() - previousMillis >= 10000))
+  {
+    Websocket_RefreshClientData_DTCs(0);
+    Websocket_RefreshClientData_Status(0);
+    previousMillis = millis();
+  }
 }

 String processor(const String &var)
 {
+  if (var == "HOSTNAME")
+    return String(globals.DeviceName);
  if (var == "TANK_REMAIN_CAPACITY")
    return String((PersistenceData.tankRemain_microL / 10) / LubeConfig.tankCapacity_ml);
  if (var == "LUBE_DISTANCE_NORMAL")
@@ -97,17 +105,19 @@ String processor(const String &var)
  if (var == "SPEED_SOURCE")
    return String(SpeedSourceString[LubeConfig.SpeedSource]);
  if (var == "GPS_BAUD")
-#ifdef FEATURE_ENABLE_GPS
    return String(GPSBaudRateString[LubeConfig.GPSBaudRate]);
-#else
-    return "Feature N/A";
-#endif
  if (var == "CAN_SOURCE")
-#ifdef FEATURE_ENABLE_CAN
    return String(CANSourceString[LubeConfig.CANSource]);
-#else
-    return "Feature N/A";
-#endif
+  if (var == "LED_MODE_FLASH")
+    return String(LubeConfig.LED_Mode_Flash);
+  if (var == "LEDFLASHCHECKED")
+    return String(LubeConfig.LED_Mode_Flash == true ? "checked" : "");
+  if (var == "LED_MAX_BRIGHTNESS")
+    return String(LubeConfig.LED_Max_Brightness);
+  if (var == "LED_MIN_BRIGHTNESS")
+    return String(LubeConfig.LED_Min_Brightness);
+  if (var == "EEPROM_VERSION")
+    return String(LubeConfig.EEPROM_Version);
  if (var == "CONFIG_CHECKSUM")
  {
    char buffer[7];
@@ -135,66 +145,9 @@ String processor(const String &var)
  if (var == "SHOW_IMPULSE_SETTINGS")
    return LubeConfig.SpeedSource == SOURCE_IMPULSE ? "" : "hidden";
  if (var == "SHOW_CAN_SETTINGS")
-#ifdef FEATURE_ENABLE_CAN
    return LubeConfig.SpeedSource == SOURCE_CAN ? "" : "hidden";
-#else
-    return "hidden";
-#endif
  if (var == "SHOW_GPS_SETTINGS")
-#ifdef FEATURE_ENABLE_GPS
    return LubeConfig.SpeedSource == SOURCE_GPS ? "" : "hidden";
-#else
-    return "hidden";
-#endif
-  if (var == "SHOW_DTC_TABLE")
-    return globals.hasDTC ? "" : "hidden";
-
-  if (var == "DTC_TABLE")
-  {
-    String temp = "";
-    char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
-
-    for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
-    {
-      if (DTCStorage[i].Number < DTC_LAST_DTC)
-      {
-        sprintf(buff_timestamp, "%02d-%02d:%02d:%02d:%03d",
-                DTCStorage[i].timestamp / 86400000,    // Days
-                DTCStorage[i].timestamp / 360000 % 24, // Hours
-                DTCStorage[i].timestamp / 60000 % 60,  // Minutes
-                DTCStorage[i].timestamp / 1000 % 60,   // Seconds
-                DTCStorage[i].timestamp % 1000);       // milliseconds
-
-        temp = temp + "<tr data-dtc=" + String(DTCStorage[i].Number);
-        temp = temp + " data-debugval=" + String(DTCStorage[i].debugVal) + "><td>" + String(buff_timestamp);
-        temp = temp + "</td><td>" + String(DTCStorage[i].Number) + "</td><td>";
-        temp = temp + "<img src=static/img/";
-        switch (DTCStorage[i].severity)
-        {
-        case DTC_CRITICAL:
-          temp = temp + "critical";
-          break;
-        case DTC_WARN:
-          temp = temp + "warn";
-          break;
-        case DTC_INFO:
-          temp = temp + "info";
-          break;
-        }
-        temp = temp + ".png></td><td>";
-
-        if (DTCStorage[i].active == DTC_ACTIVE)
-          temp = temp + "active";
-        else if (DTCStorage[i].active == DTC_PREVIOUS)
-          temp = temp + "previous";
-        else
-          temp = temp + "none";
-
-        temp = temp + "</td></tr>";
-      }
-    }
-    return temp;
-  }

  if (var == "SOURCE_SELECT_OPTIONS")
  {
@@ -207,7 +160,6 @@ String processor(const String &var)
    return temp;
  }

-#ifdef FEATURE_ENABLE_CAN
  if (var == "CANSOURCE_SELECT_OPTIONS")
  {
    String temp;
@@ -218,8 +170,7 @@ String processor(const String &var)
    }
    return temp;
  }
-#endif
-#ifdef FEATURE_EABLE_GPS
+
  if (var == "GPSBAUD_SELECT_OPTIONS")
  {
    String temp;
@@ -230,17 +181,29 @@ String processor(const String &var)
    }
    return temp;
  }
-#endif

  if (var == "SYSTEM_STATUS")
    return String(globals.systemStatustxt);
+
  if (var == "SW_VERSION")
  {
-    return String(QUOTE(SW_VERSION));
+    char buffer[6];
+    snprintf(buffer, sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor);
+    return String(buffer);
  }
+
  if (var == "FS_VERSION")
    return String(globals.FlashVersion);

+  if (var == "GIT_REV")
+    return String(constants.GitHash);
+
+  if (var == "MEASURED_PULSES")
+    return String(globals.measuredPulses);
+
+  if (var == "MEASURE_BTN")
+    return String(globals.measurementActive == true ? "Stop" : "Start");
+
  if (var == "PLACEHOLDER")
    return "placeholder";

@@ -287,23 +250,19 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
      LubeConfig.PulsePerRevolution = p->value().toInt();
    if (p->name() == "pulsesave")
      globals.requestEEAction = EE_CFG_SAVE;
-      // end: POST Form Source Pulse Settings
-#ifdef FEATURE_EABLE_GPS
+    // end: POST Form Source Pulse Settings
    // begin: POST Form Source GPS Settings
    if (p->name() == "gpsbaud")
      LubeConfig.GPSBaudRate = (GPSBaudRate_t)p->value().toInt();
    if (p->name() == "gpssave")
      globals.requestEEAction = EE_CFG_SAVE;
-// end: POST Form Source GPS Settings
-#endif
-#ifdef FEATURE_EABLE_CAN
+    // end: POST Form Source GPS Settings
    // begin: POST Form Source CAN Settings
    if (p->name() == "cansource")
      LubeConfig.CANSource = (CANSource_t)p->value().toInt();
    if (p->name() == "cansave")
      globals.requestEEAction = EE_CFG_SAVE;
-// end: POST Form Source CAN Settings
-#endif
+    // end: POST Form Source CAN Settings
    // begin: POST Form Lubrication
    if (p->name() == "lubedistancenormal")
      LubeConfig.DistancePerLube_Default = p->value().toInt();
@@ -357,6 +316,32 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
      globals.systemStatus = sysStat_Shutdown;
    }
    // end: POST Form Maintenance
+    // begin: POST Form LED Settings
+    if (p->name() == "ledmaxbrightness")
+      LubeConfig.LED_Max_Brightness = p->value().toInt();
+    if (p->name() == "ledminbrightness")
+      LubeConfig.LED_Min_Brightness = p->value().toInt();
+    if (p->name() == "ledsave")
+    {
+      if (request->hasParam("ledmodeflash", true))
+      {
+        AsyncWebParameter *param = request->getParam("ledmodeflash", true);
+        if (param->value() == "on")
+          LubeConfig.LED_Mode_Flash = true;
+      }
+      else
+      {
+        LubeConfig.LED_Mode_Flash = false;
+      }
+      globals.requestEEAction = EE_CFG_SAVE;
+    }
+    // end: POST Form LED SEttings
+    // begin: POST Form Measure Pulses
+    if (p->name() == "measurereset")
+      globals.measuredPulses = 0;
+    if (p->name() == "measurestartstop")
+      globals.measurementActive = !globals.measurementActive;
+    // end: POST Form Measure Pulses
  }
 }

@@ -426,36 +411,85 @@ void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const Stri

 void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
 {
-
  bool ee_done = false;
-  bool validext = false;
+  static bool validext = false;
+  static char *buffer = NULL;
+  static uint32_t read_ptr = 0;
+  DeserializationError error;

  if (!index)
  {
-    Debug_pushMessage("EEPROM restore\n");
-    // size_t content_len = request->contentLength();
    validext = (filename.indexOf(".ee.json") > -1);
+    if (validext)
+    {
+      buffer = (char *)malloc(1536);
+      read_ptr = 0;
+      if (buffer == NULL)
+        Debug_pushMessage("malloc() failed for EEPROM-Restore");
+    }
  }

-  if (validext)
+  if (buffer != NULL)
  {
-    Debug_pushMessage("Restoring EEPROM-Stuff\n");
+    memcpy(buffer + read_ptr, data, len);
+    read_ptr = read_ptr + len;
  }

  if (final)
  {
+    if (buffer != NULL)
+    {
+      Serial.print(buffer);
+      StaticJsonDocument<1536> doc;
+      error = deserializeJson(doc, buffer);
+      if (error)
+      {
+        Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str());
+      }
+      else
+      {
+
+        LubeConfig.DistancePerLube_Default = doc["config"]["DistancePerLube_Default"].as<uint32_t>();
+        LubeConfig.DistancePerLube_Rain = doc["config"]["DistancePerLube_Rain"].as<uint32_t>();
+        LubeConfig.tankCapacity_ml = doc["config"]["tankCapacity_ml"].as<uint32_t>();
+        LubeConfig.amountPerDose_microL = doc["config"]["amountPerDose_microL"].as<uint32_t>();
+        LubeConfig.TankRemindAtPercentage = doc["config"]["TankRemindAtPercentage"].as<uint8_t>();
+        LubeConfig.PulsePerRevolution = doc["config"]["PulsePerRevolution"].as<uint8_t>();
+        LubeConfig.TireWidth_mm = doc["config"]["TireWidth_mm"].as<uint32_t>();
+        LubeConfig.TireWidthHeight_Ratio = doc["config"]["TireWidthHeight_Ratio"].as<uint32_t>();
+        LubeConfig.RimDiameter_Inch = doc["config"]["RimDiameter_Inch"].as<uint32_t>();
+        LubeConfig.DistancePerRevolution_mm = doc["config"]["DistancePerRevolution_mm"].as<uint32_t>();
+        LubeConfig.BleedingPulses = doc["config"]["BleedingPulses"].as<uint16_t>();
+        LubeConfig.SpeedSource = (SpeedSource_t)doc["config"]["SpeedSource"].as<int>();
+        LubeConfig.GPSBaudRate = (GPSBaudRate_t)doc["config"]["GPSBaudRate"].as<int>();
+        LubeConfig.CANSource = (CANSource_t)doc["config"]["CANSource"].as<int>();
+        LubeConfig.LED_Mode_Flash = doc["config"]["LED_Mode_Flash"].as<bool>();
+        LubeConfig.LED_Max_Brightness = doc["config"]["LED_Max_Brightness"].as<uint8_t>();
+        LubeConfig.LED_Min_Brightness = doc["config"]["LED_Min_Brightness"].as<uint8_t>();
+
+        PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>();
+        PersistenceData.tankRemain_microL = doc["persis"]["tankRemain_microL"].as<uint32_t>();
+        PersistenceData.TravelDistance_highRes_mm = doc["persis"]["TravelDistance_highRes_mm"].as<uint32_t>();
+        PersistenceData.odometer_mm = doc["persis"]["odometer_mm"].as<uint32_t>();
+        PersistenceData.odometer = doc["persis"]["odometer"].as<uint32_t>();
+        PersistenceData.checksum = doc["persis"]["checksum"].as<uint32_t>();
+
+        ee_done = true;
+      }
+    }
+
+    free(buffer);
+
    AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
    response->addHeader("Refresh", "20");
    response->addHeader("Location", "/");
    request->send(response);
+
    if (ee_done)
    {
      Debug_pushMessage("Update complete");
      globals.systemStatus = sysStat_Shutdown;
    }
-    else
-    {
-    }
  }
 }

@@ -468,8 +502,11 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
  char buffer[16];

  fwinfo["DeviceName"] = globals.DeviceName;
-  fwinfo["FW-Version"] = QUOTE(SW_VERSION);
+  sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  fwinfo["FW-Version"] = buffer;
  fwinfo["FS-Version"] = globals.FlashVersion;
+  snprintf_P(buffer, sizeof(buffer), "%s", constants.GitHash);
+  fwinfo["Git-Hash"] = buffer;

  JsonObject config = json.createNestedObject("config");

@@ -487,14 +524,13 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
  config["BleedingPulses"] = LubeConfig.BleedingPulses;
  config["SpeedSource"] = LubeConfig.SpeedSource;
  config["SpeedSource_Str"] = SpeedSourceString[LubeConfig.SpeedSource];
-#ifdef FEATURE_ENABLE_GPS
  config["GPSBaudRate"] = LubeConfig.GPSBaudRate;
  config["GPSBaudRate_Str"] = GPSBaudRateString[LubeConfig.GPSBaudRate];
-#endif
-#ifdef FEATURE_ENABLE_CAN
  config["CANSource"] = LubeConfig.CANSource;
  config["CANSource_Str"] = CANSourceString[LubeConfig.CANSource];
-#endif
+  config["LED_Mode_Flash"] = LubeConfig.LED_Mode_Flash;
+  config["LED_Max_Brightness"] = LubeConfig.LED_Max_Brightness;
+  config["LED_Min_Brightness"] = LubeConfig.LED_Min_Brightness;
  sprintf(buffer, "0x%08X", LubeConfig.checksum);
  config["checksum"] = buffer;

@@ -520,13 +556,15 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
  request->send(response);
 }

-#ifdef FEATURE_ENABLE_WEBSOCKETS
 void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
 {
  switch (type)
  {
  case WS_EVT_CONNECT:
    Debug_pushMessage("WebSocket client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
+    Websocket_RefreshClientData_Status(client->id(), true);
+    Websocket_RefreshClientData_Static(client->id(), true);
+    Websocket_RefreshClientData_DTCs(client->id());
    break;
  case WS_EVT_DISCONNECT:
    Debug_pushMessage("WebSocket client #%u disconnected\n", client->id());
@@ -566,6 +604,154 @@ void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len)

 void Websocket_PushLiveDebug(String Message)
 {
-  webSocket.textAll(Message + "\n");
+  webSocket.textAll("DEBUG:" + Message);
 }
-#endif
+
+void Websocket_RefreshClientData_DTCs(uint32_t client_id)
+{
+  String temp = "DTC:";
+
+  // Build DTC-String
+  if (globals.hasDTC != true)
+  {
+    temp.concat(String(DTC_NO_DTC) + ";");
+  }
+  else
+  {
+    for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+      if (DTCStorage[i].Number < DTC_LAST_DTC)
+      {
+        temp.concat(String(DTCStorage[i].timestamp) + ",");
+        temp.concat(String(DTCStorage[i].Number) + ",");
+        temp.concat(String(getSeverityForDTC(DTCStorage[i].Number)) + ",");
+        temp.concat(String(DTCStorage[i].active) + ",");
+        temp.concat(String(DTCStorage[i].debugVal) + ";");
+      }
+    }
+  }
+  if (client_id > 0)
+  {
+    webSocket.text(client_id, temp);
+  }
+  else
+  {
+    webSocket.textAll(temp);
+  }
+}
+
+void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
+{
+
+  if (send_mapping)
+  {
+    const char mapping[] = "MAPPING_STATUS:"
+                           "SystemStatus;"
+                           "TankRemain;"
+                           "TravelDistance_hr;"
+                           "Odometer;"
+                           "Odometer_mm;"
+                           "writeCycleCounter;"
+                           "BleedingPulses;"
+                           "TankPercent;";
+
+    if (client_id > 0)
+      webSocket.text(client_id, mapping);
+    else
+      webSocket.textAll(mapping);
+  }
+
+  String temp = "STATUS:";
+
+  temp.concat(String(globals.systemStatustxt) + ";");
+  temp.concat(String(PersistenceData.tankRemain_microL) + ";");
+  temp.concat(String(PersistenceData.TravelDistance_highRes_mm) + ";");
+  temp.concat(String(PersistenceData.odometer) + ";");
+  temp.concat(String(PersistenceData.odometer_mm / 1000) + ";");
+  temp.concat(String(PersistenceData.writeCycleCounter) + ";");
+  temp.concat(String(LubeConfig.BleedingPulses) + ";");
+  temp.concat(String((PersistenceData.tankRemain_microL / 10) / LubeConfig.tankCapacity_ml) + ";");
+
+  if (client_id > 0)
+  {
+    webSocket.text(client_id, temp);
+  }
+  else
+  {
+    webSocket.textAll(temp);
+  }
+}
+
+void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
+{
+
+  if (send_mapping)
+  {
+    const char mapping[] = "MAPPING_STATIC:"
+                           "DeviceName;"
+                           "EEPROM_Version;"
+                           "ConfigChecksum;"
+                           "DistanceDefault;"
+                           "DistanceRain;"
+                           "tankCapacity;"
+                           "amountPerDose;"
+                           "TankRemindAtPercentage;"
+                           "PulsePerRevolution;"
+                           "TireWidth_mm;"
+                           "TireWidthHeight_Ratio;"
+                           "RimDiameter_Inch;"
+                           "DistancePerRevolution_mm;"
+                           "SpeedSourceString;"
+                           "GPSBaudRateString;"
+                           "CANSourceString;"
+                           "LED_Mode_Flash;"
+                           "LED_Max;"
+                           "LED_Min;"
+                           "eePersistanceAdress;"
+                           "PersisChecksum";
+
+    if (client_id > 0)
+      webSocket.text(client_id, mapping);
+    else
+      webSocket.textAll(mapping);
+  }
+
+  String temp = "STATIC:";
+
+  temp.concat(String(globals.DeviceName) + ";");
+  temp.concat(String(LubeConfig.EEPROM_Version) + ";");
+  temp.concat(String(LubeConfig.checksum) + ";");
+  temp.concat(String(LubeConfig.DistancePerLube_Default) + ";");
+  temp.concat(String(LubeConfig.DistancePerLube_Rain) + ";");
+  temp.concat(String(LubeConfig.tankCapacity_ml) + ";");
+  temp.concat(String(LubeConfig.amountPerDose_microL) + ";");
+  temp.concat(String(LubeConfig.TankRemindAtPercentage) + ";");
+  temp.concat(String(LubeConfig.PulsePerRevolution) + ";");
+  temp.concat(String(LubeConfig.TireWidth_mm) + ";");
+  temp.concat(String(LubeConfig.TireWidthHeight_Ratio) + ";");
+  temp.concat(String(LubeConfig.RimDiameter_Inch) + ";");
+  temp.concat(String(LubeConfig.DistancePerRevolution_mm) + ";");
+  temp.concat(String(SpeedSourceString[LubeConfig.SpeedSource]) + ";");
+  temp.concat(String(GPSBaudRateString[LubeConfig.GPSBaudRate]) + ";");
+  temp.concat(String(CANSourceString[LubeConfig.CANSource]) + ";");
+  temp.concat(String(LubeConfig.LED_Mode_Flash) + ";");
+  temp.concat(String(LubeConfig.LED_Max_Brightness) + ";");
+  temp.concat(String(LubeConfig.LED_Min_Brightness) + ";");
+  temp.concat(String(globals.eePersistanceAdress) + ";");
+  temp.concat(String(PersistenceData.checksum) + ";");
+
+  for (uint32_t i = 0; i < SpeedSourceString_Elements; i++)
+  {
+    temp.concat(String(SpeedSourceString[i]) + ",");
+  }
+  temp.concat(";");
+
+  if (client_id > 0)
+  {
+    webSocket.text(client_id, temp);
+  }
+  else
+  {
+    webSocket.textAll(temp);
+  }
+}
Author	SHA1	Message	Date
Marcel Peterkau	eaf2ad4933	first Values updated by websockets!	2023-12-25 02:05:22 +01:00
Marcel Peterkau	9c2e039bf8	fixed css minifying	2023-12-25 02:04:31 +01:00
Marcel Peterkau	3d7e798310	removed feature-defines for CAN and Websockets	2023-12-25 00:44:24 +01:00
Marcel Peterkau	e8a93a600e	CAN-Debug now with timeout after failed send	2023-12-11 21:34:40 +01:00
Marcel Peterkau	be53089726	webfiles now get packed and comments removed	2023-12-11 19:09:51 +01:00
Marcel Peterkau	e85eef271b	improved sanity-check of config-values	2023-12-11 19:09:29 +01:00
Marcel Peterkau	cc93236b8e	moved javascript from html file to external script	2023-12-11 19:07:38 +01:00
Marcel Peterkau	51b80f08a5	added Notification to WebUI	2023-12-04 22:05:39 +01:00
Marcel Peterkau	a576c7b70c	DTC in WebUI now handled via Websocket	2023-12-04 02:18:16 +01:00
Marcel Peterkau	aa3a2106aa	added KTM 1290 Superduke (2023) to CAN-Sources	2023-12-03 23:49:41 +01:00
Marcel Peterkau	f8a195bd4b	changed order of I2C-Init to fix EE-Issues	2023-12-03 22:53:35 +01:00
Marcel Peterkau	b20481140c	fixed package-Issue in prebuild-Script	2023-12-03 19:49:46 +01:00
Marcel Peterkau	b37c0a05be	dtc-buildscript now via template and utf-8	2023-10-20 12:05:27 +02:00
Marcel Peterkau	2138f640ee	reworked DTC-Data handling	2023-09-27 19:13:54 +02:00
Marcel Peterkau	d593e40f38	fixed typo in define	2023-09-27 10:39:37 +02:00
Marcel Peterkau	3bb9bf694e	fixed some warnings	2023-09-27 09:59:35 +02:00
Marcel Peterkau	f320fb1ca6	disable CAN when used InputTrigger - shared Pin	2023-09-25 23:01:23 +02:00
Marcel Peterkau	b775738e20	fixed platform.ini-File	2023-09-25 07:26:42 +02:00
Marcel Peterkau	c42de4b24c	added CAN-Debug-Message	2023-09-25 07:21:33 +02:00
Marcel Peterkau	ce9f1a2306	fix of type	2023-09-25 07:19:17 +02:00
Marcel Peterkau	e1770527ab	added some \n in Debug-Messages	2023-09-25 07:18:46 +02:00
Marcel Peterkau	aff1d40297	some Code-simplification	2023-09-25 07:17:38 +02:00
Marcel Peterkau	caff1c185f	restructured Project Build Configuration	2023-05-01 11:59:19 +02:00
Marcel Peterkau	bea78c0020	some refactoring	2023-05-01 11:29:22 +02:00
Marcel Peterkau	744f8c431c	added Hostname to WebUI-Info	2023-03-20 23:38:13 +01:00
Marcel Peterkau	e9567602d3	Date updated on Webfiles	2023-03-19 18:03:52 +01:00
Marcel Peterkau	0469b183f2	restructured Folder-Structure	2023-03-19 18:03:28 +01:00
Marcel Peterkau	e3392d92c4	Changed DTC for CAN-Signal timeout (Startup-delay)	2023-03-18 15:21:18 +01:00
Marcel Peterkau	6a6227ed85	DTC-Debug Formatting	2023-03-18 15:20:16 +01:00
Marcel Peterkau	c8f5cda4ba	more work done on the Debugger	2023-03-14 23:30:26 +01:00
Marcel Peterkau	0bc7d0862b	prevent Crash if pulsePerRev is set to 0	2023-03-10 10:25:01 +01:00
Marcel Peterkau	c593b8a546	added Connection-Schemata of PCB Rev 1.2	2023-03-03 22:41:02 +01:00
Marcel Peterkau	6221262dbf	EEPROM Backup and Restore works	2023-03-03 22:01:32 +01:00
Marcel Peterkau	83e288fdcf	added Shutdown-Anim for LED	2023-03-03 11:39:43 +01:00
Marcel Peterkau	9c4c4a14b4	show measurement only when Source is Pulse	2023-03-03 10:52:52 +01:00
Marcel Peterkau	49b3598275	added Function to WebUI to measure Pulses	2023-03-03 10:51:16 +01:00
Marcel Peterkau	8fdd09f32f	Version-String Format change	2023-03-03 10:48:19 +01:00
Marcel Peterkau	f87d2aaeca	more Versioninfo for easier identification	2023-03-02 23:35:41 +01:00
Marcel Peterkau	34c50df2e9	Replaced FastLED by Adafruit Neopixel	2023-03-02 22:30:42 +01:00
Marcel Peterkau	cb3d49ad13	made "Timer"-Feature disabled by define	2023-03-02 17:40:25 +01:00
Marcel Peterkau	f02a53e161	fixed FlashVersion File	2023-03-02 17:39:30 +01:00
Marcel Peterkau	50208e4a1a	fixed some PCB_rev-define-Stuff	2023-03-02 17:38:57 +01:00
Marcel Peterkau	a563182f3e	reload EEPROM after format to maintain DTCs	2023-03-02 17:38:13 +01:00
Marcel Peterkau	335b883043	fixed cannot shutdown when in ErrorState	2023-03-02 17:37:43 +01:00
Marcel Peterkau	fb366b4976	added Documentation	2023-02-28 22:16:19 +01:00
@@ -1 +1 @@
 .3
 .04