added Function to WebUI to measure Pulses
This commit is contained in:
parent
8fdd09f32f
commit
49b3598275
@ -148,6 +148,32 @@
|
|||||||
</form>
|
</form>
|
||||||
</p>
|
</p>
|
||||||
<!-- Div Group Purging -->
|
<!-- 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 -->
|
<!-- Div Group EEPROM formatting -->
|
||||||
<hr />
|
<hr />
|
||||||
<p>
|
<p>
|
||||||
@ -451,8 +477,8 @@
|
|||||||
<label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
|
<label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text" class="form-control"
|
<input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text"
|
||||||
required="required">
|
class="form-control" required="required">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -460,8 +486,8 @@
|
|||||||
<label for="ledminbrightness" class="control-label col-4">Min Helligkeit</label>
|
<label for="ledminbrightness" class="control-label col-4">Min Helligkeit</label>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text" class="form-control"
|
<input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text"
|
||||||
required="required">
|
class="form-control" required="required">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -8,4 +8,6 @@ void initGlobals()
|
|||||||
globals.requestEEAction = EE_IDLE;
|
globals.requestEEAction = EE_IDLE;
|
||||||
globals.resumeStatus = sysStat_Normal;
|
globals.resumeStatus = sysStat_Normal;
|
||||||
globals.systemStatus = sysStat_Startup;
|
globals.systemStatus = sysStat_Startup;
|
||||||
|
globals.measurementActive = false;
|
||||||
|
globals.measuredPulses = 0;
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,8 @@ typedef struct Globals_s
|
|||||||
uint16_t eePersistanceAdress;
|
uint16_t eePersistanceAdress;
|
||||||
uint8_t TankPercentage;
|
uint8_t TankPercentage;
|
||||||
bool hasDTC;
|
bool hasDTC;
|
||||||
|
bool measurementActive;
|
||||||
|
uint32_t measuredPulses;
|
||||||
} Globals_t;
|
} Globals_t;
|
||||||
|
|
||||||
extern Globals_t globals;
|
extern Globals_t globals;
|
||||||
|
@ -594,6 +594,10 @@ uint32_t Process_Impulse_WheelSpeed()
|
|||||||
uint32_t add_milimeters;
|
uint32_t add_milimeters;
|
||||||
// Calculate traveled Distance in mm
|
// Calculate traveled Distance in mm
|
||||||
add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
|
add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
|
||||||
|
|
||||||
|
if (globals.measurementActive == true)
|
||||||
|
globals.measuredPulses = globals.measuredPulses + wheel_pulse;
|
||||||
|
|
||||||
wheel_pulse = 0;
|
wheel_pulse = 0;
|
||||||
|
|
||||||
return add_milimeters;
|
return add_milimeters;
|
||||||
|
@ -260,6 +260,12 @@ String processor(const String &var)
|
|||||||
if (var == "GIT_REV")
|
if (var == "GIT_REV")
|
||||||
return String(constants.GitHash);
|
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")
|
if (var == "PLACEHOLDER")
|
||||||
return "placeholder";
|
return "placeholder";
|
||||||
|
|
||||||
@ -396,6 +402,12 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
|
|||||||
globals.requestEEAction = EE_CFG_SAVE;
|
globals.requestEEAction = EE_CFG_SAVE;
|
||||||
}
|
}
|
||||||
// end: POST Form LED SEttings
|
// 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user