updated FW Version Number

Fixed Bug in LoRa Uart Parser, because I'm stupid
Bugfix in LoRa-Uart
2024-05-01 20:42:34 +02:00 · 2024-05-01 20:35:09 +02:00 · 2023-05-28 19:36:39 +02:00 · 2023-05-25 20:59:18 +02:00 · 2023-05-25 19:59:34 +02:00 · 2023-05-25 14:00:18 +02:00
69 changed files with 21875 additions and 917 deletions
--- a/Documentation/Pinout_UART_LoRa.png
+++ b/Documentation/Pinout_UART_LoRa.png
--- a/Software/data_src/index.htm
+++ b/Software/data_src/index.htm
@@ -0,0 +1,566 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>%DEVICENAME%</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="static/css/bootstrap.min.css">
+  <link rel="stylesheet" href="static/css/custom.css">
+  <link rel="stylesheet" href="static/css/tweaks.css">
+  <script src="static/js/jquery.min.js"></script>
+  <script src="static/js/bootstrap.min.js"></script>
+  <script src="static/js/websocket.js"></script>
+  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="manifest" href="static/img/site.webmanifest">
+</head>
+
+<body>
+
+  <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
+    <a class="navbar-brand" href="#">
+      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="">
+      %DEVICENAME%
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
+      aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="collapsingNavbar">
+      <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
+
+        <li class="nav-item"><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_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>
+
+      </ul>
+    </div>
+  </nav>
+
+  <main class="container">
+
+    <!-- Tabs Content -->
+    <div class="tab-content">
+      <!-- Div Tab Home-->
+      <div id="tab_home" class="tab-pane fade show active" role="tabpanel">
+        <div class="col text-center">
+          <div class="jumbotron">
+            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="">
+            <h3 class="pt-3">%DEVICENAME%</h3>
+          </div>
+        </div>
+        <!-- Div Group Battery remain -->
+        <hr />
+        <p>
+        <h4>Akku Ladestand</h4>
+        <div class="progress">
+          <div class="progress-bar text-light" role="progressbar" aria-valuenow="%BAT_REMAIN_CAPACITY%"
+            aria-valuemin="0" aria-valuemax="100" style="width: %BAT_REMAIN_CAPACITY%&#37;">
+            %BAT_REMAIN_CAPACITY%&#37;
+          </div>
+        </div>
+        </p>
+        <!-- Div Group Battery remain -->
+        <!-- Div Group current Mode -->
+        <hr />
+        <p>
+        <h4>aktueller Modus</h4>
+        <input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
+        </p>
+        <!-- Div Group current Mode -->
+        <!-- Div Group Faction Points -->
+        <hr />
+        <p>
+        <h4>aktueller Punktestand</h4>
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col text-center %FACTION_1_ACTIVE% text-white p-3">%NAME_FAC_1%</div>
+            <div class="col text-center %FACTION_2_ACTIVE% text-white p-3">%NAME_FAC_2%</div>
+            <div class="col text-center %FACTION_3_ACTIVE% text-white p-3">%NAME_FAC_3%</div>
+          </div>
+          <div class="row">
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac1.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac2.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac3.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+          </div>
+          <div class="row">
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_1%</div>
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_2%</div>
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_3%</div>
+          </div>
+        </div>
+        </p>
+        <!-- Div GroupFaction Points -->
+        <!-- Div Group DTC Table -->
+        <div %SHOW_DTC_TABLE%>
+          <hr />
+          <p>
+          <h4>Fehlercodes</h4>
+          <table class="table">
+            <tbody>
+              <tr>
+                <th class="col-6" scope="col">Zeitstempel</th>
+                <th class="col-2" scope="col">Fehlercode</th>
+                <th class="col-2" scope="col">Schwere</th>
+                <th class="col-2" scope="col">Aktiv</th>
+              </tr>
+              %DTC_TABLE%
+            </tbody>
+          </table>
+          </p>
+        </div>
+        <!-- Div Group DTC Table -->
+      </div>
+      <!-- Div Tab Home-->
+
+      <!-- Div Tab Maintenance -->
+      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
+        <h3>Wartung</h3>
+        <!-- Div Group Reset Timers -->
+        <hr />
+        <p>
+        <h4>Punkte zur&uuml;cksetzen</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="resetpoints" type="submit" class="btn btn-outline-primary">Reset</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Reset Timers  -->
+        <!-- Div Group EEPROM formatting -->
+        <hr />
+        <p>
+        <h4>EEPROM formatieren</h4>
+        <div class="alert alert-primary alert-dismissable show fade" role="alert">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+          <strong>Achtung!</strong><br>
+          Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
+          Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
+          Folgende Situationen erfordern unter anderem eine Formatierung:
+          - Erstinitialisierung (bei neu aufgebautem Gerät)
+          - Firmware-Update (nur wenn es die Release-Notes fordern)
+        </div>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div 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>Einstellungen</h3>
+        <!-- Div Group Battery Type -->
+        <hr />
+        <p>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <h4>Akku-Variante</h4>
+          <div class="form-group row">
+            <label for="battery_select" class="control-label col-4">Akku</label>
+            <div class="col-8">
+              <select id="battery_select" name="battery_select" class="select form-control">
+                %BATTERY_SELECT_OPTIONS%
+              </select>
+            </div>
+          </div>
+          <h4>Timer-Einstellungen</h4>
+          <div class="form-group row">
+            <label for="factionreboot_cont" class="control-label col-4">active Faction Recovery</label>
+            <div class="col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="factionreboot_cont" id="factionreboot_cont"
+                  %FACTIONREBOOT_CHECKED%>
+                <label class="form-check-label" for="factionreboot_cont">
+                  aktive Faktion beim booten wiederherstellen ?
+                </label>
+              </div>
+            </div>
+          </div>
+          <h4>Faktionsbezeichnungen</h4>
+          <div class="alert alert-primary alert-dismissable show fade" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">×</span>
+            </button>
+            <strong>Achtung!</strong><br>
+            Faktionsbezeichnungen können nur aus ASCII-Zeichen bestehen, also A-Z, a-z und 0-9
+          </div>
+          <div class="form-group row">
+            <label for="faction_1_name" class="control-label col-4">Faktion 1</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_1_name" name="faction_1_name" value="%NAME_FAC_1%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="faction_2_name" class="control-label col-4">Faktion 2</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_2_name" name="faction_2_name" value="%NAME_FAC_2%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="faction_3_name" class="control-label col-4">Faktion 3</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_3_name" name="faction_3_name" value="%NAME_FAC_3%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="settingssave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Battery Type -->
+      </div>
+      <!-- Div Tab Settings -->
+
+      <!-- Div Tab SystemInfo -->
+      <div id="tab_sysinfo" class="tab-pane fade" role="tabpanel">
+        <h3>Systeminfo</h3>
+        <!-- Div Group Sysinfo:Geraeteinfo -->
+        <hr />
+        <p>
+        <h4>Ger&auml;t</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>Hostname</td>
+              <td>%HOSTNAME%</td>
+            </tr>
+            <tr>
+              <td>Device-ID</td>
+              <td>%DEVICENAME_ID%</td>
+            </tr>
+            <tr>
+              <td>Battery Voltage</td>
+              <td>%BAT_VOLTAGE%V</td>
+            </tr>
+            <tr>
+              <td>Battery Remain</td>
+              <td>%BAT_REMAIN_CAPACITY%&#37;</td>
+            </tr>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Geraeteinfo -->
+        <!-- Div Group Sysinfo:Settings -->
+        <hr />
+        <p>
+        <h4>Einstellungen</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>Battery_type</td>
+              <td>%BATTERY_TYPE%</td>
+            </tr>
+            <tr>
+              <td>Faction_recovery</td>
+              <td>%FACTION_RECOVERY%</td>
+            </tr>
+            <tr>
+              <td>EEPROM Version</td>
+              <td>%EEPROM_VERSION%</td>
+            </tr>
+            <tr>
+              <td>Checksum</td>
+              <td>%CONFIG_CHECKSUM%</td>
+            </tr>
+          </tbody>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Settings -->
+        <!-- Div Group Sysinfo:Persistance -->
+        <hr />
+        <p>
+        <h4>Betriebsdaten</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>writeCycleCounter</td>
+              <td>%WRITE_CYCLE_COUNT%</td>
+            </tr>
+            <tr>
+              <td>PersistenceMarker</td>
+              <td>%PERSISTENCE_MARKER%</td>
+            </tr>
+            <tr>
+              <td>activeFaction</td>
+              <td>%ACTIVE_FACTION%</td>
+            </tr>
+            <tr>
+              <td>faction_1_timer</td>
+              <td>%POINTS_FAC_1%</td>
+            </tr>
+            <tr>
+              <td>faction_2_timer</td>
+              <td>%POINTS_FAC_2%</td>
+            </tr>
+            <tr>
+              <td>faction_3_timer</td>
+              <td>%POINTS_FAC_3%</td>
+            </tr>
+            <tr>
+              <td>checksum</td>
+              <td>%PERSISTANCE_CHECKSUM%</td>
+            </tr>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Persistance -->
+        <!-- Div Group LiveDebug -->
+        <hr />
+        <p>
+        <h4>Live Debug</h4>
+        <div class="form-group row">
+          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
+        </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>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>Firmware Version</td>
+              <td>%SW_VERSION%</td>
+            </tr>
+            <tr>
+              <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>
+        <div class="form-group row">
+          <div class="col text-center">
+            <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
+          </div>
+        </div>
+        </p>
+        <!-- Div Group EEPROM Backup -->
+        <!-- Div Group EEPROM Restore -->
+        <hr />
+        <p>
+        <h4>EEPROM-Restore</h4>
+        <form method='POST' action='eeRestore' enctype='multipart/form-data'>
+          <div class="form-group row">
+            <div class="custom-file">
+              <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
+                required />
+              <label class="custom-file-label" for="ee-restore-file">EEPROM-Backup ausw&auml;hlen</label>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="submit" type="submit" class="btn btn-outline-primary">Restore starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group EEPROM Restore -->
+        <!-- Div Group Firmware Update -->
+        <hr />
+        <p>
+        <h4>Firmware-Update</h4>
+        <form method='POST' action='doUpdate' enctype='multipart/form-data'>
+          <div class="form-group row">
+            <div class="custom-file">
+              <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
+                accept=".fw.bin,.fs.gz" required />
+              <label class="custom-file-label" for="fw-update-file">Firmware-Update ausw&auml;hlen</label>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Firmware Update -->
+      </div>
+      <!-- Div Tab Firmware Update-->
+    </div>
+    <!-- Tabs Content -->
+  </main>
+
+
+  <!-- Footer -->
+
+  <footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
+    <div class="container-fluid text-center">
+      <div class="footer-copyright text-center py-3">
+        <span class="text-muted">© 2023 -
+          <a class="text-reset fw-bold" href="https://hiabuto.de/">Hiabuto Defense Systems</a></span>
+      </div>
+    </div>
+  </footer>
+
+  <!-- Footer -->
+
+  <!-- Modal Dialog -->
+
+  <div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="dtcModalLabel">DTC-Description</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <p class="dtc-desc">DTC Description</p>
+          <p class="dtc-debugval">DTC DebugVal</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Modal Dialog -->
+
+  <script>
+    $('.navbar-nav>li>a').on('click', function () {
+      $('.navbar-collapse').collapse('hide');
+    });
+
+    document.querySelector('.custom-file-input').addEventListener('change', function (e) {
+      var fileName = document.getElementById("fw-update-file").files[0].name;
+      var nextSibling = e.target.nextElementSibling
+      nextSibling.innerText = fileName
+    });
+
+    $(document).ready(function () {
+      $("tr[data-dtc]").each(function (i) {
+        $(this).attr('data-toggle', "modal");
+        $(this).attr('data-target', "#dtcModal");
+      });
+    });
+
+    $('#dtcModal').on('show.bs.modal', function (event) {
+      var dtctr = $(event.relatedTarget)
+      var dtc = dtctr.data('dtc')
+      var debugval = dtctr.data('debugval')
+      var modal = $(this)
+      $.getJSON('static/tt_dtc/dtc_' + dtc + '.json', function (data) {
+        modal.find('.modal-title').text(data.title)
+        modal.find('.dtc-desc').text(data.description)
+        if (debugval > 0) {
+          modal.find('.dtc-debugval').text("Debugvalue: " + debugval)
+        }
+        else {
+          modal.find('.dtc-debugval').remove()
+        }
+      }).fail(function () {
+        console.log("An error has occurred.");
+        modal.find('.modal-title').text("Fehler")
+        modal.find('.dtc-desc').text("DTC-Beschreibung konnte nicht geladen werden")
+      });
+    });
+
+  </script>
+
+</body>
+
+</html>
--- a/Software/data_src/post.htm
+++ b/Software/data_src/post.htm
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>KTM CAN Chain Oiler</title>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="static/css/bootstrap.min.css">
+  <link rel="stylesheet" href="static/css/custom.css">
+  <script src="static/js/jquery.min.js"></script>
+  <script src="static/js/bootstrap.min.js"></script>
+  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="manifest" href="static/img/site.webmanifest">
+  <meta http-equiv="refresh" content="3; url='index.htm'" />
+</head>
+
+<body>
+  <div class="container" style="display: flex; justify-content: center; align-items: center; height: 100vh">
+    <div class="alert alert-success">
+      <strong>Bitte warten!</strong> Änderungen werden übernommen.
+    </div>
+  </div>
+</body>
+
+</html>
--- a/Software/data_src/static/css/bootstrap.min.css
+++ b/Software/data_src/static/css/bootstrap.min.css
--- a/Software/data_src/static/css/custom.css
+++ b/Software/data_src/static/css/custom.css
--- a/Software/data_src/static/css/tweaks.css
+++ b/Software/data_src/static/css/tweaks.css
@@ -0,0 +1,27 @@
+@font-face {
+    font-family: 'Comfortaa';
+    font-style: normal;
+    font-weight: 300;
+    src: url(../fonts/comfortaa.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  }
+
+body {
+    padding-top: 70px;
+    margin-bottom: 70px;
+}
+
+hr {
+    height: 2px;
+    border-width: 0;
+    color: gray;
+    background-color: gray
+}
+
+.dtc-debugval {
+    color: #F2771A;
+    font: 0.8rem Inconsolata, monospace;
+    background-color: black;
+    padding: 10px;
+}
+
--- a/Software/data_src/static/fonts/comfortaa.woff2
+++ b/Software/data_src/static/fonts/comfortaa.woff2
--- a/Software/data_src/static/img/android-chrome-192x192.png
+++ b/Software/data_src/static/img/android-chrome-192x192.png
--- a/Software/data_src/static/img/android-chrome-256x256.png
+++ b/Software/data_src/static/img/android-chrome-256x256.png
--- a/Software/data_src/static/img/apple-touch-icon.png
+++ b/Software/data_src/static/img/apple-touch-icon.png
--- a/Software/data_src/static/img/browserconfig.xml
+++ b/Software/data_src/static/img/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
--- a/Software/data_src/static/img/critical.png
+++ b/Software/data_src/static/img/critical.png
--- a/Software/data_src/static/img/favicon-16x16.png
+++ b/Software/data_src/static/img/favicon-16x16.png
--- a/Software/data_src/static/img/favicon-32x32.png
+++ b/Software/data_src/static/img/favicon-32x32.png
--- a/Software/data_src/static/img/favicon.ico
+++ b/Software/data_src/static/img/favicon.ico
--- a/Software/data_src/static/img/info.png
+++ b/Software/data_src/static/img/info.png
--- a/Software/data_src/static/img/logo.png
+++ b/Software/data_src/static/img/logo.png
--- a/Software/data_src/static/img/logo_fac1.png
+++ b/Software/data_src/static/img/logo_fac1.png
--- a/Software/data_src/static/img/logo_fac2.png
+++ b/Software/data_src/static/img/logo_fac2.png
--- a/Software/data_src/static/img/logo_fac3.png
+++ b/Software/data_src/static/img/logo_fac3.png
--- a/Software/data_src/static/img/mstile-150x150.png
+++ b/Software/data_src/static/img/mstile-150x150.png
--- a/Software/data_src/static/img/safari-pinned-tab.svg
+++ b/Software/data_src/static/img/safari-pinned-tab.svg
@@ -0,0 +1,345 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="300.000000pt" height="300.000000pt" viewBox="0 0 300.000000 300.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M210 2778 c1 -198 2 -221 15 -204 13 18 17 18 41 5 31 -16 41 -36 26
+-51 -8 -8 -15 -8 -25 0 -19 16 -49 -22 -53 -69 -3 -30 1 -38 16 -42 26 -7 25
+-27 -1 -34 -18 -5 -20 -11 -15 -47 3 -23 6 -48 5 -56 0 -8 -2 -168 -4 -355
+l-4 -340 31 -18 c29 -17 31 -16 69 5 22 12 38 27 35 33 -2 7 0 18 5 26 7 11 9
+11 9 -3 0 -26 13 -23 93 25 39 24 98 58 130 76 31 18 57 38 58 44 0 7 1 63 1
+125 1 87 -2 116 -14 130 -26 29 -30 59 -13 92 8 16 19 30 23 30 8 0 7 212 -2
+235 -3 8 -2 15 2 15 10 0 8 62 -2 78 -4 7 -5 12 -1 12 3 0 1 9 -5 20 -6 11
+-17 20 -25 20 -8 0 -15 5 -15 11 0 16 -26 39 -45 39 -12 0 -15 6 -10 21 8 26
+78 139 86 139 3 0 11 -36 18 -80 13 -79 23 -101 36 -80 4 7 11 8 18 1 14 -11
+36 -14 103 -12 l52 1 25 53 c15 28 40 67 56 85 29 31 31 32 51 15 27 -23 25
+-37 -10 -100 l-30 -53 75 0 c41 0 74 3 74 8 -3 18 2 32 11 32 6 0 10 -9 10
+-20 0 -17 7 -20 39 -20 29 0 41 5 44 18 4 15 5 15 6 0 1 -13 13 -18 54 -20 99
+-6 227 3 227 15 0 7 9 23 19 37 l19 24 18 -37 c19 -39 32 -43 118 -37 30 2 60
+23 49 34 -13 13 -13 48 -1 44 7 -3 14 -20 15 -38 2 -18 5 -35 7 -37 2 -2 30
+-3 62 -1 53 3 57 4 41 19 -18 19 -13 29 15 29 13 0 18 -7 18 -25 0 -33 10 -32
+50 10 19 19 38 35 42 35 5 0 16 -16 24 -36 13 -31 18 -35 47 -32 20 2 32 8 32
+18 0 8 9 15 20 16 48 2 48 3 34 22 -13 15 -12 16 3 4 14 -11 23 -9 59 17 23
+17 46 31 52 31 8 0 539 302 556 316 2 2 -186 4 -418 3 -265 0 -419 -3 -416 -9
+4 -6 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 -16 10 -35 10 -24 0 -35 -4 -33 -12
+1 -7 -6 -26 -17 -41 l-18 -29 -16 29 c-8 15 -14 34 -13 41 2 9 -21 12 -88 12
+-70 0 -89 -3 -84 -12 6 -10 4 -10 -8 0 -23 18 -184 13 -180 -6 1 -8 -3 -12
+-10 -9 -7 2 -12 10 -11 16 2 7 -16 11 -52 11 -42 0 -55 -3 -55 -15 0 -19 -34
+-19 -50 0 -10 12 -45 14 -193 14 -128 0 -184 -4 -189 -12 -6 -9 -8 -9 -8 1 0
+7 -13 12 -30 12 -16 0 -30 -4 -30 -10 0 -5 -5 -10 -11 -10 -5 0 -7 5 -4 10 4
+7 -12 10 -44 9 -28 -1 -51 -5 -51 -9 0 -4 10 -19 21 -34 30 -38 39 -87 23
+-122 -11 -26 -12 -27 -13 -6 -1 28 -81 108 -91 91 -6 -8 -10 -8 -16 2 -4 7 -3
+14 3 16 6 2 -2 17 -18 34 -26 27 -33 29 -104 29 -61 0 -75 -3 -75 -15 0 -9 -7
+-27 -16 -41 l-17 -25 -12 23 c-6 13 -8 28 -3 34 14 19 -4 24 -89 24 l-83 0 0
+-222z m2395 192 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4 10 3 0 8 -4
+11 -10z m-107 -33 c-2 -11 -9 -12 -28 -5 -24 9 -24 10 -6 24 22 15 40 6 34
+-19z m-1928 -52 c0 -5 -11 -23 -25 -40 l-24 -30 -24 26 -25 26 21 48 21 47 28
+-33 c15 -19 28 -38 28 -44z m1139 13 c-5 -10 -14 -18 -19 -18 -16 0 -23 49 -9
+66 11 14 14 13 25 -8 8 -15 9 -29 3 -40z m186 42 c3 -5 1 -10 -4 -10 -6 0 -11
+5 -11 10 0 6 2 10 4 10 3 0 8 -4 11 -10z m-1066 -9 c11 -7 10 -11 -5 -19 -18
+-10 -16 -14 19 -47 35 -33 63 -82 53 -92 -2 -2 -25 17 -50 42 -54 52 -72 90
+-55 111 13 16 19 17 38 5z m106 -1 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6
+2 10 4 10 3 0 8 -4 11 -10z m169 -17 c9 -22 -12 -43 -23 -24 -10 15 -4 41 9
+41 4 0 11 -8 14 -17z m391 7 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4
+10 3 0 8 -4 11 -10z m465 -30 c0 -13 -5 -18 -15 -14 -8 4 -15 12 -15 20 0 8 7
+14 15 14 8 0 15 -9 15 -20z m-1573 -22 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3
+-3 4 -12 1 -19z m592 13 c17 -11 7 -41 -14 -41 -9 0 -15 9 -15 25 0 27 6 30
+29 16z m881 -1 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0 10
+-4 10 -10z m-1541 -31 c33 -32 37 -44 21 -54 -6 -3 -10 4 -10 17 l0 23 -18
+-23 -18 -24 -18 27 c-16 25 -14 65 4 65 5 0 22 -14 39 -31z m1131 11 c0 -5 -4
+-10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0 10 -4 10 -10z m-300 -20 c0
+-5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0 10 -4 10 -10z m250
+-10 c0 -11 -4 -20 -10 -20 -5 0 -10 9 -10 20 0 11 5 20 10 20 6 0 10 -9 10
+-20z m116 -32 l2 -42 -19 23 c-14 17 -16 27 -9 42 17 30 25 22 26 -23z m179
+22 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4 10 3 0 8 -4 11 -10z
+m-891 -16 c4 -9 1 -23 -6 -31 -10 -12 -13 -12 -20 1 -9 15 -1 46 12 46 4 0 11
+-7 14 -16z m-106 -35 c-2 -6 -8 -10 -13 -10 -5 0 -11 4 -13 10 -2 6 4 11 13
+11 9 0 15 -5 13 -11z m719 -44 c-4 -53 4 -77 18 -55 10 16 25 1 25 -24 0 -27
+-44 -71 -60 -61 -6 4 -10 17 -8 30 1 12 -4 35 -12 49 -13 25 -12 31 9 72 13
+24 25 44 27 44 3 0 3 -25 1 -55z m-167 29 c0 -8 -5 -12 -10 -9 -6 4 -8 11 -5
+16 9 14 15 11 15 -7z m560 -30 c0 -8 -4 -14 -10 -14 -5 0 -10 9 -10 21 0 11 5
+17 10 14 6 -3 10 -13 10 -21z m270 -46 c0 -23 -12 -23 -34 1 -12 13 -15 27
+-11 41 l7 21 19 -22 c10 -12 19 -30 19 -41z m-1830 18 c-13 -13 -35 7 -25 24
+5 8 11 8 21 -1 10 -8 12 -15 4 -23z m968 4 c9 -16 23 -30 30 -30 13 0 15 -10
+6 -34 -6 -15 -8 -15 -19 1 -11 15 -13 15 -20 -6 -5 -18 -9 -20 -21 -10 -29 24
+-36 48 -22 79 16 38 25 38 46 0z m-362 -88 c-6 -5 -56 44 -56 54 0 3 8 16 17
+31 l17 26 14 -53 c7 -29 11 -55 8 -58z m257 72 c-7 -19 -23 -7 -23 18 0 17 3
+18 14 8 8 -6 12 -18 9 -26z m-673 16 c0 -5 -2 -10 -4 -10 -3 0 -8 5 -11 10 -3
+6 -1 10 4 10 6 0 11 -4 11 -10z m1060 0 c0 -5 -2 -10 -4 -10 -3 0 -8 5 -11 10
+-3 6 -1 10 4 10 6 0 11 -4 11 -10z m58 -35 c-8 -17 -15 -22 -21 -16 -7 7 -6
+15 3 26 20 24 31 18 18 -10z m606 9 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16 0
+14 7 11 14 -7z m-1469 -14 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4
+10 3 0 8 -4 11 -10z m-395 -21 c0 -5 -4 -9 -10 -9 -5 0 -10 7 -10 16 0 8 5 12
+10 9 6 -3 10 -10 10 -16z m1044 5 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16 0 14
+7 11 14 -7z m-602 -36 c-9 -9 -12 -7 -12 12 0 19 3 21 12 12 9 -9 9 -15 0 -24z
+m-432 8 c0 -2 3 -12 7 -21 5 -14 2 -16 -18 -10 -31 9 -32 11 -24 24 6 10 35
+16 35 7z m111 -68 c24 -29 23 -37 -5 -71 l-22 -28 -2 61 c0 33 1 60 4 60 3 0
+14 -10 25 -22z m73 -14 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16 0 14 7 11 14 -7z
+m-185 -94 c17 -22 31 -44 31 -49 0 -6 4 -11 10 -11 5 0 -2 -12 -15 -26 -14
+-15 -25 -31 -25 -35 0 -5 -7 -6 -15 -3 -8 3 -13 9 -12 12 1 4 -4 22 -12 40
+-10 24 -11 35 -2 46 8 10 6 19 -9 39 -25 31 -25 36 -1 30 11 -3 33 -22 50 -43z
+m150 -30 c0 -44 0 -45 -14 -19 -8 14 -13 39 -11 55 5 41 5 41 16 24 5 -8 10
+-35 9 -60z m-54 20 c-3 -5 -11 -10 -16 -10 -6 0 -7 5 -4 10 3 6 11 10 16 10 6
+0 7 -4 4 -10z m35 -115 c11 7 29 -26 23 -42 -2 -6 1 -14 6 -18 21 -12 11 -25
+-39 -49 -44 -21 -70 -21 -56 2 2 4 8 35 11 67 9 74 13 82 32 56 8 -12 18 -19
+23 -16z m-80 -35 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0
+10 -4 10 -10z m237 -17 c8 -12 12 -27 8 -33 -8 -13 -65 26 -65 45 0 22 41 13
+57 -12z m-56 -33 c18 -10 26 -49 13 -63 -6 -5 -64 55 -64 67 0 9 29 7 51 -4z
+m-78 -66 c-4 -11 -9 -12 -19 -4 -7 7 -10 18 -7 26 4 11 9 12 19 4 7 -7 10 -18
+7 -26z m49 -46 c-15 -15 -27 14 -17 40 6 15 8 15 18 -6 7 -16 7 -26 -1 -34z
+m87 -90 c5 -16 6 -28 1 -28 -17 0 -60 63 -60 88 l0 27 25 -30 c13 -16 29 -42
+34 -57z m-235 -89 c-10 -16 -24 -9 -24 12 0 18 2 19 15 9 8 -7 12 -16 9 -21z
+m-37 -65 c-1 -2 -13 6 -27 16 -23 17 -23 20 -10 45 l14 26 13 -43 c6 -23 11
+-43 10 -44z m284 23 c-8 -8 -11 -3 -11 19 1 25 2 27 11 11 8 -14 8 -22 0 -30z
+m-201 -8 c0 -6 -4 -7 -10 -4 -5 3 -10 11 -10 16 0 6 5 7 10 4 6 -3 10 -11 10
+-16z m45 -59 c3 -11 11 -20 17 -20 7 0 7 -4 0 -13 -6 -7 -9 -23 -6 -34 3 -12
+1 -30 -4 -40 -10 -17 -11 -17 -17 2 -11 33 -20 48 -30 46 -18 -4 -23 43 -7 62
+20 23 39 22 47 -3z m167 -37 c-4 -24 -6 -25 -17 -9 -7 9 -11 26 -8 37 8 30 31
+5 25 -28z m-102 -5 c0 -19 -2 -20 -10 -8 -13 19 -13 30 0 30 6 0 10 -10 10
+-22z m-257 -49 c3 -14 1 -32 -3 -39 -7 -11 -12 -7 -21 13 -9 21 -9 30 1 42 15
+19 17 17 23 -16z m157 -59 c0 -25 -4 -30 -25 -30 -31 0 -31 7 -3 37 27 29 28
+29 28 -7z"/>
+<path d="M2695 2824 c-44 -25 -82 -48 -85 -52 -3 -4 -11 -8 -19 -10 -7 -1 -38
+-19 -70 -39 -31 -20 -60 -38 -66 -39 -5 -1 -57 -29 -113 -63 -57 -34 -118 -70
+-135 -79 -18 -9 -78 -44 -134 -76 l-101 -59 18 -35 c14 -25 16 -40 9 -53 -23
+-43 -42 -35 -64 26 l-13 38 -24 -24 c-13 -13 -33 -24 -43 -24 -13 0 -20 -7
+-21 -20 -2 -37 -5 -40 -17 -23 -12 14 -25 9 -140 -55 l-127 -72 2 -47 c1 -55
+-23 -98 -32 -58 -7 31 -26 36 -27 8 -1 -60 -3 -68 -21 -68 -26 0 -44 41 -26
+58 8 7 14 22 14 32 0 19 -4 18 -57 -11 -32 -18 -64 -39 -70 -47 -7 -9 -13 -12
+-13 -8 0 4 -13 0 -29 -10 -18 -11 -31 -29 -37 -53 -6 -25 -15 -36 -26 -35 -11
+1 -21 -10 -29 -33 l-11 -35 -27 26 c-30 28 -53 33 -69 13 -12 -14 11 -52 31
+-52 7 0 13 -12 15 -27 3 -22 -1 -28 -16 -28 -20 0 -39 16 -42 35 -3 23 -12 55
+-17 55 -13 0 -133 -76 -133 -85 0 -6 -10 -15 -22 -20 -12 -6 -25 -21 -29 -35
+-4 -14 -7 -18 -8 -8 -2 27 -19 31 -51 11 -28 -16 -35 -26 -31 -47 1 -4 -9 -6
+-23 -2 -14 3 -30 1 -38 -6 -8 -7 -49 -31 -92 -53 -43 -22 -89 -50 -102 -62
+-13 -12 -24 -20 -24 -17 0 3 -8 1 -17 -5 -10 -5 -18 -19 -18 -32 0 -12 -6 -24
+-12 -26 -7 -3 -13 2 -13 11 0 21 -4 20 -61 -10 -40 -22 -48 -31 -43 -49 4 -17
+-6 -31 -47 -66 -28 -24 -60 -50 -70 -57 -16 -11 -19 -27 -19 -108 0 -81 3 -96
+18 -101 64 -23 134 -105 116 -135 -4 -6 4 -4 17 3 26 13 253 144 309 178 19
+11 46 26 60 33 14 7 27 15 30 18 3 3 26 16 52 30 83 43 83 44 59 83 -11 19
+-21 45 -21 58 0 24 37 95 45 87 10 -10 42 -118 35 -118 -5 0 -13 -14 -19 -30
+l-10 -31 42 26 c23 14 95 55 160 92 109 63 117 70 112 94 -3 14 -2 36 4 50 l9
+24 7 -30 c13 -58 12 -57 57 -29 24 15 45 28 47 30 2 2 -4 20 -15 39 -17 31
+-17 37 -4 45 22 14 27 12 27 -7 0 -10 1 -31 2 -48 2 -29 2 -30 19 -10 9 11 23
+20 30 21 29 2 33 5 30 22 -2 13 3 17 25 15 34 -2 34 7 1 38 -42 39 -55 71 -43
+112 5 19 9 39 8 44 -7 40 26 44 70 8 24 -21 28 -30 22 -47 -6 -16 0 -33 22
+-64 l30 -43 36 24 c20 14 52 32 71 42 19 9 63 34 98 55 34 21 66 38 71 38 4 0
+5 17 2 38 -4 20 -4 55 0 77 11 60 1 99 -38 145 -31 36 -35 46 -29 78 6 40 28
+62 62 62 18 0 31 -21 80 -130 33 -71 65 -130 72 -130 6 0 12 -9 12 -20 0 -23
+8 -25 32 -6 14 10 15 15 5 26 -10 10 -8 10 10 1 18 -9 24 -8 32 7 7 12 6 25
+-2 39 -47 81 -48 83 -34 83 25 0 65 -39 72 -70 7 -33 8 -33 107 23 36 21 69
+45 72 53 3 8 11 12 17 9 5 -4 29 6 52 21 23 16 44 29 47 29 3 0 28 14 55 29
+28 16 67 39 88 51 20 12 35 25 32 28 -3 4 -2 5 1 2 9 -6 84 34 84 45 0 6 7 10
+16 10 8 0 35 12 60 26 36 21 44 31 44 54 0 16 -11 42 -25 59 l-26 30 23 3 c20
+3 23 10 26 50 2 38 0 47 -11 42 -9 -3 -16 3 -19 14 -6 23 9 55 23 47 5 -4 9
+38 9 104 0 61 -3 111 -7 111 -5 0 -44 -21 -88 -46z m33 -44 c12 -12 22 -23 22
+-25 0 -11 -24 -55 -30 -55 -3 0 -11 23 -16 50 -12 55 -8 60 24 30z m42 -70 c0
+-5 -2 -10 -4 -10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m-150
+-52 c0 -16 -3 -19 -11 -11 -6 6 -8 16 -5 22 11 17 16 13 16 -11z m-97 -14 c-7
+-18 -19 -18 -26 0 -7 18 1 26 18 19 8 -2 11 -11 8 -19z m15 -100 c12 -22 -9
+-79 -33 -88 -10 -4 -13 12 -13 70 0 72 1 75 18 57 9 -11 22 -28 28 -39z m-316
+-26 c-7 -7 -12 -8 -12 -2 0 6 3 14 7 17 3 4 9 5 12 2 2 -3 -1 -11 -7 -17z m20
+-93 c0 -5 -5 -11 -11 -13 -6 -2 -11 4 -11 13 0 9 5 15 11 13 6 -2 11 -8 11
+-13z m-212 -20 c0 -8 -2 -15 -4 -15 -2 0 -6 7 -10 15 -3 8 -1 15 4 15 6 0 10
+-7 10 -15z m173 -31 c22 -22 24 -29 15 -50 -13 -27 -25 -30 -51 -10 -14 11
+-17 22 -12 50 9 43 14 44 48 10z m-113 -19 c0 -9 -6 -12 -16 -8 -13 5 -13 7
+-2 14 17 11 18 11 18 -6z m48 -25 c-1 -16 -6 -30 -10 -30 -9 0 -10 22 -2 44
+10 25 15 19 12 -14z m182 -20 c13 -31 6 -100 -10 -100 -14 0 -40 43 -40 67 0
+31 18 75 29 69 4 -3 14 -19 21 -36z m-390 -20 c0 -5 -2 -10 -4 -10 -3 0 -8 5
+-11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m66 -57 c-10 -11 -25 18 -18 35 4
+13 8 11 15 -6 6 -12 7 -25 3 -29z m-226 7 c0 -5 -4 -10 -10 -10 -5 0 -10 5
+-10 10 0 6 5 10 10 10 6 0 10 -4 10 -10z m483 -47 c-5 -12 -7 -12 -14 -1 -5 7
+-9 19 -9 27 0 11 3 11 14 1 8 -6 12 -18 9 -27z m207 16 c0 -5 -4 -9 -10 -9 -5
+0 -10 7 -10 16 0 8 5 12 10 9 6 -3 10 -10 10 -16z m-123 -11 c-3 -8 -6 -5 -6
+6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-617 -15 c0 -21 -3 -24 -9 -14 -5 8 -7
+20 -4 28 8 21 13 15 13 -14z m383 -22 c3 -11 2 -22 -1 -25 -9 -10 -31 15 -25
+30 7 20 20 17 26 -5z m-113 -27 c0 -8 -4 -12 -10 -9 -5 3 -10 10 -10 16 0 5 5
+9 10 9 6 0 10 -7 10 -16z m-273 -66 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4
+-12 1 -19z m296 -22 c3 -8 0 -22 -7 -32 -13 -17 -14 -16 -20 4 -11 34 15 60
+27 28z m-643 -46 c0 -5 -2 -10 -4 -10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0
+11 -4 11 -10z m178 -23 c13 -15 -1 -42 -17 -33 -13 8 -15 46 -2 46 5 0 13 -6
+19 -13z m93 -20 c-1 -12 -15 -9 -19 4 -3 6 1 10 8 8 6 -3 11 -8 11 -12z m108
+-29 c5 -13 16 -39 25 -59 l15 -37 -27 3 c-35 4 -72 16 -72 23 0 7 43 92 47 92
+2 0 7 -10 12 -22z m-159 -29 c0 -18 -18 -9 -23 12 -4 16 -3 18 9 8 8 -6 14
+-15 14 -20z m-95 11 c11 -17 -5 -32 -21 -19 -7 6 -11 15 -8 20 7 12 21 11 29
+-1z m-128 -22 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-31 -58
+c2 -35 -6 -38 -23 -10 -11 16 -10 21 5 29 9 6 17 11 17 11 0 0 1 -13 1 -30z
+m-306 -26 c0 -8 -4 -12 -10 -9 -5 3 -10 13 -10 21 0 8 5 12 10 9 6 -3 10 -13
+10 -21z m573 -21 c-3 -7 -9 -13 -13 -13 -14 0 -18 24 -7 45 10 19 10 19 17 0
+4 -11 5 -26 3 -32z m-337 -56 c-4 -18 1 -38 12 -55 l17 -27 -33 23 c-40 29
+-64 72 -51 93 5 8 9 25 9 38 0 24 1 23 26 -10 18 -25 24 -42 20 -62z m124 57
+c0 -24 -17 -15 -22 11 -4 20 -3 23 8 14 8 -6 14 -18 14 -25z m310 -8 c-15 -15
+-32 7 -24 29 7 17 8 17 21 -1 9 -12 10 -21 3 -28z m-725 -12 c-3 -29 -2 -34 9
+-25 11 9 15 5 18 -23 4 -33 3 -34 -13 -20 -36 33 -49 104 -19 104 6 0 8 -15 5
+-36z m107 14 c6 -17 -1 -38 -13 -38 -5 0 -9 11 -9 25 0 26 14 34 22 13z m64
+-53 c4 -8 1 -22 -6 -30 -9 -11 -9 -22 1 -49 11 -31 10 -41 -5 -72 l-17 -37
+-24 34 c-14 18 -25 43 -25 55 0 24 30 84 43 84 4 0 7 7 7 15 0 20 19 19 26 0z
+m189 6 c3 -5 1 -12 -4 -15 -5 -3 -11 1 -15 9 -6 16 9 21 19 6z m-515 -31 c0
+-5 -5 -10 -11 -10 -5 0 -7 5 -4 10 3 6 8 10 11 10 2 0 4 -4 4 -10z m-45 -40
+c7 -23 -2 -43 -16 -35 -12 8 -12 55 0 55 5 0 12 -9 16 -20z m205 -15 c0 -18
+-4 -23 -15 -19 -15 6 -20 35 -9 47 12 11 24 -3 24 -28z m-90 -32 l-1 -58 -19
+24 c-23 27 -25 44 -8 71 21 33 28 23 28 -37z m-231 -20 c1 -26 0 -45 -1 -42
+-2 2 -11 13 -20 25 -16 18 -16 22 -2 42 8 12 16 22 18 22 1 0 4 -21 5 -47z
+m290 1 c21 -27 36 -63 28 -70 -10 -10 -39 10 -52 37 -29 56 -13 79 24 33z m86
+-4 c-5 -8 -11 -8 -17 -2 -6 6 -7 16 -3 22 5 8 11 8 17 2 6 -6 7 -16 3 -22z
+m163 -52 c-7 -19 -21 -12 -23 9 -1 18 1 20 12 11 8 -6 12 -15 11 -20z m-113
+-8 c3 -5 1 -10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4 10 3 0 8 -4 11 -10z m-42
+-46 c-4 -11 -9 -12 -19 -4 -7 7 -10 18 -7 26 4 11 9 12 19 4 7 -7 10 -18 7
+-26z m-453 -28 c0 -6 -8 -20 -16 -31 l-15 -20 -15 20 c-8 11 -20 20 -27 20 -6
+0 -13 8 -15 19 -2 11 0 16 7 12 5 -4 15 3 21 15 l12 21 24 -23 c13 -12 24 -27
+24 -33z m344 9 c-6 -15 -8 -15 -16 -2 -4 8 -5 23 -2 32 6 15 8 15 16 2 4 -8 5
+-23 2 -32z m-152 -44 c-5 -3 -12 -13 -16 -21 -3 -8 -4 -4 -2 9 3 14 1 30 -4
+36 -6 7 -3 20 8 36 l17 24 3 -39 c2 -21 -1 -42 -6 -45z m308 -1 c0 -5 -2 -10
+-4 -10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m-655 -17 c13 -12
+19 -13 24 -4 14 23 6 -53 -8 -79 -13 -23 -14 -23 -21 -5 -10 27 -21 105 -16
+105 3 0 12 -7 21 -17z m239 -19 c-6 -3 -10 -18 -8 -34 4 -32 -6 -39 -24 -17
+-13 15 11 58 31 56 8 0 9 -2 1 -5z m50 -20 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10
+16 0 14 7 11 14 -7z m-71 -86 c-19 -33 -40 -39 -35 -10 4 18 29 42 45 42 5 0
+1 -14 -10 -32z m-198 -102 c7 3 27 -7 44 -23 l31 -28 -26 -23 -27 -23 6 30 c6
+28 5 30 -16 20 -19 -9 -22 -17 -19 -47 l3 -37 -25 40 c-25 40 -26 65 -3 94 7
+8 13 9 15 3 2 -6 9 -9 17 -6z m-125 -46 c0 -22 -16 -35 -25 -20 -9 14 4 52 16
+45 5 -4 9 -15 9 -25z"/>
+<path d="M2720 2219 c-68 -38 -62 -31 -62 -73 0 -41 -17 -47 -46 -16 l-19 20
+-24 -22 c-14 -13 -29 -23 -34 -23 -22 0 -185 -101 -181 -112 3 -7 -1 -10 -9
+-6 -11 4 -109 -42 -133 -62 -1 -1 7 -23 19 -49 31 -70 24 -211 -12 -250 -9
+-11 -29 34 -29 67 0 11 -9 31 -21 43 -14 15 -19 29 -14 43 3 12 11 19 16 15 5
+-3 7 -9 5 -13 -3 -4 0 -13 5 -21 7 -11 9 -5 8 20 -1 19 1 59 5 88 l8 53 -24
+-14 c-24 -15 -366 -215 -428 -249 -221 -125 -349 -202 -344 -209 3 -5 2 -14
+-2 -21 -5 -8 -9 -7 -13 5 -6 15 -9 15 -36 -3 -19 -13 -24 -20 -14 -20 31 0 40
+-24 20 -54 l-19 -28 -12 36 c-13 41 -21 43 -58 18 -15 -10 -35 -22 -45 -25
+-11 -4 -21 -16 -24 -28 -4 -14 -8 -17 -13 -8 -6 8 -25 1 -71 -26 -77 -46 -100
+-65 -93 -76 3 -5 0 -9 -5 -9 -6 0 -11 5 -11 11 0 5 -5 7 -10 4 -6 -4 -8 -11
+-5 -16 11 -16 -5 -31 -21 -18 -11 9 -54 -12 -203 -97 -180 -103 -191 -111
+-191 -139 -1 -25 -2 -27 -11 -12 -14 24 -24 22 -83 -15 -28 -17 -67 -40 -86
+-50 -129 -73 -180 -103 -180 -108 0 -4 17 -16 38 -28 l39 -22 13 25 c16 29 27
+32 27 7 0 -51 5 -61 39 -81 19 -12 36 -21 37 -21 1 0 11 15 21 34 13 24 23 33
+34 29 11 -5 14 -2 9 10 -3 9 -3 17 2 17 8 0 12 -18 28 -118 5 -29 15 -39 87
+-80 44 -26 84 -46 89 -44 4 1 7 -3 7 -8 0 -6 12 -16 28 -23 15 -6 49 -27 77
+-44 27 -18 52 -33 56 -33 3 0 14 18 24 40 10 22 22 40 27 40 18 0 47 -82 38
+-106 -8 -20 -4 -26 26 -45 34 -21 36 -21 49 -3 13 18 14 18 34 0 12 -11 20
+-28 19 -38 -2 -14 47 -47 212 -146 118 -71 216 -128 218 -126 2 1 -2 11 -9 22
+-11 17 -10 24 2 38 13 16 14 14 19 -19 l5 -36 74 44 c40 25 74 45 76 45 1 0
+29 16 61 35 50 30 59 40 60 66 1 16 10 39 20 50 18 20 18 20 31 -6 8 -14 16
+-25 19 -25 3 0 25 11 50 24 l45 24 -25 18 c-19 15 -24 25 -19 46 6 30 22 35
+55 17 15 -8 19 -17 14 -39 -5 -28 -2 -27 124 48 71 42 130 83 130 90 0 6 10
+12 22 12 16 0 85 36 127 67 2 1 -2 9 -8 17 -7 8 -9 20 -5 27 5 8 12 5 23 -9
+16 -21 17 -21 209 94 l192 116 0 244 c0 134 -3 244 -6 244 -3 0 -46 -24 -97
+-54 -51 -29 -112 -65 -137 -78 -119 -66 -220 -130 -216 -137 3 -4 1 -13 -4
+-21 -7 -12 -10 -12 -15 2 -6 16 -9 16 -30 2 -13 -8 -29 -28 -35 -45 -11 -26
+-14 -28 -25 -12 -11 15 -20 12 -96 -32 -134 -78 -127 -70 -85 -97 46 -30 60
+-64 49 -119 l-9 -44 -44 2 c-25 1 -47 -3 -51 -9 -15 -25 21 -68 78 -93 52 -23
+55 -27 48 -52 -13 -56 -27 -59 -94 -19 -34 20 -64 36 -67 36 -21 0 -64 77 -64
+114 0 7 19 19 43 27 61 23 62 50 1 88 l-48 29 -28 -19 c-15 -11 -28 -26 -28
+-34 0 -7 -9 -23 -20 -36 l-19 -24 -1 23 c0 28 -3 27 -67 -7 -52 -28 -52 -28
+-33 -46 22 -20 26 -55 8 -73 -20 -20 -28 -14 -28 21 0 59 -11 62 -78 21 -34
+-20 -62 -38 -62 -41 0 -2 18 -31 40 -63 22 -32 40 -61 40 -65 0 -3 -17 5 -38
+18 -20 13 -45 26 -55 30 -9 4 -26 22 -37 41 -16 26 -66 61 -215 150 -107 64
+-195 118 -195 120 0 2 56 36 125 75 69 40 125 76 125 80 0 16 -46 47 -68 45
+-16 -1 -21 3 -18 12 3 8 1 14 -4 14 -6 0 -10 -6 -10 -12 0 -18 -20 13 -20 31
+0 10 3 11 14 2 11 -9 15 -5 18 24 2 19 0 41 -4 48 -6 9 -8 8 -8 -3 -1 -12 -3
+-11 -14 3 -8 10 -11 27 -8 39 5 20 6 20 18 3 8 -10 16 -16 18 -14 10 9 8 86
+-3 129 -16 66 -14 79 7 52 28 -37 101 -47 160 -23 72 29 75 29 100 -1 31 -36
+23 -58 -23 -59 -19 -1 -39 -3 -45 -4 -5 -1 -14 -3 -18 -4 -12 -1 -14 -93 -3
+-109 4 -8 24 -17 42 -21 26 -5 35 -13 39 -33 l5 -26 125 73 c92 54 128 80 137
+101 8 19 12 23 13 12 0 -10 3 -18 6 -18 16 0 143 78 173 106 36 34 38 43 40
+157 1 44 3 47 20 38 20 -11 39 -54 48 -106 3 -16 6 -31 7 -32 1 -1 59 32 129
+72 70 41 146 85 170 98 113 64 167 99 167 107 0 6 7 10 16 10 27 0 75 33 69
+48 -3 8 1 23 9 34 14 20 14 20 21 -1 3 -12 11 -21 17 -21 13 0 128 69 128 77
+0 4 -3 3 -6 0 -8 -8 -39 30 -48 59 -4 12 -2 34 4 49 10 27 11 27 30 10 20 -18
+20 -17 20 65 0 72 -2 81 -13 66 -13 -18 -15 -17 -34 8 -12 14 -28 26 -38 26
+-9 0 -13 5 -10 10 4 6 11 8 16 5 5 -4 9 -2 9 3 0 19 33 22 51 6 18 -17 19 -14
+19 79 0 54 -3 97 -7 97 -5 0 -33 -14 -63 -31z m-42 -220 c-2 -6 -8 -10 -13
+-10 -5 0 -11 4 -13 10 -2 6 4 11 13 11 9 0 15 -5 13 -11z m-246 -46 c20 -18
+24 -58 8 -68 -16 -10 -60 23 -55 40 3 8 7 22 10 30 6 19 14 19 37 -2z m248
+-42 c0 -3 -8 -17 -17 -31 l-17 -24 -12 35 c-18 48 -17 49 16 38 17 -6 30 -14
+30 -18z m-317 -36 c-7 -21 -13 -19 -13 6 0 11 4 18 10 14 5 -3 7 -12 3 -20z
+m-183 -9 c0 -11 -19 -15 -25 -6 -3 5 1 10 9 10 9 0 16 -2 16 -4z m450 -40 c-8
+-8 -13 -7 -20 4 -12 20 -1 33 16 19 11 -9 12 -15 4 -23z m-500 -6 c0 -10 -5
+-22 -11 -25 -6 -5 -4 -11 6 -19 15 -11 15 -14 -4 -36 l-20 -25 -2 30 c-2 17
+-3 39 -4 50 -2 27 14 57 26 50 5 -4 9 -15 9 -25z m-10 -120 c0 -5 -2 -10 -4
+-10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m-215 -10 c3 -5 1
+-10 -4 -10 -6 0 -11 5 -11 10 0 6 2 10 4 10 3 0 8 -4 11 -10z m152 -36 c7 3
+15 1 17 -3 3 -5 18 -11 34 -14 24 -5 28 -11 30 -44 1 -21 5 -55 8 -76 5 -37 5
+-38 -18 -26 -40 21 -128 82 -128 88 -1 3 -7 31 -14 62 l-14 57 36 -24 c20 -14
+42 -22 49 -20z m433 6 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10
+6 0 10 -4 10 -10z m-690 -93 c0 -5 -5 -5 -10 -2 -6 4 -8 10 -5 15 3 5 -4 11
+-15 15 -22 7 -26 35 -8 53 10 10 15 3 25 -30 7 -24 13 -47 13 -51z m121 -25
+c15 -27 15 -31 -1 -61 l-16 -33 -17 26 c-9 14 -17 31 -17 38 0 9 -3 9 -10 -2
+-5 -8 -10 -11 -10 -7 0 12 40 67 48 67 4 0 14 -13 23 -28z m270 -19 c-9 -17
+-10 -17 -16 0 -4 9 -4 25 0 35 6 16 7 16 16 0 7 -12 7 -24 0 -35z m-505 1 c17
+-16 24 -32 21 -45 -3 -10 0 -19 6 -20 7 0 2 -4 -11 -10 -25 -10 -72 13 -72 35
+0 12 23 66 28 66 2 0 14 -12 28 -26z m73 -8 c7 -8 8 -17 3 -20 -6 -3 -12 3
+-15 14 -6 24 -4 25 12 6z m491 -36 c0 -5 -2 -10 -4 -10 -3 0 -8 5 -11 10 -3 6
+-1 10 4 10 6 0 11 -4 11 -10z m-746 -36 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16
+0 14 7 11 14 -7z m-42 -56 c-9 -9 -12 -7 -12 12 0 19 3 21 12 12 9 -9 9 -15 0
+-24z m405 10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-457 -59
+c0 -10 -4 -19 -10 -19 -5 0 -10 12 -10 26 0 14 4 23 10 19 6 -3 10 -15 10 -26z
+m203 16 c4 -8 2 -17 -2 -20 -5 -2 -11 4 -14 15 -6 23 8 27 16 5z m87 -84 c0
+-11 5 -21 11 -23 5 -2 7 -11 3 -21 -5 -14 -13 -17 -33 -11 -14 4 -37 8 -51 9
+-16 1 -26 9 -28 21 -3 15 -1 16 9 7 9 -10 18 -7 41 12 35 30 48 31 48 6z
+m-485 -70 c-10 -16 -25 -3 -25 22 0 20 1 20 16 5 9 -9 13 -21 9 -27z m407 -88
+c2 -3 -9 -7 -24 -9 -23 -2 -28 1 -29 19 0 12 -2 30 -4 40 -2 12 5 8 25 -13 16
+-17 30 -34 32 -37z m-572 41 c0 -8 -5 -12 -10 -9 -6 4 -8 11 -5 16 9 14 15 11
+15 -7z m-157 -46 c6 -42 -2 -49 -21 -18 -9 15 -10 26 -1 41 13 25 15 24 22
+-23z m47 32 c0 -5 -4 -10 -10 -10 -5 0 -10 5 -10 10 0 6 5 10 10 10 6 0 10 -4
+10 -10z m590 -36 c0 -8 -4 -14 -10 -14 -5 0 -10 9 -10 21 0 11 5 17 10 14 6
+-3 10 -13 10 -21z m-537 -25 c-5 -5 -9 3 -11 19 -1 24 0 25 9 9 7 -11 7 -23 2
+-28z m107 20 c0 -11 -4 -18 -10 -14 -5 3 -7 12 -3 20 7 21 13 19 13 -6z m1585
+-32 c0 -26 -20 -25 -23 2 -3 16 1 22 10 19 7 -3 13 -12 13 -21z m-1897 -43 c1
+-14 6 -33 11 -42 9 -18 4 -42 -8 -42 -10 0 -31 46 -31 68 0 14 17 42 25 42 0
+0 2 -11 3 -26z m57 7 c3 -5 1 -12 -5 -16 -5 -3 -10 1 -10 9 0 18 6 21 15 7z
+m187 -8 c10 -9 18 -23 18 -32 -1 -19 -29 -72 -30 -55 0 7 -9 14 -20 17 -14 3
+-20 14 -20 32 0 19 4 26 14 22 10 -4 12 0 9 14 -6 23 4 24 29 2z m73 -32 c3
+-5 1 -12 -5 -16 -5 -3 -10 1 -10 9 0 18 6 21 15 7z m1385 -67 c0 -9 -5 -12
+-12 -8 -27 15 -38 27 -32 35 8 13 44 -9 44 -27z m-1552 -8 c7 1 8 0 3 -2 -6
+-3 -8 -11 -6 -17 17 -56 15 -67 -7 -67 -48 1 -73 50 -52 105 6 14 9 14 28 -3
+11 -11 27 -18 34 -16z m109 2 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1
+-19z m105 -62 c-16 -30 -17 -30 -20 -8 -3 18 -7 21 -17 12 -10 -8 -14 -4 -18
+16 -3 18 -1 22 6 15 18 -18 24 -12 19 22 l-4 32 25 -29 c25 -29 25 -30 9 -60z
+m-515 58 c10 -28 -13 -37 -25 -9 -10 21 -9 25 4 25 8 0 17 -7 21 -16z m373
+-49 c0 -8 -4 -17 -10 -20 -6 -4 -10 5 -10 20 0 15 4 24 10 20 6 -3 10 -12 10
+-20z m-320 -16 c0 -24 -12 -24 -27 0 -10 15 -10 21 0 24 18 6 27 -2 27 -24z
+m-110 -5 c0 -8 -5 -12 -10 -9 -6 4 -8 11 -5 16 9 14 15 11 15 -7z m220 12 c0
+-3 -4 -8 -10 -11 -5 -3 -10 -1 -10 4 0 6 5 11 10 11 6 0 10 -2 10 -4z m1790
+-38 c0 -30 0 -31 -20 -13 -19 17 -19 19 -2 31 23 18 22 18 22 -18z m-1950 -34
+c0 -8 -5 -12 -10 -9 -6 4 -8 11 -5 16 9 14 15 11 15 -7z m100 6 c0 -5 -2 -10
+-4 -10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m301 -16 c9 -11 8
+-21 -1 -44 -16 -39 -26 -38 -33 3 -3 17 -8 40 -12 49 -5 13 -2 15 14 11 11 -3
+26 -11 32 -19z m1259 -51 c0 -30 -20 -73 -35 -73 -6 0 -19 15 -27 34 -16 32
+-16 35 9 71 l26 38 13 -24 c7 -13 13 -34 14 -46z m-1873 35 c-3 -8 -6 -5 -6 6
+-1 11 2 17 5 13 3 -3 4 -12 1 -19z m2082 -63 c1 -50 -12 -59 -41 -28 -28 31
+-29 47 -2 88 l18 28 13 -29 c7 -16 12 -42 12 -59z m-1686 38 c7 -43 3 -53 -24
+-53 -10 0 -28 -9 -39 -20 -11 -11 -23 -20 -27 -20 -5 0 -9 -11 -10 -25 -1 -14
+-8 -34 -16 -46 -14 -20 -16 -18 -27 38 -6 32 -12 64 -13 72 -2 14 115 89 139
+90 6 1 14 -15 17 -36z m95 9 c14 -9 16 -159 1 -167 -9 -6 -59 56 -59 75 0 7 9
+28 21 46 11 19 18 38 14 44 -7 12 5 13 23 2z m-535 -39 c-6 -14 -8 -14 -14 3
+-12 30 -10 37 5 24 8 -6 12 -19 9 -27z m777 -88 c-6 -19 -13 -35 -15 -35 -3 0
+-15 16 -29 36 -24 35 -24 38 -9 70 l16 34 24 -36 c22 -31 23 -39 13 -69z
+m-313 53 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m385 -50 c-13
+-13 -26 8 -17 30 6 16 7 16 17 -1 7 -13 7 -22 0 -29z m908 2 c0 -5 -2 -10 -4
+-10 -3 0 -8 5 -11 10 -3 6 -1 10 4 10 6 0 11 -4 11 -10z m-845 -53 c17 -33 17
+-35 -1 -65 -10 -18 -21 -32 -24 -31 -3 0 -15 13 -28 30 l-24 29 22 35 c12 19
+25 35 29 35 4 0 16 -15 26 -33z m-265 -59 l0 -32 -16 23 c-14 19 -14 25 -3 32
+19 12 19 13 19 -23z m-220 -19 c0 -6 -4 -7 -10 -4 -5 3 -10 11 -10 16 0 6 5 7
+10 4 6 -3 10 -11 10 -16z m436 -96 c-11 -12 -27 13 -20 32 7 17 8 17 17 -3 6
+-12 7 -25 3 -29z m-52 -44 c-8 -13 -24 -1 -24 18 0 13 3 13 15 3 8 -7 12 -16
+9 -21z m196 16 c0 -8 -4 -15 -10 -15 -5 0 -7 7 -4 15 4 8 8 15 10 15 2 0 4 -7
+4 -15z m-93 -61 c17 -4 -4 -54 -23 -54 -9 0 -34 48 -34 66 0 2 34 -4 57 -12z
+m-57 -20 c0 -8 -4 -14 -10 -14 -5 0 -10 9 -10 21 0 11 5 17 10 14 6 -3 10 -13
+10 -21z m60 -60 c0 -8 -5 -12 -10 -9 -6 4 -8 11 -5 16 9 14 15 11 15 -7z m103
+-40 c18 -24 18 -25 -7 -55 l-26 -31 0 26 c0 14 0 27 0 29 -1 1 -5 19 -9 39 -8
+32 -7 35 8 26 9 -5 24 -21 34 -34z m364 14 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13
+3 -3 4 -12 1 -19z m-247 -69 c0 -20 -15 -26 -24 -10 -8 13 4 42 15 35 5 -3 9
+-14 9 -25z m-63 -64 c0 -8 -4 -12 -9 -9 -5 3 -6 10 -3 15 9 13 12 11 12 -6z"/>
+<path d="M210 982 c0 -45 3 -82 6 -82 5 0 68 35 83 46 3 2 -42 62 -81 109 -4
+5 -8 -28 -8 -73z"/>
+<path d="M1440 1001 c-7 -15 -7 -21 0 -21 12 0 25 28 17 36 -3 3 -10 -4 -17
+-15z"/>
+</g>
+</svg>
--- a/Software/data_src/static/img/site.webmanifest
+++ b/Software/data_src/static/img/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
--- a/Software/data_src/static/img/warn.png
+++ b/Software/data_src/static/img/warn.png
--- a/Software/data_src/static/js/bootstrap.min.js
+++ b/Software/data_src/static/js/bootstrap.min.js
--- a/Software/data_src/static/js/jquery.min.js
+++ b/Software/data_src/static/js/jquery.min.js
--- a/Software/data_src/static/js/popper.min.js
+++ b/Software/data_src/static/js/popper.min.js
--- a/Software/data_src/static/js/websocket.js
+++ b/Software/data_src/static/js/websocket.js
@@ -0,0 +1,84 @@
+var gateway = `ws://${window.location.hostname}/ws`;
+var websocket;
+
+window.addEventListener("load", onLoad);
+
+function initWebSocket() {
+  console.log("Trying to open a WebSocket connection...");
+  websocket = new WebSocket(gateway);
+  websocket.onopen = onOpen;
+  websocket.onclose = onClose;
+  websocket.onmessage = onMessage; // <-- add this line
+}
+
+function initButtons() {
+  document
+    .getElementById("btn-ws-stop")
+    .addEventListener("click", livedebug_stop);
+  document
+    .getElementById("btn-ws-start")
+    .addEventListener("click", livedebug_start);
+}
+
+function onOpen(event) {
+  console.log("Connection opened");
+}
+
+function onClose(event) {
+  console.log("Connection closed");
+  setTimeout(initWebSocket, 2000);
+}
+
+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);
+}
+
+function onLoad(event) {
+  initWebSocket();
+  initButtons();
+}
+
+function livedebug_start() {
+  websocket.send("start");
+}
+
+function livedebug_stop() {
+  websocket.send("stop");
+}
+
+function do_resize(textbox) {
+  var maxrows = 15;
+  var minrows = 3;
+  var txt = textbox.value;
+  var cols = textbox.cols;
+
+  var arraytxt = txt.split("\n");
+  var rows = arraytxt.length;
+
+  for (i = 0; i < arraytxt.length; i++)
+    rows += parseInt(arraytxt[i].length / cols);
+
+  if (rows > maxrows) textbox.rows = maxrows;
+  else if (rows < minrows) textbox.rows = minrows;
+  else textbox.rows = rows;
+}
+
+function notifyMe() {
+  if (!("Notification" in window)) {
+    alert("This browser does not support desktop notification");
+  } else if (Notification.permission === "granted") {
+    const notification = new Notification("Hi there!");
+    // …
+  } else if (Notification.permission !== "denied") {
+    Notification.requestPermission().then((permission) => {
+      if (permission === "granted") {
+        const notification = new Notification("Hi there!");
+        // …
+      }
+    });
+  }
+}
--- a/Software/data_src/static/tt_dtc/dtc_1.json
+++ b/Software/data_src/static/tt_dtc/dtc_1.json
@@ -0,0 +1,4 @@
+{
+    "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_10.json
+++ b/Software/data_src/static/tt_dtc/dtc_10.json
@@ -0,0 +1,4 @@
+{
+    "title": "Power-Monitor Fehler",
+    "description": "Es gibt ein Problem mit dem Power-Monitoring. Die Akku-Überwachung ist ohne Funktion! Bitte Hardware prüfen"
+}
--- a/Software/data_src/static/tt_dtc/dtc_11.json
+++ b/Software/data_src/static/tt_dtc/dtc_11.json
@@ -0,0 +1,4 @@
+{
+    "title": "Akku-Spannung niedrig",
+    "description": "Die Akkuspannung ist niedrig. Bitte Akku bald aufladen!"
+}
--- a/Software/data_src/static/tt_dtc/dtc_12.json
+++ b/Software/data_src/static/tt_dtc/dtc_12.json
@@ -0,0 +1,4 @@
+{
+    "title": "Akku-Spannung kritisch",
+    "description": "Die Akkuspannung ist sehr niedrig. Bitte Akku umgehend ersetzen um eine schädliche Tiefentladung zu vermeiden!"
+}
--- a/Software/data_src/static/tt_dtc/dtc_13.json
+++ b/Software/data_src/static/tt_dtc/dtc_13.json
@@ -0,0 +1,4 @@
+{
+    "title": "EEPROM-Migration failed",
+    "description": "Migration of EEPROM-Image from an other FW-Version failed - you need to reset everything manually!"
+}
--- a/Software/data_src/static/tt_dtc/dtc_2.json
+++ b/Software/data_src/static/tt_dtc/dtc_2.json
@@ -0,0 +1,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"
+}
--- a/Software/data_src/static/tt_dtc/dtc_3.json
+++ b/Software/data_src/static/tt_dtc/dtc_3.json
@@ -0,0 +1,4 @@
+{
+    "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_4.json
+++ b/Software/data_src/static/tt_dtc/dtc_4.json
@@ -0,0 +1,4 @@
+{
+    "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_5.json
+++ b/Software/data_src/static/tt_dtc/dtc_5.json
@@ -0,0 +1,4 @@
+{
+    "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_6.json
+++ b/Software/data_src/static/tt_dtc/dtc_6.json
@@ -0,0 +1,4 @@
+{
+    "title": "Flashstorage Fehler",
+    "description": "Der Flashstorage konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware"
+}
--- a/Software/data_src/static/tt_dtc/dtc_7.json
+++ b/Software/data_src/static/tt_dtc/dtc_7.json
@@ -0,0 +1,4 @@
+{
+    "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/static/tt_dtc/dtc_8.json
+++ b/Software/data_src/static/tt_dtc/dtc_8.json
@@ -0,0 +1,4 @@
+{
+    "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_9.json
+++ b/Software/data_src/static/tt_dtc/dtc_9.json
@@ -0,0 +1,4 @@
+{
+    "title": "LoRa-Modul Fehler",
+    "description": "Es gibt ein Problem mit dem LoRa-Modul. Es konnte keine LoRa-Verbindung aufgebaut werden. Bitte Hardware prüfen"
+}
--- a/Software/data_src/version
+++ b/Software/data_src/version
@@ -0,0 +1 @@
+1.04
--- a/Software/include/common.h
+++ b/Software/include/common.h
@@ -12,13 +12,16 @@

 #define HOST_NAME "AirsoftTimer_%08X"

+#define SHUTDOWN_DELAY_MS 5000
+#define STARTUP_DELAY_MS 20000
+
 #define GPIO_LORA_TX D3
 #define GPIO_LORA_RX D4
 #define GPIO_LORA_AUX D0

-#define GPIO_7SEG_EN_FAC1 D5
+#define GPIO_7SEG_EN_FAC1 D7
 #define GPIO_7SEG_EN_FAC2 D6
-#define GPIO_7SEG_EN_FAC3 D7
+#define GPIO_7SEG_EN_FAC3 D5
 #define GPIO_7SEG_CLK D8

 #define I2C_IO_BTN_FAC1 0
@@ -41,17 +44,6 @@
 #define OTA_DELAY 50 // ticks -> 10ms / tick
 #endif

-#ifndef ADMIN_PASSWORD
-#error "You need to define ADMIN_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_PASSWORD
-#error "You must define an WIFI_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_SSID
-#error "You must define an WIFI_SSID for OTA-Update"
-#endif
-#ifndef WIFI_AP_PASSWORD
-#error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
-#endif
+

 #endif
--- 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/defaults.h
+++ b/Software/include/defaults.h
--- a/Software/include/dtc.h
+++ b/Software/include/dtc.h
@@ -0,0 +1,57 @@
+#ifndef _DTC_H_
+#define _DTC_H_
+
+#include <Arduino.h>
+
+#define MAX_DTC_STORAGE 12
+
+typedef enum DTCNums_e
+{
+  DTC_NO_EEPROM_FOUND = 1,
+  DTC_EEPROM_CFG_BAD,
+  DTC_EEPROM_PDS_BAD,
+  DTC_EEPROM_PDSADRESS_BAD,
+  DTC_EEPROM_VERSION_BAD,
+  DTC_FLASHFS_ERROR,
+  DTC_FLASHFS_VERSION_ERROR,
+  DTC_EEPROM_CFG_SANITY,
+  DTC_NO_LORA_FOUND,
+  DTC_NO_BATMNON_FOUND,
+  DTC_BAT_LOW,
+  DTC_BAT_CRITICAL,
+  DTC_EEPROM_MIGRATE_FAILED,
+  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/include/eeprom.h
+++ b/Software/include/eeprom.h
@@ -0,0 +1,89 @@
+#ifndef _EEPROM_H_
+#define _EEPROM_H_
+
+#include <Arduino.h>
+#include <Wire.h>
+#include <I2C_eeprom.h>
+
+#include "globals.h"
+#include "dtc.h"
+#include "common.h"
+#include "debugger.h"
+
+#define I2C_EE_ADDRESS 0x50
+#define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC64
+#define EEPROM_ENDURANCE 1000000
+
+typedef enum
+{
+  NONE,
+  FACTION_1,
+  FACTION_2,
+  FACTION_3
+} factions_t;
+
+typedef struct
+{
+  uint32_t writeCycleCounter = 0;
+  uint32_t faction_1_timer = 0;
+  uint32_t faction_2_timer = 0;
+  uint32_t faction_3_timer = 0;
+  factions_t activeFaction = NONE;
+  uint32_t checksum = 0;
+} persistenceData_t;
+
+extern persistenceData_t PersistenceData;
+typedef enum
+{
+  BATTERY_UNDEFINED,
+  BATTERY_LIPO_2S,
+  BATTERY_LIPO_3S
+} batteryType_t;
+
+const char BatteryString[][10]{
+    "Undefined",
+    "LiPo 2S",
+    "LiPo 3S"};
+
+const size_t BatteryString_Elements = sizeof(BatteryString) / sizeof(BatteryString[0]);
+
+typedef struct
+{
+  uint8_t EEPROM_Version;
+  batteryType_t batteryType;
+  bool active_faction_on_reboot;
+  char Faction_1_Name[33];
+  char Faction_2_Name[33];
+  char Faction_3_Name[33];
+  uint32_t checksum;
+} configData_t;
+
+extern configData_t ConfigData;
+
+const configData_t ConfigData_defaults = {
+    2,                      // EEPROM_Version (incerease this if anything on Layout changes!)
+    BATTERY_LIPO_3S,        // batteryType
+    false,                  // active_faction_on_reboot
+    "FACTION 1",            // Faction_1_Name
+    "FACTION 2",            // Faction_2_Name
+    "FACTION 3",            // Faction_3_Name
+    0                       // checksum
+};
+
+const uint16_t startofConfigData = 16;
+const uint16_t startofPersistence = 16 + sizeof(ConfigData) + (sizeof(ConfigData) % 16);
+
+void InitEEPROM();
+void EEPROM_Process();
+void StoreConfig_EEPROM();
+void GetConfig_EEPROM();
+void StorePersistence_EEPROM();
+void GetPersistence_EEPROM();
+void FormatConfig_EEPROM();
+void FormatPersistence_EEPROM();
+uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
+void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
+void MovePersistencePage_EEPROM(boolean reset);
+uint32_t ConfigSanityCheck(bool autocorrect = false);
+
+#endif // _EEPROM_H_
--- a/Software/include/globals.h
+++ b/Software/include/globals.h
@@ -0,0 +1,69 @@
+#ifndef _GLOBALS_H_
+#define _GLOBALS_H_
+
+#include <Arduino.h>
+
+typedef enum eSystem_Status
+{
+  sysStat_null,
+  sysStat_Startup,
+  sysStat_Normal,
+  sysStat_Error,
+  sysStat_Shutdown
+} tSystem_Status;
+
+const char sSystem_Status_txt[][9] = {
+    "Null",
+    "Startup",
+    "Normal",
+    "Error",
+    "Shutdown"
+};
+
+typedef enum eEERequest
+{
+  EE_IDLE,
+  EE_CFG_SAVE,
+  EE_CFG_LOAD,
+  EE_CFG_FORMAT,
+  EE_PDS_SAVE,
+  EE_PDS_LOAD,
+  EE_PDS_FORMAT,
+  EE_FORMAT_ALL,
+  EE_ALL_SAVE
+
+} tEERequest;
+
+typedef struct Globals_s
+{
+  char DeviceName[33];
+  char DeviceName_ID[43];
+  char FlashVersion[10];
+  tSystem_Status systemStatus = sysStat_Startup;
+  eEERequest requestEEAction = EE_IDLE;
+  uint16_t eePersistanceAdress;
+  bool hasDTC;
+  int loadvoltage_mV = 0;
+  int battery_level = 0;
+  bool timer_disabled = false;
+} 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,5,     // Firmware_Version
+ 1,4,     // Required Flash Version
+ GIT_REV  // Git-Hash-String
+};
+
+void initGlobals();
+
+#endif
--- a/Software/include/lora_net.h
+++ b/Software/include/lora_net.h
@@ -0,0 +1,27 @@
+#ifndef _LORA_NET_H_
+#define _LORA_NET_H_
+
+#include <Arduino.h>
+
+#ifdef LORA_FEATURE_ENABLED
+#include <LoRa_E220.h>
+#elif defined(FEATURE_ENABLE_UARTLORA)
+#include <SoftwareSerial.h>
+#endif
+
+// local includes
+#include "lora_messages.h"
+#include "debugger.h"
+#include "defaults.h"
+#include "config.h"
+#include "globals.h"
+#include "dtc.h"
+#include "common.h"
+
+#define FREQUENCY_868
+
+bool InitLoRa(void (*MPinHelper)(int, int));
+void LoRa_Process();
+void sendStatus_LoRa();
+
+#endif
--- a/Software/include/oled_display.h
+++ b/Software/include/oled_display.h
@@ -6,7 +6,7 @@
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 #include "globals.h"
-#include "config.h"
+#include "eeprom.h"

 #define OLED_SDA 4
 #define OLED_SCL 15
--- a/Software/include/sanitycheck.h
+++ b/Software/include/sanitycheck.h
@@ -0,0 +1,31 @@
+#ifndef _SANITYCHECK_H_
+#define _SANITYCHECK_H_
+
+#ifndef ADMIN_PASSWORD
+    #error "You need to define ADMIN_PASSWORD for OTA-Update"
+#endif
+
+#ifndef WIFI_AP_SSID
+    #warning "No WIFI_AP_SSID defined. Using DeviceName"
+    #define WIFI_AP_SSID DEVICE_NAME
+#endif
+
+#ifndef WIFI_AP_PASSWORD
+    #error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
+#endif
+
+#if defined(FEATURE_ENABLE_UARTLORA) && defined(FEATURE_ENABLE_LORA)
+    #error "You cannot enable LoRa and UART-Protocol at the same time!"
+#endif
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+    #ifndef WIFI_CLIENT_PASSWORD
+        #error "You must define an WIFI_PASSWORD for OTA-Update"
+    #endif
+    #ifndef WIFI_CLIENT_SSID
+        #error "You must define an WIFI_SSID for OTA-Update"
+    #endif
+#endif
+
+
+#endif //_SANITYCHECK_H_
--- a/Software/include/webui.h
+++ b/Software/include/webui.h
@@ -0,0 +1,24 @@
+#ifndef _WEBUI_H_
+#define _WEBUI_H_
+
+#include <Arduino.h>
+#include <FS.h>
+#include <LittleFS.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <Updater.h>
+#include <ESP8266mDNS.h>
+#include <AsyncJson.h>
+#include <ArduinoJson.h>
+
+#include "eeprom.h"
+#include "globals.h"
+#include "dtc.h"
+#include "common.h"
+#include "debugger.h"
+
+void initWebUI();
+void Webserver_Process();
+void Websocket_PushLiveDebug(String Message);
+
+#endif
--- a/library/LoRa_E220.cpp
+++ b/library/LoRa_E220.cpp
@@ -274,7 +274,7 @@ bool LoRa_E220::begin(){

    this->serialDef.stream->setTimeout(100);
    Status status = setMode(MODE_0_NORMAL);
-    return status==E220_SUCCESS;
+    return status;
 }

 /*
--- a/Software/platformio.ini
+++ b/Software/platformio.ini
@@ -16,44 +16,45 @@ extra_configs =
 platform = espressif8266
 framework = arduino
 board = d1_mini
-board_build.filesystem = littlefs
-;board_build.f_flash = 80000000L
-;board_build.ldscript = eagle.flash.4m1m.ld
-
-monitor_filters = esp8266_exception_decoder
-monitor_speed = 115200

 upload_protocol = esptool
 upload_speed = 921600
 ;upload_port = 10.0.1.48
 ;upload_protocol = espota
 ;upload_flags =  
-;   --auth=${wifi_cred.admin_password}
+;   --auth=${wifi_cred.ota_password}

-build_type = debug
 build_flags=
  !python git_rev_macro.py
-  -DSERIAL_DEBUG
-  ;-DWIFI_CLIENT
+  -DATOMIC_FS_UPDATE
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_LORA
  ;-DCAPTIVE
-  -DWIFI_AP_IP_GW=10,0,1,1
-  -DADMIN_PASSWORD=${wifi_cred.admin_password}
-  -DWIFI_SSID=${wifi_cred.wifi_ssid}
-  -DWIFI_PASSWORD=${wifi_cred.wifi_password}
+  -DFEATURE_ENABLE_UARTLORA
+  -DWIFI_AP_IP_GW=10,0,0,1
+  -DADMIN_PASSWORD=${wifi_cred.ota_password}
+  -DWIFI_CLIENT_SSID=${wifi_cred.wifi_client_ssid}
+  -DWIFI_CLIENT_PASSWORD=${wifi_cred.wifi_client_password}
+  -DWIFI_AP_SSID=${wifi_cred.wifi_ap_ssid}
  -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
  -DDEVICE_NAME='"Dark Emergency Timer"'
-  -DFACTION_1_NAME='"GOF"'
-  -DFACTION_2_NAME='"MILIZ"'
-  -DFACTION_3_NAME='"KGG"'
+
+;build_type = debug
+
+board_build.filesystem = littlefs
+board_build.ldscript = eagle.flash.4m1m.ld
+extra_scripts = post:prepare_littlefs.py
+
+monitor_filters = esp8266_exception_decoder
+monitor_speed = 115200

 lib_deps = 
-	;xreef/EByte LoRa E220 library@^1.0.6  ;made Lib local, due to changes for I2C-controller M0,M1-Pins
+	;xreef/EByte LoRa E220 library@^1.0.6   ; made Lib local, due to changes for I2C-controller M0,M1-Pins
 	sstaub/Ticker@^4.4.0
-    robtillaart/PCF8574 @ ^0.3.7
+  robtillaart/PCF8574 @ ^0.3.7
 	adafruit/Adafruit INA219 @ ^1.1.1
-    plerup/EspSoftwareSerial @ 6.8.5  ; needed exactly this Version as newer ones have Problems with compiling
-    smougenot/TM1637@0.0.0-alpha+sha.9486982048
-    me-no-dev/ESPAsyncTCP @ ^1.2.2
-    robtillaart/I2C_EEPROM @ ^1.5.2
-    sandeepmistry/LoRa @ ^0.8.0
-    bblanchon/ArduinoJson @ ^6.19.4
+  akj7/TM1637 Driver @ ^2.1.2
+  me-no-dev/ESPAsyncTCP @ ^1.2.2
+  robtillaart/I2C_EEPROM @ ^1.5.2
+  sandeepmistry/LoRa @ ^0.8.0
+  bblanchon/ArduinoJson @ ^6.19.4
--- a/Software/prepare_littlefs.py
+++ b/Software/prepare_littlefs.py
@@ -0,0 +1,116 @@
+# SCRIPT TO GZIP CRITICAL FILES FOR ACCELERATED WEBSERVING
+# see also https://community.platformio.org/t/question-esp32-compress-files-in-data-to-gzip-before-upload-possible-to-spiffs/6274/10
+
+
+import glob
+import shutil
+import gzip
+import os
+Import("env")
+Import("projenv")
+
+
+def gzip_file(src_path, dst_path):
+
+    with open(src_path, 'rb') as src, gzip.open(dst_path, 'wb') as dst:
+        for chunk in iter(lambda: src.read(4096), b""):
+            dst.write(chunk)
+
+
+def getListOfFiles(dirName):
+    # create a list of file and sub directories
+    # names in the given directory
+    listOfFile = os.listdir(dirName)
+    allFiles = list()
+    # Iterate over all the entries
+    for entry in listOfFile:
+        # Create full path
+        fullPath = os.path.join(dirName, entry)
+        # If entry is a directory then get the list of files in this directory
+        if os.path.isdir(fullPath):
+            allFiles = allFiles + getListOfFiles(fullPath)
+        else:
+            allFiles.append(fullPath)
+
+    return allFiles
+
+def remove_prefix(text, prefix):
+    if text.startswith(prefix):
+        return text[len(prefix):]
+    return text  # or whatever
+
+# Compress files from 'data_src/' to 'data/'
+
+
+def gzip_webfiles(source, target, env):
+    # Filetypes to compress
+    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_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)):
+        print('GZIP: Directory "'+data_dir_path +
+              '" exists, "'+data_src_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)
+    # Delete the 'data' directory
+    if(os.path.exists(data_dir_path)):
+        print('GZIP: Deleting the "data" directory ' + data_dir_path)
+        shutil.rmtree(data_dir_path)
+    # Recreate empty 'data' directory
+    print('GZIP: Re-creating an empty data directory ' + data_dir_path)
+    os.mkdir(data_dir_path)
+    # Determine the files to compress
+
+    files_to_copy = []
+    files_to_gzip = []
+
+    all_data_src = getListOfFiles(data_src_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)
+            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)
+        os.makedirs(os.path.dirname(data_dir_path + file), exist_ok=True)
+        shutil.copy(data_src_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)
+            target_file_path = data_dir_path + filename_subdir
+            os.makedirs(os.path.dirname(target_file_path), exist_ok=True)
+            print('GZIP: Compressed... ' + target_file_path)
+            gzip_file(source_file_path, target_file_path + ".gz")
+    except IOError as e:
+        was_error = True
+        print('GZIP: Failed to compress file: ' + source_file_path)
+        # print( 'GZIP: EXCEPTION... {}'.format( e ) )
+    if was_error:
+        print('GZIP: Failure/Incomplete.\n')
+    else:
+        print('GZIP: Compressed correctly.\n')
+
+    return
+ 
+def gzip_binffiles(source, target, env):
+    littlefsbin = target[0].get_abspath()
+    targetbin = os.path.join(os.path.dirname(littlefsbin), 'filesystem.fs')
+    shutil.copyfile(littlefsbin, targetbin)
+    gzip_file(targetbin, os.path.join(str(targetbin) + '.gz'))
+    os.remove(targetbin)
+    return
+
+# IMPORTANT, this needs to be added to call the routine
+env.AddPreAction('$BUILD_DIR/littlefs.bin', gzip_webfiles)
+env.AddPostAction('$BUILD_DIR/littlefs.bin', gzip_binffiles)
--- a/Software/src/config.cpp
+++ b/Software/src/config.cpp
@@ -1,261 +0,0 @@
-#include "config.h"
-
-I2C_eeprom ee(0x50, EEPROM_SIZE_BYTES);
-
-configData_t ConfigData;
-persistenceData_t PersistenceData;
-const uint16_t eeVersion = 1; // inc
-boolean eeAvailable = false;
-
-const uint16_t persistencemarker_Adress = 0; // sizeof 4
-const uint16_t startofConfig_Adress = 16;
-const uint16_t startofPersistence_Adress = startofConfig_Adress + sizeof(ConfigData) + (sizeof(ConfigData) % 16);
-
-boolean checkEEPROMavailable();
-
-void InitEEPROM()
-{
-  ee.begin();
-  if (!checkEEPROMavailable())
-  {
-    globals.systemStatus = sysStat_Error;
-    MaintainDTC(DTC_NO_EEPROM_FOUND, true);
-    return;
-  }
-  GetConfig_EEPROM();
-
-  if (ConfigData.EEPROM_Version != eeVersion)
-  {
-    FormatConfig_EEPROM();
-    globals.systemStatus = sysStat_Error;
-    MaintainDTC(DTC_EEPROM_VERSION_BAD, true);
-    return;
-  }
-
-  if (getPersistanceAddress() > ee.getDeviceSize())
-  {
-    FormatPersistence_EEPROM();
-    globals.systemStatus = sysStat_Error;
-    MaintainDTC(DTC_EEPROM_PDS_MARKER_INVALID, true);
-    return;
-  }
-  GetPersistence_EEPROM();
-}
-
-void EEPROM_Process()
-{
-
-  switch (globals.requestEEAction)
-  {
-  case EE_CFG_SAVE:
-    StoreConfig_EEPROM();
-    globals.requestEEAction = EE_IDLE;
-    break;
-  case EE_CFG_LOAD:
-    GetConfig_EEPROM();
-    globals.requestEEAction = EE_IDLE;
-    break;
-  case EE_PDS_SAVE:
-    StorePersistence_EEPROM();
-    globals.requestEEAction = EE_IDLE;
-    break;
-  case EE_PDS_LOAD:
-    GetPersistence_EEPROM();
-    globals.requestEEAction = EE_IDLE;
-    break;
-  case EE_IDLE:
-  default:
-    globals.requestEEAction = EE_IDLE;
-  }
-}
-
-void StoreConfig_EEPROM()
-{
-  ConfigData.checksum = 0;
-  ConfigData.checksum = Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData));
-  if (!checkEEPROMavailable())
-    return;
-
-  ee.updateBlock(startofConfig_Adress, (uint8_t *)&ConfigData, sizeof(ConfigData));
-}
-
-void GetConfig_EEPROM()
-{
-  if (!checkEEPROMavailable())
-    return;
-
-  ee.readBlock(startofConfig_Adress, (uint8_t *)&ConfigData, sizeof(ConfigData));
-
-  uint32_t checksum = ConfigData.checksum;
-  ConfigData.checksum = 0;
-
-  if (Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData)) != checksum)
-  {
-    MaintainDTC(DTC_EEPROM_CFG_BAD, true);
-    FormatConfig_EEPROM();
-  }
-  ConfigData.checksum = checksum;
-}
-
-uint32_t getPersistanceAddress()
-{
-  uint32_t eePersistenceMarker;
-  ee.readBlock(persistencemarker_Adress, (uint8_t *)&eePersistenceMarker, sizeof(eePersistenceMarker));
-  return eePersistenceMarker;
-}
-
-void updatePersistanceAddress(uint32_t adress)
-{
-  ee.updateBlock(persistencemarker_Adress, (uint8_t *)&adress, sizeof(adress));
-}
-
-void StorePersistence_EEPROM()
-{
-  if (PersistenceData.writeCycleCounter >= EEPROM_ENDURANCE)
-    MovePersistencePage_EEPROM(false);
-  else
-    PersistenceData.writeCycleCounter++;
-
-  PersistenceData.checksum = 0;
-  PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
-
-  if (!checkEEPROMavailable())
-    return;
-
-  ee.updateBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
-}
-
-void GetPersistence_EEPROM()
-{
-  if (!checkEEPROMavailable())
-    return;
-
-  ee.readBlock(getPersistanceAddress(), (uint8_t *)&PersistenceData, sizeof(PersistenceData));
-
-  uint32_t checksum = PersistenceData.checksum;
-  PersistenceData.checksum = 0;
-
-  if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
-  {
-    MaintainDTC(DTC_EEPROM_PDS_BAD, true);
-    FormatPersistence_EEPROM();
-  }
-  PersistenceData.checksum = checksum;
-}
-
-void FormatConfig_EEPROM()
-{
-  configData_t defaults;
-  ConfigData = defaults;
-  ConfigData.EEPROM_Version = eeVersion;
-  StoreConfig_EEPROM();
-}
-
-void FormatPersistence_EEPROM()
-{
-  persistenceData_t defaults;
-  PersistenceData = defaults;
-  updatePersistanceAddress(startofPersistence_Adress);
-  StorePersistence_EEPROM();
-}
-
-void MovePersistencePage_EEPROM(boolean reset)
-{
-  if (!checkEEPROMavailable())
-    return;
-
-  if (reset)
-  {
-    updatePersistanceAddress(startofPersistence_Adress);
-  }
-  else
-  {
-    uint32_t newPersistenceMarker = getPersistanceAddress() + sizeof(PersistenceData);
-
-    // check if we reached the End of the EEPROM and Startover at the beginning
-    if ((newPersistenceMarker + sizeof(PersistenceData)) > ee.getDeviceSize())
-    {
-      MaintainDTC(DTC_EEPROM_WORNOUT, true);
-      return;
-    }
-    else
-    {
-      updatePersistanceAddress(newPersistenceMarker);
-      PersistenceData.writeCycleCounter = 0;
-    }
-  }
-}
-
-uint32_t GetEESize()
-{
-  return ee.getDeviceSize();
-}
-
-uint32_t Checksum_EEPROM(uint8_t const *data, size_t len)
-{
-  if (data == NULL)
-    return 0;
-  uint32_t crc, mask;
-  crc = 0xFFFFFFFF;
-
-  while (len--)
-  {
-    crc ^= *data++;
-    for (uint8_t k = 0; k < 8; k++)
-    {
-      mask = -(crc & 1);
-      crc = (crc >> 1) ^ (0xEDB88320 & mask);
-    }
-  }
-  return ~crc;
-}
-
-void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
-{
-#define BLOCK_TO_LENGTH 16
-
-  if (length > ee.getDeviceSize())
-    length = ee.getDeviceSize();
-
-  if (memoryAddress + length > ee.getDeviceSize())
-    return;
-
-  if (!checkEEPROMavailable())
-    return;
-
-  char ascii_buf[BLOCK_TO_LENGTH + 1];
-  sprintf(ascii_buf, "%*s", BLOCK_TO_LENGTH, "ASCII");
-  Serial.print(PSTR("\nAddress "));
-  for (int x = 0; x < BLOCK_TO_LENGTH; x++)
-    Serial.printf("%3d", x);
-
-  memoryAddress = memoryAddress / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
-  length = (length + BLOCK_TO_LENGTH - 1) / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
-
-  for (unsigned int i = 0; i < length; i++)
-  {
-    int blockpoint = memoryAddress % BLOCK_TO_LENGTH;
-    if (blockpoint == 0)
-    {
-      ascii_buf[BLOCK_TO_LENGTH] = 0;
-      Serial.printf("  %s", ascii_buf);
-      Serial.printf("\n0x%05X:", memoryAddress);
-    }
-    ascii_buf[blockpoint] = ee.readByte(memoryAddress);
-    Serial.printf(" %02X", ascii_buf[blockpoint]);
-    if (ascii_buf[blockpoint] < 0x20 || ascii_buf[blockpoint] > 0x7E)
-      ascii_buf[blockpoint] = '.';
-    memoryAddress++;
-  }
-  Serial.println();
-}
-
-boolean checkEEPROMavailable()
-{
-  if (!ee.isConnected())
-  {
-    MaintainDTC(DTC_NO_EEPROM_FOUND, true);
-    return false;
-  }
-  return true;
-}
--- a/Software/src/config.h
+++ b/Software/src/config.h
@@ -1,69 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-#include <Arduino.h>
-#include <Wire.h>
-#include <I2C_eeprom.h>
-
-#include "globals.h"
-#include "dtc.h"
-
-#define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC01
-#define EEPROM_ENDURANCE 1000000
-
-typedef enum
-{
-  NONE,
-  FACTION_1,
-  FACTION_2,
-  FACTION_3
-} factions_t;
-
-typedef struct
-{
-  uint32_t writeCycleCounter = 0;
-  uint32_t faction_1_timer = 0;
-  uint32_t faction_2_timer = 0;
-  uint32_t faction_3_timer = 0;
-  factions_t activeFaction = NONE;
-  uint32_t checksum = 0;
-} persistenceData_t;
-
-typedef enum
-{
-  BATTERY_UNDEFINED,
-  BATTERY_LIPO_2S,
-  BATTERY_LIPO_3S
-} batteryType_t;
-
-const char BatteryString[][10]{
-  "Undefined",
-  "LiPo 2S",
-  "LiPo 3S"
-};
-
-typedef struct
-{
-  uint8_t EEPROM_Version = 1;
-  batteryType_t batteryType = BATTERY_UNDEFINED;
-  uint32_t checksum = 0;
-} configData_t;
-
-void InitEEPROM();
-void EEPROM_Process();
-void StoreConfig_EEPROM();
-void GetConfig_EEPROM();
-void StorePersistence_EEPROM();
-void GetPersistence_EEPROM();
-void FormatConfig_EEPROM();
-void FormatPersistence_EEPROM();
-uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
-void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
-void MovePersistencePage_EEPROM(boolean reset);
-uint32_t getPersistanceAddress();
-void updatePersistanceAddress(uint32_t adress);
-uint32_t GetEESize();
-
-extern configData_t ConfigData;
-extern persistenceData_t PersistenceData;
-#endif // _CONFIG_H_
--- a/Software/src/debugger.cpp
+++ b/Software/src/debugger.cpp
@@ -0,0 +1,302 @@
+#include "debugger.h"
+
+DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+String IpAddress2String(const IPAddress &ipAddress);
+void processCmdDebug(String command);
+void Debug_formatCFG();
+void Debug_formatPersistence();
+void Debug_printSystemInfo();
+void Debug_printWifiInfo();
+void Debug_CheckEEPOM();
+void Debug_dumpConfig();
+void Debug_dumpPersistance();
+void Debug_ShowDTCs();
+void Debug_dumpGlobals();
+void Debug_printHelp();
+
+void initDebugger()
+{
+    DebuggerStatus[dbg_Serial] = disabled;
+    DebuggerStatus[dbg_Webui] = disabled;
+
+    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\n", sDebugPorts[port]);
+
+    DebuggerStatus[port] = status;
+
+    if (status == enabled)
+        Debug_pushMessage("enabled DebugPort %s\n", sDebugPorts[port]);
+}
+
+void Debug_pushMessage(const char *format, ...)
+{
+    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
+    {
+        char buff[64];
+        va_list arg;
+        va_start(arg, format);
+        vsnprintf(buff, sizeof(buff), format, arg);
+        va_end(arg);
+
+        if (DebuggerStatus[dbg_Serial] == enabled)
+        {
+            Serial.print(buff);
+        }
+        if (DebuggerStatus[dbg_Webui] == enabled)
+        {
+            Websocket_PushLiveDebug(String(buff));
+        }
+    }
+}
+
+void processCmdDebug(String command)
+{
+    if (command == "help")
+        Debug_printHelp();
+    else if (command == "sysinfo")
+        Debug_printSystemInfo();
+    else if (command == "netinfo")
+        Debug_printWifiInfo();
+    else if (command == "formatCFG")
+        Debug_formatCFG();
+    else if (command == "formatPDS")
+        Debug_formatPersistence();
+    else if (command == "checkEE")
+        Debug_CheckEEPOM();
+    else if (command == "dumpEE1k")
+        dumpEEPROM(0, 1024);
+    else if (command == "dumpEE")
+        dumpEEPROM(0, EEPROM_SIZE_BYTES);
+    else if (command == "resetPageEE")
+        MovePersistencePage_EEPROM(true);
+    else if (command == "dumpCFG")
+        Debug_dumpConfig();
+    else if (command == "dumpPDS")
+        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
+        Debug_pushMessage("unknown Command\n");
+}
+
+void Debug_formatCFG()
+{
+    Debug_pushMessage("Formatting Config-EEPROM and reseting to default\n");
+    FormatConfig_EEPROM();
+}
+
+void Debug_formatPersistence()
+{
+    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default\n");
+    FormatPersistence_EEPROM();
+}
+
+void Debug_printSystemInfo()
+{
+    Debug_pushMessage("Hostname: %s\n", globals.DeviceName);
+
+    FlashMode_t ideMode = ESP.getFlashChipMode();
+    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("batteryType: %d\n", ConfigData.batteryType);
+    Debug_pushMessage("EEPROM_Version: %d\n", ConfigData.EEPROM_Version);
+    Debug_pushMessage("checksum: 0x%08X\n", ConfigData.checksum);
+}
+
+void Debug_dumpGlobals()
+{
+    Debug_pushMessage("systemStatus: %d\n", globals.systemStatus);
+    Debug_pushMessage("battery_level: %d\n", globals.battery_level);
+    Debug_pushMessage("loadvoltage_mV: %d\n", globals.loadvoltage_mV);
+    Debug_pushMessage("requestEEAction: %d\n", globals.requestEEAction);
+    Debug_pushMessage("DeviceName: %s\n", globals.DeviceName);
+    Debug_pushMessage("DeviceName_ID: %s\n", globals.DeviceName_ID);
+    Debug_pushMessage("FlashVersion: %s\n", globals.FlashVersion);
+    Debug_pushMessage("eePersistanceAdress: %d\n", globals.eePersistanceAdress);
+    Debug_pushMessage("hasDTC: %d\n", globals.hasDTC);
+}
+
+void Debug_dumpPersistance()
+{
+    Debug_pushMessage("writeCycleCounter: %d\n", PersistenceData.writeCycleCounter);
+    Debug_pushMessage("activeFaction: %d\n", PersistenceData.activeFaction);
+    Debug_pushMessage("faction_1_timer: %d\n", PersistenceData.faction_1_timer);
+    Debug_pushMessage("faction_2_timer: %d\n", PersistenceData.faction_2_timer);
+    Debug_pushMessage("faction_3_timer: %d\n", PersistenceData.faction_3_timer);
+    Debug_pushMessage("checksum: %d\n", PersistenceData.checksum);
+    Debug_pushMessage("PSD Adress: 0x%04X\n", globals.eePersistanceAdress);
+}
+
+void Debug_printWifiInfo()
+{
+}
+
+void Debug_CheckEEPOM()
+{
+    uint32_t checksum = PersistenceData.checksum;
+    PersistenceData.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) == checksum)
+    {
+        Debug_pushMessage("PersistenceData EEPROM Checksum OK\n");
+    }
+    else
+    {
+        Debug_pushMessage("PersistenceData EEPROM Checksum BAD\n");
+    }
+
+    PersistenceData.checksum = checksum;
+
+    checksum = ConfigData.checksum;
+    ConfigData.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData)) == checksum)
+    {
+        Debug_pushMessage("ConfigData EEPROM Checksum OK\n");
+    }
+    else
+    {
+        Debug_pushMessage("ConfigData EEPROM Checksum BAD\n");
+    }
+    ConfigData.checksum = checksum;
+}
+
+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 | debugVal\n");
+
+    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
+
+            if (DTCStorage[i].active == DTC_ACTIVE)
+                strcpy(buff_active, "active");
+            else if (DTCStorage[i].active == DTC_PREVIOUS)
+                strcpy(buff_active, "previous");
+            else
+                strcpy(buff_active, "none");
+
+            Debug_pushMessage("%s   %7d   %8s   %8d   %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity, DTCStorage[i].debugVal);
+        }
+    }
+}
+
+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/dtc.cpp
+++ b/Software/src/dtc.cpp
@@ -1,8 +1,9 @@
 #include "dtc.h"
+#include "debugger.h"

 DTCEntry_s DTCStorage[MAX_DTC_STORAGE];

-void MaintainDTC(DTCNums_t DTC_no, boolean active)
+void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, uint32_t DebugValue)
 {
    for (int i = 0; i < MAX_DTC_STORAGE; i++)
    {
@@ -10,13 +11,15 @@ void MaintainDTC(DTCNums_t DTC_no, boolean active)
        {
            if (active && DTCStorage[i].active != DTC_ACTIVE)
            {
-                Serial.printf("DTC gone active: %d", DTC_no);
+                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)
            {
-                Serial.printf("DTC gone previous: %d", DTC_no);
+                Debug_pushMessage("DTC gone previous: %d\n", DTC_no);
                DTCStorage[i].active = DTC_PREVIOUS;
            }
            return;
@@ -31,10 +34,12 @@ void MaintainDTC(DTCNums_t DTC_no, boolean active)
        {
            if (DTCStorage[i].Number == DTC_LAST_DTC)
            {
-                Serial.printf("new DTC registered: %d", DTC_no);
+                Debug_pushMessage("new DTC registered: %d, DebugVal: %d\n", DTC_no, DebugValue);
                DTCStorage[i].Number = DTC_no;
                DTCStorage[i].timestamp = millis();
                DTCStorage[i].active = DTC_ACTIVE;
+                DTCStorage[i].debugVal = DebugValue;
+                DTCStorage[i].severity = DTC_severity;
                return;
            }
        }
@@ -82,4 +87,53 @@ 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)
+{
+    int8_t pointer = -1;
+    uint32_t lasttimestamp = 0;
+
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number > 0 && DTCStorage[i].timestamp > lasttimestamp)
+        {
+            if ((only_active == false || DTCStorage[i].active == DTC_ACTIVE) && DTCStorage[i].severity == severity)
+            {
+                pointer = i;
+                lasttimestamp = DTCStorage[i].timestamp;
+            }
+        }
+    }
+
+    return pointer >= 0 ? DTCStorage[pointer].Number : DTC_LAST_DTC;
+}
+
+void DTC_Process()
+{
+    static tSystem_Status preserverSysStatusError;
+
+    if (getlastDTC(false) < DTC_LAST_DTC)
+    {
+        globals.hasDTC = true;
+        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC && globals.systemStatus != sysStat_Shutdown)
+        {
+            if (globals.systemStatus != sysStat_Error)
+            {
+                preserverSysStatusError = globals.systemStatus;
+            }
+            globals.systemStatus = sysStat_Error;
+        }
+        else
+        {
+            if (globals.systemStatus == sysStat_Error)
+            {
+                globals.systemStatus = preserverSysStatusError;
+            }
+        }
+    }
+    else
+    {
+        globals.hasDTC = false;
+    }
 }
--- a/Software/src/dtc.h
+++ b/Software/src/dtc.h
@@ -1,39 +0,0 @@
-#ifndef _DTC_H_
-#define _DTC_H_
-
-#include <Arduino.h>
-
-#define MAX_DTC_STORAGE 6
-
-typedef enum DTCNums_e
-{
-  DTC_NO_EEPROM_FOUND,
-  DTC_EEPROM_CFG_BAD,
-  DTC_EEPROM_PDS_BAD,
-  DTC_EEPROM_VERSION_BAD,
-  DTC_EEPROM_WORNOUT,                 // this will happen if the EEPROM-cells are all overwritten 1 million times!
-  DTC_EEPROM_PDS_MARKER_INVALID,      // This happens if the Marker of the PersistanceData was pointing to an EE-Adress bigger than the used EEPROM-IC
-  DTC_LAST_DTC
-} DTCNums_t;
-
-typedef enum DTCActive_e
-{
-  DTC_ACTIVE,
-  DTC_PREVIOUS,
-  DTC_NONE
-} DTCActive_t;
-
-typedef struct DTCEntry_s
-{
-  DTCNums_t Number;
-  uint32_t timestamp;
-  DTCActive_t active;
-} DTCEntry_t;
-
-void MaintainDTC(DTCNums_t DTC_no, boolean active);
-void ClearDTC(DTCNums_t DTC_no);
-void ClearAllDTC();
-DTCNums_t getlastDTC(boolean only_active);
-
-extern DTCEntry_s DTCStorage[MAX_DTC_STORAGE];
-#endif
--- a/Software/src/eeprom.cpp
+++ b/Software/src/eeprom.cpp
@@ -0,0 +1,358 @@
+#include "eeprom.h"
+
+I2C_eeprom ee(I2C_EE_ADDRESS, EEPROM_SIZE_BYTES);
+
+configData_t ConfigData;
+persistenceData_t PersistenceData;
+bool eeAvailable = false;
+
+bool checkEEPROMavailable();
+bool ValidateEEPROM_Version();
+bool MigrateEEPROM(uint8_t fromVersion);
+
+void InitEEPROM()
+{
+  ee.begin();
+  eeAvailable = checkEEPROMavailable();
+  eeAvailable = ValidateEEPROM_Version();
+	Serial.printf("Initialized EEPROM at Address 0x%02X\n", I2C_EE_ADDRESS);
+}
+
+void EEPROM_Process()
+{
+  if (eeAvailable == false)
+    return;
+
+  switch (globals.requestEEAction)
+  {
+  case EE_CFG_SAVE:
+    StoreConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Stored EEPROM CFG");
+    break;
+  case EE_CFG_LOAD:
+    GetConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Loaded EEPROM CFG");
+    break;
+  case EE_CFG_FORMAT:
+    FormatConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    globals.systemStatus = sysStat_Shutdown;
+    Serial.println("Formated EEPROM CFG");
+    break;
+  case EE_PDS_SAVE:
+    StorePersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Stored EEPROM PDS");
+    break;
+  case EE_PDS_LOAD:
+    GetPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Loaded EEPROM PDS");
+    break;
+  case EE_PDS_FORMAT:
+    FormatPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Formated EEPROM PDS");
+    break;
+  case EE_FORMAT_ALL:
+    FormatConfig_EEPROM();
+    FormatPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Formated EEPROM ALL");
+    break;
+  case EE_ALL_SAVE:
+    StorePersistence_EEPROM();
+    StoreConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Serial.println("Stored EEPROM ALL");
+    break;
+  case EE_IDLE:
+  default:
+    globals.requestEEAction = EE_IDLE;
+  }
+}
+
+void StoreConfig_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  ConfigData.checksum = 0;
+  ConfigData.checksum = Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData));
+
+  ee.updateBlock(startofConfigData, (uint8_t *)&ConfigData, sizeof(ConfigData));
+}
+
+void GetConfig_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  ee.readBlock(startofConfigData, (uint8_t *)&ConfigData, sizeof(ConfigData));
+
+  uint32_t checksum = ConfigData.checksum;
+  ConfigData.checksum = 0;
+
+  if (Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData)) != checksum)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_BAD, DTC_CRITICAL, true);
+  }
+  ConfigData.checksum = checksum;
+
+  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
+
+  if (ConfigSanityCheckResult > 0)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_SANITY, DTC_WARN, true, ConfigSanityCheckResult);
+    globals.requestEEAction = EE_CFG_SAVE;
+  }
+}
+
+void StorePersistence_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  if (PersistenceData.writeCycleCounter >= 0xFFF0)
+    MovePersistencePage_EEPROM(false);
+  else
+    PersistenceData.writeCycleCounter++;
+
+  PersistenceData.checksum = 0;
+  PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
+
+  ee.updateBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+}
+
+void GetPersistence_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  ee.readBlock(0, (uint8_t *)&globals.eePersistanceAdress, sizeof(globals.eePersistanceAdress));
+  // if we got the StartAdress of Persistance and it's out of Range - we Reset it and store defaults
+  // otherwise we Read from eeprom and check if everything is correct
+  if (globals.eePersistanceAdress < startofPersistence || globals.eePersistanceAdress > ee.getDeviceSize())
+  {
+    MovePersistencePage_EEPROM(true);
+    FormatPersistence_EEPROM();
+    MaintainDTC(DTC_EEPROM_PDSADRESS_BAD, DTC_CRITICAL, true);
+  }
+  else
+  {
+    ee.readBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+
+    uint32_t checksum = PersistenceData.checksum;
+    PersistenceData.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
+    {
+      MaintainDTC(DTC_EEPROM_PDS_BAD, DTC_CRITICAL, true);
+    }
+    PersistenceData.checksum = checksum;
+  }
+}
+
+void FormatConfig_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  Serial.println("Formatting Config-Partition");
+  ConfigData = ConfigData_defaults;
+  StoreConfig_EEPROM();
+  GetConfig_EEPROM();
+}
+
+void FormatPersistence_EEPROM()
+{
+  if (eeAvailable == false)
+    return;
+
+  Serial.println("Formatting Persistance-Partition");
+  PersistenceData = {0};
+  StorePersistence_EEPROM();
+  GetPersistence_EEPROM();
+}
+
+void MovePersistencePage_EEPROM(boolean reset)
+{
+  if (eeAvailable == false)
+    return;
+
+  globals.eePersistanceAdress = +sizeof(PersistenceData);
+  PersistenceData.writeCycleCounter = 0;
+
+  // check if we reached the End of the EEPROM and Startover at the beginning
+  if ((globals.eePersistanceAdress + sizeof(PersistenceData)) > ee.getDeviceSize() || reset)
+  {
+    globals.eePersistanceAdress = startofPersistence;
+  }
+
+  ee.updateBlock(0, (uint8_t *)&globals.eePersistanceAdress, sizeof(globals.eePersistanceAdress));
+}
+
+uint32_t Checksum_EEPROM(uint8_t const *data, size_t len)
+{
+  if (data == NULL)
+    return 0;
+  uint32_t crc, mask;
+  crc = 0xFFFFFFFF;
+
+  while (len--)
+  {
+    crc ^= *data++;
+    for (uint8_t k = 0; k < 8; k++)
+    {
+      mask = -(crc & 1);
+      crc = (crc >> 1) ^ (0xEDB88320 & mask);
+    }
+  }
+  return ~crc;
+}
+
+void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
+{
+#define BLOCK_TO_LENGTH 16
+
+  if (eeAvailable == false)
+    return;
+
+  char ascii_buf[BLOCK_TO_LENGTH + 1];
+  sprintf(ascii_buf, "%*s", BLOCK_TO_LENGTH, "ASCII");
+  Serial.print(PSTR("\nAddress "));
+  for (int x = 0; x < BLOCK_TO_LENGTH; x++)
+    Serial.printf("%3d", x);
+
+  memoryAddress = memoryAddress / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
+  length = (length + BLOCK_TO_LENGTH - 1) / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
+
+  for (unsigned int i = 0; i < length; i++)
+  {
+    int blockpoint = memoryAddress % BLOCK_TO_LENGTH;
+    if (blockpoint == 0)
+    {
+      ascii_buf[BLOCK_TO_LENGTH] = 0;
+      Serial.printf("  %s", ascii_buf);
+      Serial.printf("\n0x%05X:", memoryAddress);
+    }
+    ascii_buf[blockpoint] = ee.readByte(memoryAddress);
+    Serial.printf(" %02X", ascii_buf[blockpoint]);
+    if (ascii_buf[blockpoint] < 0x20 || ascii_buf[blockpoint] > 0x7E)
+      ascii_buf[blockpoint] = '.';
+    memoryAddress++;
+  }
+  Serial.println();
+}
+
+bool checkEEPROMavailable()
+{
+  if (!ee.isConnected())
+  {
+    MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, true);
+    return false;
+  }
+  return true;
+}
+
+uint32_t ConfigSanityCheck(bool autocorrect)
+{
+  uint32_t setting_reset_bits = 0;
+
+  if ((ConfigData.batteryType != BATTERY_LIPO_2S) || (ConfigData.batteryType != BATTERY_LIPO_3S))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 0);
+    if (autocorrect)
+      ConfigData.batteryType = ConfigData_defaults.batteryType;
+  }
+
+  return setting_reset_bits;
+}
+
+bool ValidateEEPROM_Version()
+{
+  if (eeAvailable == false)
+    return false;
+
+  uint8_t EEPROMVersionOnChip = ee.readByte(startofConfigData);
+
+  if (EEPROMVersionOnChip < ConfigData_defaults.EEPROM_Version)
+  {
+    Serial.printf("EEPROM Image Version is %d, but %d expected - trying to migrate\n", EEPROMVersionOnChip, ConfigData_defaults.EEPROM_Version);
+    if (!MigrateEEPROM(EEPROMVersionOnChip))
+    {
+      Serial.print("Error\n");
+      MaintainDTC(DTC_EEPROM_MIGRATE_FAILED, DTC_CRITICAL, true, EEPROMVersionOnChip);
+      return false;
+    }
+    else
+    {
+      Serial.print("Success\n");
+    }
+  }
+  return true;
+}
+
+bool MigrateEEPROM(uint8_t fromVersion)
+{
+  uint16_t persistanceMarker_onChip;
+
+  switch (fromVersion)
+  {
+
+    // Version 1 EEPROM Layout:                             startAdress     size (byte)
+    //  const uint16_t startofConfigData  =                 16               16
+    //  const uint16_t startofPersistence =                 32               24
+    //
+    //  typedef struct
+    //  {
+    //    uint8_t EEPROM_Version = 1;                       16                1
+    //    batteryType_t batteryType = BATTERY_UNDEFINED;    17                4
+    //    bool active_faction_on_reboot = false;            21                1
+    //    uint32_t checksum = 0;                            22                4
+    //  } configData_t;
+    //
+    //  typedef struct                                      offset
+    //  {
+    //    uint32_t writeCycleCounter = 0;                   0                 4
+    //    uint32_t faction_1_timer = 0;                     4                 4
+    //    uint32_t faction_2_timer = 0;                     8                 4
+    //    uint32_t faction_3_timer = 0;                     12                4
+    //    factions_t activeFaction = NONE;                  16                4
+    //    uint32_t checksum = 0;                            20                4
+    //  } persistenceData_t;
+
+  case 1:
+    // Migrate Persistance-Data
+    ee.readBlock(0, (uint8_t *)&persistanceMarker_onChip, sizeof(uint16_t));
+    if (persistanceMarker_onChip < startofPersistence)
+    {
+      ee.readBlock(persistanceMarker_onChip + 0, (uint8_t *)&PersistenceData.writeCycleCounter, 4);
+      ee.readBlock(persistanceMarker_onChip + 4, (uint8_t *)&PersistenceData.faction_1_timer, 4);
+      ee.readBlock(persistanceMarker_onChip + 8, (uint8_t *)&PersistenceData.faction_2_timer, 4);
+      ee.readBlock(persistanceMarker_onChip + 12, (uint8_t *)&PersistenceData.faction_3_timer, 4);
+      ee.readBlock(persistanceMarker_onChip + 16, (uint8_t *)&PersistenceData.activeFaction, 4);
+      ee.readBlock(persistanceMarker_onChip + 20, (uint8_t *)&PersistenceData.checksum, 4);
+      MovePersistencePage_EEPROM(true);
+      StorePersistence_EEPROM();
+    }
+
+    // Migrate Config-Data and set defaults for Values which doesn't exists in this earlier Version
+    ConfigData.EEPROM_Version = ConfigData_defaults.EEPROM_Version;
+    strncpy(ConfigData.Faction_1_Name, ConfigData_defaults.Faction_1_Name, sizeof(ConfigData.Faction_1_Name));
+    strncpy(ConfigData.Faction_2_Name, ConfigData_defaults.Faction_2_Name, sizeof(ConfigData.Faction_2_Name));
+    strncpy(ConfigData.Faction_3_Name, ConfigData_defaults.Faction_3_Name, sizeof(ConfigData.Faction_3_Name));
+    ee.readBlock(17, (uint8_t *)&ConfigData.batteryType, 4);
+    ee.readBlock(21, (uint8_t *)&ConfigData.active_faction_on_reboot, 1);
+    StoreConfig_EEPROM();
+
+    return true;
+    break;
+
+  default:
+    return false;
+    break;
+  }
+}
--- a/Software/src/globals.cpp
+++ b/Software/src/globals.cpp
@@ -0,0 +1,9 @@
+#include "globals.h"
+
+Globals_t globals;
+
+void initGlobals()
+{
+  globals.systemStatus = sysStat_Startup;
+  globals.requestEEAction = EE_IDLE;
+}
--- a/Software/src/globals.h
+++ b/Software/src/globals.h
@@ -1,36 +0,0 @@
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-
-#include <Arduino.h>
-
-typedef enum eSystem_Status
-{
-  sysStat_Startup,
-  sysStat_Normal,
-  sysStat_Error,
-  sysStat_Shutdown
-} tSystem_Status;
-
-typedef enum eEERequest
-{
-  EE_IDLE,
-  EE_CFG_SAVE,
-  EE_CFG_LOAD,
-  EE_PDS_SAVE,
-  EE_PDS_LOAD
-} tEERequest;
-
-typedef struct Globals_s
-{
-  char DeviceName[33];
-  char DeviceName_ID[43];
-  tSystem_Status systemStatus = sysStat_Startup;
-  tSystem_Status resumeStatus = sysStat_Startup;
-  eEERequest requestEEAction = EE_IDLE;
-  float loadvoltage = 0;
-  int battery_level = 0;
-} Globals_t;
-
-extern Globals_t globals;
-
-#endif
--- a/Software/src/lora_net.cpp
+++ b/Software/src/lora_net.cpp
@@ -0,0 +1,322 @@
+#include "lora_net.h"
+
+#ifdef FEATURE_ENABLE_LORA
+LoRa_E220 e220ttl(GPIO_LORA_TX, GPIO_LORA_RX, GPIO_LORA_AUX, 3, 4); // Arduino RX <-- e220 TX, Arduino TX --> e220 RX AUX M0 M1
+void printParameters(struct Configuration configuration);
+void printModuleInformation(struct ModuleInformation moduleInformation);
+#elif defined(FEATURE_ENABLE_UARTLORA)
+SoftwareSerial SerialLoRa(GPIO_LORA_RX, GPIO_LORA_TX); // RX, TX
+void Parse_LoRa_UartCommand(char input[], int size);
+#endif
+
+bool InitLoRa(void (*MPinHelper)(int, int))
+{
+    bool returnval = false;
+
+#ifdef FEATURE_ENABLE_LORA
+
+    e220ttl.setMPins = MPinHelper;
+    returnval = e220ttl.begin();
+
+    if (returnval == true)
+    {
+        ResponseStructContainer c;
+        c = e220ttl.getConfiguration();
+        // It's important get configuration pointer before all other operation
+        Configuration configuration = *(Configuration *)c.data;
+        Serial.println(c.status.getResponseDescription());
+        Serial.println(c.status.code);
+
+        ResponseStructContainer cMi;
+        cMi = e220ttl.getModuleInformation();
+        // It's important get information pointer before all other operation
+        // ModuleInformation mi = *(ModuleInformation *)cMi.data;
+
+        Serial.println(cMi.status.getResponseDescription());
+        Serial.println(cMi.status.code);
+
+        //	----------------------- DEFAULT TRANSPARENT WITH RSSI -----------------------
+        configuration.ADDL = 0x02;
+        configuration.ADDH = 0x00;
+
+        configuration.CHAN = 23;
+
+        configuration.SPED.uartBaudRate = UART_BPS_9600;
+        configuration.SPED.airDataRate = AIR_DATA_RATE_010_24;
+        configuration.SPED.uartParity = MODE_00_8N1;
+
+        configuration.OPTION.subPacketSetting = SPS_200_00;
+        configuration.OPTION.RSSIAmbientNoise = RSSI_AMBIENT_NOISE_ENABLED;
+        configuration.OPTION.transmissionPower = POWER_22;
+
+        configuration.TRANSMISSION_MODE.enableRSSI = RSSI_ENABLED;
+        configuration.TRANSMISSION_MODE.fixedTransmission = FT_FIXED_TRANSMISSION;
+        configuration.TRANSMISSION_MODE.enableLBT = LBT_ENABLED;
+        configuration.TRANSMISSION_MODE.WORPeriod = WOR_2000_011;
+
+        // Set configuration changed and set to not hold the configuration
+        ResponseStatus rs = e220ttl.setConfiguration(configuration, WRITE_CFG_PWR_DWN_LOSE);
+        Serial.println(rs.getResponseDescription());
+        Serial.println(rs.code);
+        c.close();
+
+        printParameters(configuration);
+    }
+    else
+    {
+        MaintainDTC(DTC_NO_LORA_FOUND, DTC_WARN, true);
+    }
+#elif defined(FEATURE_ENABLE_UARTLORA)
+    SerialLoRa.begin(9600);
+    returnval = true;
+#endif
+    return returnval;
+}
+
+void LoRa_Process()
+{
+#ifdef FEATURE_ENABLE_LORA
+    if (e220ttl.available() > 1)
+    {
+        ResponseContainer rc = e220ttl.receiveMessageRSSI();
+        // Is something goes wrong print error
+        if (rc.status.code != 1)
+        {
+            Serial.println(rc.status.getResponseDescription());
+        }
+        else
+        {
+            // Print the data received
+            Serial.println(rc.status.getResponseDescription());
+            Serial.println(rc.data);
+            Serial.print("RSSI: ");
+            Serial.println(rc.rssi, DEC);
+        }
+    }
+#elif defined(FEATURE_ENABLE_UARTLORA)
+
+    static char packageInput[32];
+    static bool packageRecieved = false;
+    static unsigned int bufferPtr = 0;
+    int recievedSize = 0;
+
+    while (SerialLoRa.available() && packageRecieved == false)
+    {
+        if (bufferPtr < sizeof(packageInput) - 1)
+        {
+            packageInput[bufferPtr] = SerialLoRa.read();
+            packageInput[bufferPtr + 1] = 0; // always terminate String
+
+            if (packageInput[bufferPtr] == '\n')
+            {
+                packageRecieved = true;
+                recievedSize = bufferPtr;
+                bufferPtr = 0;
+                Debug_pushMessage("Got LoRa UART: %s\n", packageInput);
+            }
+            else if ((packageInput[bufferPtr] >= 0x30) || (packageInput[bufferPtr] <= 0x5A)) // only accept Numbers, UpperCase-Letters and some special chars
+            {
+                bufferPtr++;
+            }
+        }
+    }
+
+    if (packageRecieved) {
+        Parse_LoRa_UartCommand(packageInput, recievedSize);
+        packageRecieved = false;
+    }
+
+#endif
+}
+
+void sendStatus_LoRa()
+{
+#ifdef FEATURE_ENABLE_LORA
+    struct
+    {
+        MessageType_t type = "STATUS";
+        MessageStatus_t status;
+    } __attribute__((packed)) sendStatus;
+
+    sendStatus.status.nodeid = 0x0002;
+    sendStatus.status.millis = millis();
+    sendStatus.status.faction_active = 1;
+    sendStatus.status.faction_1_timer = 0xBBBBBBBB;
+    sendStatus.status.faction_2_timer = 0xCCCCCCCC;
+    sendStatus.status.faction_3_timer = 0xDDDDDDDD;
+
+    ResponseStatus rs = e220ttl.sendFixedMessage(0xFF, 0xFF, 23, (byte *)&sendStatus, sizeof(sendStatus));
+    Serial.println(rs.getResponseDescription());
+
+#elif defined(FEATURE_ENABLE_UARTLORA)
+
+    SerialLoRa.print(PersistenceData.faction_1_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.faction_2_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.faction_3_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.activeFaction);
+    SerialLoRa.write(";");
+    SerialLoRa.print(globals.battery_level);
+    SerialLoRa.write('\n');
+
+#endif
+}
+
+#ifdef FEATURE_ENABLE_LORA
+
+void printParameters(struct Configuration configuration)
+{
+    Serial.println("----------------------------------------");
+
+    Serial.print(F("HEAD : "));
+    Serial.print(configuration.COMMAND, HEX);
+    Serial.print(" ");
+    Serial.print(configuration.STARTING_ADDRESS, HEX);
+    Serial.print(" ");
+    Serial.println(configuration.LENGHT, HEX);
+    Serial.println(F(" "));
+    Serial.print(F("AddH : "));
+    Serial.println(configuration.ADDH, HEX);
+    Serial.print(F("AddL : "));
+    Serial.println(configuration.ADDL, HEX);
+    Serial.println(F(" "));
+    Serial.print(F("Chan : "));
+    Serial.print(configuration.CHAN, DEC);
+    Serial.print(" -> ");
+    Serial.println(configuration.getChannelDescription());
+    Serial.println(F(" "));
+    Serial.print(F("SpeedParityBit     : "));
+    Serial.print(configuration.SPED.uartParity, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.SPED.getUARTParityDescription());
+    Serial.print(F("SpeedUARTDatte     : "));
+    Serial.print(configuration.SPED.uartBaudRate, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.SPED.getUARTBaudRateDescription());
+    Serial.print(F("SpeedAirDataRate   : "));
+    Serial.print(configuration.SPED.airDataRate, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.SPED.getAirDataRateDescription());
+    Serial.println(F(" "));
+    Serial.print(F("OptionSubPacketSett: "));
+    Serial.print(configuration.OPTION.subPacketSetting, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.OPTION.getSubPacketSetting());
+    Serial.print(F("OptionTranPower    : "));
+    Serial.print(configuration.OPTION.transmissionPower, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.OPTION.getTransmissionPowerDescription());
+    Serial.print(F("OptionRSSIAmbientNo: "));
+    Serial.print(configuration.OPTION.RSSIAmbientNoise, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.OPTION.getRSSIAmbientNoiseEnable());
+    Serial.println(F(" "));
+    Serial.print(F("TransModeWORPeriod : "));
+    Serial.print(configuration.TRANSMISSION_MODE.WORPeriod, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.TRANSMISSION_MODE.getWORPeriodByParamsDescription());
+    Serial.print(F("TransModeEnableLBT : "));
+    Serial.print(configuration.TRANSMISSION_MODE.enableLBT, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.TRANSMISSION_MODE.getLBTEnableByteDescription());
+    Serial.print(F("TransModeEnableRSSI: "));
+    Serial.print(configuration.TRANSMISSION_MODE.enableRSSI, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.TRANSMISSION_MODE.getRSSIEnableByteDescription());
+    Serial.print(F("TransModeFixedTrans: "));
+    Serial.print(configuration.TRANSMISSION_MODE.fixedTransmission, BIN);
+    Serial.print(" -> ");
+    Serial.println(configuration.TRANSMISSION_MODE.getFixedTransmissionDescription());
+
+    Serial.println("----------------------------------------");
+}
+#endif
+
+#ifdef FEATURE_ENABLE_UARTLORA
+void Parse_LoRa_UartCommand(char input[], int size)
+{
+
+    Debug_pushMessage("Start parsing, size: %d", size);
+    char delimiter[] = ";";
+    char *ptr;
+    char command[8];
+    char value[8];
+
+    ptr = strtok(input, delimiter);
+
+    ptr = strtok(input, delimiter);
+
+    while (ptr != NULL)
+    {
+        strncpy(command, ptr, sizeof(command) - 1); // Platz für Nullterminator lassen
+        command[sizeof(command) - 1] = '\0'; // Nullterminator setzen
+
+        ptr = strtok(NULL, delimiter);
+
+        if (ptr != NULL)
+        {
+            strncpy(value, ptr, sizeof(value) - 1); // Platz für Nullterminator lassen
+            value[sizeof(value) - 1] = '\0'; // Nullterminator setzen
+        }
+        else
+        {
+            // Wenn ptr NULL ist, setze value auf leeren String
+            value[0] = '\0';
+        }
+
+        // Hier kannst du den Wert und das Kommando verarbeiten
+        Debug_pushMessage("Command: %s, Value: %s", command, value);
+    }
+
+    Debug_pushMessage("Parsed LoRa UART Command:  %s Value: %s\n", command, value);
+
+    if (!strcmp(command, "ENABLE"))
+    {
+        globals.timer_disabled = false;
+        Debug_pushMessage("Enabled by LoRa");
+    }
+    else if (!strcmp(command, "DISABLE"))
+    {
+        globals.timer_disabled = true;
+        Debug_pushMessage("Disabled by LoRa");
+    }
+    else if (!strcmp(command, "RESET"))
+    {
+        PersistenceData.activeFaction = NONE;
+        PersistenceData.faction_1_timer = 0;
+        PersistenceData.faction_2_timer = 0;
+        PersistenceData.faction_3_timer = 0;
+        Debug_pushMessage("Reset by LoRa");
+    }
+    else if (!strcmp(command, "TMRSTP"))
+    {
+        PersistenceData.activeFaction = NONE;
+    }
+    else if (!strcmp(command, "TMR1"))
+    {
+        PersistenceData.faction_1_timer = atol(value);
+    }
+    else if (!strcmp(command, "TMR2"))
+    {
+        PersistenceData.faction_2_timer = atol(value);
+    }
+    else if (!strcmp(command, "TMR3"))
+    {
+        PersistenceData.faction_3_timer = atol(value);
+    }
+    else if (!strcmp(command, "EFAC1"))
+    {
+        PersistenceData.activeFaction = FACTION_1;
+    }
+    else if (!strcmp(command, "EFAC2"))
+    {
+        PersistenceData.activeFaction = FACTION_2;
+    }
+    else if (!strcmp(command, "EFAC3"))
+    {
+        PersistenceData.activeFaction = FACTION_3;
+    }
+}
+#endif
--- a/Software/src/main.cpp
+++ b/Software/src/main.cpp
@@ -1,65 +1,60 @@
-#define FREQUENCY_868
-
 #include <Arduino.h>
-#include <TM1637Display.h>
+#include <TM1637.h>
 #include <Ticker.h>
-#include <DNSServer.h>
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
 #include <ESP8266mDNS.h>
 #include <ArduinoOTA.h>
-#include <ESPAsyncWebServer.h>
-#include <LittleFS.h>
 #include <PCF8574.h>
 #include <Wire.h>
 #include <Adafruit_INA219.h>
 #include <ArduinoJson.h>
-#include <LoRa_E220.h>

 // local includes
-#include "lora_messages.h"
+#include "common.h"
+#include "sanitycheck.h"
 #include "defaults.h"
 #include "webui.h"
 #include "config.h"
 #include "globals.h"
 #include "dtc.h"
-#include "common.h"
+#include "debugger.h"
+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
+#include "lora_net.h"
+#endif

-#ifdef WIFI_CLIENT
-#include <WiFiMulti.h>
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+#include <ESP8266WiFiMulti.h>

-const char *ssid = QUOTE(WIFI_SSID);
-const char *password = QUOTE(WIFI_PASSWORD);
+const char *ssid = QUOTE(WIFI_SSID_CLIENT);
+const char *password = QUOTE(WIFI_PASSWORD_CLIENT);
 const uint32_t connectTimeoutMs = 5000;

-WiFiMulti wifiMulti;
+ESP8266WiFiMulti wifiMulti;
 #endif

 PCF8574 i2c_io(I2C_IO_ADDRESS);
 Adafruit_INA219 ina219;
-LoRa_E220 e220ttl(GPIO_LORA_TX, GPIO_LORA_RX, GPIO_LORA_AUX, 3, 4); // Arduino RX <-- e220 TX, Arduino TX --> e220 RX AUX M0 M1

-TM1637Display disp_FAC_1(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC1);
-TM1637Display disp_FAC_2(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC2);
-TM1637Display disp_FAC_3(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC3);
+TM1637 disp_FAC_1(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC1);
+TM1637 disp_FAC_2(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC2);
+TM1637 disp_FAC_3(GPIO_7SEG_CLK, GPIO_7SEG_EN_FAC3);

-#ifdef CAPTIVE
-DNSServer dnsServer;
-#endif
-AsyncWebServer server(80);
-
-void printParameters(struct Configuration configuration);
-void printModuleInformation(struct ModuleInformation moduleInformation);
-void displayInfo();
 void SevenSeg_Output();
 void toggleWiFiAP(boolean shutdown = false);
 void SystemShutdown();
 void SetBatteryType(batteryType_t type);
 void ProcessKeyCombos(bool *btnState);
-void OverrideDisplay(const uint8_t *message, uint32_t time);
+void OverrideDisplay(uint32_t time, const char *message1, const char *message2, const char *message3);
+void initGlobals();
+void maintainSysStat();

+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
+void setMPins_Helper(int pin, int status);
 void tmrCallback_StatusSender();
 Ticker tmrStatusSender(tmrCallback_StatusSender, 30000, 0, MILLIS);
+#endif
+
 void tmrCallback_PowerMonitor();
 Ticker tmrPowerMonitor(tmrCallback_PowerMonitor, 10000, 0, MILLIS);
 void tmrCallback_FactionTicker();
@@ -69,50 +64,41 @@ Ticker tmrInputGetter(tmrCallback_InputGetter, 250, 0, MILLIS);
 void tmrCallback_EEPROMCyclicPDS();
 Ticker tmrEEPROMCyclicPDS(tmrCallback_EEPROMCyclicPDS, 60000, 0, MILLIS);

-#ifdef WIFI_CLIENT
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
 void tmrCallback_WiFiMaintainConnection();
 Ticker tmrWiFiMaintainConnection(tmrCallback_WiFiMaintainConnection, 1000, 0, MILLIS);
 #endif

-uint32_t getESPChipID();
-
-uint8_t Faction_1_dot = 0;
-uint8_t Faction_2_dot = 0;
-uint8_t Faction_3_dot = 0;
-
 uint32_t DisplayOverrideFlag = 0;
-uint8_t *DisplayOverrideValue = 0;
-
-Globals_t globals;
-
-const uint8_t sevenSeg_bat[] = {0x00, 0b01111100, 0b01110111, 0b01111000};
-const uint8_t sevenSeg_low[] = {0b00111000, 0b01011100, 0x00, 0x00};
-const uint8_t sevenSeg_net[] = {0b01010100, 0b01111001, 0b01111000, 0x00};
-const uint8_t sevenSeg_ota[] = {0x3F, 0x78, 0x77, 0x00};
-const uint8_t sevenSeg_flsh[] = {0x71, 0x38, 0x6D, 0x76};
-const uint8_t sevenSeg_file[] = {0x71, 0x30, 0x38, 0x79};
+char DisplayOverrideValue[3][5] = {0};

+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
 void setMPins_Helper(int pin, int status)
 {
 	i2c_io.write(pin, status);
 }
+#endif

 void setup()
 {
 	system_update_cpu_freq(SYS_CPU_80MHZ);
-
-	Serial.begin(115200);
-	Serial.print("\n\n\n");
-
-#ifdef SERIAL_DEBUG
-	Serial.setDebugOutput(true);
-#endif
-
+	strcpy(globals.DeviceName, DEVICE_NAME);
+	snprintf(globals.DeviceName_ID, 42, "%s_%08X", globals.DeviceName, ESP.getChipId());
 	WiFi.persistent(false);
 	WiFi.disconnect();

-	strcpy(globals.DeviceName, DEVICE_NAME);
-	snprintf(globals.DeviceName_ID, 42, "%s_%08X", globals.DeviceName, getESPChipID());
+	Serial.begin(115200);
+	Serial.setDebugOutput(false);
+
+	Serial.print("\n\n-------------------START-------------------\n");
+	Serial.print(globals.DeviceName);
+	Serial.print("\nby Hiabuto Defense\n");
+
+	ClearAllDTC(); // Init DTC-Storage
+
+	InitEEPROM();
+	GetConfig_EEPROM();
+	GetPersistence_EEPROM();

 	if (i2c_io.begin())
 	{
@@ -133,101 +119,58 @@ void setup()
 		Serial.print("INA219 not Initialized\n");
 	}

-	e220ttl.setMPins = &setMPins_Helper;
-	e220ttl.begin();
-
-	ResponseStructContainer c;
-	c = e220ttl.getConfiguration();
-	// It's important get configuration pointer before all other operation
-	Configuration configuration = *(Configuration *)c.data;
-	Serial.println(c.status.getResponseDescription());
-	Serial.println(c.status.code);
-
-	ResponseStructContainer cMi;
-	cMi = e220ttl.getModuleInformation();
-	// It's important get information pointer before all other operation
-	ModuleInformation mi = *(ModuleInformation *)cMi.data;
-
-	Serial.println(cMi.status.getResponseDescription());
-	Serial.println(cMi.status.code);
-
-	//	----------------------- DEFAULT TRANSPARENT WITH RSSI -----------------------
-	configuration.ADDL = 0x02;
-	configuration.ADDH = 0x00;
-
-	configuration.CHAN = 23;
-
-	configuration.SPED.uartBaudRate = UART_BPS_9600;
-	configuration.SPED.airDataRate = AIR_DATA_RATE_010_24;
-	configuration.SPED.uartParity = MODE_00_8N1;
-
-	configuration.OPTION.subPacketSetting = SPS_200_00;
-	configuration.OPTION.RSSIAmbientNoise = RSSI_AMBIENT_NOISE_ENABLED;
-	configuration.OPTION.transmissionPower = POWER_22;
-
-	configuration.TRANSMISSION_MODE.enableRSSI = RSSI_ENABLED;
-	configuration.TRANSMISSION_MODE.fixedTransmission = FT_FIXED_TRANSMISSION;
-	configuration.TRANSMISSION_MODE.enableLBT = LBT_ENABLED;
-	configuration.TRANSMISSION_MODE.WORPeriod = WOR_2000_011;
-
-	// Set configuration changed and set to not hold the configuration
-	ResponseStatus rs = e220ttl.setConfiguration(configuration, WRITE_CFG_PWR_DWN_LOSE);
-	Serial.println(rs.getResponseDescription());
-	Serial.println(rs.code);
-	c.close();
-
-	printParameters(configuration);
-	tmrStatusSender.start();
-
-	LittleFS.begin();
-
-#ifdef WIFI_CLIENT
-	WiFi.mode(WIFI_STA);
-	WiFi.setHostname(globals.DeviceName_ID);
-	wifiMulti.addAP(QUOTE(WIFI_SSID), QUOTE(WIFI_PASSWORD));
-	tmrWiFiMaintainConnection.start();
-#else
-	WiFi.mode(WIFI_AP);
-	WiFi.begin(QUOTE(DEVICE_NAME), QUOTE(WIFI_AP_PASSWORD));
-#if defined(ESP32)
-	WiFi.sleep(true);
+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
+	if (InitLoRa(&setMPins_Helper))
+	{
+		Serial.print("Initialized LoRa_Transceiver\n");
+		tmrStatusSender.start();
+	}
+	else
+	{
+		Serial.print("LoRa not Initialized\n");
+	}
 #endif
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+	WiFi.mode(WIFI_STA);
+	WiFi.setHostname(globals.DeviceName);
+	wifiMulti.addAP(QUOTE(WIFI_CLIENT_SSID), QUOTE(WIFI_CLIENT_PASSWORD));
+	tmrWiFiMaintainConnection.start();
+	Serial.print("WiFi-Client Initialized\n");
+#else
 	WiFi.mode(WIFI_OFF);
 #endif

-	InitEEPROM();
-
 	ArduinoOTA.setPort(8266);
 	ArduinoOTA.setHostname(globals.DeviceName_ID);
 	ArduinoOTA.setPassword(QUOTE(ADMIN_PASSWORD));

 	ArduinoOTA.onStart([]()
 					   {
-                       disp_FAC_1.setBrightness(7);
-                       disp_FAC_2.setBrightness(7);
-                       disp_FAC_3.setBrightness(7);
-                       disp_FAC_1.setSegments(sevenSeg_ota);
-                       disp_FAC_3.clear();
+                       disp_FAC_1.setBrightness(5);
+                       disp_FAC_2.setBrightness(5);
+                       disp_FAC_3.setBrightness(5);
+                       disp_FAC_1.display("OTA ");
+                       disp_FAC_3.clearScreen();
                       
                       if (ArduinoOTA.getCommand() == U_FLASH)
                       {
-                         disp_FAC_2.setSegments(sevenSeg_flsh);
+                         disp_FAC_2.display("FLSH");
                       }
                       else
                       {
-                         disp_FAC_2.setSegments(sevenSeg_file);
+                         disp_FAC_2.display("FILE");
                         LittleFS.end();
                       } });

 	ArduinoOTA.onEnd([]()
 					 { 
-                       const uint8_t seg_done[] = {0x5E, 0x3F, 0x54, 0x79};
-                       disp_FAC_1.setSegments(seg_done);
-                       disp_FAC_2.clear();
-                       disp_FAC_3.clear(); });
+                       disp_FAC_1.display("DONE");
+                       disp_FAC_2.clearScreen();
+                       disp_FAC_3.clearScreen(); });

 	ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
-						  { disp_FAC_3.showNumberDecEx((progress / (total / 100))); });
+						  { disp_FAC_3.display((progress / (total / 100))); });

 	ArduinoOTA.onError([](ota_error_t error)
 					   {
@@ -242,58 +185,62 @@ void setup()
                         Serial.println("Receive Failed");
                       else if (error == OTA_END_ERROR)
                         Serial.println("End Failed"); });
-	ArduinoOTA.begin();

+	ArduinoOTA.begin();
+	Serial.print("\nOTA-Init done");
+	initWebUI();
+	Serial.print("\nWebUI-Init done");
+	initGlobals();
+	Serial.print("\nglobals-Init done");
 #ifdef CAPTIVE
 	dnsServer.start(53, "*", WiFi.softAPIP());
 #endif

-	initWebUI();
+	disp_FAC_1.init();
+	disp_FAC_1.setBrightness(5);
+	disp_FAC_2.init();
+	disp_FAC_2.setBrightness(5);
+	disp_FAC_3.init();
+	disp_FAC_3.setBrightness(5);

 	tmrEEPROMCyclicPDS.start();
 	tmrFactionTicker.start();
 	tmrInputGetter.start();
-	Serial.println("Setup Done");
+
+	if (ConfigData.active_faction_on_reboot == false)
+		PersistenceData.activeFaction = NONE;
+
+	Serial.print("\nSetup Done\n");
 }

 void loop()
 {
-	if (e220ttl.available() > 1)
-	{
-		ResponseContainer rc = e220ttl.receiveMessageRSSI();
-		// Is something goes wrong print error
-		if (rc.status.code != 1)
-		{
-			Serial.println(rc.status.getResponseDescription());
-		}
-		else
-		{
-			// Print the data received
-			Serial.println(rc.status.getResponseDescription());
-			Serial.println(rc.data);
-			Serial.print("RSSI: ");
-			Serial.println(rc.rssi, DEC);
-		}
-	}
+	maintainSysStat();

 	tmrEEPROMCyclicPDS.update();
 	tmrFactionTicker.update();
 	tmrInputGetter.update();
+	tmrPowerMonitor.update();
+
 	ArduinoOTA.handle();
 	SevenSeg_Output();
 	EEPROM_Process();
+	Webserver_Process();
+	DTC_Process();
+	Debug_Process();

+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
+	LoRa_Process();
 	tmrStatusSender.update();
-	tmrPowerMonitor.update();
+#endif

 #ifdef CAPTIVE
 	dnsServer.processNextRequest();
 #endif
-#ifdef WIFI_CLIENT
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
 	tmrWiFiMaintainConnection.update();
 #endif
-	if (globals.systemStatus == sysStat_Shutdown)
-		SystemShutdown();
+
 	yield();
 }

@@ -307,66 +254,75 @@ String macToString(const unsigned char *mac)

 void SevenSeg_Output()
 {
+	char sevenSegBuff[5] = "";
+
 	if (DisplayOverrideFlag > millis())
 	{
-		disp_FAC_1.setBrightness(7);
-		disp_FAC_2.setBrightness(7);
-		disp_FAC_3.setBrightness(7);
-		disp_FAC_1.setSegments(DisplayOverrideValue);
-		disp_FAC_2.clear();
-		disp_FAC_3.clear();
+		disp_FAC_1.setBrightness(5);
+		disp_FAC_2.setBrightness(5);
+		disp_FAC_3.setBrightness(5);
+		disp_FAC_1.display(String(DisplayOverrideValue[0]));
+		disp_FAC_2.display(String(DisplayOverrideValue[1]));
+		disp_FAC_3.display(String(DisplayOverrideValue[2]));
 	}
 	else
 	{
 		if (globals.battery_level < BAT_LOW_PERCENT && millis() % 10000 > 7000)
 		{
-			disp_FAC_1.setBrightness(0);
-			disp_FAC_2.setBrightness(0);
-			disp_FAC_3.setBrightness(0);
-
-			disp_FAC_1.setSegments(sevenSeg_bat);
-			disp_FAC_2.setSegments(sevenSeg_low);
 			if (millis() % 3000 < 1500)
-				disp_FAC_3.showNumberDec(globals.battery_level);
+				snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", globals.battery_level);
 			else
-				disp_FAC_3.showNumberDecEx(globals.loadvoltage * 100, 0x40);
+				snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%3d.%1d", (globals.loadvoltage_mV / 1000), ((globals.loadvoltage_mV % 1000) / 100));
+
+			disp_FAC_1.setBrightness(1);
+			disp_FAC_1.display(" Bat");
+
+			disp_FAC_2.setBrightness(1);
+			disp_FAC_2.display("low ");
+
+			disp_FAC_3.setBrightness(1);
+			disp_FAC_3.display(String(sevenSegBuff));
 		}
 		else
 		{
-			disp_FAC_1.setBrightness(PersistenceData.activeFaction == FACTION_1 ? 7 : 0);
-			disp_FAC_2.setBrightness(PersistenceData.activeFaction == FACTION_2 ? 7 : 0);
-			disp_FAC_3.setBrightness(PersistenceData.activeFaction == FACTION_3 ? 7 : 0);
+			disp_FAC_1.setBrightness(PersistenceData.activeFaction == FACTION_1 ? 5 : 1);
+			disp_FAC_1.refresh();
+			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_1_timer / 60);
+			disp_FAC_1.display(String(sevenSegBuff), false, false);
+			disp_FAC_1.setDp((PersistenceData.activeFaction == FACTION_1) && (millis() % 1000 > 500) ? 0x08 : 0x00);

-			disp_FAC_1.showNumberDecEx(PersistenceData.faction_1_timer / 60, Faction_1_dot, true, 4, 0);
-			disp_FAC_2.showNumberDecEx(PersistenceData.faction_2_timer / 60, Faction_2_dot, true, 4, 0);
-			disp_FAC_3.showNumberDecEx(PersistenceData.faction_3_timer / 60, Faction_3_dot, true, 4, 0);
+			disp_FAC_2.setBrightness(PersistenceData.activeFaction == FACTION_2 ? 5 : 1);
+			disp_FAC_2.refresh();
+			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_2_timer / 60);
+			disp_FAC_2.display(String(sevenSegBuff), false, false);
+			disp_FAC_2.setDp((PersistenceData.activeFaction == FACTION_2) && (millis() % 1000 > 500) ? 0x08 : 0x00);
+
+			disp_FAC_3.setBrightness(PersistenceData.activeFaction == FACTION_3 ? 5 : 1);
+			disp_FAC_3.refresh();
+			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_3_timer / 60);
+			disp_FAC_3.display(String(sevenSegBuff), false, false);
+			disp_FAC_3.setDp((PersistenceData.activeFaction == FACTION_3) && (millis() % 1000 > 500) ? 0x08 : 0x00);
 		}
 	}
 }

 void tmrCallback_FactionTicker()
 {
+	if (globals.timer_disabled == true)
+		PersistenceData.activeFaction = NONE;
+
 	switch (PersistenceData.activeFaction)
 	{
 	case FACTION_1:
 		PersistenceData.faction_1_timer++;
-		Faction_1_dot = Faction_1_dot == 0x80 || Faction_1_dot == 0x00 ? 0x10 : Faction_1_dot << 1;
-		Faction_2_dot = 0;
-		Faction_3_dot = 0;
 		break;

 	case FACTION_2:
 		PersistenceData.faction_2_timer++;
-		Faction_2_dot = Faction_2_dot == 0x80 || Faction_2_dot == 0x00 ? 0x10 : Faction_2_dot << 1;
-		Faction_1_dot = 0;
-		Faction_3_dot = 0;
 		break;

 	case FACTION_3:
 		PersistenceData.faction_3_timer++;
-		Faction_3_dot = Faction_3_dot == 0x80 || Faction_3_dot == 0x00 ? 0x10 : Faction_3_dot << 1;
-		Faction_1_dot = 0;
-		Faction_2_dot = 0;
 		break;

 	default:
@@ -377,7 +333,7 @@ void tmrCallback_FactionTicker()
 void tmrCallback_InputGetter()
 {
 	static bool btnState[3];
-	static bool btnlastState[3];
+	uint8_t keysPressed = 0;

 	btnState[0] = i2c_io.readButton(I2C_IO_BTN_FAC1);
 	btnState[1] = i2c_io.readButton(I2C_IO_BTN_FAC2);
@@ -385,123 +341,54 @@ void tmrCallback_InputGetter()

 	ProcessKeyCombos(btnState);

-	for (int i = 0; i < sizeof(btnState); i++)
-	{
-		if (btnlastState[i] != btnState[i])
-		{
-			btnlastState[i] = btnState[i];
-			Serial.printf("Button %d changed to %d\n", i, btnState[i]);
-		}
-	}
-
-	uint8_t keysPressed = 0;
-
-	keysPressed = +btnState[0] == FAC_1_TRG_PRESSED ? 1 : 0;
-	keysPressed = +btnState[1] == FAC_2_TRG_PRESSED ? 1 : 0;
-	keysPressed = +btnState[2] == FAC_3_TRG_PRESSED ? 1 : 0;
+	keysPressed = keysPressed + (btnState[0] == FAC_1_TRG_PRESSED ? 1 : 0);
+	keysPressed = keysPressed + (btnState[1] == FAC_2_TRG_PRESSED ? 1 : 0);
+	keysPressed = keysPressed + (btnState[2] == FAC_3_TRG_PRESSED ? 1 : 0);

 	if (keysPressed > 1)
 	{
-		Serial.println("ERROR: More than one Flag active - setting no Faction active");
+		Debug_pushMessage("ERROR: More than one Flag active - setting no Faction active");
 		PersistenceData.activeFaction = NONE;
 		return;
 	}

-	if (btnState[0] == FAC_1_TRG_PRESSED)
+	if (btnState[0] == FAC_1_TRG_PRESSED && globals.timer_disabled != true)
+	{
+		if (PersistenceData.activeFaction != FACTION_1)
+		{
+			Debug_pushMessage("Faction 1 captured !");
+			globals.requestEEAction = EE_PDS_SAVE;
+		}
 		PersistenceData.activeFaction = FACTION_1;
+	}

-	if (btnState[1] == FAC_2_TRG_PRESSED)
+	if (btnState[1] == FAC_2_TRG_PRESSED && globals.timer_disabled != true)
+	{
+		if (PersistenceData.activeFaction != FACTION_2)
+		{
+			Debug_pushMessage("Faction 2 captured !");
+			globals.requestEEAction = EE_PDS_SAVE;
+		}
 		PersistenceData.activeFaction = FACTION_2;
+	}

-	if (btnState[2] == FAC_3_TRG_PRESSED)
+	if (btnState[2] == FAC_3_TRG_PRESSED && globals.timer_disabled != true)
+	{
+		if (PersistenceData.activeFaction != FACTION_3)
+		{
+			Debug_pushMessage("Faction 3 captured !");
+			globals.requestEEAction = EE_PDS_SAVE;
+		}
 		PersistenceData.activeFaction = FACTION_3;
+	}
 }

-void printParameters(struct Configuration configuration)
-{
-	Serial.println("----------------------------------------");
-
-	Serial.print(F("HEAD : "));
-	Serial.print(configuration.COMMAND, HEX);
-	Serial.print(" ");
-	Serial.print(configuration.STARTING_ADDRESS, HEX);
-	Serial.print(" ");
-	Serial.println(configuration.LENGHT, HEX);
-	Serial.println(F(" "));
-	Serial.print(F("AddH : "));
-	Serial.println(configuration.ADDH, HEX);
-	Serial.print(F("AddL : "));
-	Serial.println(configuration.ADDL, HEX);
-	Serial.println(F(" "));
-	Serial.print(F("Chan : "));
-	Serial.print(configuration.CHAN, DEC);
-	Serial.print(" -> ");
-	Serial.println(configuration.getChannelDescription());
-	Serial.println(F(" "));
-	Serial.print(F("SpeedParityBit     : "));
-	Serial.print(configuration.SPED.uartParity, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.SPED.getUARTParityDescription());
-	Serial.print(F("SpeedUARTDatte     : "));
-	Serial.print(configuration.SPED.uartBaudRate, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.SPED.getUARTBaudRateDescription());
-	Serial.print(F("SpeedAirDataRate   : "));
-	Serial.print(configuration.SPED.airDataRate, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.SPED.getAirDataRateDescription());
-	Serial.println(F(" "));
-	Serial.print(F("OptionSubPacketSett: "));
-	Serial.print(configuration.OPTION.subPacketSetting, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.OPTION.getSubPacketSetting());
-	Serial.print(F("OptionTranPower    : "));
-	Serial.print(configuration.OPTION.transmissionPower, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.OPTION.getTransmissionPowerDescription());
-	Serial.print(F("OptionRSSIAmbientNo: "));
-	Serial.print(configuration.OPTION.RSSIAmbientNoise, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.OPTION.getRSSIAmbientNoiseEnable());
-	Serial.println(F(" "));
-	Serial.print(F("TransModeWORPeriod : "));
-	Serial.print(configuration.TRANSMISSION_MODE.WORPeriod, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.TRANSMISSION_MODE.getWORPeriodByParamsDescription());
-	Serial.print(F("TransModeEnableLBT : "));
-	Serial.print(configuration.TRANSMISSION_MODE.enableLBT, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.TRANSMISSION_MODE.getLBTEnableByteDescription());
-	Serial.print(F("TransModeEnableRSSI: "));
-	Serial.print(configuration.TRANSMISSION_MODE.enableRSSI, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.TRANSMISSION_MODE.getRSSIEnableByteDescription());
-	Serial.print(F("TransModeFixedTrans: "));
-	Serial.print(configuration.TRANSMISSION_MODE.fixedTransmission, BIN);
-	Serial.print(" -> ");
-	Serial.println(configuration.TRANSMISSION_MODE.getFixedTransmissionDescription());
-
-	Serial.println("----------------------------------------");
-}
-
+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 void tmrCallback_StatusSender()
 {
-	struct
-	{
-		MessageType_t type = "STATUS";
-		MessageStatus_t status;
-	} __attribute__((packed)) sendStatus;
-
-	sendStatus.status.nodeid = 0x0002;
-	sendStatus.status.millis = millis();
-	sendStatus.status.faction_active = 1;
-	sendStatus.status.faction_1_timer = 0xBBBBBBBB;
-	sendStatus.status.faction_2_timer = 0xCCCCCCCC;
-	sendStatus.status.faction_3_timer = 0xDDDDDDDD;
-
-	ResponseStatus rs = e220ttl.sendFixedMessage(0xFF, 0xFF, 23, (byte *)&sendStatus, sizeof(sendStatus));
-	Serial.println(rs.getResponseDescription());
+	sendStatus_LoRa();
 }
+#endif

 void tmrCallback_PowerMonitor()
 {
@@ -513,24 +400,24 @@ void tmrCallback_PowerMonitor()
 	const int bat_max_3s = 1260;

 	float shuntvoltage = 0;
-	//float current_mA = 0;
+	// float current_mA = 0;
 	float busvoltage = 0;
-	//float power_mW = 0;
+	// float power_mW = 0;
 	int battery_level = 0;

 	shuntvoltage = ina219.getShuntVoltage_mV();
 	busvoltage = ina219.getBusVoltage_V();
-	//current_mA = ina219.getCurrent_mA();
-	//power_mW = ina219.getPower_mW();
-	globals.loadvoltage = busvoltage + (shuntvoltage / 1000);
+	// current_mA = ina219.getCurrent_mA();
+	// power_mW = ina219.getPower_mW();
+	globals.loadvoltage_mV = (busvoltage * 1000) + shuntvoltage;
 	switch (ConfigData.batteryType)
 	{
 	case BATTERY_LIPO_2S:
-		battery_level = map(globals.loadvoltage * 100, bat_min_2s, bat_max_2s, 0, 100);
+		battery_level = map(globals.loadvoltage_mV / 10, bat_min_2s, bat_max_2s, 0, 100);
 		globals.battery_level = battery_level < 0 ? 0 : battery_level;
 		break;
 	case BATTERY_LIPO_3S:
-		battery_level = map(globals.loadvoltage * 100, bat_min_3s, bat_max_3s, 0, 100);
+		battery_level = map(globals.loadvoltage_mV / 10, bat_min_3s, bat_max_3s, 0, 100);
 		globals.battery_level = battery_level < 0 ? 0 : battery_level;
 		break;
 	default:
@@ -538,10 +425,13 @@ void tmrCallback_PowerMonitor()
 		break;
 	}

+	MaintainDTC(DTC_BAT_LOW, DTC_WARN, (battery_level < 15 ? true : false), battery_level);
+	MaintainDTC(DTC_BAT_CRITICAL, DTC_CRITICAL, (battery_level < 5 ? true : false), battery_level);
+
 	// Serial.printf("Battery Level: %d %%\n", globals.battery_level);
 	// Serial.printf("Bus Voltage: %f V\n", busvoltage);
 	// Serial.printf("Shunt Voltage: %f mV\n", shuntvoltage);
-	// Serial.printf("Load Voltage: %f V\n", globals.loadvoltage);
+	// Serial.printf("Load Voltage: %d mV\n", globals.loadvoltage_mV;
 	// Serial.printf("Current: %f mA\n", current_mA);
 	// Serial.printf("Power: %f mW\n", power_mW);
 }
@@ -551,7 +441,7 @@ void tmrCallback_EEPROMCyclicPDS()
 	StorePersistence_EEPROM();
 }

-#ifdef WIFI_CLIENT
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
 void tmrCallback_WiFiMaintainConnection()
 {
 	static uint32_t WiFiFailCount = 0;
@@ -564,37 +454,57 @@ void tmrCallback_WiFiMaintainConnection()
 	else
 	{
 		if (WiFiFailCount < WiFiFailMax)
+		{
 			WiFiFailCount++;
+		}
 		else
-			toggleWiFiAP(false);
+		{
+			Debug_pushMessage("WiFi not connected! - Start AP");
+			toggleWiFiAP();
+		}
 	}
 }
 #endif

 void toggleWiFiAP(boolean shutdown)
 {
-	if (WiFi.getMode() != WIFI_OFF && shutdown == true)
+	if (WiFi.getMode() != WIFI_OFF)
 	{
 		WiFi.mode(WIFI_OFF);
-#ifdef WIFI_CLIENT
+		Serial.println("WiFi turned off");
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
 		tmrWiFiMaintainConnection.stop();
 #endif
 	}
-	else if (shutdown == false)
+	else
 	{
 		WiFi.mode(WIFI_AP);
 		WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
-		WiFi.softAP(globals.DeviceName_ID, QUOTE(WIFI_AP_PASSWORD));
-#ifdef WIFI_CLIENT
+		WiFi.softAP(QUOTE(WIFI_AP_SSID), QUOTE(WIFI_AP_PASSWORD));
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
 		tmrWiFiMaintainConnection.stop();
+		Serial.println("WiFi AP started, stopped Maintain-Timer");
+#else
+		Serial.println("WiFi AP started");
 #endif
 	}
 }

 void SystemShutdown()
 {
-	StoreConfig_EEPROM();
-	ESP.restart();
+	static uint32_t shutdown_delay = 0;
+
+	if (shutdown_delay == 0)
+	{
+		shutdown_delay = millis() + SHUTDOWN_DELAY_MS;
+		Serial.printf("Shutdown requested - Restarting in %d seconds\n", SHUTDOWN_DELAY_MS / 1000);
+	}
+	if (shutdown_delay < millis())
+	{
+		StoreConfig_EEPROM();
+		StorePersistence_EEPROM();
+		ESP.restart();
+	}
 }

 void SetBatteryType(batteryType_t type)
@@ -607,80 +517,135 @@ void SetBatteryType(batteryType_t type)
 	}
 }

-void OverrideDisplay(const uint8_t *message, uint32_t time)
+void OverrideDisplay(uint32_t time, const char *message1, const char *message2, const char *message3)
 {
 	DisplayOverrideFlag = millis() + time;
-	DisplayOverrideValue = (uint8_t *)message;
-}
-
-uint32_t getESPChipID()
-{
-#if defined(ESP8266)
-	return ESP.getChipId();
-#elif defined(ESP32)
-	uint32_t chipId;
-	for (int i = 0; i < 17; i = i + 8)
-	{
-		chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
-	}
-	return chipId;
-#endif
+	strcpy(DisplayOverrideValue[0], message1);
+	strcpy(DisplayOverrideValue[1], message2);
+	strcpy(DisplayOverrideValue[2], message3);
 }

 void ProcessKeyCombos(bool *btnState)
 {
-  typedef enum
-  {
-    KEY_PRESSED,
-    KEY_RELEASED
-  } keyStatus_t;
+	typedef enum
+	{
+		KEY_PRESSED,
+		KEY_RELEASED
+	} keyStatus_t;

-  static keyStatus_t keyStatus_Fac1 = KEY_RELEASED;
-  static uint8_t keyCount_Fac1 = 0;
-  static keyStatus_t keyStatus_Fac2 = KEY_RELEASED;
-  static uint8_t keyCount_Fac2 = 0;
-  static keyStatus_t keyStatus_Fac3 = KEY_RELEASED;
+	static keyStatus_t keyStatus_Fac1 = KEY_RELEASED;
+	static keyStatus_t keyStatus_Fac2 = KEY_RELEASED;
+	static uint8_t keyCount_Fac2 = 0;
+	static keyStatus_t keyStatus_Fac3 = KEY_RELEASED;
+	static uint8_t keyCount_Fac3 = 0;

-  if (btnState[2] == FAC_3_TRG_PRESSED)
-  {
-    keyStatus_Fac3 = KEY_PRESSED;
+	if (btnState[0] == FAC_1_TRG_PRESSED)
+	{
+		keyStatus_Fac1 = KEY_PRESSED;

-    // Process FactionKey 1 ComboCounter
-    if (btnState[0] == FAC_1_TRG_PRESSED && keyStatus_Fac1 == KEY_RELEASED)
-    {
-      keyStatus_Fac1 = KEY_PRESSED;
-      keyCount_Fac1++;
-    }
+		// Process FactionKey 2 ComboCounter
+		if (btnState[1] == FAC_2_TRG_PRESSED && keyStatus_Fac2 == KEY_RELEASED)
+		{
+			keyStatus_Fac2 = KEY_PRESSED;
+			keyCount_Fac2++;
+		}

-    if (btnState[0] != FAC_1_TRG_PRESSED)
-      keyStatus_Fac1 = KEY_RELEASED;
+		if (btnState[1] != FAC_2_TRG_PRESSED)
+			keyStatus_Fac2 = KEY_RELEASED;

-    // Process FactionKey 2 ComboCounter
-    if (btnState[1] == FAC_2_TRG_PRESSED && keyStatus_Fac2 == KEY_RELEASED)
-    {
-      keyStatus_Fac2 = KEY_PRESSED;
-      keyCount_Fac2++;
-    }
+		// Process FactionKey 3 ComboCounter
+		if (btnState[2] == FAC_3_TRG_PRESSED && keyStatus_Fac3 == KEY_RELEASED)
+		{
+			keyStatus_Fac3 = KEY_PRESSED;
+			keyCount_Fac3++;
+		}

-    if (btnState[1] != FAC_2_TRG_PRESSED)
-      keyStatus_Fac2 = KEY_RELEASED;
-  }
+		if (btnState[2] != FAC_3_TRG_PRESSED)
+			keyStatus_Fac3 = KEY_RELEASED;
+	}

-  if (btnState[2] != FAC_3_TRG_PRESSED && keyStatus_Fac3 == KEY_PRESSED)
-  {
-    Serial.printf("KeyCombo 1: %d | 2: %d\n", keyCount_Fac1, keyCount_Fac2);
+	if (btnState[0] != FAC_1_TRG_PRESSED && keyStatus_Fac1 == KEY_PRESSED)
+	{
+		if (keyCount_Fac2 > 0 || keyCount_Fac3 > 0)
+			Debug_pushMessage("KeyCombo 2: %d | 3: %d\n", keyCount_Fac2, keyCount_Fac3);

-    if (keyCount_Fac1 == 2 && keyCount_Fac2 == 2)
-    {
-      Serial.println("KeyCombo: WiFi AP ON");
-      OverrideDisplay(sevenSeg_net, 5000);
-      toggleWiFiAP(false);
-    }
+		if (keyCount_Fac2 == 2 && keyCount_Fac3 == 0)
+		{
+			Debug_pushMessage("KeyCombo: WiFi AP ON");
+			OverrideDisplay(5000, "NET ", "    ", "    ");
+			toggleWiFiAP(false);
+		}
+		else if (keyCount_Fac2 == 4 && keyCount_Fac3 == 0)
+		{
+			Debug_pushMessage("KeyCombo: Reset Timer\n");
+			if (globals.systemStatus == sysStat_Startup)
+			{
+				OverrideDisplay(5000, "RST ", "    ", "    ");
+				PersistenceData.faction_1_timer = 0;
+				PersistenceData.faction_2_timer = 0;
+				PersistenceData.faction_3_timer = 0;
+				PersistenceData.activeFaction = NONE;
+				globals.requestEEAction = EE_PDS_SAVE;
+			}
+			else
+			{
+				OverrideDisplay(5000, "ERR ", "    ", "    ");
+				Debug_pushMessage("ERROR: only %d seconds after Startup!\n", STARTUP_DELAY_MS / 1000);
+			}
+		}

-    keyCount_Fac1 = 0;
-    keyCount_Fac2 = 0;
-    keyStatus_Fac1 = KEY_RELEASED;
-    keyStatus_Fac2 = KEY_RELEASED;
-    keyStatus_Fac3 = KEY_RELEASED;
-  }
+		keyCount_Fac2 = 0;
+		keyCount_Fac3 = 0;
+		keyStatus_Fac1 = KEY_RELEASED;
+		keyStatus_Fac2 = KEY_RELEASED;
+		keyStatus_Fac3 = KEY_RELEASED;
+	}
+}
+
+void maintainSysStat()
+{
+
+	static tSystem_Status lastStat = sysStat_null;
+
+	// system Status Transistions
+	switch (globals.systemStatus)
+	{
+	case sysStat_Shutdown:
+		SystemShutdown();
+		break;
+
+	case sysStat_Startup:
+		if (millis() > STARTUP_DELAY_MS)
+			globals.systemStatus = sysStat_Normal;
+		break;
+
+	case sysStat_Error:
+	case sysStat_Normal:
+	case sysStat_null:
+	default:
+		break;
+	}
+
+	// system Status Changed Actions
+	if (lastStat != globals.systemStatus)
+	{
+		switch (globals.systemStatus)
+		{
+		case sysStat_Shutdown:
+			OverrideDisplay(SHUTDOWN_DELAY_MS, "  re", "boot", "    ");
+			break;
+
+		case sysStat_Startup:
+			OverrideDisplay(STARTUP_DELAY_MS, "star", "t up", "    ");
+			break;
+
+		case sysStat_Error:
+		case sysStat_Normal:
+		case sysStat_null:
+		default:
+			break;
+		}
+
+		lastStat = globals.systemStatus;
+	}
 }
--- a/Software/src/oled_display.cpp
+++ b/Software/src/oled_display.cpp
@@ -33,10 +33,10 @@ void OLED_Process()
    display.setCursor(0, 0);
    display.printf("LiPo: %d%%\n", globals.battery_level);
    display.print(PersistenceData.activeFaction == FACTION_1 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_1_NAME, PersistenceData.faction_1_timer / 3600, (PersistenceData.faction_1_timer / 60) % 60, PersistenceData.faction_1_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_1_timer, PersistenceData.faction_1_timer / 3600, (PersistenceData.faction_1_timer / 60) % 60, PersistenceData.faction_1_timer % 60);
    display.print(PersistenceData.activeFaction == FACTION_2 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_2_NAME, PersistenceData.faction_2_timer / 3600, (PersistenceData.faction_2_timer / 60) % 60, PersistenceData.faction_2_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_2_timer, PersistenceData.faction_2_timer / 3600, (PersistenceData.faction_2_timer / 60) % 60, PersistenceData.faction_2_timer % 60);
    display.print(PersistenceData.activeFaction == FACTION_3 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_3_NAME, PersistenceData.faction_3_timer / 3600, (PersistenceData.faction_3_timer / 60) % 60, PersistenceData.faction_3_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_3_timer, PersistenceData.faction_3_timer / 3600, (PersistenceData.faction_3_timer / 60) % 60, PersistenceData.faction_3_timer % 60);
    display.display();
 }
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -2,86 +2,120 @@

 AsyncWebServer webServer(80);

-typedef enum
-{
-  RESPMSG_HIDE,
-  RESPMSG_SUCCESS,
-  RESPMSG_INFO,
-  RESPMSG_WARNING,
-  RESPMSG_DANGER
-} statusResponseMessage_Type_t;
-char StatusResponseMessage[64];
-statusResponseMessage_Type_t StatusResponseMessage_Type = RESPMSG_INFO;
+const char *PARAM_MESSAGE = "message";

 String processor(const String &var);
 void WebserverPOST_Callback(AsyncWebServerRequest *request);
 void WebserverNotFound_Callback(AsyncWebServerRequest *request);
 void Webserver_Callback(AsyncWebServerRequest *request);
-void WebserverCommands_Callback(String input);
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+void WebServerEEJSON_Callback(AsyncWebServerRequest *request);
+void GetFlashVersion(char *buff, size_t buff_size);
+
+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);

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

+  GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
+
+  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);
+  }
+
+  MDNS.begin(globals.DeviceName);
+  MDNS.addService("http", "tcp", 80);
+
+  webSocket.onEvent(WebsocketEvent_Callback);
+  webServer.addHandler(&webSocket);
+
  webServer.serveStatic("/static/", LittleFS, "/static/").setCacheControl("max-age=360000");
  webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
               { request->redirect("/index.htm"); });
  webServer.onNotFound(WebserverNotFound_Callback);
  webServer.on("/index.htm", HTTP_GET, Webserver_Callback);
-  webServer.on("/index.htm", HTTP_POST, WebserverPOST_Callback);
+  webServer.on("/post.htm", HTTP_POST, WebserverPOST_Callback);
+  webServer.on("/eejson", HTTP_GET, WebServerEEJSON_Callback);
+  webServer.on(
+      "/doUpdate", HTTP_POST, [](AsyncWebServerRequest *request) {}, WebserverFirmwareUpdate_Callback);
+  webServer.on(
+      "/eeRestore", HTTP_POST, [](AsyncWebServerRequest *request) {}, WebserverEERestore_Callback);

  webServer.begin();
 }

+void Webserver_Process()
+{
+  webSocket.cleanupClients();
+}
 String processor(const String &var)
 {
+  if (var == "HOSTNAME")
+    return String(globals.DeviceName);
+  if (var == "SYSTEM_STATUS")
+    return String(sSystem_Status_txt[globals.systemStatus]);
+  if (var == "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 == "SHOW_DTC_TABLE")
    return globals.systemStatus == sysStat_Error ? "" : "hidden";
-
-  if (var == "SHOW_RESP_MESSAGE")
-    return StatusResponseMessage_Type != RESPMSG_HIDE ? "" : "hidden";
-
-  if (var == "RESP_MESSAGE_TYPE")
-  {
-    switch (StatusResponseMessage_Type)
-    {
-    case RESPMSG_SUCCESS:
-      return "success";
-    case RESPMSG_INFO:
-      return "info";
-    case RESPMSG_WARNING:
-      return "warning";
-    case RESPMSG_DANGER:
-      return "danger";
-    default:
-      return "info";
-    }
-  }
-
-  if (var == "RESP_MESSAGE")
-    return String(StatusResponseMessage);
-
  if (var == "BAT_REMAIN_CAPACITY")
    return String(globals.battery_level);
-
-  if (var == "DEVICE_NAME")
+  if (var == "DEVICENAME")
    return String(globals.DeviceName);
-
+  if (var == "DEVICENAME_ID")
+    return String(globals.DeviceName_ID);
+  if (var == "BATTERY_TYPE")
+    return String(ConfigData.batteryType);
  if (var == "BAT_VOLTAGE")
-    return String(globals.loadvoltage);
-
+    return String((float)globals.loadvoltage_mV / 1000.0);
+  if (var == "PERSISTANCE_CHECKSUM")
+  {
+    char buffer[7];
+    sprintf(buffer, "0x%04X", PersistenceData.checksum);
+    return String(buffer);
+  }
+  if (var == "WRITE_CYCLE_COUNT")
+    return String(PersistenceData.writeCycleCounter);
+  if (var == "PERSISTENCE_MARKER")
+    return String(globals.eePersistanceAdress);
+  if (var == "EEPROM_VERSION")
+    return String(ConfigData.EEPROM_Version);
+  if (var == "CONFIG_CHECKSUM")
+  {
+    char buffer[7];
+    sprintf(buffer, "0x%04X", ConfigData.checksum);
+    return String(buffer);
+  }
  if (var == "DTC_TABLE")
  {
-    String temp;
+    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 > 0)
+      if (DTCStorage[i].Number < DTC_LAST_DTC)
      {
        sprintf(buff_timestamp, "%02d-%02d:%02d:%02d:%03d",
                DTCStorage[i].timestamp / 86400000,    // Days
@@ -90,8 +124,23 @@ String processor(const String &var)
                DTCStorage[i].timestamp / 1000 % 60,   // Seconds
                DTCStorage[i].timestamp % 1000);       // milliseconds

-        temp = "<tr><td>" + String(buff_timestamp);
+        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";
@@ -130,39 +179,41 @@ String processor(const String &var)
    return String(buff);
  }

-  if (var == "STATUS_FAC_1")
-    return PersistenceData.activeFaction == FACTION_1 ? "ACTIVE" : "INACTIVE";
+  if (var == "ACTIVE_FACTION")
+    return String(PersistenceData.activeFaction);

-  if (var == "STATUS_FAC_2")
-    return PersistenceData.activeFaction == FACTION_2 ? "ACTIVE" : "INACTIVE";
-
-  if (var == "STATUS_FAC_3")
-    return PersistenceData.activeFaction == FACTION_3 ? "ACTIVE" : "INACTIVE";
+  if (var == "FACTION_1_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_1 ? "bg-primary" : "bg-secondary");
+  if (var == "FACTION_2_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_2 ? "bg-primary" : "bg-secondary");
+  if (var == "FACTION_3_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_3 ? "bg-primary" : "bg-secondary");

  if (var == "NAME_FAC_1")
-    return FACTION_1_NAME;
+    return String(ConfigData.Faction_1_Name);

  if (var == "NAME_FAC_2")
-    return FACTION_2_NAME;
+    return String(ConfigData.Faction_2_Name);

  if (var == "NAME_FAC_3")
-    return FACTION_3_NAME;
+    return String(ConfigData.Faction_3_Name);

-  if (var == "TITLE")
-    return DEVICE_NAME;
+  if (var == "BATTERY_SELECT_OPTIONS")
+  {
+    String temp;
+    for (uint32_t i = 0; i < BatteryString_Elements; i++)
+    {
+      String selected = ConfigData.batteryType == i ? " selected " : "";
+      temp = temp + "<option value=\"" + i + "\"" + selected + ">" + BatteryString[i] + "</option>";
+    }
+    return temp;
+  }

-  if (var == "BATTERY_LEVEL")
-  {
-    return String(globals.battery_level);
-  }
-  if (var == "BATTERY_TYPE")
-  {
-    return String(BatteryString[ConfigData.batteryType]);
-  }
-  if (var == "BATTERY_VOLTAGE")
-  {
-    return String(globals.loadvoltage);
-  }
+  if (var == "FACTIONREBOOT_CHECKED")
+    return String(ConfigData.active_faction_on_reboot == true ? "checked" : "");
+
+  if (var == "FACTION_RECOVERY")
+    return String(ConfigData.active_faction_on_reboot);

  return String();
 }
@@ -170,19 +221,84 @@ String processor(const String &var)
 void Webserver_Callback(AsyncWebServerRequest *request)
 {
  request->send(LittleFS, "/index.htm", "text/html", false, processor);
-  StatusResponseMessage_Type = RESPMSG_HIDE;
 }

 void WebserverPOST_Callback(AsyncWebServerRequest *request)
 {
+  request->send(LittleFS, "/post.htm", "text/html", false, processor);
+
+  Debug_pushMessage("POST:\n");
  int paramsNr = request->params();
  for (int i = 0; i < paramsNr; i++)
  {
    AsyncWebParameter *p = request->getParam(i);
-    if (p->name() == "commandInput")
-      WebserverCommands_Callback(p->value());
+    Debug_pushMessage("%s : %s\n", p->name().c_str(), p->value().c_str());
+
+    // begin: POST Form Maintenance
+    if (p->name() == "reset_ee_btn")
+    {
+      if (request->hasParam("reset_ee_pds", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_pds", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_CFG_FORMAT ? EE_FORMAT_ALL : EE_PDS_FORMAT;
+      }
+      if (request->hasParam("reset_ee_cfg", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_cfg", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_PDS_FORMAT ? EE_FORMAT_ALL : EE_CFG_FORMAT;
+      }
+    }
+    if (p->name() == "reboot")
+    {
+      globals.systemStatus = sysStat_Shutdown;
+    }
+    if (p->name() == "resetpoints")
+    {
+      PersistenceData.faction_1_timer = 0;
+      PersistenceData.faction_2_timer = 0;
+      PersistenceData.faction_3_timer = 0;
+      PersistenceData.activeFaction = NONE;
+      globals.requestEEAction == EE_PDS_SAVE;
+    }
+    // end: POST Form Maintenance
+
+    // begin: POST Form Settings
+    if (p->name() == "battery_select")
+    {
+      batteryType_t temp = (batteryType_t)p->value().toInt();
+      ConfigData.batteryType = temp;
+    }
+
+    if (request->hasParam("factionreboot_cont", true))
+    {
+      AsyncWebParameter *param = request->getParam("factionreboot_cont", true);
+      if (param->value() == "on")
+        ConfigData.active_faction_on_reboot = true;
+    }
+    else
+    {
+      ConfigData.active_faction_on_reboot = false;
+    }
+
+    if (p->name() == "faction_1_name")
+    {
+      strncpy(ConfigData.Faction_1_Name, p->value().c_str(), sizeof(ConfigData.Faction_1_Name));
+    }
+    if (p->name() == "faction_2_name")
+    {
+      strncpy(ConfigData.Faction_2_Name, p->value().c_str(), sizeof(ConfigData.Faction_2_Name));
+    }
+    if (p->name() == "faction_3_name")
+    {
+      strncpy(ConfigData.Faction_3_Name, p->value().c_str(), sizeof(ConfigData.Faction_3_Name));
+    }
+
+    if (p->name() == "settingssave")
+      globals.requestEEAction = EE_CFG_SAVE;
+    // end: POST Form Settings
  }
-  request->send(LittleFS, "/index.htm", "text/html", false, processor);
 }

 void WebserverNotFound_Callback(AsyncWebServerRequest *request)
@@ -190,20 +306,231 @@ void WebserverNotFound_Callback(AsyncWebServerRequest *request)
  request->send(404, "text/html", "Not found");
 }

-void WebserverCommands_Callback(String input)
+void GetFlashVersion(char *buff, size_t buff_size)
 {
-  String command = input.substring(0, input.indexOf(' '));
-  command.toUpperCase();
-  StatusResponseMessage_Type = RESPMSG_HIDE;
-
-  if (command == "RESET")
-  {
-    strcpy(StatusResponseMessage, "Counter Reset done");
-    StatusResponseMessage_Type = RESPMSG_SUCCESS;
-
-    PersistenceData.faction_1_timer = 0;
-    PersistenceData.faction_2_timer = 0;
-    PersistenceData.faction_3_timer = 0;
-    PersistenceData.activeFaction = NONE;
+  File this_file = LittleFS.open("version", "r");
+  if (!this_file)
+  { // failed to open the file, retrn empty result
+    buff[0] = '\0';
+    return;
  }
+  if (this_file.available())
+  {
+    int bytes_read;
+    bytes_read = this_file.readBytesUntil('\r', buff, buff_size - 1);
+    buff[bytes_read] = '\0';
+  }
+  this_file.close();
+}
+
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+
+  if (!index)
+  {
+    Debug_pushMessage("Update");
+    size_t content_len = request->contentLength();
+    int cmd = (filename.indexOf(".fs") > -1) ? U_FS : U_FLASH;
+    Update.runAsync(true);
+    if (!Update.begin(content_len, cmd))
+    {
+      Update.printError(Serial);
+    }
+  }
+
+  if (Update.write(data, len) != len)
+  {
+    Update.printError(Serial);
+  }
+  else
+  {
+    Debug_pushMessage("Progress: %d%%\n", (Update.progress() * 100) / Update.size());
+  }
+
+  if (final)
+  {
+    AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
+    response->addHeader("Refresh", "20");
+    response->addHeader("Location", "/");
+    request->send(response);
+    if (!Update.end(true))
+    {
+      Update.printError(Serial);
+    }
+    else
+    {
+      Debug_pushMessage("Update complete\n");
+      globals.systemStatus = sysStat_Shutdown;
+    }
+  }
+}
+
+void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+  bool ee_done = false;
+  static bool validext = false;
+  static char *buffer = NULL;
+  static uint32_t read_ptr = 0;
+  DeserializationError error;
+
+  if (!index)
+  {
+    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 (buffer != NULL)
+  {
+    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
+      {
+
+        ConfigData.batteryType = (batteryType_t)doc["config"]["batteryType"].as<uint32_t>();
+        ConfigData.EEPROM_Version = doc["config"]["EEPROM_Version"].as<uint32_t>();
+        strncpy(ConfigData.Faction_1_Name, doc["config"]["Faction_1_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_1_Name));
+        strncpy(ConfigData.Faction_2_Name, doc["config"]["Faction_2_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_2_Name));
+        strncpy(ConfigData.Faction_3_Name, doc["config"]["Faction_3_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_3_Name));
+
+        PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>();
+        PersistenceData.activeFaction = (factions_t)doc["persis"]["activeFaction"].as<uint32_t>();
+        PersistenceData.faction_1_timer = doc["persis"]["faction_1_timer"].as<uint32_t>();
+        PersistenceData.faction_2_timer = doc["persis"]["faction_2_timer"].as<uint32_t>();
+        PersistenceData.faction_3_timer = doc["persis"]["faction_3_timer"].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
+    {
+    }
+  }
+}
+
+void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
+{
+  AsyncResponseStream *response = request->beginResponseStream("application/json");
+  DynamicJsonDocument json(1024);
+  JsonObject fwinfo = json.createNestedObject("info");
+
+  char buffer[16];
+
+  fwinfo["DeviceName"] = globals.DeviceName;
+  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");
+
+  config["EEPROM_Version"] = ConfigData.EEPROM_Version;
+  config["batteryType"] = ConfigData.batteryType;
+  config["Faction_1_Name"] = ConfigData.Faction_1_Name;
+  config["Faction_2_Name"] = ConfigData.Faction_2_Name;
+  config["Faction_3_Name"] = ConfigData.Faction_3_Name;
+  sprintf(buffer, "0x%08X", ConfigData.checksum);
+  config["checksum"] = buffer;
+
+  JsonObject eepart = json.createNestedObject("eepart");
+
+  sprintf(buffer, "0x%04X", globals.eePersistanceAdress);
+  eepart["PersistanceAddress"] = buffer;
+
+  JsonObject persis = json.createNestedObject("persis");
+
+  persis["writeCycleCounter"] = PersistenceData.writeCycleCounter;
+  persis["activeFaction"] = PersistenceData.activeFaction;
+  persis["faction_1_timer"] = PersistenceData.faction_1_timer;
+  persis["faction_2_timer"] = PersistenceData.faction_2_timer;
+  persis["faction_3_timer"] = PersistenceData.faction_3_timer;
+  sprintf(buffer, "0x%08X", PersistenceData.checksum);
+  persis["checksum"] = buffer;
+
+  serializeJsonPretty(json, *response);
+
+  response->addHeader("Content-disposition", "attachment; filename=backup.ee.json");
+
+  request->send(response);
+}
+
+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());
+    break;
+  case WS_EVT_DISCONNECT:
+    Debug_pushMessage("WebSocket client #%u disconnected\n", client->id());
+    break;
+  case WS_EVT_DATA:
+    Websocket_HandleMessage(arg, data, len);
+    break;
+  case WS_EVT_PONG:
+  case WS_EVT_ERROR:
+    break;
+  }
+}
+
+void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len)
+{
+  AwsFrameInfo *info = (AwsFrameInfo *)arg;
+  if (info->final && info->index == 0 && info->len == len && info->opcode == WS_TEXT)
+  {
+    data[len] = 0;
+
+    Debug_pushMessage("Got WebSocket Message: %s \n", (char *)data);
+
+    if (strcmp((char *)data, "start") == 0)
+    {
+      SetDebugportStatus(dbg_Webui, enabled);
+    }
+    else if (strcmp((char *)data, "stop") == 0)
+    {
+      SetDebugportStatus(dbg_Webui, disabled);
+    }
+    else if (strcmp((char *)data, "foo") == 0)
+    {
+      Debug_pushMessage("Got WebSocket Message 'foo' from client\n");
+    }
+  }
+}
+
+void Websocket_PushLiveDebug(String Message)
+{
+  webSocket.textAll(Message + "\n");
 }
--- a/Software/src/webui.h
+++ b/Software/src/webui.h
@@ -1,16 +0,0 @@
-#ifndef _WEBUI_H_
-#define _WEBUI_H_
-
-#include <Arduino.h>
-#include <FS.h>
-#include <LittleFS.h>
-#include <ESPAsyncTCP.h>
-#include <ESPAsyncWebServer.h>
-#include "config.h"
-#include "globals.h"
-#include "dtc.h"
-#include "defaults.h"
-
-void initWebUI();
-
-#endif
--- a/Software/wifi_credentials.example.ini
+++ b/Software/wifi_credentials.example.ini
@@ -1,5 +1,6 @@
 [wifi_cred]
+wifi_ap_ssid = wifi-ap-ssid
 wifi_ap_password = wifiappass
-wifi_ssid = wifi-ssid
-wifi_password = wifi-pass
-admin_password = ota-password
+wifi_client_ssid = wifi-ssid
+wifi_client_password = wifi-pass
+ota_password = ota-password
Author	SHA1	Message	Date
Marcel Peterkau	1cf0560957	updated FW Version Number	2024-05-01 20:42:34 +02:00
Marcel Peterkau	b66d175948	Fixed Bug in LoRa Uart Parser, because I'm stupid	2024-05-01 20:35:09 +02:00
Marcel Peterkau	0967b6aa65	Bugfix in LoRa-Uart	2023-05-28 19:36:39 +02:00
Marcel Peterkau	498d813624	increase Version after Release	2023-05-25 20:59:18 +02:00
Marcel Peterkau	268c204957	added LoraUartCommand Interpreter	2023-05-25 19:59:34 +02:00
Marcel Peterkau	65d51f13aa	added Pinout for LoRa-UART	2023-05-25 14:00:18 +02:00
Marcel Peterkau	f727bb3247	first Draft of UART for external LoRa-Module	2023-05-25 14:00:06 +02:00
Marcel Peterkau	cd1379f90c	updated project-config	2023-05-25 10:58:50 +02:00
Marcel Peterkau	0363b1eebc	increase Version after Release	2023-04-30 10:08:34 +02:00
Marcel Peterkau	e6f1283aae	final fixes before Release for DE XI	2023-04-30 10:05:41 +02:00
Marcel Peterkau	a92b1edfd9	reformated points-table on WebUI	2023-04-18 20:07:52 +02:00
Marcel Peterkau	4cce7c1c86	fixed show setting in WebUI	2023-04-18 20:07:38 +02:00
Marcel Peterkau	0a1625e9b8	made Faction-Names configurable	2023-04-18 20:06:57 +02:00
Marcel Peterkau	c24829ed70	added Device-ID to SystemInfo	2023-04-18 13:00:34 +02:00
Marcel Peterkau	a102405596	reverted calculation-order of checksum and store	2023-04-18 12:53:27 +02:00
Marcel Peterkau	1b7157dbdc	read back EEPROM after Format to Maintain DTC	2023-04-18 12:50:26 +02:00
Marcel Peterkau	cad34d6b84	swapped migration of Persistance and Config	2023-04-18 12:47:04 +02:00
Marcel Peterkau	701bf9f457	fixed another warning and bug in Logoutput	2023-04-18 12:30:14 +02:00
Marcel Peterkau	0a895a00b9	fixed warning	2023-04-18 12:29:55 +02:00
Marcel Peterkau	22a62e3d1e	refactoring	2023-04-18 12:28:11 +02:00
Marcel Peterkau	f48b5a09ed	renamed eeprom-files and added migrator	2023-04-18 12:27:04 +02:00
Marcel Peterkau	7f6c486eab	fixed config if checkbox not set	2023-04-17 23:14:46 +02:00
Marcel Peterkau	3e77f89538	propely handle sysstart and display Startup	2023-04-17 23:12:13 +02:00
Marcel Peterkau	f33076a0a3	fixed typo	2023-04-17 22:57:43 +02:00
Marcel Peterkau	7e58db489d	made active faction recovery configurable	2023-04-17 22:55:16 +02:00
Marcel Peterkau	eb771d07d3	fixed copy&paste-error	2023-04-17 22:29:19 +02:00
Marcel Peterkau	e2059cb587	reworked DisplayOverride	2023-04-17 22:28:16 +02:00
Marcel Peterkau	6702154ef5	made dot blink if faction active	2023-04-17 22:27:26 +02:00
Marcel Peterkau	a899cf4dcf	Log-Output Format fix	2023-04-17 22:27:01 +02:00
Marcel Peterkau	ea230bcee7	bumped Version	2023-04-17 22:02:37 +02:00
Marcel Peterkau	c059d7d085	more Sysinfo on WebUI	2023-04-17 22:00:06 +02:00
Marcel Peterkau	b8c79955a8	fixed warning	2023-04-17 21:54:46 +02:00
Marcel Peterkau	44240aa7bf	extended DTC-output by DebugVal	2023-04-17 21:54:36 +02:00
Marcel Peterkau	6bc523b2a8	fixed Display of current SysStatus	2023-04-17 21:53:52 +02:00
Marcel Peterkau	97cdd7fad1	changed Reset via Buttons during Startup	2023-04-17 21:52:49 +02:00
Marcel Peterkau	ec62eeee1e	corrected ColorScheme on WebUI	2023-04-17 21:51:27 +02:00
Marcel Peterkau	7b166caf84	points and reset-function on webUI	2023-04-17 21:51:13 +02:00
Marcel Peterkau	62a7cd1b9c	correct EEPROM-Type	2023-04-17 20:23:17 +02:00
Marcel Peterkau	7e047c0c09	some Wifi-defines renamed for consistency	2023-04-17 20:23:05 +02:00
Marcel Peterkau	8c2d553dfb	switched Factions	2023-04-13 21:04:29 +02:00
Marcel Peterkau	ca9409e328	more fixes	2023-04-13 01:28:41 +02:00
Marcel Peterkau	5a6dc524ad	removed Artifacts from other Project	2023-04-13 00:56:35 +02:00
Marcel Peterkau	41b27c02dd	fixed DTC-Numbering	2023-04-13 00:55:55 +02:00
Marcel Peterkau	e344977b8f	fixed WiFi-Client Feature	2023-04-13 00:48:43 +02:00
Marcel Peterkau	aeab80d5a8	Updated Debugging-Stuff and WebUI Backend	2023-04-13 00:35:24 +02:00
Marcel Peterkau	4507c80eba	Updated WebUI	2023-04-13 00:32:50 +02:00
Marcel Peterkau	427e5e5d16	restructured Folders and Files	2023-04-12 23:05:46 +02:00
Marcel Peterkau	3a0e1a931d	disabled Lora by define	2023-04-12 22:56:36 +02:00
Marcel Peterkau	a960e67c7d	smaller fixes	2023-04-12 22:49:04 +02:00
Marcel Peterkau	9e1a4d821f	added defines for Versioning	2023-04-12 22:47:56 +02:00
Marcel Peterkau	4d0a9918ce	Some LoRa-stuff	2023-04-12 22:47:17 +02:00
Marcel Peterkau	53928a93b0	Reworked KeyCombo to support 2-Button-Variant	2023-04-12 22:45:24 +02:00
Marcel Peterkau	6b89ed9a8c	reworked WiFi-Stuff	2023-04-12 22:43:25 +02:00
Marcel Peterkau	ae29e23812	migrated lot of stuff from Chainoiler-Project	2023-02-20 13:51:54 +01:00
Marcel Peterkau	8884e995ca	removed SoftSerial Library, due to integrated in Core	2023-02-20 13:51:28 +01:00
Marcel Peterkau	8eb52e286f	restructured data-Folder and prepared for gzip	2023-02-20 09:27:34 +01:00
Marcel Peterkau	98145b424d	7Seg Ports on PCB switched - switch back in Code	2023-02-15 20:14:24 +01:00
Marcel Peterkau	43ab7c6934	replaced 7Seg Library	2023-02-15 20:13:36 +01:00
Marcel Peterkau	99dc58f3c9	Added Commands for BatterySetting	2023-02-15 20:12:29 +01:00