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

Software-Info in webUI finally works

Browse Source
This commit is contained in:
Marcel Peterkau
2025-07-18 23:55:42 +02:00
parent 546e4a1885
commit a0e5c60b72
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Software/data_src/index.htm
View File

@@ -515,15 +515,15 @@
</tr>
<tr>
<td>Firmware Version</td>
<td>%SW_VERSION%</td>
<td class="data-sw-version" id="sw-version">%SW_VERSION%</td>
</tr>
<tr>
<td>Flash Version</td>
<td>%FS_VERSION%</td>
<td class="data-fs-version" id="fs-version">%FS_VERSION%</td>
</tr>
<tr>
<td>Git Revision</td>
<td>%GIT_REV%</td>
<td class="data-git-revision" id="git-revision">%GIT_REV%</td>
</tr>
</table>
</p>
@@ -590,7 +590,7 @@
<footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
<div class="container-fluid text-center">
<div class="footer-copyright text-center py-3">
<span class="text-muted">© 2023 -
<span class="text-muted">© 2025 -
<a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
</div>
</div>

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

@@ -172,6 +172,8 @@ function fillValuesToHTML(dataset) {
} else if (element.tagName === "SELECT") {
// Wenn das Element ein Dropdown ist
setDropdownValue(element, dataset[key]);
} else if (element.tagName === "TD") {
element.innerHTML = dataset[key];
} else if (element.classList.contains("progress-bar")) {
// Wenn das Element eine Fortschrittsleiste ist
updateProgressBar(element, dataset[key]);
@@ -212,15 +214,15 @@ function showNotification(message, type) {
// Erstellen Sie ein Bootstrap-Alert-Element
var alertElement = $(
'<div class="alert alert-' +
type +
' alert-dismissible fade show notification" role="alert">' +
"<strong>" +
message +
"</strong>" +
'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
'<span aria-hidden="true">&times;</span>' +
"</button>" +
"</div>"
type +
' alert-dismissible fade show notification" role="alert">' +
"<strong>" +
message +
"</strong>" +
'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
'<span aria-hidden="true">&times;</span>' +
"</button>" +
"</div>"
);
// Fügen Sie das Alert-Element dem Container hinzu

9
Software/src/webui.cpp
View File

@@ -728,7 +728,11 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
"showcan;"
"bleedingpulses;"
"wifi-ssid;"
"wifi-pass;";
"wifi-pass;"
"sw-version;"
"fs-version;"
"git-revision;"
"speedsource-list";
if (client_id > 0)
webSocket.text(client_id, mapping);
@@ -761,6 +765,9 @@ void Websocket_RefreshClientData_Static(uint32_t client_id, bool send_mapping)
temp.concat(String(LubeConfig.BleedingPulses) + ";");
temp.concat(String(LubeConfig.wifi_client_ssid) + ";");
temp.concat(String(LubeConfig.wifi_client_password) + ";");
temp.concat(String(constants.FW_Version_major) + "." + String(constants.FW_Version_minor) + ";");
temp.concat(String(globals.FlashVersion) + ";");
temp.concat(String(constants.GitHash) + ";");
for (uint32_t i = 0; i < SpeedSourceString_Elements; i++)
{