From 49b35982753b66d7accc9d4b398303594ba51af7 Mon Sep 17 00:00:00 2001
From: Marcel Peterkau <marcel@peterkau.de>
Date: Fri, 3 Mar 2023 10:51:16 +0100
Subject: [PATCH] added Function to WebUI to measure Pulses

---
 Software/data_src/index.htm | 36 +++++++++++++++++++++++++++++++-----
 Software/src/globals.cpp    |  2 ++
 Software/src/globals.h      |  2 ++
 Software/src/main.cpp       |  4 ++++
 Software/src/webui.cpp      | 12 ++++++++++++
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/Software/data_src/index.htm b/Software/data_src/index.htm
index 43db8d8..ce116ec 100644
--- a/Software/data_src/index.htm
+++ b/Software/data_src/index.htm
@@ -148,6 +148,32 @@
         </form>
         </p>
         <!-- Div Group Purging -->
+        <!-- Div Group Measure -->
+        <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 Group Purging -->
         <!-- Div Group EEPROM formatting -->
         <hr />
         <p>
@@ -451,8 +477,8 @@
             <label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
             <div class="col-8">
               <div class="input-group">
-                <input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text" class="form-control"
-                  required="required">
+                <input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
               </div>
             </div>
           </div>
@@ -460,8 +486,8 @@
             <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">
+                <input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
               </div>
             </div>
           </div>
@@ -648,7 +674,7 @@
             <tr>
               <td>Git Revision</td>
               <td>%GIT_REV%</td>
-            </tr>            
+            </tr>
         </table>
         </p>
         <!-- Div Group VersionInfo -->
diff --git a/Software/src/globals.cpp b/Software/src/globals.cpp
index 8886874..c202307 100644
--- a/Software/src/globals.cpp
+++ b/Software/src/globals.cpp
@@ -8,4 +8,6 @@ void initGlobals()
   globals.requestEEAction = EE_IDLE;
   globals.resumeStatus = sysStat_Normal;
   globals.systemStatus = sysStat_Startup;
+  globals.measurementActive = false;
+  globals.measuredPulses = 0;
 }
diff --git a/Software/src/globals.h b/Software/src/globals.h
index 6161a6e..69b29fe 100644
--- a/Software/src/globals.h
+++ b/Software/src/globals.h
@@ -39,6 +39,8 @@ typedef struct Globals_s
   uint16_t eePersistanceAdress;
   uint8_t TankPercentage;
   bool hasDTC;
+  bool measurementActive;
+  uint32_t measuredPulses;
 } Globals_t;
 
 extern Globals_t globals;
diff --git a/Software/src/main.cpp b/Software/src/main.cpp
index 522b87f..1a00f29 100644
--- a/Software/src/main.cpp
+++ b/Software/src/main.cpp
@@ -594,6 +594,10 @@ uint32_t Process_Impulse_WheelSpeed()
   uint32_t add_milimeters;
   // Calculate traveled Distance in mm
   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;
diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp
index 9e08d37..bd1da76 100644
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -260,6 +260,12 @@ String processor(const String &var)
   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";
 
@@ -396,6 +402,12 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
       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
   }
 }