souko/Kettenoeler
souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

added Function to WebUI to measure Pulses

Browse Source
This commit is contained in:
Marcel Peterkau 2023-03-03 10:51:16 +01:00
parent 8fdd09f32f
commit 49b3598275
5 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Software/data_src/index.htm
View File

@ -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 -->

2
Software/src/globals.cpp
View File

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

2
Software/src/globals.h
View File

@ -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;

4
Software/src/main.cpp
View File

@ -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;

12
Software/src/webui.cpp
View File

@ -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
}
}