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

added remaining settings to websocket-functionality

Browse Source
This commit is contained in:
Marcel Peterkau 2024-01-15 22:55:08 +01:00
parent d524b919fd
commit cebf0db60c
3 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Software/data_src/index.htm
View File

@ -122,7 +122,7 @@
</div>
<div class="form-group row">
<div class="col text-center">
<button id="resettank" class="btn-wsevent btn btn-outline-primary ml-2">Tank zurücksetzen</button>
<button id="resettank" class="btn-wsevent confirm btn btn-outline-primary ml-2">Tank zurücksetzen</button>
</div>
</div>
</p>
@ -195,7 +195,7 @@
<h4>Ger&auml;t neustarten</h4>
<div class="form-group row">
<div class="col text-center">
<button id="reboot" class="btn-wsevent btn btn-outline-primary">Reboot</button>
<button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">Reboot</button>
</div>
</div>
</p>
@ -230,7 +230,7 @@
</div>
<div class="form-group row">
<div class="col text-center">
<button id="sourcesave" class="btn-wsevent btn btn-outline-primary">&Uuml;bernehmen</button>
<button id="sourcesave" class="btn-wsevent confirm btn btn-outline-primary">&Uuml;bernehmen</button>
</div>
</div>
</p>

16
Software/data_src/static/js/websocket.js
View File

@ -25,9 +25,7 @@ function initButtons() {
if (elements.length > 0) {
for (var i = 0; i < elements.length; i++) {
let element = elements[i];
element.addEventListener("click", function () {
websocket_sendevent("btn-" + element.id, 0);
});
element.addEventListener("click", sendButton);
}
}
}
@ -55,6 +53,18 @@ function onClose(event) {
overlay.style.display = "flex";
}
function sendButton(event) {
var targetElement = event.target;
if (
targetElement.classList.contains("confirm") &&
window.confirm("Sicher?") == false
)
return;
websocket_sendevent("btn-" + targetElement.id, targetElement.value);
}
function onMessage(event) {
var data = event.data;
console.log("ws_msg:" + event.data + "\n");

36
Software/src/webui.cpp
View File

@ -492,6 +492,10 @@ void Websocket_HandleButtons(uint8_t *data)
{
globals.systemStatus = sysStat_Shutdown;
}
else if (strcmp(identifier, "resettank") == 0)
{
PersistenceData.tankRemain_microL = LubeConfig.tankCapacity_ml * 1000;
}
else
{
Debug_pushMessage("Got unknown Button-id '%s' from ws-client\n", identifier);
@ -532,6 +536,38 @@ void Websocket_HandleSettings(uint8_t *data)
int index = findIndexByString(value, GPSBaudRateString, GPSBaudRateString_Elements);
LubeConfig.GPSBaudRate = (GPSBaudRate_t)index;
}
else if (strcmp(identifier, "ledmaxbrightness") == 0)
{
LubeConfig.LED_Max_Brightness = atoi(value);
}
else if (strcmp(identifier, "ledminbrightness") == 0)
{
LubeConfig.LED_Min_Brightness = atoi(value);
}
else if (strcmp(identifier, "pumppulse") == 0)
{
LubeConfig.BleedingPulses = atoi(value);
}
else if (strcmp(identifier, "tankwarn") == 0)
{
LubeConfig.TankRemindAtPercentage = atoi(value);
}
else if (strcmp(identifier, "tankcap") == 0)
{
LubeConfig.tankCapacity_ml = atoi(value);
}
else if (strcmp(identifier, "lubedistancerain") == 0)
{
LubeConfig.DistancePerLube_Rain = atoi(value);
}
else if (strcmp(identifier, "lubedistancenormal") == 0)
{
LubeConfig.DistancePerLube_Default = atoi(value);
}
else if (strcmp(identifier, "ledmodeflash") == 0)
{
LubeConfig.LED_Mode_Flash = value[0] == '1' ? true : false;
}
else
{
Debug_pushMessage("Got unknown Settings-id and value '%s' from ws-client\n", identifier);