more work done on the Debugger

Software/data_src/index.htm

@@ -33,9 +33,8 @@
       <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
 
         <li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Wegstrecke</a></li>
-        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_lube">Schmierung</a></li>
         <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
+        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a></li>
         <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_sysinfo">Systeminfo</a></li>
         <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li>
 
@@ -55,6 +54,7 @@
             <h3 class="pt-3">KTM CAN Chain Lube</h3>
           </div>
         </div>
+        <!-- Div Group Tank remain -->
         <hr />
         <p>
         <h4>Tankinhalt verbleibend</h4>
@@ -65,13 +65,17 @@
           </div>
         </div>
         </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group current Mode -->
         <hr />
         <p>
         <h4>aktueller Modus</h4>
         <input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
         </p>
-        <hr />
+        <!-- Div Group current Mode -->
+        <!-- Div Group DTC Table -->
         <div %SHOW_DTC_TABLE%>
+          <hr />
           <p>
           <h4>Fehlercodes</h4>
           <table class="table">
@@ -86,13 +90,152 @@
             </tbody>
           </table>
           </p>
-          <hr />
         </div>
+        <!-- Div Group DTC Table -->
       </div>
       <!-- Div Tab Home-->
-      <!-- Div Tab Source Settings-->
+
+      <!-- Div Tab Maintenance -->
+      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
+        <h3>Wartung</h3>
+        <!-- Div Group Tank remain -->
+        <hr />
+        <p>
+        <h4>&Ouml;lvorrat</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
+            <div class="col-8">
+              <div class="progress">
+                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
+                  aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
+                  style="width: %TANK_REMAIN_CAPACITY%&#37;">
+                  %TANK_REMAIN_CAPACITY%&#37;
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group Purging -->
+        <hr />
+        <p>
+        <h4>Entl&uuml;ftung</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="purgepulse" name="purgepulse" value="%BLEEDING_PULSES%" type="text" class="form-control">
+                <div class="input-group-append">
+                  <span class="input-group-text">Pulse</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Purging -->
+        <!-- Div Group Measure -->
+        <div %SHOW_IMPULSE_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einmessen</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+            <div class="form-group row">
+              <label for="measuredpulses" class="control-label col-4">erfasste Pulse</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="measuredpulses" name="measuredpulses" value="%MEASURED_PULSES%" type="text" readonly
+                    class="form-control">
+                  <div class="input-group-append">
+                    <span class="input-group-text">Pulse</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="measurestartstop" type="submit" class="btn btn-outline-primary">%MEASURE_BTN%</button>
+                <button name="measurereset" type="submit" class="btn btn-outline-primary ml-2">Reset</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Purging -->
+        <!-- Div Group EEPROM formatting -->
+        <hr />
+        <p>
+        <h4>EEPROM formatieren</h4>
+        <div class="alert alert-primary alert-dismissable show fade" role="alert">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+          <strong>Achtung!</strong><br>
+          Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
+          Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
+          Folgende Situationen erfordern unter anderem eine Formatierung:
+          - Erstinitialisierung (bei neu aufgebautem Gerät)
+          - Firmware-Update (nur wenn es die Release-Notes fordern)
+        </div>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="offset-4 col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
+                <label class="form-check-label" for="reset_ee_cfg">
+                  Bereich "CFG"
+                </label>
+              </div>
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
+                <label class="form-check-label" for="reset_ee_pds">
+                  Bereich "PDS"
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group EEPROM formatting -->
+        <!-- Div Group Device Reboot -->
+        <hr />
+        <p>
+        <h4>Ger&auml;t neustarten</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Device Reboot -->
+      </div>
+      <!-- Div Tab Maintenance -->
+
+      <!-- Div Tab Settings-->
       <div id="tab_source" class="tab-pane fade" role="tabpanel">
-        <h3>Wegstreckenerfassung</h3>
+        <h3>Einstellungen</h3>
+        <!-- Div Group Signal Source -->
         <hr />
         <p>
         <h4>Signalquelle</h4>
@@ -120,7 +263,8 @@
           </div>
         </form>
         </p>
-        <!-- Div Source:Impulse Settings-->
+        <!-- Div Group Signal Source -->
+        <!-- Div Group Source:Impulse Settings-->
         <div %SHOW_IMPULSE_SETTINGS%>
           <hr />
           <p>
@@ -181,10 +325,9 @@
             </div>
           </form>
           </p>
-          <hr />
         </div>
-        <!-- Div Source:Impulse Settings-->
+        <!-- Div Group Source:Impulse Settings-->
-        <!-- Div Source:CAN Settings-->
+        <!-- Div Group Source:CAN Settings-->
         <div %SHOW_CAN_SETTINGS%>
           <hr />
           <p>
@@ -205,10 +348,9 @@
             </div>
           </form>
           </p>
-          <hr />
         </div>
-        <!-- Div Source:CAN Settings-->
+        <!-- Div Group Source:CAN Settings-->
-        <!-- Div Source:GPS Settings-->
+        <!-- Div Group Source:GPS Settings-->
         <div %SHOW_GPS_SETTINGS%>
           <hr />
           <p>
@@ -229,14 +371,9 @@
             </div>
           </form>
           </p>
-          <hr />
         </div>
-        <!-- Div Source:GPS Settings-->
+        <!-- Div Group Source:GPS Settings-->
-      </div>
+        <!-- Div Group Lube Settings-->
-      <!-- Div Tab Source Settings-->
-      <!-- Div Tab Lube -->
-      <div id="tab_lube" class="tab-pane fade" role="tabpanel">
-        <h3>Schmierung</h3>
         <hr />
         <p>
         <h4>Dosierung</h4>
@@ -272,15 +409,11 @@
           </div>
         </form>
         </p>
-        <hr />
+        <!-- Div Group Lube Settings-->
-      </div>
+        <!-- Div Group Oiltank Settings -->
-      <!-- Div Tab Lube -->
-      <!-- Div Tab Maintenance -->
-      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
-        <h3>Wartung</h3>
         <hr />
         <p>
-        <h4>&Ouml;lvorrat</h4>
+        <h4>&Ouml;ltank</h4>
         <form action="post.htm" method="POST" class="form-horizontal">
           <div class="form-group row">
             <label for="tankcap" class="control-label col-4">Tankkapazität</label>
@@ -318,104 +451,63 @@
               </div>
             </div>
           </div>
-          <div class="form-group row">
-            <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
-            <div class="col-8">
-              <div class="progress">
-                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
-                  aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
-                  style="width: %TANK_REMAIN_CAPACITY%&#37;">
-                  %TANK_REMAIN_CAPACITY%&#37;
-                </div>
-              </div>
-            </div>
-          </div>
           <div class="form-group row">
             <div class="col text-center">
               <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
-              <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
             </div>
           </div>
         </form>
         </p>
+        <!-- Div Group Oiltank Settings -->
+        <!-- Div Group LED Settings-->
         <hr />
         <p>
-        <h4>Entl&uuml;ftung</h4>
+        <h4>LED Einstellungen</h4>
         <form action="post.htm" method="POST" class="form-horizontal">
           <div class="form-group row">
-            <label for="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
+            <label for="ledmodeflash" class="control-label col-4">LED Modus blinken</label>
+            <div class="col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="ledmodeflash" id="ledmodeflash" %LEDFLASHCHECKED%>
+                <label class="form-check-label" for="ledmodeflash">
+                  LED blinken
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
             <div class="col-8">
               <div class="input-group">
-                <input id="purgepulse" name="purgepulse" value="%BLEEDING_PULSES%" type="text" class="form-control">
+                <input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text"
-                <div class="input-group-append">
+                  class="form-control" required="required">
-                  <span class="input-group-text">Pulse</span>
+              </div>
-                </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledminbrightness" class="control-label col-4">Min Helligkeit</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
               </div>
             </div>
           </div>
           <div class="form-group row">
             <div class="col text-center">
-              <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              <button name="ledsave" type="submit" class="btn btn-outline-primary">Speichern</button>
-              <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
             </div>
           </div>
         </form>
         </p>
-        <hr />
+        <!-- Div Group Lube Settings-->
-        <p>
-        <h4>EEPROM formatieren</h4>
-        <div class="alert alert-primary alert-dismissable show fade" role="alert">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-          </button>
-          <strong>Achtung!</strong><br>
-          Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
-          Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
-          Folgende Situationen erfordern unter anderem eine Formatierung:
-          - Erstinitialisierung (bei neu aufgebautem Gerät)
-          - Firmware-Update (nur wenn es die Release-Notes fordern)
-        </div>
-        <form action="post.htm" method="POST" class="form-horizontal">
-          <div class="form-group row">
-            <div class="offset-4 col-8">
-              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
-                <label class="form-check-label" for="reset_ee_cfg">
-                  Bereich "CFG"
-                </label>
-              </div>
-              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
-                <label class="form-check-label" for="reset_ee_pds">
-                  Bereich "PDS"
-                </label>
-              </div>
-            </div>
-          </div>
-          <div class="form-group row">
-            <div class="col text-center">
-              <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <hr />
-        <p>
-        <h4>Ger&auml;t neustarten</h4>
-        <form action="post.htm" method="POST" class="form-horizontal">
-          <div class="form-group row">
-            <div class="col text-center">
-              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
-            </div>
-          </div>
-        </form>
-        </p>
-        <hr />
       </div>
-      <!-- Div Tab Maintenance -->
+      <!-- Div Tab Settings -->
+
       <!-- Div Tab SystemInfo -->
       <div id="tab_sysinfo" class="tab-pane fade" role="tabpanel">
         <h3>Systeminfo</h3>
+        <!-- Div Group Sysinfo:Settings -->
         <hr />
         <p>
         <h4>Einstellungen</h4>
@@ -481,6 +573,22 @@
               <td>CANSource</td>
               <td>%CAN_SOURCE%</td>
             </tr>
+            <tr>
+              <td>LED Mode Flash</td>
+              <td>%LED_MODE_FLASH%</td>
+            </tr>
+            <tr>
+              <td>LED Max Brightness</td>
+              <td>%LED_MAX_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>LED Min Brightness</td>
+              <td>%LED_MIN_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>EEPROM Version</td>
+              <td>%EEPROM_VERSION%</td>
+            </tr>
             <tr>
               <td>Checksum</td>
               <td>%CONFIG_CHECKSUM%</td>
@@ -488,6 +596,8 @@
           </tbody>
         </table>
         </p>
+        <!-- Div Group Sysinfo:Settings -->
+        <!-- Div Group Sysinfo:Persistance -->
         <hr />
         <p>
         <h4>Betriebsdaten</h4>
@@ -523,25 +633,29 @@
             </tr>
         </table>
         </p>
+        <!-- Div Group Sysinfo:Persistance -->
+        <!-- Div Group LiveDebug -->
         <hr />
         <p>
-          <h4>Live Debug</h4>
+        <h4>Live Debug</h4>
-            <div class="form-group row">
+        <div class="form-group row">
-              <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
+          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
-            </div>
+        </div>
-            <div class="form-group row">
+        <div class="form-group row">
-              <div class="col text-center">
+          <div class="col text-center">
-                <button id="btn-ws-start" class="btn btn-outline-primary">Start</button>
+            <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>
+            <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
-              </div>
+          </div>
-            </div>
+        </div>
-          </p>
+        </p>
-          <hr />
+        <!-- Div Group LiveDebug -->
       </div>
       <!-- Div Tab SystemInfo -->
+
       <!-- Div Tab Firmware Update-->
       <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
         <h3>Firmware</h3>
+        <!-- Div Group VersionInfo -->
         <hr />
         <p>
         <h4>Version-Info</h4>
@@ -559,8 +673,14 @@
               <td>Flash Version</td>
               <td>%FS_VERSION%</td>
             </tr>
+            <tr>
+              <td>Git Revision</td>
+              <td>%GIT_REV%</td>
+            </tr>
         </table>
         </p>
+        <!-- Div Group VersionInfo -->
+        <!-- Div Group EEPROM Backup -->
         <hr />
         <p>
         <h4>EEPROM-Backup</h4>
@@ -570,6 +690,8 @@
           </div>
         </div>
         </p>
+        <!-- Div Group EEPROM Backup -->
+        <!-- Div Group EEPROM Restore -->
         <hr />
         <p>
         <h4>EEPROM-Restore</h4>
@@ -588,6 +710,8 @@
           </div>
         </form>
         </p>
+        <!-- Div Group EEPROM Restore -->
+        <!-- Div Group Firmware Update -->
         <hr />
         <p>
         <h4>Firmware-Update</h4>
@@ -606,7 +730,7 @@
           </div>
         </form>
         </p>
-        <hr />
+        <!-- Div Group Firmware Update -->
       </div>
       <!-- Div Tab Firmware Update-->
     </div>

Software/data_src/version

@@ -1 +1 @@
-1.3
+1.04

Software/platformio.ini

@@ -32,13 +32,13 @@ build_flags =
   -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
   -DWIFI_AP_IP_GW=10,0,0,1
   -DATOMIC_FS_UPDATE
-  -DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
   -DFEATURE_ENABLE_OLED
+  ;-DFEATURE_ENABLE_TIMER
   -DFEATURE_ENABLE_CAN
   ;-DFEATURE_ENABLE_GPS
   -DFEATURE_ENABLE_WEBSOCKETS
-  -DPCB_REV=4
+  -DPCB_REV=3
-  ;-DNO_MODE_FLASH
 
 ;build_type = debug
 
@@ -52,7 +52,8 @@ board_build.ldscript = eagle.flash.4m1m.ld
 lib_ldf_mode = deep
 lib_deps = 
     olikraus/U8g2 @ ^2.28.8
-    https://github.com/FastLED/FastLED.git#3d2ab78 ;fastled/FastLED @ ^3.5.0
+    adafruit/Adafruit NeoPixel @ ^1.11.0
+    ;https://github.com/FastLED/FastLED.git#3d2ab78 ;fastled/FastLED @ ^3.5.0
     sstaub/Ticker @ ^4.2.0
     coryjfowler/mcp_can @ ^1.5.0
     robtillaart/I2C_EEPROM @ ^1.5.2

Software/src/common.h

@@ -4,16 +4,22 @@
 #define Q(x) #x
 #define QUOTE(x) Q(x)
 
-#if PCB_REV == 2
+#if PCB_REV == 1
     #define GPIO_BUTTON D7
     #define GPIO_LED D8
     #define GPIO_TRIGGER D6
     #define GPIO_PUMP D5
-#elif PCB_REV == 1 || PCB_REV == 3
+#elif PCB_REV == 2
-    #define GPIO_BUTTON D5
+    #define GPIO_BUTTON D7
-    #define GPIO_LED D6
+    #define GPIO_LED D8
-    #define GPIO_TRIGGER D4
+    #define GPIO_TRIGGER D6
-    #define GPIO_PUMP D3
+    #define GPIO_PUMP D5
+#elif PCB_REV == 3
+    #define GPIO_BUTTON D4
+    #define GPIO_LED D3
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D0
+    #define GPIO_CS_CAN D8
 #elif PCB_REV == 4
     #define GPIO_BUTTON D4
     #define GPIO_LED D3
@@ -26,9 +32,6 @@
 #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
 #endif
 
-#define SW_VERSION 1.4
-#define FLASH_FS_VERSION 1.4
-
 #ifndef OTA_DELAY
 #define OTA_DELAY 50 // ticks -> 10ms / tick
 #endif

Software/src/config.cpp

@@ -36,7 +36,7 @@ void EEPROM_Process()
   case EE_CFG_FORMAT:
     FormatConfig_EEPROM();
     globals.requestEEAction = EE_IDLE;
-    globals.systemStatus = sysStat_Shutdown;
+    GetConfig_EEPROM();
     Debug_pushMessage("Formated EEPROM CFG\n");
     break;
   case EE_PDS_SAVE:
@@ -52,11 +52,14 @@ void EEPROM_Process()
   case EE_PDS_FORMAT:
     FormatPersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
+    GetPersistence_EEPROM();
     Debug_pushMessage("Formated EEPROM PDS\n");
     break;
   case EE_FORMAT_ALL:
     FormatConfig_EEPROM();
     FormatPersistence_EEPROM();
+    GetConfig_EEPROM();
+    GetPersistence_EEPROM();
     globals.requestEEAction = EE_IDLE;
     Debug_pushMessage("Formated EEPROM ALL\n");
     break;

Software/src/config.h

@@ -16,7 +16,9 @@
 
 typedef enum SpeedSource_e
 {
+#ifdef FEATURE_ENABLE_TIMER
   SOURCE_TIME,
+#endif
   SOURCE_IMPULSE,
 #ifdef FEATURE_ENABLE_GPS
   SOURCE_GPS,
@@ -27,7 +29,9 @@ typedef enum SpeedSource_e
 } SpeedSource_t;
 
 const char SpeedSourceString[][8] = {
+#ifdef FEATURE_ENABLE_TIMER
     "Timer",
+#endif
     "Impuls",
 #ifdef FEATURE_ENABLE_GPS
     "GPS",
@@ -96,6 +100,9 @@ typedef struct
 #ifdef FEATURE_ENABLE_CAN
   CANSource_t CANSource = KTM_890_ADV_R_2021;
 #endif
+  bool LED_Mode_Flash = false;
+  uint8_t LED_Max_Brightness = 255;
+  uint8_t LED_Min_Brightness = 5;
   uint32_t checksum = 0;
 } LubeConfig_t;
 
@@ -107,6 +114,9 @@ const LubeConfig_t LubeConfig_defaults = {
 #ifdef FEATURE_ENABLE_CAN
     KTM_890_ADV_R_2021,
 #endif
+    false,
+    255,
+    5,
     0};
 
 void InitEEPROM();

Software/src/debugger.cpp

@@ -3,7 +3,7 @@
 DebugStatus_t DebuggerStatus[dbg_cntElements];
 
 String IpAddress2String(const IPAddress &ipAddress);
-void processCmdDebug();
+void processCmdDebug(String command);
 void Debug_formatCFG();
 void Debug_formatPersistence();
 void Debug_printSystemInfo();
@@ -13,6 +13,7 @@ void Debug_dumpConfig();
 void Debug_dumpPersistance();
 void Debug_ShowDTCs();
 void Debug_dumpGlobals();
+void Debug_printHelp();
 
 void initDebugger()
 {
@@ -22,15 +23,84 @@ void initDebugger()
     Serial.setDebugOutput(false);
 }
 
+void Debug_Process()
+{
+    typedef enum InputProcessed_e
+    {
+        IDLE,
+        CMD_COMPLETE,
+        CMD_ABORT,
+        CMD_OVERFLOW
+    } InputProcessed_t;
+
+    static int inputCnt = 0;
+    static char inputBuffer[32];
+    InputProcessed_t InputProcessed = IDLE;
+
+    if (Serial.available())
+    {
+        char inputChar = Serial.read();
+
+        switch (inputChar)
+        {
+        case '\n':
+            inputBuffer[inputCnt] = 0; // terminate the String
+            inputCnt = 0;
+            InputProcessed = CMD_COMPLETE;
+            break;
+
+        case 0x1B: // Esc
+            inputBuffer[0] = 0;
+            inputCnt = 0;
+            InputProcessed = CMD_ABORT;
+            break;
+
+        case 0x21 ... 0x7E: // its a real letter or sign and not some control-chars
+            inputBuffer[inputCnt] = inputChar;
+            inputCnt++;
+            break;
+
+        default:
+            break;
+        }
+
+        if (inputCnt > sizeof(inputBuffer))
+        {
+            inputCnt = 0;
+            inputBuffer[sizeof(inputBuffer) - 1] = 0; // terminate the String
+            InputProcessed = CMD_OVERFLOW;
+        }
+    }
+
+    switch (InputProcessed)
+    {
+    case CMD_ABORT:
+        Debug_pushMessage("Abort\n");
+        break;
+
+    case CMD_COMPLETE:
+        processCmdDebug(String(inputBuffer));
+        break;
+
+    case CMD_OVERFLOW:
+        Debug_pushMessage("input Buffer overflow\n");
+        break;
+
+    default:
+        break;
+    }
+    InputProcessed = IDLE;
+}
+
 void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status)
 {
     if (status == disabled)
-        Debug_pushMessage("disable DebugPort %s", sDebugPorts[port]);
+        Debug_pushMessage("disable DebugPort %s\n", sDebugPorts[port]);
 
     DebuggerStatus[port] = status;
 
     if (status == enabled)
-        Debug_pushMessage("enabled DebugPort %s", sDebugPorts[port]);
+        Debug_pushMessage("enabled DebugPort %s\n", sDebugPorts[port]);
 }
 
 void Debug_pushMessage(const char *format, ...)
@@ -81,7 +151,9 @@ void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data)
 
 void processCmdDebug(String command)
 {
-    if (command == "sysinfo")
+    if (command == "help")
+        Debug_printHelp();
+    else if (command == "sysinfo")
         Debug_printSystemInfo();
     else if (command == "netinfo")
         Debug_printWifiInfo();
@@ -107,87 +179,91 @@ void processCmdDebug(String command)
         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");
+    Debug_pushMessage("Formatting Config-EEPROM and reseting to default\n");
     FormatConfig_EEPROM();
 }
 
 void Debug_formatPersistence()
 {
-    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default");
+    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default\n");
     FormatPersistence_EEPROM();
 }
 
-void RemotDebug_printSystemInfo()
+void Debug_printSystemInfo()
 {
-    Debug_pushMessage("Souko's ChainOiler Mk1");
+    Debug_pushMessage("Souko's ChainOiler Mk1\n");
-    Debug_pushMessage("Hostname: %s", globals.DeviceName);
+    Debug_pushMessage("Hostname: %s\n", globals.DeviceName);
 
     FlashMode_t ideMode = ESP.getFlashChipMode();
-    Debug_pushMessage("Sdk version: %s", ESP.getSdkVersion());
+    Debug_pushMessage("Sdk version: %s\n", ESP.getSdkVersion());
-    Debug_pushMessage("Core Version: %s", ESP.getCoreVersion().c_str());
+    Debug_pushMessage("Core Version: %s\n", ESP.getCoreVersion().c_str());
-    Debug_pushMessage("Boot Version: %u", ESP.getBootVersion());
+    Debug_pushMessage("Boot Version: %u\n", ESP.getBootVersion());
-    Debug_pushMessage("Boot Mode: %u", ESP.getBootMode());
+    Debug_pushMessage("Boot Mode: %u\n", ESP.getBootMode());
-    Debug_pushMessage("CPU Frequency: %u MHz", ESP.getCpuFreqMHz());
+    Debug_pushMessage("CPU Frequency: %u MHz\n", ESP.getCpuFreqMHz());
-    Debug_pushMessage("Reset reason: %s", ESP.getResetReason().c_str());
+    Debug_pushMessage("Reset reason: %s\n", ESP.getResetReason().c_str());
-    Debug_pushMessage("Flash Size: %d", ESP.getFlashChipRealSize());
+    Debug_pushMessage("Flash Size: %d\n", ESP.getFlashChipRealSize());
-    Debug_pushMessage("Flash Size IDE: %d", ESP.getFlashChipSize());
+    Debug_pushMessage("Flash Size IDE: %d\n", ESP.getFlashChipSize());
-    Debug_pushMessage("Flash ide mode:  %s", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
+    Debug_pushMessage("Flash ide mode:  %s\n", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
-                                                           : ideMode == FM_DIO    ? "DIO"
+                                                                      : ideMode == FM_DIO    ? "DIO"
-                                                           : ideMode == FM_DOUT   ? "DOUT"
+                                                                      : ideMode == FM_DOUT   ? "DOUT"
-                                                                                  : "UNKNOWN"));
+                                                                                             : "UNKNOWN"));
-    Debug_pushMessage("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
+    Debug_pushMessage("OTA-Pass: %s\n", QUOTE(ADMIN_PASSWORD));
-    Debug_pushMessage("Git-Revison: %s", GIT_REV);
+    Debug_pushMessage("Git-Revison: %s\n", constants.GitHash);
-    Debug_pushMessage("Sw-Version: %s", QUOTE(SW_VERSION));
+    Debug_pushMessage("Sw-Version: %d.%02d\n", constants.FW_Version_major, constants.FW_Version_minor);
 }
 
 void Debug_dumpConfig()
 {
-    Debug_pushMessage("DistancePerLube_Default: %d", LubeConfig.DistancePerLube_Default);
+    Debug_pushMessage("DistancePerLube_Default: %d\n", LubeConfig.DistancePerLube_Default);
-    Debug_pushMessage("DistancePerLube_Rain: %d", LubeConfig.DistancePerLube_Rain);
+    Debug_pushMessage("DistancePerLube_Rain: %d\n", LubeConfig.DistancePerLube_Rain);
-    Debug_pushMessage("tankCapacity_ml: %d", LubeConfig.tankCapacity_ml);
+    Debug_pushMessage("tankCapacity_ml: %d\n", LubeConfig.tankCapacity_ml);
-    Debug_pushMessage("amountPerDose_microL: %d", LubeConfig.amountPerDose_microL);
+    Debug_pushMessage("amountPerDose_microL: %d\n", LubeConfig.amountPerDose_microL);
-    Debug_pushMessage("TankRemindAtPercentage: %d", LubeConfig.TankRemindAtPercentage);
+    Debug_pushMessage("TankRemindAtPercentage: %d\n", LubeConfig.TankRemindAtPercentage);
-    Debug_pushMessage("PulsePerRevolution: %d", LubeConfig.PulsePerRevolution);
+    Debug_pushMessage("PulsePerRevolution: %d\n", LubeConfig.PulsePerRevolution);
-    Debug_pushMessage("TireWidth_mm: %d", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("TireWidth_mm: %d\n", LubeConfig.TireWidth_mm);
-    Debug_pushMessage("TireWidthHeight_Ratio: %d", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("TireWidthHeight_Ratio: %d\n", LubeConfig.TireWidth_mm);
-    Debug_pushMessage("RimDiameter_Inch: %d", LubeConfig.RimDiameter_Inch);
+    Debug_pushMessage("RimDiameter_Inch: %d\n", LubeConfig.RimDiameter_Inch);
-    Debug_pushMessage("DistancePerRevolution_mm: %d", LubeConfig.DistancePerRevolution_mm);
+    Debug_pushMessage("DistancePerRevolution_mm: %d\n", LubeConfig.DistancePerRevolution_mm);
-    Debug_pushMessage("BleedingPulses: %d", LubeConfig.BleedingPulses);
+    Debug_pushMessage("BleedingPulses: %d\n", LubeConfig.BleedingPulses);
-    Debug_pushMessage("SpeedSource: %d", LubeConfig.SpeedSource);
+    Debug_pushMessage("SpeedSource: %d\n", LubeConfig.SpeedSource);
 #ifdef FEATURE_ENABLE_GPS
-    Debug_pushMessage("GPSBaudRate: %d", LubeConfig.GPSBaudRate);
+    Debug_pushMessage("GPSBaudRate: %d\n", LubeConfig.GPSBaudRate);
 #endif
 #ifdef FEATURE_ENABLE_CAN
-    Debug_pushMessage("CANSource: %d", LubeConfig.CANSource);
+    Debug_pushMessage("CANSource: %d\n", LubeConfig.CANSource);
 #endif
-    Debug_pushMessage("checksum: 0x%08X", LubeConfig.checksum);
+    Debug_pushMessage("checksum: 0x%08X\n", LubeConfig.checksum);
 }
 
 void Debug_dumpGlobals()
 {
-    Debug_pushMessage("systemStatus: %d", globals.systemStatus);
+    Debug_pushMessage("systemStatus: %d\n", globals.systemStatus);
-    Debug_pushMessage("resumeStatus: %d", globals.resumeStatus);
+    Debug_pushMessage("resumeStatus: %d\n", globals.resumeStatus);
-    Debug_pushMessage("systemStatustxt: %s", globals.systemStatustxt);
+    Debug_pushMessage("systemStatustxt: %s\n", globals.systemStatustxt);
-    Debug_pushMessage("purgePulses: %d", globals.purgePulses);
+    Debug_pushMessage("purgePulses: %d\n", globals.purgePulses);
-    Debug_pushMessage("requestEEAction: %d", globals.requestEEAction);
+    Debug_pushMessage("requestEEAction: %d\n", globals.requestEEAction);
-    Debug_pushMessage("DeviceName: %s", globals.DeviceName);
+    Debug_pushMessage("DeviceName: %s\n", globals.DeviceName);
-    Debug_pushMessage("FlashVersion: %s", globals.FlashVersion);
+    Debug_pushMessage("FlashVersion: %s\n", globals.FlashVersion);
-    Debug_pushMessage("eePersistanceAdress: %d", globals.eePersistanceAdress);
+    Debug_pushMessage("eePersistanceAdress: %d\n", globals.eePersistanceAdress);
-    Debug_pushMessage("TankPercentage: %d", globals.TankPercentage);
+    Debug_pushMessage("TankPercentage: %d\n", globals.TankPercentage);
-    Debug_pushMessage("hasDTC: %d", globals.hasDTC);
+    Debug_pushMessage("hasDTC: %d\n", globals.hasDTC);
 }
 
 void Debug_dumpPersistance()
 {
-    Debug_pushMessage("writeCycleCounter: %d", PersistenceData.writeCycleCounter);
+    Debug_pushMessage("writeCycleCounter: %d\n", PersistenceData.writeCycleCounter);
-    Debug_pushMessage("tankRemain_microL: %d", PersistenceData.tankRemain_microL);
+    Debug_pushMessage("tankRemain_microL: %d\n", PersistenceData.tankRemain_microL);
-    Debug_pushMessage("TravelDistance_highRes_mm: %d", PersistenceData.TravelDistance_highRes_mm);
+    Debug_pushMessage("TravelDistance_highRes_mm: %d\n", PersistenceData.TravelDistance_highRes_mm);
-    Debug_pushMessage("checksum: %d", PersistenceData.checksum);
+    Debug_pushMessage("checksum: %d\n", PersistenceData.checksum);
-    Debug_pushMessage("PSD Adress: 0x%04X", globals.eePersistanceAdress);
+    Debug_pushMessage("PSD Adress: 0x%04X\n", globals.eePersistanceAdress);
 }
 
 void Debug_printWifiInfo()
@@ -247,7 +323,19 @@ void Debug_ShowDTCs()
             else
                 strcpy(buff_active, "none");
 
-            Debug_pushMessage("%s \t %6d \t %s \t %d", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
+            Debug_pushMessage("%s \t %6d \t %s \t %d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
         }
     }
 }
+
+void Debug_printHelp()
+{
+    char buff[64];
+
+    for (int i = sizeof(helpCmd) / 63; i < sizeof(helpCmd) / 63; i++)
+    {
+        memcpy_P(buff, (helpCmd + (i * 63)), 63);
+        buff[63] = 0;
+        Debug_pushMessage(buff);
+    }
+}

Software/src/debugger.h

@@ -4,19 +4,19 @@
 #include <Arduino.h>
 #include "webui.h"
 
-const char helpCmd[] = "sysinfo     - System Info\r\n"
+const char PROGMEM helpCmd[] = "sysinfo     - System Info\n"
-                       "netinfo     - WiFi Info\r\n"
+                               "netinfo     - WiFi Info\n"
-                       "formatPDS   - Format Persistence EEPROM Data\r\n"
+                               "formatPDS   - Format Persistence EEPROM Data\n"
-                       "formatCFG   - Format Configuration EEPROM Data\r\n"
+                               "formatCFG   - Format Configuration EEPROM Data\n"
-                       "checkEE     - Check EEPROM with checksum\r\n"
+                               "checkEE     - Check EEPROM with checksum\n"
-                       "dumpEE1k    - dump the first 1kb of EEPROM to Serial\r\n"
+                               "dumpEE1k    - dump the first 1kb of EEPROM to Serial\n"
-                       "dumpEE      - dump the whole EPPROM to Serial\r\n"
+                               "dumpEE      - dump the whole EPPROM to Serial\n"
-                       "resetPageEE - Reset the PersistenceData Page\r\n"
+                               "resetPageEE - Reset the PersistenceData Page\n"
-                       "dumpCFG     - print Config struct\r\n"
+                               "dumpCFG     - print Config struct\n"
-                       "dumpPDS     - print PersistanceStruct\r\n"
+                               "dumpPDS     - print PersistanceStruct\n"
-                       "saveEE      - save EE-Data\r\n"
+                               "saveEE      - save EE-Data\n"
-                       "showdtc     - Show all DTCs\r\n"
+                               "showdtc     - Show all DTCs\n"
-                       "dumpGlobals - print globals\r\n";
+                               "dumpGlobals - print globals\n";
 
 typedef enum DebugStatus_e
 {
@@ -41,5 +41,6 @@ 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

Software/src/dtc.cpp

@@ -116,7 +116,7 @@ void DTC_Process()
     if (getlastDTC(false) < DTC_LAST_DTC)
     {
         globals.hasDTC = true;
-        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC)
+        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC && globals.systemStatus != sysStat_Shutdown)
         {
             if (globals.systemStatus != sysStat_Error)
             {

Software/src/globals.cpp

@@ -8,4 +8,6 @@ void initGlobals()
   globals.requestEEAction = EE_IDLE;
   globals.resumeStatus = sysStat_Normal;
   globals.systemStatus = sysStat_Startup;
+  globals.measurementActive = false;
+  globals.measuredPulses = 0;
 }

Software/src/globals.h

@@ -39,10 +39,27 @@ typedef struct Globals_s
   uint16_t eePersistanceAdress;
   uint8_t TankPercentage;
   bool hasDTC;
+  bool measurementActive;
+  uint32_t measuredPulses;
 } Globals_t;
 
 extern Globals_t globals;
 
+typedef struct Constants_s
+{
+  uint8_t FW_Version_major;
+  uint8_t FW_Version_minor;
+  uint8_t Required_Flash_Version_major;
+  uint8_t Required_Flash_Version_minor;
+  char GitHash[11];
+} Constants_t;
+
+const Constants_t constants PROGMEM = {
+ 1,4,     // Firmware_Version
+ 1,4,     // Required Flash Version
+ GIT_REV  // Git-Hash-String
+};
+
 void initGlobals();
 
 #endif

Software/src/led_colors.h

@@ -0,0 +1,35 @@
+#ifndef _LED_COLORS_H_
+#define _LED_COLORS_H_
+
+#define COLOR_RED           0xFF0000
+#define COLOR_GREEN         0x00FF00
+#define COLOR_BLUE          0x0000FF
+#define COLOR_YELLOW        0xFF9600
+#define COLOR_ORANGE        0xFF2800
+#define COLOR_TEAL          0x00FF78
+#define COLOR_CYAN          0x00FFFF
+#define COLOR_PURPLE        0xB400FF
+#define COLOR_MAGENTA       0xFF0014
+#define COLOR_WHITE         0xFFFFFF
+#define COLOR_BLACK         0x000000
+#define COLOR_GOLD          0xFFDE1E
+#define COLOR_PINK          0xF25AFF
+#define COLOR_AQUA          0x32FFFF
+#define COLOR_JADE          0x00FF28
+#define COLOR_AMBER         0xFF6400
+#define COLOR_WARM_WHITE    0xFDF5E6
+
+
+#define LED_DEFAULT_COLOR       COLOR_WARM_WHITE
+#define LED_STARTUP_NORMAL      COLOR_WARM_WHITE
+#define LED_STARTUP_TANKWARN    COLOR_AMBER
+#define LED_NORMAL_COLOR        COLOR_GREEN 
+#define LED_RAIN_COLOR          COLOR_BLUE 
+#define LED_WIFI_BLINK          COLOR_YELLOW
+#define LED_PURGE_COLOR         COLOR_MAGENTA
+#define LED_ERROR_BLINK         COLOR_RED
+#define LED_SHUTDOWN_BLINK      COLOR_CYAN
+
+
+
+#endif /* _LED_COLORS_H_ */

Software/src/main.cpp

@@ -6,7 +6,7 @@
 #include <ESP8266WiFi.h>
 #include <ArduinoOTA.h>
 
-#include <FastLED.h>
+#include <Adafruit_NeoPixel.h>
 #include <Ticker.h>
 
 #include "common.h"
@@ -25,6 +25,7 @@
 #include "gps.h"
 #endif
 #include "dtc.h"
+#include "led_colors.h"
 
 #ifdef FEATURE_ENABLE_WIFI_CLIENT
 #include <ESP8266WiFiMulti.h>
@@ -39,11 +40,11 @@ ESP8266WiFiMulti wifiMulti;
 bool startSetupMode = false;
 volatile uint32_t wheel_pulse = 0;
 
-CRGB leds[1];
+Adafruit_NeoPixel leds(1, GPIO_LED, NEO_RGB + NEO_KHZ800);
 
 // Function-Prototypes
 void IRAM_ATTR trigger_ISR();
-void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White);
+void LED_Process(uint8_t override = false, uint32_t setColor = LED_DEFAULT_COLOR);
 #ifdef FEATURE_ENABLE_OLED
 U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
 void Display_Process();
@@ -88,7 +89,7 @@ void setup()
   u8x8.begin();
   u8x8.setFont(u8x8_font_chroma48medium8_r);
 #endif
-  FastLED.addLeds<WS2811, GPIO_LED, RGB>(leds, 1); // GRB ordering is assumed
+  leds.begin();
 
   switch (LubeConfig.SpeedSource)
   {
@@ -101,9 +102,11 @@ void setup()
     Init_GPS();
     break;
 #endif
+#ifdef FEATURE_ENABLE_TIMER
   case SOURCE_TIME:
 
     break;
+#endif
 #ifdef FEATURE_ENABLE_CAN
   case SOURCE_CAN:
     Init_CAN();
@@ -175,8 +178,10 @@ void loop()
     wheelDistance = Process_CAN_WheelSpeed();
     break;
 #endif
+#ifdef FEATURE_ENABLE_TIMER
   case SOURCE_TIME:
     break;
+#endif
 #ifdef FEATURE_ENABLE_GPS
   case SOURCE_GPS:
     wheelDistance = Process_GPS_WheelSpeed();
@@ -193,6 +198,7 @@ void loop()
   EEPROM_Process();
   Webserver_Process();
   DTC_Process();
+  Debug_Process();
 
   ArduinoOTA.handle();
   EEPROMCyclicPDSTicker.update();
@@ -247,7 +253,7 @@ void trigger_ISR()
   wheel_pulse++;
 }
 
-void LED_Process(uint8_t override, CRGB SetColor)
+void LED_Process(uint8_t override, uint32_t SetColor)
 {
   typedef enum
   {
@@ -258,16 +264,18 @@ void LED_Process(uint8_t override, CRGB SetColor)
     LED_Confirm_Rain,
     LED_Purge,
     LED_Error,
+    LED_Shutdown,
     LED_Override
   } tLED_Status;
 
   static tSystem_Status oldSysStatus = sysStat_Startup;
   static tLED_Status LED_Status = LED_Startup;
-  static CRGB LED_override_color = 0;
+  static uint32_t LED_override_color = 0;
   static tLED_Status LED_ResumeOverrideStatus = LED_Startup;
 
   uint8_t color = 0;
   uint32_t timer = 0;
+  uint32_t animtimer = 0;
   static uint32_t timestamp = 0;
   timer = millis();
 
@@ -318,6 +326,9 @@ void LED_Process(uint8_t override, CRGB SetColor)
       Debug_pushMessage("sysStat: Error");
       break;
     case sysStat_Shutdown:
+      LED_Status = LED_Shutdown;
+      Debug_pushMessage("sysStat: Shutdown");
+      break;
     default:
       break;
     }
@@ -327,84 +338,105 @@ void LED_Process(uint8_t override, CRGB SetColor)
   switch (LED_Status)
   {
   case LED_Startup:
-    FastLED.setBrightness(255);
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
 
     if (globals.TankPercentage < LubeConfig.TankRemindAtPercentage)
-      leds[0] = CRGB::OrangeRed;
+      leds.setPixelColor(0, LED_STARTUP_TANKWARN);
     else
-      leds[0] = CRGB::White;
+      leds.setPixelColor(0, LED_STARTUP_NORMAL);
     break;
 
   case LED_Confirm_Normal:
-    FastLED.setBrightness(255);
+    animtimer = timer % 500;
-    leds[0] = timer % 250 > 125 ? CRGB(0, 255, 0) : CRGB(0, 4, 0);
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
+
     if (timestamp < timer)
     {
       LED_Status = LED_Normal;
-      FastLED.setBrightness(64);
       Debug_pushMessage("LED_Status: Confirm -> Normal");
     }
     break;
 
   case LED_Normal:
-#ifndef NO_MODE_FLASH
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
-    if (timer % 2000 > 1950)
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
-      leds[0] = CRGB(0, 255, 0);
+
-    else if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1800 && timer % 2000 < 1850)
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
-#else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
-    if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1950)
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
-#endif
+      leds.setPixelColor(0, LED_WIFI_BLINK);
-      leds[0] = CRGB(255, 128, 0);
+
-    else
-      leds[0] = CRGB(0, 4, 0);
     break;
 
   case LED_Confirm_Rain:
-    FastLED.setBrightness(255);
+    animtimer = timer % 500;
-    leds[0] = timer % 250 > 125 ? CRGB(0, 0, 255) : CRGB(0, 0, 4);
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_RAIN_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
     if (timestamp < timer)
     {
       LED_Status = LED_Rain;
-      FastLED.setBrightness(64);
       Debug_pushMessage("LED_Status: Confirm -> Rain");
     }
     break;
 
   case LED_Rain:
-#ifndef NO_MODE_FLASH
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
-    if (timer % 2000 > 1950)
+    leds.setPixelColor(0, LED_RAIN_COLOR);
-      leds[0] = CRGB(0, 0, 255);
+
-    else if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1800 && timer % 2000 < 1850)
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
-#else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
-    if (WiFi.getMode() != WIFI_OFF && timer % 2000 > 1950)
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
-#endif
+      leds.setPixelColor(0, LED_WIFI_BLINK);
-      leds[0] = CRGB(255, 128, 0);
+
-    else
-      leds[0] = CRGB(0, 0, 4);
     break;
 
   case LED_Purge:
     timer = timer % 500;
-    color = timer / 2;
+    color = map(timer / 2, 0, 250, LubeConfig.LED_Min_Brightness, LubeConfig.LED_Max_Brightness);
-    leds[0] = CRGB::DeepPink;
+    leds.setPixelColor(0, LED_PURGE_COLOR);
     if (timer < 250)
-      FastLED.setBrightness(color);
+      leds.setBrightness(color);
     else
-      FastLED.setBrightness(250 - color);
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
     break;
 
   case LED_Error:
-    leds[0] = timer % 500 > 250 ? CRGB::Red : CRGB::Black;
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, timer % 500 > 250 ? LED_ERROR_BLINK : 0);
+    break;
+
+  case LED_Shutdown:
+    timer = timer % 600;
+    leds.setPixelColor(0, LED_SHUTDOWN_BLINK);
+    if (timer < 500)
+    {
+      color = map(timer, 0, 500, LubeConfig.LED_Max_Brightness, LubeConfig.LED_Min_Brightness);
+      leds.setBrightness(color);
+    }
+    else
+    {
+      leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    }
     break;
 
   case LED_Override:
-    leds[0] = LED_override_color;
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_override_color);
     break;
 
   default:
     break;
   }
-  FastLED.show();
+  leds.show();
 }
 #ifdef FEATURE_ENABLE_OLED
 void Display_Process()
@@ -468,22 +500,22 @@ void Button_Process()
 
     if (buttonTimestamp + BUTTON_ACTION_DELAY_NOTHING < millis())
     {
-      LED_Process(1, CRGB::White);
+      LED_Process(1, COLOR_WARM_WHITE);
       buttonAction = BTN_NOTHING;
     }
     else if (buttonTimestamp + BUTTON_ACTION_DELAY_WIFI < millis())
     {
-      LED_Process(1, CRGB::Yellow);
+      LED_Process(1, LED_WIFI_BLINK);
       buttonAction = BTN_TOGGLEWIFI;
     }
     else if (buttonTimestamp + BUTTON_ACTION_DELAY_PURGE < millis())
     {
-      LED_Process(1, CRGB::DeepPink);
+      LED_Process(1, LED_PURGE_COLOR);
       buttonAction = BTN_STARTPURGE;
     }
     else if (buttonTimestamp + BUTTON_ACTION_DELAY_TOGGLEMODE < millis())
     {
-      CRGB color = globals.systemStatus == sysStat_Normal ? CRGB::Blue : CRGB::Green;
+      uint32_t color = globals.systemStatus == sysStat_Normal ? LED_RAIN_COLOR : LED_NORMAL_COLOR;
       LED_Process(1, color);
       buttonAction = BTN_TOGGLEMODE;
     }
@@ -578,11 +610,15 @@ void SystemShutdown()
 
 uint32_t Process_Impulse_WheelSpeed()
 {
-  uint32_t add_milimeters;
+  uint32_t add_milimeters = 0;
   // Calculate traveled Distance in mm
-  add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
+  if (LubeConfig.PulsePerRevolution != 0)
+    add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
+
+  if (globals.measurementActive == true)
+    globals.measuredPulses = globals.measuredPulses + wheel_pulse;
+
   wheel_pulse = 0;
 
   return add_milimeters;
 }
-

Software/src/sanitycheck.h

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

Software/src/webui.cpp

@@ -33,7 +33,9 @@ void initWebUI()
 
   GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
 
-  if (strcmp(globals.FlashVersion, QUOTE(FLASH_FS_VERSION)))
+  char buffer[6];
+  snprintf(buffer, sizeof(buffer), "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  if (strcmp(globals.FlashVersion, buffer))
   {
     MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
   }
@@ -108,6 +110,16 @@ String processor(const String &var)
 #else
     return "Feature N/A";
 #endif
+  if (var == "LED_MODE_FLASH")
+    return String(LubeConfig.LED_Mode_Flash);
+  if (var == "LEDFLASHCHECKED")
+    return String(LubeConfig.LED_Mode_Flash == true ? "checked" : "");
+  if (var == "LED_MAX_BRIGHTNESS")
+    return String(LubeConfig.LED_Max_Brightness);
+  if (var == "LED_MIN_BRIGHTNESS")
+    return String(LubeConfig.LED_Min_Brightness);
+  if (var == "EEPROM_VERSION")
+    return String(LubeConfig.EEPROM_Version);
   if (var == "CONFIG_CHECKSUM")
   {
     char buffer[7];
@@ -234,13 +246,26 @@ String processor(const String &var)
 
   if (var == "SYSTEM_STATUS")
     return String(globals.systemStatustxt);
+
   if (var == "SW_VERSION")
   {
-    return String(QUOTE(SW_VERSION));
+    char buffer[6];
+    snprintf(buffer, sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor);
+    return String(buffer);
   }
+
   if (var == "FS_VERSION")
     return String(globals.FlashVersion);
 
+  if (var == "GIT_REV")
+    return String(constants.GitHash);
+
+  if (var == "MEASURED_PULSES")
+    return String(globals.measuredPulses);
+
+  if (var == "MEASURE_BTN")
+    return String(globals.measurementActive == true ? "Stop" : "Start");
+
   if (var == "PLACEHOLDER")
     return "placeholder";
 
@@ -357,6 +382,32 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
       globals.systemStatus = sysStat_Shutdown;
     }
     // end: POST Form Maintenance
+    // begin: POST Form LED Settings
+    if (p->name() == "ledmaxbrightness")
+      LubeConfig.LED_Max_Brightness = p->value().toInt();
+    if (p->name() == "ledminbrightness")
+      LubeConfig.LED_Min_Brightness = p->value().toInt();
+    if (p->name() == "ledsave")
+    {
+      if (request->hasParam("ledmodeflash", true))
+      {
+        AsyncWebParameter *param = request->getParam("ledmodeflash", true);
+        if (param->value() == "on")
+          LubeConfig.LED_Mode_Flash = true;
+      }
+      else
+      {
+        LubeConfig.LED_Mode_Flash = false;
+      }
+      globals.requestEEAction = EE_CFG_SAVE;
+    }
+    // end: POST Form LED SEttings
+    // begin: POST Form Measure Pulses
+    if (p->name() == "measurereset")
+      globals.measuredPulses = 0;
+    if (p->name() == "measurestartstop")
+      globals.measurementActive = !globals.measurementActive;
+    // end: POST Form Measure Pulses
   }
 }
 
@@ -426,28 +477,84 @@ void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const Stri
 
 void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
 {
-
   bool ee_done = false;
-  bool validext = false;
+  static bool validext = false;
+  static char *buffer = NULL;
+  static uint32_t read_ptr = 0;
+  DeserializationError error;
 
   if (!index)
   {
-    Debug_pushMessage("EEPROM restore\n");
-    // size_t content_len = request->contentLength();
     validext = (filename.indexOf(".ee.json") > -1);
+    if (validext)
+    {
+      buffer = (char *)malloc(1536);
+      read_ptr = 0;
+      if (buffer == NULL)
+        Debug_pushMessage("malloc() failed for EEPROM-Restore");
+    }
   }
 
-  if (validext)
+  if (buffer != NULL)
   {
-    Debug_pushMessage("Restoring EEPROM-Stuff\n");
+    memcpy(buffer + read_ptr, data, len);
+    read_ptr = read_ptr + len;
   }
 
   if (final)
   {
+    if (buffer != NULL)
+    {
+      Serial.print(buffer);
+      StaticJsonDocument<1536> doc;
+      error = deserializeJson(doc, buffer);
+      if (error)
+      {
+        Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str());
+      }
+      else
+      {
+
+        LubeConfig.DistancePerLube_Default = doc["config"]["DistancePerLube_Default"].as<uint32_t>();
+        LubeConfig.DistancePerLube_Rain = doc["config"]["DistancePerLube_Rain"].as<uint32_t>();
+        LubeConfig.tankCapacity_ml = doc["config"]["tankCapacity_ml"].as<uint32_t>();
+        LubeConfig.amountPerDose_microL = doc["config"]["amountPerDose_microL"].as<uint32_t>();
+        LubeConfig.TankRemindAtPercentage = doc["config"]["TankRemindAtPercentage"].as<uint8_t>();
+        LubeConfig.PulsePerRevolution = doc["config"]["PulsePerRevolution"].as<uint8_t>();
+        LubeConfig.TireWidth_mm = doc["config"]["TireWidth_mm"].as<uint32_t>();
+        LubeConfig.TireWidthHeight_Ratio = doc["config"]["TireWidthHeight_Ratio"].as<uint32_t>();
+        LubeConfig.RimDiameter_Inch = doc["config"]["RimDiameter_Inch"].as<uint32_t>();
+        LubeConfig.DistancePerRevolution_mm = doc["config"]["DistancePerRevolution_mm"].as<uint32_t>();
+        LubeConfig.BleedingPulses = doc["config"]["BleedingPulses"].as<uint16_t>();
+        LubeConfig.SpeedSource = (SpeedSource_t)doc["config"]["SpeedSource"].as<int>();
+#ifdef FEATURE_ENABLE_GPS
+        LubeConfig.GPSBaudRate = (GPSBaudRate_t)doc["config"]["GPSBaudRate"].as<int>();
+#endif
+#ifdef FEATURE_ENABLE_CAN
+        LubeConfig.CANSource = (CANSource_t)doc["config"]["CANSource"].as<int>();
+#endif
+        LubeConfig.LED_Mode_Flash = doc["config"]["LED_Mode_Flash"].as<bool>();
+        LubeConfig.LED_Max_Brightness = doc["config"]["LED_Max_Brightness"].as<uint8_t>();
+        LubeConfig.LED_Min_Brightness = doc["config"]["LED_Min_Brightness"].as<uint8_t>();
+
+        PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>();
+        PersistenceData.tankRemain_microL = doc["persis"]["tankRemain_microL"].as<uint32_t>();
+        PersistenceData.TravelDistance_highRes_mm = doc["persis"]["TravelDistance_highRes_mm"].as<uint32_t>();
+        PersistenceData.odometer_mm = doc["persis"]["odometer_mm"].as<uint32_t>();
+        PersistenceData.odometer = doc["persis"]["odometer"].as<uint32_t>();
+        PersistenceData.checksum = doc["persis"]["checksum"].as<uint32_t>();
+
+        ee_done = true;
+      }
+    }
+
+    free(buffer);
+
     AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
     response->addHeader("Refresh", "20");
     response->addHeader("Location", "/");
     request->send(response);
+
     if (ee_done)
     {
       Debug_pushMessage("Update complete");
@@ -468,8 +575,11 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
   char buffer[16];
 
   fwinfo["DeviceName"] = globals.DeviceName;
-  fwinfo["FW-Version"] = QUOTE(SW_VERSION);
+  sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  fwinfo["FW-Version"] = buffer;
   fwinfo["FS-Version"] = globals.FlashVersion;
+  snprintf_P(buffer, sizeof(buffer), "%s", constants.GitHash);
+  fwinfo["Git-Hash"] = buffer;
 
   JsonObject config = json.createNestedObject("config");
 
@@ -495,6 +605,9 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
   config["CANSource"] = LubeConfig.CANSource;
   config["CANSource_Str"] = CANSourceString[LubeConfig.CANSource];
 #endif
+  config["LED_Mode_Flash"] = LubeConfig.LED_Mode_Flash;
+  config["LED_Max_Brightness"] = LubeConfig.LED_Max_Brightness;
+  config["LED_Min_Brightness"] = LubeConfig.LED_Min_Brightness;
   sprintf(buffer, "0x%08X", LubeConfig.checksum);
   config["checksum"] = buffer;