Updated DTC-Descriptions

Software/data_src/index.htm

@@ -84,17 +84,6 @@
               %DTC_TABLE%
             </tbody>
           </table>
-          <p>
-            <button class="btn btn-outline-primary" type="button" data-toggle="collapse"
-              data-target="#collapseDTCDescription" aria-expanded="false" aria-controls="collapseDTCDescription">
-              DTC Beschreibung
-            </button>
-          </p>
-          <div class="collapse" id="collapseDTCDescription">
-            <div class="card card-body">
-              <embed type="text/html" src="static/dtc.txt" width="100&#37;">
-            </div>
-          </div>
           </p>
           <hr />
         </div>
@@ -386,7 +375,7 @@
           <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_pds" id="reset_ee_cfg">
+                <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>
@@ -544,7 +533,8 @@
         <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 />
+              <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
+                accept=".fw.bin,.fs.bin" required />
               <label class="custom-file-label" for="fw-update-file">Firmware-Update ausw&auml;hlen</label>
             </div>
           </div>
@@ -572,6 +562,29 @@
 
   <!-- 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>
+        </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');
@@ -581,7 +594,29 @@
       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 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)
+      }).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>

Software/data_src/static/dtc.txt

@@ -1,12 +0,0 @@
-1 - TANK_EMPTY
-2 - DTC_TANK_LOW
-3 - DTC_NO_EEPROM_FOUND
-4 - DTC_EEPROM_CFG_BAD
-5 - DTC_EEPROM_PDS_BAD
-6 - DTC_EEPROM_PDSADRESS_BAD
-7 - DTC_EEPROM_VERSION_BAD
-8 - DTC_FLASHFS_ERROR
-9 - DTC_FLASHFS_VERSION_ERROR
-10 - DTC_NO_GPS_SERIAL
-11 - DTC_CAN_TRANSCEIVER_FAILED
-12 - DTC_NO_CAN_SIGNAL

Software/data_src/static/tt_dtc/dtc_1.json

@@ -0,0 +1,4 @@
+{
+    "title": "Ölvorrat leer",
+    "description": "Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen"
+}

Software/data_src/static/tt_dtc/dtc_10.json

@@ -0,0 +1,4 @@
+{
+    "title": "Keine GPS-Verbindung",
+    "description": "Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul"
+}

Software/data_src/static/tt_dtc/dtc_11.json

@@ -0,0 +1,4 @@
+{
+    "title": "CAN-Transceiver Error",
+    "description": "Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte"
+}

Software/data_src/static/tt_dtc/dtc_12.json

@@ -0,0 +1,4 @@
+{
+    "title": "Keine CAN-Verbindung",
+    "description": "Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen"
+}

Software/data_src/static/tt_dtc/dtc_2.json

@@ -0,0 +1,4 @@
+{
+    "title": "Ölvorrat niedrig",
+    "description": "Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen"
+}

Software/data_src/static/tt_dtc/dtc_3.json

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

Software/data_src/static/tt_dtc/dtc_4.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"
+}

Software/data_src/static/tt_dtc/dtc_5.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"
+}

Software/data_src/static/tt_dtc/dtc_6.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"
+}

Software/data_src/static/tt_dtc/dtc_7.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"
+}

Software/data_src/static/tt_dtc/dtc_8.json

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

Software/data_src/static/tt_dtc/dtc_9.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"
+}

Software/prepare_littlefs.py

@@ -44,7 +44,7 @@ def remove_prefix(text, prefix):
 
 def gzip_webfiles(source, target, env):
     # Filetypes to compress
-    filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2']
+    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')

Software/src/config.cpp

@@ -137,16 +137,16 @@ void GetPersistence_EEPROM()
 
 void FormatConfig_EEPROM()
 {
-  LubeConfig_t defaults;
+  Serial.println("Formatting Config-Partition");
-  LubeConfig = defaults;
+  LubeConfig = LubeConfig_defaults;
   LubeConfig.EEPROM_Version = eeVersion;
   StoreConfig_EEPROM();
 }
 
 void FormatPersistence_EEPROM()
 {
-  persistenceData_t defaults;
+  Serial.println("Formatting Persistance-Partition");
-  PersistenceData = defaults;
+  memset(&PersistenceData, 0, sizeof(PersistenceData));
   StorePersistence_EEPROM();
 }
 

Software/src/config.h

@@ -94,6 +94,16 @@ typedef struct
   uint32_t checksum = 0;
 } LubeConfig_t;
 
+const LubeConfig_t LubeConfig_defaults{
+    0, 8000, 4000, 320, 72, 30, 1, 150, 70, 18, 2000, 25, SOURCE_IMPULSE,
+#ifdef FEATURE_ENABLE_GPS
+    BAUD_115200,
+#endif
+#ifdef FEATURE_ENABLE_CAN
+    KTM_890_ADV_R_2021,
+#endif
+    0};
+
 void InitEEPROM();
 void EEPROM_Process();
 void StoreConfig_EEPROM();

Software/src/main.cpp

@@ -105,7 +105,7 @@ void setup()
   Serial.begin(115200);
   Serial.setDebugOutput(false);
 
-  Serial.println("Souko's ChainLube Mk1");
+  Serial.println("\n\nSouko's ChainLube Mk1");
   Serial.println(globals.DeviceName);
 
   InitEEPROM();

Software/src/webui.cpp

@@ -140,7 +140,7 @@ String processor(const String &var)
                 DTCStorage[i].timestamp / 1000 % 60,   // Seconds
                 DTCStorage[i].timestamp % 1000);       // milliseconds
 
-        temp = temp + "<tr><td>" + String(buff_timestamp);
+        temp = temp + "<tr data-dtc=" + String(DTCStorage[i].Number) + "><td>" + String(buff_timestamp);
         temp = temp + "</td><td>" + String(DTCStorage[i].Number) + "</td><td>";
         temp = temp + "<img src=static/img/";
         switch (DTCStorage[i].severity)
@@ -310,15 +310,15 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
     }
     if (p->name() == "reset_ee_btn")
     {
-      if (request->hasParam("reset_ee_pds"))
+      if (request->hasParam("reset_ee_pds", true))
       {
-        AsyncWebParameter *param = request->getParam("reset_ee_pds");
+        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"))
+      if (request->hasParam("reset_ee_cfg", true))
       {
-        AsyncWebParameter *param = request->getParam("reset_ee_cfg");
+        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;
       }