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

Compare commits

base: souko:925167ec3cebc8690ab903e20a3247a5f04e71d0
Branches Tags
souko:master
souko:PCB_Rev_1.4
souko:Firmware_1.4
souko:PCB_Rev_1.3
souko:PCB_Rev_1.2
souko:PCB_Rev_1.1
souko:PCB_Proto_1
..
compare: souko:157d59963c2250c9240f9302c6ca3d503684b658
Branches Tags
souko:master
souko:PCB_Rev_1.4
souko:Firmware_1.4
souko:PCB_Rev_1.3
souko:PCB_Rev_1.2
souko:PCB_Rev_1.1
souko:PCB_Proto_1

No commits in common. "925167ec3cebc8690ab903e20a3247a5f04e71d0" and "157d59963c2250c9240f9302c6ca3d503684b658" have entirely different histories.
925167ec3c ... 157d59963c

4 changed files with 51 additions and 59 deletions
Show Stats Expand all files Collapse all files

55
Software/data_src/index.htm
View File

@ -60,7 +60,7 @@
<p> <p>
<h4>Tankinhalt verbleibend</h4> <h4>Tankinhalt verbleibend</h4>
<div class="progress"> <div class="progress">
<div id="tankremain" class="data-tankremain progress-bar text-light" role="progressbar" aria-valuenow="0" <div id="tankremain" class="progress-bar text-light" role="progressbar" aria-valuenow="0"
aria-valuemin="0" aria-valuemax="100" style="width: 0%"> aria-valuemin="0" aria-valuemax="100" style="width: 0%">
0 0
</div> </div>
@ -71,7 +71,7 @@
<hr /> <hr />
<p> <p>
<h4>aktueller Modus</h4> <h4>aktueller Modus</h4>
<input class="data-systemstatus form-control" type="text" id="sysstatus" readonly> <input class="form-control" type="text" id="SystemStatus" readonly>
</p> </p>
<!-- Div Group current Mode --> <!-- Div Group current Mode -->
<!-- Div Group DTC Table --> <!-- Div Group DTC Table -->
@ -107,9 +107,9 @@
<label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label> <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
<div class="col-8"> <div class="col-8">
<div class="progress"> <div class="progress">
<div id="tankremain_maint" class="data-tankremain progress-bar text-light" role="progressbar" <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
style="width: 0%"> style="width: %TANK_REMAIN_CAPACITY%&#37;">
%TANK_REMAIN_CAPACITY%&#37; %TANK_REMAIN_CAPACITY%&#37;
</div> </div>
</div> </div>
@ -129,10 +129,10 @@
<h4>Entl&uuml;ftung</h4> <h4>Entl&uuml;ftung</h4>
<form action="post.htm" method="POST" class="form-horizontal"> <form action="post.htm" method="POST" class="form-horizontal">
<div class="form-group row"> <div class="form-group row">
<label for="bleedingpulses" class="control-label col-4">Entl&uuml;ftung Dosierung</label> <label for="BleedingPulses" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="bleedingpulses" name="bleedingpulses" value="0" type="text" class="data-bleedingpulses form-control"> <input id="BleedingPulses" name="BleedingPulses" value="0" type="text" class="form-control">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">Pulse</span> <span class="input-group-text">Pulse</span>
</div> </div>
@ -258,10 +258,7 @@
<div class="form-group row"> <div class="form-group row">
<label for="sourceselect" class="control-label col-4">Schnittstelle</label> <label for="sourceselect" class="control-label col-4">Schnittstelle</label>
<div class="col-8"> <div class="col-8">
<select id="sourceselect" name="sourceselect" class="data-sourceselect select form-control"> <select id="sourceselect" name="sourceselect" class="select form-control">
<option value="Impuls">Impuls</option>
<option value="GPS">GPS</option>
<option value="CAN-Bus">CAN-Bus</option>
</select> </select>
</div> </div>
</div> </div>
@ -282,7 +279,7 @@
</p> </p>
<!-- Div Group Signal Source --> <!-- Div Group Signal Source -->
<!-- Div Group Source:Impulse Settings--> <!-- Div Group Source:Impulse Settings-->
<div id="showimpulse" class="data-showimpulse removeable"> <div id="showimpulse" class="removeable">
<hr /> <hr />
<p> <p>
<h4>Einstellungen Impulseingang</h4> <h4>Einstellungen Impulseingang</h4>
@ -292,7 +289,7 @@
<label for="tirewidth" class="control-label col-4">Reifenbreite</label> <label for="tirewidth" class="control-label col-4">Reifenbreite</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="tirewidth" name="tirewidth" type="text" required="required" class="data-tirewidth form-control"> <input id="tirewidth" name="tirewidth" type="text" required="required" class="form-control">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
@ -304,7 +301,7 @@
<label for="tireratio" class="control-label col-4">Höhe/Breite-Verhältniss</label> <label for="tireratio" class="control-label col-4">Höhe/Breite-Verhältniss</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="tireratio" name="tireratio" type="text" required="required" class="data-tireratio form-control"> <input id="tireratio" name="tireratio" type="text" required="required" class="form-control">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
@ -315,7 +312,7 @@
<label for="tiredia" class="control-label col-4">Felgendurchmesser</label> <label for="tiredia" class="control-label col-4">Felgendurchmesser</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="tiredia" name="tiredia" type="text" required="required" class="data-tiredia form-control"> <input id="tiredia" name="tiredia" type="text" required="required" class="form-control">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">"</span> <span class="input-group-text">"</span>
</div> </div>
@ -326,7 +323,7 @@
<label for="pulserev" class="control-label col-4">Pulse pro Umdrehung</label> <label for="pulserev" class="control-label col-4">Pulse pro Umdrehung</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="pulserev" name="pulserev" type="text" required="required" class="data-pulserev form-control"> <input id="pulserev" name="pulserev" type="text" required="required" class="form-control">
<div class="input-group-addon"></div> <div class="input-group-addon"></div>
</div> </div>
</div> </div>
@ -341,7 +338,7 @@
</div> </div>
<!-- Div Group Source:Impulse Settings--> <!-- Div Group Source:Impulse Settings-->
<!-- Div Group Source:CAN Settings--> <!-- Div Group Source:CAN Settings-->
<div id="showcan" class="data-showcan removeable"> <div id="showcan" class="removeable">
<hr /> <hr />
<p> <p>
<h4>Einstellungen CAN-Bus</h4> <h4>Einstellungen CAN-Bus</h4>
@ -349,9 +346,7 @@
<div class="form-group row"> <div class="form-group row">
<label for="cansource" class="control-label col-4">Model</label> <label for="cansource" class="control-label col-4">Model</label>
<div class="col-8"> <div class="col-8">
<select id="cansource" name="cansource" class="data-cansource select form-control"> <select id="cansource" name="cansource" class="select form-control">
<option value="KTM 890 Adventure R (2021)">KTM 890 Adventure R (2021)</option>
<option value="KTM 1290 Superduke R (2023)">KTM 1290 Superduke R (2023)</option>
</select> </select>
</div> </div>
</div> </div>
@ -365,7 +360,7 @@
</div> </div>
<!-- Div Group Source:CAN Settings--> <!-- Div Group Source:CAN Settings-->
<!-- Div Group Source:GPS Settings--> <!-- Div Group Source:GPS Settings-->
<div id="showgps" class="data-showgps removeable"> <div id="showgps" class="removeable">
<hr /> <hr />
<p> <p>
<h4>Einstellungen GPS</h4> <h4>Einstellungen GPS</h4>
@ -373,7 +368,7 @@
<div class="form-group row"> <div class="form-group row">
<label for="gpsbaud" class="control-label col-4">Baudrate</label> <label for="gpsbaud" class="control-label col-4">Baudrate</label>
<div class="col-8"> <div class="col-8">
<select id="gpsbaud" name="gpsbaud" class="data-gpsbaud select form-control"> <select id="gpsbaud" name="gpsbaud" class="select form-control">
</select> </select>
</div> </div>
</div> </div>
@ -396,7 +391,7 @@
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="lubedistancenormal" name="lubedistancenormal" type="text" <input id="lubedistancenormal" name="lubedistancenormal" type="text"
class="data-lubedistancenormal form-control" required="required"> class="form-control" required="required">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">m</span> <span class="input-group-text">m</span>
</div> </div>
@ -408,7 +403,7 @@
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="lubedistancerain" name="lubedistancerain" type="text" <input id="lubedistancerain" name="lubedistancerain" type="text"
class="data-lubedistancerain form-control" required="required"> class="form-control" required="required">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">m</span> <span class="input-group-text">m</span>
</div> </div>
@ -432,7 +427,7 @@
<label for="tankcap" class="control-label col-4">Tankkapazität</label> <label for="tankcap" class="control-label col-4">Tankkapazität</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="tankcap" name="tankcap" type="text" class="data-tankcap form-control" <input id="tankcap" name="tankcap" type="text" class="form-control"
required="required"> required="required">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">ml</span> <span class="input-group-text">ml</span>
@ -444,7 +439,7 @@
<label for="tankwarn" class="control-label col-4">Leer-Warnung</label> <label for="tankwarn" class="control-label col-4">Leer-Warnung</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="tankwarn" name="tankwarn" type="text" class="data-tankwarn form-control" <input id="tankwarn" name="tankwarn" type="text" class="form-control"
required="required"> required="required">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">&#37;</span> <span class="input-group-text">&#37;</span>
@ -456,7 +451,7 @@
<label for="pumppulse" class="control-label col-4">Menge pro Puls</label> <label for="pumppulse" class="control-label col-4">Menge pro Puls</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="pumppulse" name="pumppulse" type="text" class="data-pumppulse form-control" <input id="pumppulse" name="pumppulse" type="text" class="form-control"
required="required"> required="required">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">µl</span> <span class="input-group-text">µl</span>
@ -481,7 +476,7 @@
<label for="ledmodeflash" class="control-label col-4">LED Modus blinken</label> <label for="ledmodeflash" class="control-label col-4">LED Modus blinken</label>
<div class="col-8"> <div class="col-8">
<div class="form-check"> <div class="form-check">
<input class="data-ledmodeflash form-check-input" type="checkbox" name="ledmodeflash" id="ledmodeflash"> <input class="form-check-input" type="checkbox" name="ledmodeflash" id="ledmodeflash">
<label class="form-check-label" for="ledmodeflash"> <label class="form-check-label" for="ledmodeflash">
LED blinken LED blinken
</label> </label>
@ -493,7 +488,7 @@
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="ledmaxbrightness" name="ledmaxbrightness" type="text" <input id="ledmaxbrightness" name="ledmaxbrightness" type="text"
class="data-ledmaxbrightness form-control" required="required"> class="form-control" required="required">
</div> </div>
</div> </div>
</div> </div>
@ -502,7 +497,7 @@
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="ledminbrightness" name="ledminbrightness" type="text" <input id="ledminbrightness" name="ledminbrightness" type="text"
class="data-ledminbrightness form-control" required="required"> class="form-control" required="required">
</div> </div>
</div> </div>
</div> </div>

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

@ -141,29 +141,24 @@ function do_resize(textbox) {
function fillValuesToHTML(dataset) { function fillValuesToHTML(dataset) {
for (var key in dataset) { for (var key in dataset) {
var key_prefixed = "data-" + key; var element = document.getElementById(key);
var elements = document.getElementsByClassName(key_prefixed);
if (elements.length > 0) { if (element) {
for (var i = 0; i < elements.length; i++) { if (element.type === "checkbox") {
var element = elements[i]; // Wenn das Element ein Kontrollkästchen ist
element.checked = dataset[key] == 1 ? true : false;
if (element.type === "checkbox") { } else if (element.tagName === "SELECT") {
// Wenn das Element ein Kontrollkästchen ist // Wenn das Element ein Dropdown ist
element.checked = dataset[key] == 1 ? true : false; setDropdownValue(element, dataset[key]);
} else if (element.tagName === "SELECT") { } else if (element.classList.contains("progress-bar")) {
// Wenn das Element ein Dropdown ist // Wenn das Element eine Fortschrittsleiste ist
setDropdownValue(element, dataset[key]); updateProgressBar(element, dataset[key]);
} else if (element.classList.contains("progress-bar")) { } else if (element.classList.contains("removeable")) {
// Wenn das Element eine Fortschrittsleiste ist // Wenn das Element ein Settingsabschnitt-div ist
updateProgressBar(element, dataset[key]); if (dataset[key] == 0) element.remove();
} else if (element.classList.contains("removeable")) { } else {
// Wenn das Element ein Settingsabschnitt-div ist // Standardmäßig für Textfelder und andere Elemente
if (dataset[key] == 0) element.remove(); element.value = dataset[key];
} else {
// Standardmäßig für Textfelder und andere Elemente
element.value = dataset[key];
}
} }
} }
} }

8
Software/src/main.cpp
View File

@ -169,7 +169,7 @@ void setup()
ArduinoOTA.onStart([]() ArduinoOTA.onStart([]()
{ {
u8x8.clearDisplay(); u8x8.clearDisplay();
u8x8.drawString(0, 6, "OTA-Update"); u8x8.drawString(0, 0, "OTA-Update");
u8x8.refreshDisplay(); }); u8x8.refreshDisplay(); });
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
@ -179,17 +179,17 @@ void setup()
{ {
u8x8.clearDisplay(); u8x8.clearDisplay();
refreshed = true; refreshed = true;
u8x8.drawString(0, 6, "OTA Upload"); u8x8.drawString(0, 0, "OTA Upload");
} }
uint32_t percent = progress / (total / 100); uint32_t percent = progress / (total / 100);
u8x8.setCursor(0, 7); u8x8.setCursor(0, 1);
u8x8.printf("%d %%", percent); u8x8.printf("%d %%", percent);
u8x8.refreshDisplay(); }); u8x8.refreshDisplay(); });
ArduinoOTA.onEnd([]() ArduinoOTA.onEnd([]()
{ {
u8x8.clearDisplay(); u8x8.clearDisplay();
u8x8.drawString(0, 6, "OTA-Restart"); u8x8.drawString(0, 0, "OTA-Restart");
u8x8.refreshDisplay(); }); u8x8.refreshDisplay(); });
#endif #endif

8
Software/src/webui.cpp
View File

@ -617,9 +617,9 @@ void Websocket_RefreshClientData_Status(uint32_t client_id, bool send_mapping)
if (send_mapping) if (send_mapping)
{ {
const char mapping[] = "MAPPING_STATUS:" const char mapping[] = "MAPPING_STATUS:"
"systemstatus;" "SystemStatus;"
"tankremain;" "tankremain;"
"odometer;"; "Odometer;";
if (client_id > 0) if (client_id > 0)
webSocket.text(client_id, mapping); webSocket.text(client_id, mapping);
@ -668,6 +668,7 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
"tirewidth;" "tirewidth;"
"tireratio;" "tireratio;"
"tiredia;" "tiredia;"
"DistancePerRevolution_mm;"
"sourceselect;" "sourceselect;"
"gpsbaud;" "gpsbaud;"
"cansource;" "cansource;"
@ -677,7 +678,7 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
"showimpulse;" "showimpulse;"
"showgps;" "showgps;"
"showcan;" "showcan;"
"bleedingpulses;"; "BleedingPulses;";
if (client_id > 0) if (client_id > 0)
webSocket.text(client_id, mapping); webSocket.text(client_id, mapping);
@ -696,6 +697,7 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
temp.concat(String(LubeConfig.TireWidth_mm) + ";"); temp.concat(String(LubeConfig.TireWidth_mm) + ";");
temp.concat(String(LubeConfig.TireWidthHeight_Ratio) + ";"); temp.concat(String(LubeConfig.TireWidthHeight_Ratio) + ";");
temp.concat(String(LubeConfig.RimDiameter_Inch) + ";"); temp.concat(String(LubeConfig.RimDiameter_Inch) + ";");
temp.concat(String(LubeConfig.DistancePerRevolution_mm) + ";");
temp.concat(String(SpeedSourceString[LubeConfig.SpeedSource]) + ";"); temp.concat(String(SpeedSourceString[LubeConfig.SpeedSource]) + ";");
temp.concat(String(GPSBaudRateString[LubeConfig.GPSBaudRate]) + ";"); temp.concat(String(GPSBaudRateString[LubeConfig.GPSBaudRate]) + ";");
temp.concat(String(CANSourceString[LubeConfig.CANSource]) + ";"); temp.concat(String(CANSourceString[LubeConfig.CANSource]) + ";");