Updated FW-Version

Software/data_src/index.htm

@@ -10,6 +10,7 @@
   <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">
@@ -58,8 +59,8 @@
         <p>
         <h4>Tankinhalt verbleibend</h4>
         <div class="progress">
-          <div class="progress-bar" role="progressbar" aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0"
+          <div class="progress-bar text-light" role="progressbar" aria-valuenow="%TANK_REMAIN_CAPACITY%"
-            aria-valuemax="100" style="width: %TANK_REMAIN_CAPACITY%&#37;">
+            aria-valuemin="0" aria-valuemax="100" style="width: %TANK_REMAIN_CAPACITY%&#37;">
             %TANK_REMAIN_CAPACITY%&#37;
           </div>
         </div>
@@ -76,10 +77,10 @@
           <table class="table">
             <tbody>
               <tr>
-                <th class="col-md-3" scope="col">Zeitstempel</th>
+                <th class="col-6" scope="col">Zeitstempel</th>
-                <th class="col-md-3" scope="col">Fehlercode</th>
+                <th class="col-2" scope="col">Fehlercode</th>
-                <th class="col-md-3" scope="col">Schwere</th>
+                <th class="col-2" scope="col">Schwere</th>
-                <th class="col-md-3" scope="col">Aktiv</th>
+                <th class="col-2" scope="col">Aktiv</th>
               </tr>
               %DTC_TABLE%
             </tbody>
@@ -113,7 +114,7 @@
             Dadurch wird die WiFi-Verbindung getrennt und muss neu aufgebaut werden.
           </div>
           <div class="form-group row">
-            <div class="offset-4 col-8">
+            <div class="col text-center">
               <button name="sourcesave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
             </div>
           </div>
@@ -174,12 +175,13 @@
               </div>
             </div>
             <div class="form-group row">
-              <div class="offset-4 col-8">
+              <div class="col text-center">
                 <button name="pulsesave" type="submit" class="btn btn-outline-primary">Speichern</button>
               </div>
             </div>
           </form>
           </p>
+          <hr />
         </div>
         <!-- Div Source:Impulse Settings-->
         <!-- Div Source:CAN Settings-->
@@ -197,12 +199,13 @@
               </div>
             </div>
             <div class="form-group row">
-              <div class="offset-4 col-8">
+              <div class="col text-center">
                 <button name="cansave" type="submit" class="btn btn-outline-primary">Speichern</button>
               </div>
             </div>
           </form>
           </p>
+          <hr />
         </div>
         <!-- Div Source:CAN Settings-->
         <!-- Div Source:GPS Settings-->
@@ -220,12 +223,13 @@
               </div>
             </div>
             <div class="form-group row">
-              <div class="offset-4 col-8">
+              <div class="col text-center">
                 <button name="gpssave" type="submit" class="btn btn-outline-primary">Speichern</button>
               </div>
             </div>
           </form>
           </p>
+          <hr />
         </div>
         <!-- Div Source:GPS Settings-->
       </div>
@@ -234,8 +238,8 @@
       <div id="tab_lube" class="tab-pane fade" role="tabpanel">
         <h3>Schmierung</h3>
         <hr />
-        <h4>Dosierung</h4>
         <p>
+        <h4>Dosierung</h4>
         <form action="post.htm" method="POST" class="form-horizontal">
           <div class="form-group row">
             <label for="lubedistancenormal" class="control-label col-4">Normal (gr&uuml;n)</label>
@@ -262,7 +266,7 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="offset-4 col-8">
+            <div class="col text-center">
               <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
             </div>
           </div>
@@ -318,7 +322,7 @@
             <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
             <div class="col-8">
               <div class="progress">
-                <div id="tankremain_maint" class="progress-bar" role="progressbar"
+                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
                   aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
                   style="width: %TANK_REMAIN_CAPACITY%&#37;">
                   %TANK_REMAIN_CAPACITY%&#37;
@@ -327,7 +331,7 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="offset-4 col-8 row">
+            <div class="col text-center">
               <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
               <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
             </div>
@@ -350,7 +354,7 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="offset-4 col-8 row">
+            <div class="col text-center">
               <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
               <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
             </div>
@@ -358,8 +362,8 @@
         </form>
         </p>
         <hr />
-        <h4>EEPROM formatieren</h4>
         <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>
@@ -389,26 +393,37 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="offset-4 col-8">
+            <div class="col text-center">
               <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
             </div>
           </div>
         </form>
         </p>
         <hr />
+        <p>
+        <h4>Ger&auml;t neustarten</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <hr />
       </div>
       <!-- Div Tab Maintenance -->
       <!-- Div Tab SystemInfo -->
       <div id="tab_sysinfo" class="tab-pane fade" role="tabpanel">
         <h3>Systeminfo</h3>
         <hr />
-        <h4>Einstellungen</h4>
         <p>
+        <h4>Einstellungen</h4>
         <table class="table">
           <tbody>
             <tr>
-              <th class="col-md-8" scope="col">Parameter</td>
+              <th class="col-7" scope="col">Parameter</td>
-              <th class="col-md-4" scope="col">Value</td>
+              <th class="col-5" scope="col">Value</td>
             </tr>
             <tr>
               <td>DistancePerLube_Default</td>
@@ -473,13 +488,14 @@
           </tbody>
         </table>
         </p>
-        <h4>Betriebsdaten</h4>
+        <hr />
         <p>
+        <h4>Betriebsdaten</h4>
         <table class="table">
           <tbody>
             <tr>
-              <th class="col-md-8" scope="col">Parameter</td>
+              <th class="col-7" scope="col">Parameter</td>
-              <th class="col-md-4" scope="col">Value</td>
+              <th class="col-5" scope="col">Value</td>
             </tr>
             <tr>
               <td>writeCycleCounter</td>
@@ -507,6 +523,20 @@
             </tr>
         </table>
         </p>
+        <hr />
+        <p>
+          <h4>Live Debug</h4>
+            <div class="form-group row">
+              <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button id="btn-ws-start" class="btn btn-outline-primary">Start</button>
+                <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
+              </div>
+            </div>
+          </p>
+          <hr />
       </div>
       <!-- Div Tab SystemInfo -->
       <!-- Div Tab Firmware Update-->
@@ -517,6 +547,10 @@
         <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>
@@ -529,20 +563,50 @@
         </p>
         <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>
+        <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>
+        <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.bin" required />
+                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">
-            <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
+            <div class="col text-center">
+              <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
+            </div>
           </div>
         </form>
         </p>
+        <hr />
       </div>
       <!-- Div Tab Firmware Update-->
     </div>
@@ -575,6 +639,7 @@
         </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>
@@ -606,10 +671,17 @@
     $('#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")

Software/data_src/static/css/tweaks.css

@@ -8,7 +8,7 @@
 
 body {
     padding-top: 70px;
-    margin-bottom: 56px;
+    margin-bottom: 70px;
 }
 
 hr {
@@ -18,3 +18,10 @@ hr {
     background-color: gray
 }
 
+.dtc-debugval {
+    color: #F2771A;
+    font: 0.8rem Inconsolata, monospace;
+    background-color: black;
+    padding: 10px;
+}
+

Software/data_src/static/js/websocket.js

@@ -0,0 +1,68 @@
+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;
+}

Software/data_src/static/tt_dtc/dtc_13.json

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

Software/data_src/version

@@ -1 +1 @@
-1.01
+1.3

Software/platformio.ini

@@ -31,13 +31,14 @@ build_flags =
   -DADMIN_PASSWORD=${wifi_cred.admin_password}
   -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
   -DWIFI_AP_IP_GW=10,0,0,1
+  -DATOMIC_FS_UPDATE
   -DFEATURE_ENABLE_WIFI_CLIENT
-  -DFEATURE_ENABLE_REMOTE_DEBUG
   -DFEATURE_ENABLE_OLED
   -DFEATURE_ENABLE_CAN
-  -DFEATURE_ENABLE_GPS
+  ;-DFEATURE_ENABLE_GPS
+  -DFEATURE_ENABLE_WEBSOCKETS
   -DPCB_REV=4
-  -DNO_MODE_FLASH
+  ;-DNO_MODE_FLASH
 
 ;build_type = debug
 
@@ -51,10 +52,10 @@ board_build.ldscript = eagle.flash.4m1m.ld
 lib_ldf_mode = deep
 lib_deps = 
     olikraus/U8g2 @ ^2.28.8
-    joaolopesf/RemoteDebug @ ^2.1.2
+    https://github.com/FastLED/FastLED.git#3d2ab78 ;fastled/FastLED @ ^3.5.0
-    fastled/FastLED @ ^3.5.0
     sstaub/Ticker @ ^4.2.0
     coryjfowler/mcp_can @ ^1.5.0
     robtillaart/I2C_EEPROM @ ^1.5.2
     mikalhart/TinyGPSPlus @ ^1.0.3
     me-no-dev/ESP Async WebServer @ ^1.2.3
+    bblanchon/ArduinoJson @ ^6.19.4

Software/prepare_littlefs.py

@@ -100,7 +100,17 @@ def gzip_webfiles(source, target, env):
         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)

Software/src/can.cpp

@@ -23,9 +23,11 @@ uint32_t Process_CAN_WheelSpeed()
     can_frame canMsg;
     static uint32_t lastRecTimestamp = 0;
     uint16_t RearWheelSpeed_raw;
+    uint32_t milimeters_to_add = 0;
 
     if (CAN0.readMsgBuf(&canMsg.can_id, &canMsg.can_dlc, canMsg.data) == CAN_OK)
     {
+
         RearWheelSpeed_raw = (uint16_t)canMsg.data[5] << 8 | canMsg.data[6];
         // raw / FACTOR_RWP_KMH_890ADV -> km/h * 100000 -> cm/h / 3600 -> cm/s
         // raw * 500 -> cm/s
@@ -34,13 +36,14 @@ uint32_t Process_CAN_WheelSpeed()
         uint32_t timesincelast = millis() - lastRecTimestamp;
         lastRecTimestamp = millis();
 
-        uint32_t milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
+        milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
-
-        return milimeters_to_add;
     }
 
-    MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false));
+    if (lastRecTimestamp != 0)
+    {
+        MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false));
+    }
 
-    return 0;
+    return milimeters_to_add;
 }
 #endif

Software/src/common.h

@@ -26,10 +26,8 @@
 #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
 #endif
 
-#define SW_VERSION_MAJOR 1
+#define SW_VERSION 1.4
-#define SW_VERSION_MINOR 1
+#define FLASH_FS_VERSION 1.4
-
-#define FLASH_FS_VERSION 1.1
 
 #ifndef OTA_DELAY
 #define OTA_DELAY 50 // ticks -> 10ms / tick
@@ -51,6 +49,4 @@
 #define STARTUP_DELAY 5000
 #define SHUTDOWN_DELAY_MS 5000
 
-#define ATOMIC_FS_UPDATE
-
 #endif

Software/src/config.cpp

@@ -1,4 +1,5 @@
 #include "config.h"
+#include "debugger.h"
 
 I2C_eeprom ee(0x50, EEPROM_SIZE_BYTES);
 
@@ -25,37 +26,45 @@ void EEPROM_Process()
   case EE_CFG_SAVE:
     StoreConfig_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM CFG\n");
     break;
   case EE_CFG_LOAD:
     GetConfig_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Loaded EEPROM CFG\n");
     break;
   case EE_CFG_FORMAT:
     FormatConfig_EEPROM();
     globals.requestEEAction = EE_IDLE;
     globals.systemStatus = sysStat_Shutdown;
+    Debug_pushMessage("Formated EEPROM CFG\n");
     break;
   case EE_PDS_SAVE:
     StorePersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM PDS\n");
     break;
   case EE_PDS_LOAD:
     GetPersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Loaded EEPROM PDS\n");
     break;
   case EE_PDS_FORMAT:
     FormatPersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Formated EEPROM PDS\n");
     break;
   case EE_FORMAT_ALL:
     FormatConfig_EEPROM();
     FormatPersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Formated EEPROM ALL\n");
     break;
   case EE_ALL_SAVE:
     StorePersistence_EEPROM();
     StoreConfig_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM ALL\n");
     break;
   case EE_IDLE:
   default:
@@ -88,6 +97,14 @@ void GetConfig_EEPROM()
     MaintainDTC(DTC_EEPROM_CFG_BAD, DTC_CRITICAL, true);
   }
   LubeConfig.checksum = checksum;
+
+  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
+
+  if (ConfigSanityCheckResult > 0)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_SANITY, DTC_WARN, true, ConfigSanityCheckResult);
+    globals.requestEEAction = EE_CFG_SAVE;
+  }
 }
 
 void StorePersistence_EEPROM()
@@ -137,7 +154,7 @@ void GetPersistence_EEPROM()
 
 void FormatConfig_EEPROM()
 {
-  Serial.println("Formatting Config-Partition");
+  Debug_pushMessage("Formatting Config-Partition\n");
   LubeConfig = LubeConfig_defaults;
   LubeConfig.EEPROM_Version = eeVersion;
   StoreConfig_EEPROM();
@@ -145,8 +162,9 @@ void FormatConfig_EEPROM()
 
 void FormatPersistence_EEPROM()
 {
-  Serial.println("Formatting Persistance-Partition");
+  Debug_pushMessage("Formatting Persistance-Partition\n");
-  memset(&PersistenceData, 0, sizeof(PersistenceData));
+  PersistenceData = {0};
+  // memset(&PersistenceData, 0, sizeof(PersistenceData));
   StorePersistence_EEPROM();
 }
 
@@ -195,9 +213,9 @@ void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
 
   char ascii_buf[BLOCK_TO_LENGTH + 1];
   sprintf(ascii_buf, "%*s", BLOCK_TO_LENGTH, "ASCII");
-  Serial.print(PSTR("\nAddress "));
+  Debug_pushMessage(PSTR("\nAddress "));
   for (int x = 0; x < BLOCK_TO_LENGTH; x++)
-    Serial.printf("%3d", x);
+    Debug_pushMessage("%3d", x);
 
   memoryAddress = memoryAddress / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
   length = (length + BLOCK_TO_LENGTH - 1) / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
@@ -208,16 +226,16 @@ void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
     if (blockpoint == 0)
     {
       ascii_buf[BLOCK_TO_LENGTH] = 0;
-      Serial.printf("  %s", ascii_buf);
+      Debug_pushMessage("  %s", ascii_buf);
-      Serial.printf("\n0x%05X:", memoryAddress);
+      Debug_pushMessage("\n0x%05X:", memoryAddress);
     }
     ascii_buf[blockpoint] = ee.readByte(memoryAddress);
-    Serial.printf(" %02X", ascii_buf[blockpoint]);
+    Debug_pushMessage(" %02X", ascii_buf[blockpoint]);
     if (ascii_buf[blockpoint] < 0x20 || ascii_buf[blockpoint] > 0x7E)
       ascii_buf[blockpoint] = '.';
     memoryAddress++;
   }
-  Serial.println();
+  Debug_pushMessage("\n");
 }
 
 boolean checkEEPROMavailable()
@@ -225,9 +243,116 @@ boolean checkEEPROMavailable()
   if (!ee.isConnected())
   {
     MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, true);
-    globals.systemStatus = sysStat_Error;
     return false;
   }
   MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, false);
   return true;
+}
+
+uint32_t ConfigSanityCheck(bool autocorrect)
+{
+  uint32_t setting_reset_bits = 0;
+
+  if (!(LubeConfig.DistancePerLube_Default > 0) || !(LubeConfig.DistancePerLube_Default < 50000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 0);
+    if (autocorrect)
+      LubeConfig.DistancePerLube_Default = LubeConfig_defaults.DistancePerLube_Default;
+  }
+
+  if (!(LubeConfig.DistancePerLube_Rain > 0) || !(LubeConfig.DistancePerLube_Rain < 50000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 1);
+    if (autocorrect)
+      LubeConfig.DistancePerLube_Rain = LubeConfig_defaults.DistancePerLube_Rain;
+  }
+
+  if (!(LubeConfig.tankCapacity_ml > 0) || !(LubeConfig.tankCapacity_ml < 5000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 2);
+    if (autocorrect)
+      LubeConfig.tankCapacity_ml = LubeConfig_defaults.tankCapacity_ml;
+  }
+
+  if (!(LubeConfig.amountPerDose_microL > 0) || !(LubeConfig.amountPerDose_microL < 100))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 3);
+    if (autocorrect)
+      LubeConfig.amountPerDose_microL = LubeConfig_defaults.amountPerDose_microL;
+  }
+
+  if (!(LubeConfig.TankRemindAtPercentage >= 0) || !(LubeConfig.TankRemindAtPercentage <= 100))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 4);
+    if (autocorrect)
+      LubeConfig.TankRemindAtPercentage = LubeConfig_defaults.TankRemindAtPercentage;
+  }
+
+  if (!(LubeConfig.PulsePerRevolution > 0) || !(LubeConfig.PulsePerRevolution < 1000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 5);
+    if (autocorrect)
+      LubeConfig.PulsePerRevolution = LubeConfig_defaults.PulsePerRevolution;
+  }
+
+  if (!(LubeConfig.TireWidth_mm > 0) || !(LubeConfig.TireWidth_mm < 500))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 6);
+    if (autocorrect)
+      LubeConfig.TireWidth_mm = LubeConfig_defaults.TireWidth_mm;
+  }
+
+  if (!(LubeConfig.TireWidthHeight_Ratio > 0) || !(LubeConfig.TireWidthHeight_Ratio < 150))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 7);
+    if (autocorrect)
+      LubeConfig.TireWidthHeight_Ratio = LubeConfig_defaults.TireWidthHeight_Ratio;
+  }
+
+  if (!(LubeConfig.RimDiameter_Inch > 0) || !(LubeConfig.RimDiameter_Inch < 30))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 8);
+    if (autocorrect)
+      LubeConfig.RimDiameter_Inch = LubeConfig_defaults.RimDiameter_Inch;
+  }
+
+  if (!(LubeConfig.DistancePerRevolution_mm > 0) || !(LubeConfig.DistancePerRevolution_mm < 10000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 9);
+    if (autocorrect)
+      LubeConfig.DistancePerRevolution_mm = LubeConfig_defaults.DistancePerRevolution_mm;
+  }
+
+  if (!(LubeConfig.BleedingPulses > 0) || !(LubeConfig.BleedingPulses < 1001))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 10);
+    if (autocorrect)
+      LubeConfig.BleedingPulses = LubeConfig_defaults.BleedingPulses;
+  }
+
+  if (!(LubeConfig.SpeedSource >= 0) || !(LubeConfig.SpeedSource < SpeedSourceString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 11);
+    if (autocorrect)
+      LubeConfig.SpeedSource = LubeConfig_defaults.SpeedSource;
+  }
+
+#ifdef FEATURE_ENABLE_GPS
+  if (!(LubeConfig.GPSBaudRate >= 0) || !(LubeConfig.GPSBaudRate < GPSBaudRateString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 12);
+    if (autocorrect)
+      LubeConfig.GPSBaudRate = LubeConfig_defaults.GPSBaudRate;
+  }
+#endif
+
+#ifdef FEATURE_ENABLE_CAN
+  if (!(LubeConfig.CANSource >= 0) || !(LubeConfig.CANSource < CANSourceString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 13);
+    if (autocorrect)
+      LubeConfig.CANSource = LubeConfig_defaults.CANSource;
+  }
+#endif
+  return setting_reset_bits;
 }

Software/src/config.h

@@ -8,7 +8,11 @@
 #include "dtc.h"
 #include "common.h"
 
+#if PCB_REV == 1 || PCB_REV == 2 || PCB_REV == 3
+#define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC64
+#elif PCB_REV == 4
 #define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC256
+#endif
 
 typedef enum SpeedSource_e
 {
@@ -64,7 +68,7 @@ const size_t SpeedSourceString_Elements = sizeof(SpeedSourceString) / sizeof(Spe
 typedef struct
 {
   uint16_t writeCycleCounter = 0;
-  uint32_t tankRemain_µl = 0;
+  uint32_t tankRemain_microL = 0;
   uint32_t TravelDistance_highRes_mm = 0;
   uint32_t odometer_mm = 0;
   uint32_t odometer = 0;
@@ -77,7 +81,7 @@ typedef struct
   uint32_t DistancePerLube_Default = 8000;
   uint32_t DistancePerLube_Rain = 4000;
   uint32_t tankCapacity_ml = 320;
-  uint32_t amountPerDose_µl = DEFAULT_PUMP_DOSE;
+  uint32_t amountPerDose_microL = DEFAULT_PUMP_DOSE;
   uint8_t TankRemindAtPercentage = 30;
   uint8_t PulsePerRevolution = 1;
   uint32_t TireWidth_mm = 150;
@@ -95,7 +99,7 @@ typedef struct
   uint32_t checksum = 0;
 } LubeConfig_t;
 
-const LubeConfig_t LubeConfig_defaults{
+const LubeConfig_t LubeConfig_defaults = {
     0, 8000, 4000, 320, DEFAULT_PUMP_DOSE, 30, 1, 150, 70, 18, 2000, 25, SOURCE_IMPULSE,
 #ifdef FEATURE_ENABLE_GPS
     BAUD_115200,
@@ -116,6 +120,7 @@ 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);
 
 extern LubeConfig_t LubeConfig;
 extern persistenceData_t PersistenceData;

Software/src/debugger.cpp

@@ -0,0 +1,253 @@
+#include "debugger.h"
+
+DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+String IpAddress2String(const IPAddress &ipAddress);
+void processCmdDebug();
+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 initDebugger()
+{
+    DebuggerStatus[dbg_Serial] = disabled;
+    DebuggerStatus[dbg_Webui] = disabled;
+
+    Serial.setDebugOutput(false);
+}
+
+void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status)
+{
+    if (status == disabled)
+        Debug_pushMessage("disable DebugPort %s", sDebugPorts[port]);
+
+    DebuggerStatus[port] = status;
+
+    if (status == enabled)
+        Debug_pushMessage("enabled DebugPort %s", 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 pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data)
+{
+    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
+    {
+        char buff[100];
+        char *p = buff;
+        p += snprintf(p, sizeof(buff), "CAN: 0x%08X | %d | ", id, dlc);
+        for (int i = 0; i < dlc; i++)
+        {
+            p += snprintf(p, sizeof(buff) - (p - buff), "%02X ", data[i]);
+        }
+        *(p++) = '\n';
+        *p = '\0';
+
+        if (DebuggerStatus[dbg_Serial] == enabled)
+        {
+            Serial.print(buff);
+        }
+        if (DebuggerStatus[dbg_Webui] == enabled)
+        {
+            Websocket_PushLiveDebug(String(buff));
+        }
+    }
+}
+
+void processCmdDebug(String command)
+{
+    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();
+}
+
+void Debug_formatCFG()
+{
+    Debug_pushMessage("Formatting Config-EEPROM and reseting to default");
+    FormatConfig_EEPROM();
+}
+
+void Debug_formatPersistence()
+{
+    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default");
+    FormatPersistence_EEPROM();
+}
+
+void RemotDebug_printSystemInfo()
+{
+    Debug_pushMessage("Souko's ChainOiler Mk1");
+    Debug_pushMessage("Hostname: %s", globals.DeviceName);
+
+    FlashMode_t ideMode = ESP.getFlashChipMode();
+    Debug_pushMessage("Sdk version: %s", ESP.getSdkVersion());
+    Debug_pushMessage("Core Version: %s", ESP.getCoreVersion().c_str());
+    Debug_pushMessage("Boot Version: %u", ESP.getBootVersion());
+    Debug_pushMessage("Boot Mode: %u", ESP.getBootMode());
+    Debug_pushMessage("CPU Frequency: %u MHz", ESP.getCpuFreqMHz());
+    Debug_pushMessage("Reset reason: %s", ESP.getResetReason().c_str());
+    Debug_pushMessage("Flash Size: %d", ESP.getFlashChipRealSize());
+    Debug_pushMessage("Flash Size IDE: %d", ESP.getFlashChipSize());
+    Debug_pushMessage("Flash ide mode:  %s", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
+                                                           : ideMode == FM_DIO    ? "DIO"
+                                                           : ideMode == FM_DOUT   ? "DOUT"
+                                                                                  : "UNKNOWN"));
+    Debug_pushMessage("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
+    Debug_pushMessage("Git-Revison: %s", GIT_REV);
+    Debug_pushMessage("Sw-Version: %s", QUOTE(SW_VERSION));
+}
+
+void Debug_dumpConfig()
+{
+    Debug_pushMessage("DistancePerLube_Default: %d", LubeConfig.DistancePerLube_Default);
+    Debug_pushMessage("DistancePerLube_Rain: %d", LubeConfig.DistancePerLube_Rain);
+    Debug_pushMessage("tankCapacity_ml: %d", LubeConfig.tankCapacity_ml);
+    Debug_pushMessage("amountPerDose_microL: %d", LubeConfig.amountPerDose_microL);
+    Debug_pushMessage("TankRemindAtPercentage: %d", LubeConfig.TankRemindAtPercentage);
+    Debug_pushMessage("PulsePerRevolution: %d", LubeConfig.PulsePerRevolution);
+    Debug_pushMessage("TireWidth_mm: %d", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("TireWidthHeight_Ratio: %d", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("RimDiameter_Inch: %d", LubeConfig.RimDiameter_Inch);
+    Debug_pushMessage("DistancePerRevolution_mm: %d", LubeConfig.DistancePerRevolution_mm);
+    Debug_pushMessage("BleedingPulses: %d", LubeConfig.BleedingPulses);
+    Debug_pushMessage("SpeedSource: %d", LubeConfig.SpeedSource);
+#ifdef FEATURE_ENABLE_GPS
+    Debug_pushMessage("GPSBaudRate: %d", LubeConfig.GPSBaudRate);
+#endif
+#ifdef FEATURE_ENABLE_CAN
+    Debug_pushMessage("CANSource: %d", LubeConfig.CANSource);
+#endif
+    Debug_pushMessage("checksum: 0x%08X", LubeConfig.checksum);
+}
+
+void Debug_dumpGlobals()
+{
+    Debug_pushMessage("systemStatus: %d", globals.systemStatus);
+    Debug_pushMessage("resumeStatus: %d", globals.resumeStatus);
+    Debug_pushMessage("systemStatustxt: %s", globals.systemStatustxt);
+    Debug_pushMessage("purgePulses: %d", globals.purgePulses);
+    Debug_pushMessage("requestEEAction: %d", globals.requestEEAction);
+    Debug_pushMessage("DeviceName: %s", globals.DeviceName);
+    Debug_pushMessage("FlashVersion: %s", globals.FlashVersion);
+    Debug_pushMessage("eePersistanceAdress: %d", globals.eePersistanceAdress);
+    Debug_pushMessage("TankPercentage: %d", globals.TankPercentage);
+    Debug_pushMessage("hasDTC: %d", globals.hasDTC);
+}
+
+void Debug_dumpPersistance()
+{
+    Debug_pushMessage("writeCycleCounter: %d", PersistenceData.writeCycleCounter);
+    Debug_pushMessage("tankRemain_microL: %d", PersistenceData.tankRemain_microL);
+    Debug_pushMessage("TravelDistance_highRes_mm: %d", PersistenceData.TravelDistance_highRes_mm);
+    Debug_pushMessage("checksum: %d", PersistenceData.checksum);
+    Debug_pushMessage("PSD Adress: 0x%04X", globals.eePersistanceAdress);
+}
+
+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 = LubeConfig.checksum;
+    LubeConfig.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) == checksum)
+    {
+        Debug_pushMessage("LubeConfig EEPROM Checksum OK\n");
+    }
+    else
+    {
+        Debug_pushMessage("LubeConfig EEPROM Checksum BAD\n");
+    }
+    LubeConfig.checksum = checksum;
+}
+
+void Debug_ShowDTCs()
+{
+    char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
+    char buff_active[9];
+
+    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 \t %6d \t %s \t %d", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
+        }
+    }
+}

Software/src/debugger.h

@@ -1,3 +1,9 @@
+#ifndef _DEBUGGER_H_
+#define _DEBUGGER_H_
+
+#include <Arduino.h>
+#include "webui.h"
+
 const char helpCmd[] = "sysinfo     - System Info\r\n"
                        "netinfo     - WiFi Info\r\n"
                        "formatPDS   - Format Persistence EEPROM Data\r\n"
@@ -10,4 +16,30 @@ const char helpCmd[] = "sysinfo     - System Info\r\n"
                        "dumpPDS     - print PersistanceStruct\r\n"
                        "saveEE      - save EE-Data\r\n"
                        "showdtc     - Show all DTCs\r\n"
-                       "dumpGlobals - print globals\r\n";
+                       "dumpGlobals - print globals\r\n";
+
+typedef enum DebugStatus_e
+{
+    disabled,
+    enabled
+} DebugStatus_t;
+
+typedef enum DebugPorts_e
+{
+    dbg_Serial,
+    dbg_Webui,
+    dbg_cntElements
+} DebugPorts_t;
+
+const char sDebugPorts[dbg_cntElements][7] = {
+    "Serial",
+    "WebUI"};
+
+extern DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+void initDebugger();
+void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data);
+void Debug_pushMessage(const char *format, ...);
+void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status);
+
+#endif

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, DTCSeverity_t DTC_severity, 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,14 +11,15 @@ void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active)
         {
             if (active && DTCStorage[i].active != DTC_ACTIVE)
             {
-                Serial.printf("DTC gone active: %d\n", 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\n", DTC_no);
+                Debug_pushMessage("DTC gone previous: %d\n", DTC_no);
                 DTCStorage[i].active = DTC_PREVIOUS;
             }
             return;
@@ -32,10 +34,12 @@ void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active)
         {
             if (DTCStorage[i].Number == DTC_LAST_DTC)
             {
-                Serial.printf("new DTC registered: %d\n", 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;
             }
         }
@@ -103,4 +107,33 @@ DTCNums_t getlastDTC_Severity(boolean only_active, DTCSeverity_t severity)
     }
 
     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)
+        {
+            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;
+    }
 }

Software/src/dtc.h

@@ -23,6 +23,7 @@ typedef enum DTCNums_e
   DTC_CAN_TRANSCEIVER_FAILED,
   DTC_NO_CAN_SIGNAL,
 #endif
+  DTC_EEPROM_CFG_SANITY,
   DTC_LAST_DTC
 } DTCNums_t;
 
@@ -46,13 +47,15 @@ typedef struct DTCEntry_s
   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);
+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

Software/src/globals.cpp

@@ -0,0 +1,11 @@
+#include "globals.h"
+
+Globals_t globals;
+
+void initGlobals()
+{
+  globals.purgePulses = 0;
+  globals.requestEEAction = EE_IDLE;
+  globals.resumeStatus = sysStat_Normal;
+  globals.systemStatus = sysStat_Startup;
+}

Software/src/globals.h

@@ -43,4 +43,6 @@ typedef struct Globals_s
 
 extern Globals_t globals;
 
+void initGlobals();
+
 #endif

Software/src/gps.cpp

@@ -19,7 +19,7 @@ void Init_GPS()
         break;
     }
 
-    Serial.printf(PSTR("Init GPS with Baud %d\n"), baudrate);
+    Debug_pushMessage(PSTR("Init GPS with Baud %d\n"), baudrate);
     Serial.begin(baudrate);
 }
 

Software/src/lubeapp.cpp

@@ -5,37 +5,11 @@ uint32_t lubePulseTimestamp = 0;
 void RunLubeApp(uint32_t add_milimeters)
 {
 
-    globals.TankPercentage = PersistenceData.tankRemain_µl / (LubeConfig.tankCapacity_ml * 10);
+    globals.TankPercentage = PersistenceData.tankRemain_microL / (LubeConfig.tankCapacity_ml * 10);
 
-    MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_µl < LubeConfig.amountPerDose_µl));
+    MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL));
     MaintainDTC(DTC_TANK_LOW, DTC_WARN, (globals.TankPercentage < LubeConfig.TankRemindAtPercentage));
 
-    static tSystem_Status preserverSysStatusError;
-
-    if (getlastDTC(false) < DTC_LAST_DTC)
-    {
-        globals.hasDTC = true;
-        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC)
-        {
-            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;
-    }
-
     // Add traveled Distance in mm
     PersistenceData.TravelDistance_highRes_mm += add_milimeters;
     PersistenceData.odometer_mm += add_milimeters;
@@ -121,13 +95,13 @@ void RunLubeApp(uint32_t add_milimeters)
 
 void LubePulse()
 {
-    if (PersistenceData.tankRemain_µl > 0) // Only Lube if theres Oil remaining!
+    if (PersistenceData.tankRemain_microL > 0) // Only Lube if theres Oil remaining!
     {
         lubePulseTimestamp = millis() + LUBE_PULSE_LENGHT_MS;
 
-        if (PersistenceData.tankRemain_µl < LubeConfig.amountPerDose_µl) // Prevent underrun and shiftover
+        if (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL) // Prevent underrun and shiftover
-            PersistenceData.tankRemain_µl = 0;
+            PersistenceData.tankRemain_microL = 0;
         else
-            PersistenceData.tankRemain_µl = PersistenceData.tankRemain_µl - LubeConfig.amountPerDose_µl;
+            PersistenceData.tankRemain_microL = PersistenceData.tankRemain_microL - LubeConfig.amountPerDose_microL;
     }
 }

Software/src/main.cpp

@@ -17,6 +17,7 @@
 #include "webui.h"
 #include "config.h"
 #include "globals.h"
+#include "debugger.h"
 #ifdef FEATURE_ENABLE_CAN
 #include "can.h"
 #endif
@@ -25,14 +26,6 @@
 #endif
 #include "dtc.h"
 
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
-#include <RemoteDebug.h>
-#include "rmtdbghelp.h"
-#else
-#define debugV Serial.println
-#define debugE Serial.println
-#endif
-
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 #include <ESP8266WiFiMulti.h>
 
@@ -44,9 +37,6 @@ ESP8266WiFiMulti wifiMulti;
 #endif
 
 bool startSetupMode = false;
-
-Globals_t globals;
-uint32_t TravelDistance_highRes;
 volatile uint32_t wheel_pulse = 0;
 
 CRGB leds[1];
@@ -63,22 +53,6 @@ void toggleWiFiAP(boolean shutdown = false);
 void SystemShutdown();
 uint32_t Process_Impulse_WheelSpeed();
 void EEPROMCyclicPDS_callback();
-void initGlobals();
-
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
-RemoteDebug Debug;
-String IpAddress2String(const IPAddress &ipAddress);
-void processCmdRemoteDebug();
-void RemoteDebug_formatCFG();
-void RemoteDebug_formatPersistence();
-void RemotDebug_printSystemInfo();
-void RemoteDebug_printWifiInfo();
-void RemoteDebug_CheckEEPOM();
-void RemoteDebug_dumpConfig();
-void RemoteDebug_dumpPersistance();
-void RemoteDebug_ShowDTCs();
-void RemoteDebug_dumpGlobals();
-#endif
 
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 void wifiMaintainConnectionTicker_callback();
@@ -104,8 +78,6 @@ void setup()
 #endif
 
   Serial.begin(115200);
-  Serial.setDebugOutput(false);
-
   Serial.println("\n\nSouko's ChainLube Mk1");
   Serial.println(globals.DeviceName);
 
@@ -138,26 +110,13 @@ void setup()
     break;
 #endif
   default:
-    debugE("Source Setting N/A");
+    Debug_pushMessage("Source Setting N/A");
     break;
   }
 
   pinMode(GPIO_BUTTON, INPUT_PULLUP);
   pinMode(GPIO_PUMP, OUTPUT);
 
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
-  Debug.begin(globals.DeviceName);
-  Debug.setResetCmdEnabled(true);
-  Debug.showProfiler(false);
-  Debug.showColors(true);
-  Debug.setPassword(QUOTE(ADMIN_PASSWORD));
-  Debug.setSerialEnabled(true);
-  Debug.showDebugLevel(true);
-
-  Debug.setHelpProjectsCmds(helpCmd);
-  Debug.setCallBackProjectCmds(&processCmdRemoteDebug);
-#endif
-
   ArduinoOTA.setPort(8266);
   ArduinoOTA.setHostname(globals.DeviceName);
   ArduinoOTA.setPassword(QUOTE(ADMIN_PASSWORD));
@@ -226,18 +185,17 @@ void loop()
   }
 
   RunLubeApp(wheelDistance);
-  EEPROMCyclicPDSTicker.update();
 #ifdef FEATURE_ENABLE_OLED
   Display_Process();
 #endif
   Button_Process();
   LED_Process();
   EEPROM_Process();
+  Webserver_Process();
+  DTC_Process();
 
   ArduinoOTA.handle();
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
+  EEPROMCyclicPDSTicker.update();
-  Debug.handle();
-#endif
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
   WiFiMaintainConnectionTicker.update();
 #endif
@@ -254,163 +212,6 @@ String IpAddress2String(const IPAddress &ipAddress)
          String(ipAddress[3]);
 }
 
-void initGlobals()
-{
-  globals.purgePulses = 0;
-  globals.requestEEAction = EE_IDLE;
-  globals.resumeStatus = sysStat_Normal;
-  globals.systemStatus = sysStat_Startup;
-}
-
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
-void processCmdRemoteDebug()
-{
-  String lastCmd = Debug.getLastCommand();
-
-  if (lastCmd == "sysinfo")
-    RemotDebug_printSystemInfo();
-  else if (lastCmd == "netinfo")
-    RemoteDebug_printWifiInfo();
-  else if (lastCmd == "formatCFG")
-    RemoteDebug_formatCFG();
-  else if (lastCmd == "formatPDS")
-    RemoteDebug_formatPersistence();
-  else if (lastCmd == "checkEE")
-    RemoteDebug_CheckEEPOM();
-  else if (lastCmd == "dumpEE1k")
-    dumpEEPROM(0, 1024);
-  else if (lastCmd == "dumpEE")
-    dumpEEPROM(0, EEPROM_SIZE_BYTES);
-  else if (lastCmd == "resetPageEE")
-    MovePersistencePage_EEPROM(true);
-  else if (lastCmd == "dumpCFG")
-    RemoteDebug_dumpConfig();
-  else if (lastCmd == "dumpPDS")
-    RemoteDebug_dumpPersistance();
-  else if (lastCmd == "saveEE")
-    globals.requestEEAction = EE_ALL_SAVE;
-  else if (lastCmd == "showdtc")
-    RemoteDebug_ShowDTCs();
-  else if (lastCmd == "dumpGlobals")
-    RemoteDebug_dumpGlobals();
-}
-
-void RemoteDebug_formatCFG()
-{
-  debugA("Formatting Config-EEPROM and reseting to default");
-  FormatConfig_EEPROM();
-}
-
-void RemoteDebug_formatPersistence()
-{
-  debugA("Formatting Persistence-EEPROM and reseting to default");
-  FormatPersistence_EEPROM();
-}
-
-void RemotDebug_printSystemInfo()
-{
-  debugA("Souko's ChainOiler Mk1");
-  debugA("Hostname: %s", globals.DeviceName);
-
-  FlashMode_t ideMode = ESP.getFlashChipMode();
-  debugA("Sdk version: %s", ESP.getSdkVersion());
-  debugA("Core Version: %s", ESP.getCoreVersion().c_str());
-  debugA("Boot Version: %u", ESP.getBootVersion());
-  debugA("Boot Mode: %u", ESP.getBootMode());
-  debugA("CPU Frequency: %u MHz", ESP.getCpuFreqMHz());
-  debugA("Reset reason: %s", ESP.getResetReason().c_str());
-  debugA("Flash Size: %d", ESP.getFlashChipRealSize());
-  debugA("Flash Size IDE: %d", ESP.getFlashChipSize());
-  debugA("Flash ide mode:  %s", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
-                                                         : ideMode == FM_DIO    ? "DIO"
-                                                         : ideMode == FM_DOUT   ? "DOUT"
-                                                                                : "UNKNOWN"));
-  debugA("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
-  debugA("Git-Revison: %s", GIT_REV);
-  debugA("Sw-Version: %d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR);
-}
-
-void RemoteDebug_dumpConfig()
-{
-  debugA("DistancePerLube_Default: %d", LubeConfig.DistancePerLube_Default);
-  debugA("DistancePerLube_Rain: %d", LubeConfig.DistancePerLube_Rain);
-  debugA("tankCapacity_ml: %d", LubeConfig.tankCapacity_ml);
-  debugA("amountPerDose_µl: %d", LubeConfig.amountPerDose_µl);
-  debugA("TankRemindAtPercentage: %d", LubeConfig.TankRemindAtPercentage);
-  debugA("PulsePerRevolution: %d", LubeConfig.PulsePerRevolution);
-  debugA("TireWidth_mm: %d", LubeConfig.TireWidth_mm);
-  debugA("TireWidthHeight_Ratio: %d", LubeConfig.TireWidth_mm);
-  debugA("RimDiameter_Inch: %d", LubeConfig.RimDiameter_Inch);
-  debugA("DistancePerRevolution_mm: %d", LubeConfig.DistancePerRevolution_mm);
-  debugA("BleedingPulses: %d", LubeConfig.BleedingPulses);
-  debugA("SpeedSource: %d", LubeConfig.SpeedSource);
-#ifdef FEATURE_ENABLE_GPS
-  debugA("GPSBaudRate: %d", LubeConfig.GPSBaudRate);
-#endif
-#ifdef FEATURE_ENABLE_CAN
-  debugA("CANSource: %d", LubeConfig.CANSource);
-#endif
-  debugA("checksum: 0x%08X", LubeConfig.checksum);
-}
-
-void RemoteDebug_dumpGlobals()
-{
-  debugA("systemStatus: %d", globals.systemStatus);
-  debugA("resumeStatus: %d", globals.resumeStatus);
-  debugA("systemStatustxt: %s", globals.systemStatustxt);
-  debugA("purgePulses: %d", globals.purgePulses);
-  debugA("requestEEAction: %d", globals.requestEEAction);
-  debugA("DeviceName: %s", globals.DeviceName);
-  debugA("FlashVersion: %s", globals.FlashVersion);
-  debugA("eePersistanceAdress: %d", globals.eePersistanceAdress);
-  debugA("TankPercentage: %d", globals.TankPercentage);
-  debugA("hasDTC: %d", globals.hasDTC);
-}
-
-void RemoteDebug_dumpPersistance()
-{
-  debugA("writeCycleCounter: %d", PersistenceData.writeCycleCounter);
-  debugA("tankRemain_µl: %d", PersistenceData.tankRemain_µl);
-  debugA("TravelDistance_highRes_mm: %d", PersistenceData.TravelDistance_highRes_mm);
-  debugA("checksum: %d", PersistenceData.checksum);
-  debugA("PSD Adress: 0x%04X", globals.eePersistanceAdress);
-}
-
-void RemoteDebug_printWifiInfo()
-{
-}
-
-void RemoteDebug_CheckEEPOM()
-{
-  uint32_t checksum = PersistenceData.checksum;
-  PersistenceData.checksum = 0;
-
-  if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) == checksum)
-  {
-    debugA("PersistenceData EEPROM Checksum OK\n");
-  }
-  else
-  {
-    debugA("PersistenceData EEPROM Checksum BAD\n");
-  }
-
-  PersistenceData.checksum = checksum;
-
-  checksum = LubeConfig.checksum;
-  LubeConfig.checksum = 0;
-
-  if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) == checksum)
-  {
-    debugA("LubeConfig EEPROM Checksum OK\n");
-  }
-  else
-  {
-    debugA("LubeConfig EEPROM Checksum BAD\n");
-  }
-  LubeConfig.checksum = checksum;
-}
-#endif
-
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 void wifiMaintainConnectionTicker_callback()
 {
@@ -429,7 +230,7 @@ void wifiMaintainConnectionTicker_callback()
     }
     else
     {
-      debugV("WiFi not connected! - Start AP");
+      Debug_pushMessage("WiFi not connected! - Start AP");
       toggleWiFiAP();
     }
   }
@@ -475,7 +276,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
     if (LED_Status != LED_Override)
     {
       LED_ResumeOverrideStatus = LED_Status;
-      debugV("Override LED_Status");
+      Debug_pushMessage("Override LED_Status");
     }
     LED_Status = LED_Override;
     LED_override_color = SetColor;
@@ -486,7 +287,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
     if (LED_Status == LED_Override)
     {
       LED_Status = LED_ResumeOverrideStatus;
-      debugV("Resume LED_Status");
+      Debug_pushMessage("Resume LED_Status");
     }
   }
 
@@ -496,25 +297,25 @@ void LED_Process(uint8_t override, CRGB SetColor)
     {
     case sysStat_Startup:
       LED_Status = LED_Startup;
-      debugV("sysStat: Startup");
+      Debug_pushMessage("sysStat: Startup");
       break;
     case sysStat_Normal:
       timestamp = timer + 3500;
       LED_Status = LED_Confirm_Normal;
-      debugV("sysStat: Normal");
+      Debug_pushMessage("sysStat: Normal");
       break;
     case sysStat_Rain:
       timestamp = timer + 3500;
       LED_Status = LED_Confirm_Rain;
-      debugV("sysStat: Rain");
+      Debug_pushMessage("sysStat: Rain");
       break;
     case sysStat_Purge:
       LED_Status = LED_Purge;
-      debugV("sysStat: Purge");
+      Debug_pushMessage("sysStat: Purge");
       break;
     case sysStat_Error:
       LED_Status = LED_Error;
-      debugV("sysStat: Error");
+      Debug_pushMessage("sysStat: Error");
       break;
     case sysStat_Shutdown:
     default:
@@ -541,7 +342,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
     {
       LED_Status = LED_Normal;
       FastLED.setBrightness(64);
-      debugV("LED_Status: Confirm -> Normal");
+      Debug_pushMessage("LED_Status: Confirm -> Normal");
     }
     break;
 
@@ -565,7 +366,7 @@ void LED_Process(uint8_t override, CRGB SetColor)
     {
       LED_Status = LED_Rain;
       FastLED.setBrightness(64);
-      debugV("LED_Status: Confirm -> Rain");
+      Debug_pushMessage("LED_Status: Confirm -> Rain");
     }
     break;
 
@@ -619,7 +420,7 @@ void Display_Process()
 
   u8x8.setCursor(0, 1);
   uint32_t DistRemain = globals.systemStatus == sysStat_Normal ? LubeConfig.DistancePerLube_Default : LubeConfig.DistancePerLube_Rain;
-  DistRemain -= TravelDistance_highRes / 1000;
+  DistRemain = DistRemain - (PersistenceData.TravelDistance_highRes_mm / 1000);
   u8x8.printf(PSTR("Mode: %10s\n"), globals.systemStatustxt);
   if (globals.systemStatus == sysStat_Error)
   {
@@ -628,7 +429,7 @@ void Display_Process()
   else
   {
     u8x8.printf(PSTR("next Lube: %4dm\n"), DistRemain);
-    u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_µl / 1000);
+    u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_microL / 1000);
     u8x8.printf(PSTR("WiFi: %10s\n"), (WiFi.getMode() == WIFI_AP ? "AP" : WiFi.getMode() == WIFI_OFF ? "OFF"
                                                                       : WiFi.getMode() == WIFI_STA   ? "CLIENT"
                                                                                                      : "UNKNOWN"));
@@ -695,13 +496,13 @@ void Button_Process()
       {
       case BTN_TOGGLEWIFI:
         toggleWiFiAP();
-        debugV("Starting WiFi AP");
+        Debug_pushMessage("Starting WiFi AP");
         break;
 
       case BTN_STARTPURGE:
         globals.systemStatus = sysStat_Purge;
         globals.purgePulses = LubeConfig.BleedingPulses;
-        debugV("Starting Purge");
+        Debug_pushMessage("Starting Purge");
         break;
 
       case BTN_TOGGLEMODE:
@@ -719,12 +520,12 @@ void Button_Process()
         default:
           break;
         }
-        debugV("Toggling Mode");
+        Debug_pushMessage("Toggling Mode");
         break;
 
       case BTN_NOTHING:
       default:
-        debugV("Nothing or invalid");
+        Debug_pushMessage("Nothing or invalid");
         break;
       }
       LED_Process(2);
@@ -739,7 +540,7 @@ void toggleWiFiAP(boolean shutdown)
   if (WiFi.getMode() != WIFI_OFF)
   {
     WiFi.mode(WIFI_OFF);
-    debugV("WiFi turned off");
+    Debug_pushMessage("WiFi turned off");
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
     WiFiMaintainConnectionTicker.stop();
 #endif
@@ -751,9 +552,9 @@ void toggleWiFiAP(boolean shutdown)
     WiFi.softAP(globals.DeviceName, QUOTE(WIFI_AP_PASSWORD));
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
     WiFiMaintainConnectionTicker.stop();
-    debugV("WiFi AP started, stopped Maintain-Timer");
+    Debug_pushMessage("WiFi AP started, stopped Maintain-Timer");
 #else
-    debugV("WiFi AP started");
+    Debug_pushMessage("WiFi AP started");
 #endif
   }
 }
@@ -785,32 +586,3 @@ uint32_t Process_Impulse_WheelSpeed()
   return add_milimeters;
 }
 
-#ifdef FEATURE_ENABLE_REMOTE_DEBUG
-void RemoteDebug_ShowDTCs()
-{
-  char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
-  char buff_active[9];
-
-  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");
-
-      debugA("%s \t %6d \t %s", buff_timestamp, DTCStorage[i].Number, buff_active);
-    }
-  }
-}
-#endif

Software/src/webui.cpp

@@ -9,44 +9,69 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request);
 void WebserverNotFound_Callback(AsyncWebServerRequest *request);
 void Webserver_Callback(AsyncWebServerRequest *request);
 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);
 
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+
+AsyncWebSocket webSocket("/ws");
+
+void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
+void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len);
+
+#endif
+
 void 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));
 
-  if (!strcmp(globals.FlashVersion, QUOTE(FLASH_FS_VERSION)))
+  if (strcmp(globals.FlashVersion, QUOTE(FLASH_FS_VERSION)))
   {
     MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
   }
 
   MDNS.begin(globals.DeviceName);
-  MDNS.addService("telnet", "tcp", 23);
   MDNS.addService("http", "tcp", 80);
 
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+  webSocket.onEvent(WebsocketEvent_Callback);
+  webServer.addHandler(&webSocket);
+#endif
+
   webServer.serveStatic("/static/", LittleFS, "/static/").setCacheControl("max-age=360000");
   webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
                { request->redirect("/index.htm"); });
   webServer.onNotFound(WebserverNotFound_Callback);
   webServer.on("/index.htm", HTTP_GET, Webserver_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()
+{
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+  webSocket.cleanupClients();
+#endif
+}
+
 String processor(const String &var)
 {
   if (var == "TANK_REMAIN_CAPACITY")
-    return String((PersistenceData.tankRemain_µl / 10) / LubeConfig.tankCapacity_ml);
+    return String((PersistenceData.tankRemain_microL / 10) / LubeConfig.tankCapacity_ml);
   if (var == "LUBE_DISTANCE_NORMAL")
     return String(LubeConfig.DistancePerLube_Default);
   if (var == "LUBE_DISTANCE_RAIN")
@@ -54,7 +79,7 @@ String processor(const String &var)
   if (var == "TANK_CAPACITY")
     return String(LubeConfig.tankCapacity_ml);
   if (var == "AMOUNT_PER_DOSE")
-    return String(LubeConfig.amountPerDose_µl);
+    return String(LubeConfig.amountPerDose_microL);
   if (var == "TANK_REMIND")
     return String(LubeConfig.TankRemindAtPercentage);
   if (var == "PULSE_PER_REV")
@@ -94,7 +119,7 @@ String processor(const String &var)
   if (var == "PERSISTENCE_MARKER")
     return String(globals.eePersistanceAdress);
   if (var == "TANK_REMAIN_UL")
-    return String(PersistenceData.tankRemain_µl);
+    return String(PersistenceData.tankRemain_microL);
   if (var == "TRAVEL_DISTANCE_HIGHRES")
     return String(PersistenceData.TravelDistance_highRes_mm);
   if (var == "ODOMETER")
@@ -140,7 +165,8 @@ String processor(const String &var)
                 DTCStorage[i].timestamp / 1000 % 60,   // Seconds
                 DTCStorage[i].timestamp % 1000);       // milliseconds
 
-        temp = temp + "<tr data-dtc=" + String(DTCStorage[i].Number) + "><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)
@@ -210,9 +236,7 @@ String processor(const String &var)
     return String(globals.systemStatustxt);
   if (var == "SW_VERSION")
   {
-    char buffer[7];
+    return String(QUOTE(SW_VERSION));
-    sprintf(buffer, "%d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR);
-    return String(buffer);
   }
   if (var == "FS_VERSION")
     return String(globals.FlashVersion);
@@ -232,19 +256,19 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
 {
   request->send(LittleFS, "/post.htm", "text/html", false, processor);
 
-  Serial.print("POST:\n");
+  Debug_pushMessage("POST:\n");
   int paramsNr = request->params();
   for (int i = 0; i < paramsNr; i++)
   {
     AsyncWebParameter *p = request->getParam(i);
-    Serial.printf("%s : %s\n", p->name().c_str(), p->value().c_str());
+    Debug_pushMessage("%s : %s\n", p->name().c_str(), p->value().c_str());
 
     // begin: POST Form Source Changed
     if (p->name() == "sourceselect")
     {
       SpeedSource_t temp = (SpeedSource_t)p->value().toInt();
-      Serial.printf("temp: %d", temp);
+      Debug_pushMessage("temp: %d", temp);
-      Serial.printf("SpeedSource: %d", LubeConfig.SpeedSource);
+      Debug_pushMessage("SpeedSource: %d", LubeConfig.SpeedSource);
       if (LubeConfig.SpeedSource != temp)
       {
         LubeConfig.SpeedSource = temp;
@@ -294,7 +318,7 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
     if (p->name() == "tankwarn")
       LubeConfig.TankRemindAtPercentage = p->value().toInt();
     if (p->name() == "pumppulse")
-      LubeConfig.amountPerDose_µl = p->value().toInt();
+      LubeConfig.amountPerDose_microL = p->value().toInt();
     if (p->name() == "oilsave")
       globals.requestEEAction = EE_CFG_SAVE;
     // end: POST Form Oiltank
@@ -305,7 +329,7 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
       globals.requestEEAction = EE_CFG_SAVE;
     if (p->name() == "resettank")
     {
-      PersistenceData.tankRemain_µl = LubeConfig.tankCapacity_ml * 1000;
+      PersistenceData.tankRemain_microL = LubeConfig.tankCapacity_ml * 1000;
       globals.requestEEAction = EE_PDS_SAVE;
     }
     if (p->name() == "reset_ee_btn")
@@ -328,6 +352,10 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
       globals.systemStatus = sysStat_Purge;
       globals.purgePulses = LubeConfig.BleedingPulses;
     }
+    if (p->name() == "reboot")
+    {
+      globals.systemStatus = sysStat_Shutdown;
+    }
     // end: POST Form Maintenance
   }
 }
@@ -359,9 +387,8 @@ void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const Stri
 
   if (!index)
   {
-    Serial.println("Update");
+    Debug_pushMessage("Update");
     size_t content_len = request->contentLength();
-    // if filename includes spiffs, update the spiffs partition
     int cmd = (filename.indexOf(".fs") > -1) ? U_FS : U_FLASH;
     Update.runAsync(true);
     if (!Update.begin(content_len, cmd))
@@ -376,7 +403,7 @@ void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const Stri
   }
   else
   {
-    Serial.printf("Progress: %d%%\n", (Update.progress() * 100) / Update.size());
+    Debug_pushMessage("Progress: %d%%\n", (Update.progress() * 100) / Update.size());
   }
 
   if (final)
@@ -391,9 +418,154 @@ void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const Stri
     }
     else
     {
-      Serial.println("Update complete");
+      Debug_pushMessage("Update complete\n");
-      Serial.flush();
       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;
+  bool validext = false;
+
+  if (!index)
+  {
+    Debug_pushMessage("EEPROM restore\n");
+    // size_t content_len = request->contentLength();
+    validext = (filename.indexOf(".ee.json") > -1);
+  }
+
+  if (validext)
+  {
+    Debug_pushMessage("Restoring EEPROM-Stuff\n");
+  }
+
+  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 (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;
+  fwinfo["FW-Version"] = QUOTE(SW_VERSION);
+  fwinfo["FS-Version"] = globals.FlashVersion;
+
+  JsonObject config = json.createNestedObject("config");
+
+  config["EEPROM_Version"] = LubeConfig.EEPROM_Version;
+  config["DistancePerLube_Default"] = LubeConfig.DistancePerLube_Default;
+  config["DistancePerLube_Rain"] = LubeConfig.DistancePerLube_Rain;
+  config["tankCapacity_ml"] = LubeConfig.tankCapacity_ml;
+  config["amountPerDose_microL"] = LubeConfig.amountPerDose_microL;
+  config["TankRemindAtPercentage"] = LubeConfig.TankRemindAtPercentage;
+  config["PulsePerRevolution"] = LubeConfig.PulsePerRevolution;
+  config["TireWidth_mm"] = LubeConfig.TireWidth_mm;
+  config["TireWidthHeight_Ratio"] = LubeConfig.TireWidthHeight_Ratio;
+  config["RimDiameter_Inch"] = LubeConfig.RimDiameter_Inch;
+  config["DistancePerRevolution_mm"] = LubeConfig.DistancePerRevolution_mm;
+  config["BleedingPulses"] = LubeConfig.BleedingPulses;
+  config["SpeedSource"] = LubeConfig.SpeedSource;
+  config["SpeedSource_Str"] = SpeedSourceString[LubeConfig.SpeedSource];
+#ifdef FEATURE_ENABLE_GPS
+  config["GPSBaudRate"] = LubeConfig.GPSBaudRate;
+  config["GPSBaudRate_Str"] = GPSBaudRateString[LubeConfig.GPSBaudRate];
+#endif
+#ifdef FEATURE_ENABLE_CAN
+  config["CANSource"] = LubeConfig.CANSource;
+  config["CANSource_Str"] = CANSourceString[LubeConfig.CANSource];
+#endif
+  sprintf(buffer, "0x%08X", LubeConfig.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["tankRemain_microL"] = PersistenceData.tankRemain_microL;
+  persis["TravelDistance_highRes_mm"] = PersistenceData.TravelDistance_highRes_mm;
+  persis["odometer_mm"] = PersistenceData.odometer_mm;
+  persis["odometer"] = PersistenceData.odometer;
+  sprintf(buffer, "0x%08X", PersistenceData.checksum);
+  persis["checksum"] = buffer;
+
+  serializeJsonPretty(json, *response);
+
+  response->addHeader("Content-disposition", "attachment; filename=backup.ee.json");
+
+  request->send(response);
+}
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
+{
+  switch (type)
+  {
+  case WS_EVT_CONNECT:
+    Debug_pushMessage("WebSocket client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
+    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");
+}
+#endif

Software/src/webui.h

@@ -8,12 +8,20 @@
 #include <ESPAsyncWebServer.h>
 #include <Updater.h>
 #include <ESP8266mDNS.h>
+#include <AsyncJson.h>
+#include <ArduinoJson.h>
 
 #include "config.h"
 #include "globals.h"
 #include "dtc.h"
 #include "common.h"
+#include "debugger.h"
 
 void initWebUI();
+void Webserver_Process();
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+void Websocket_PushLiveDebug(String Message);
+#endif
 
 #endif