Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

design fix in WebUI

Browse Source
This commit is contained in:
Marcel Peterkau 2024-06-06 22:18:37 +02:00
parent 0763fe2181
commit 29b690b68b
3 changed files with 2241 additions and 2135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

538
Software/data_src/index.htm
View File

@ -4,19 +4,19 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Dark Emergency Timer</title> <title>Dark Emergency Timer</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="static/css/bootstrap.min.css"> <link rel="stylesheet" href="static/css/bootstrap.min.css" />
<link rel="stylesheet" href="static/css/custom.css"> <link rel="stylesheet" href="static/css/custom.css" />
<link rel="stylesheet" href="static/css/tweaks.css"> <link rel="stylesheet" href="static/css/tweaks.css" />
<script src="static/js/jquery.min.js"></script> <script src="static/js/jquery.min.js"></script>
<script src="static/js/bootstrap.min.js"></script> <script src="static/js/bootstrap.min.js"></script>
<script src="static/js/websocket.js"></script> <script src="static/js/websocket.js"></script>
<script src="static/js/dtc_table.js"></script> <script src="static/js/dtc_table.js"></script>
<script src="static/js/script.js"></script> <script src="static/js/script.js"></script>
<link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png" />
<link rel="manifest" href="static/img/site.webmanifest"> <link rel="manifest" href="static/img/site.webmanifest" />
</head> </head>
<body> <body>
@ -31,44 +31,47 @@
<!-- Notification-Container --> <!-- Notification-Container -->
<div id="notification-container" class="notification-container"></div> <div id="notification-container" class="notification-container"></div>
<!-- Notification-Container --> <!-- Notification-Container -->
<nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1"> <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
<a class="navbar-brand" href="#"> <a class="navbar-brand" href="#">
<img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt=""> <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="" />
<span class="data-devicename">DE Airsoft Timer</span> <span class="data-devicename">DE Airsoft Timer</span>
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="collapsingNavbar"> <div class="collapse navbar-collapse" id="collapsingNavbar">
<ul class="navbar-nav nav mr-auto mt-2 mt-lg-0"> <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
<li class="nav-item">
<li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li> <a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a>
<li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a></li> </li>
<li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a></li> <li class="nav-item">
<li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li> <a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a>
</li>
<li class="nav-item">
<a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a>
</li>
<li class="nav-item">
<a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a>
</li>
</ul> </ul>
</div> </div>
</nav> </nav>
<main class="container"> <main class="container">
<!-- Tabs Content --> <!-- Tabs Content -->
<div class="tab-content"> <div class="tab-content">
<!-- Div Tab Home--> <!-- Div Tab Home-->
<div id="tab_home" class="tab-pane fade show active" role="tabpanel"> <div id="tab_home" class="tab-pane fade show active" role="tabpanel">
<div class="col text-center"> <div class="col text-center">
<div class="jumbotron"> <div class="jumbotron">
<img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt=""> <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="" />
<h3 class="pt-3"><span class="data-devicename">DE Airsoft Timer</span></h3> <h3 class="pt-3">
<span class="data-devicename">DE Airsoft Timer</span>
</h3>
</div> </div>
</div> </div>
<!-- Div Group Battery remain --> <!-- Div Group Battery remain -->
<hr /> <hr />
<p>
<h4>Akkuladestand</h4> <h4>Akkuladestand</h4>
<div class="progress"> <div class="progress">
<div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0" <div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0"
@ -76,53 +79,77 @@
0 0
</div> </div>
</div> </div>
</p>
<!-- Div Group Battery remain --> <!-- Div Group Battery remain -->
<!-- Div Group current Mode --> <!-- Div Group current Mode -->
<hr /> <hr />
<p>
<h4>aktueller Modus</h4> <h4>aktueller Modus</h4>
<input class="data-systemstatus form-control" type="text" id="sysstatus" readonly> <input class="data-systemstatus form-control" type="text" id="sysstatus" readonly />
</p>
<!-- Div Group current Mode --> <!-- Div Group current Mode -->
<!-- Div Group Faction Points --> <!-- Div Group Faction Points -->
<hr /> <hr />
<p>
<h4>aktueller Punktestand</h4> <h4>aktueller Punktestand</h4>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">%NAME_FAC_1%</div> <div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">
<div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">%NAME_FAC_2%</div> %NAME_FAC_1%
<div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">%NAME_FAC_3%</div> </div>
<div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">
%NAME_FAC_2%
</div>
<div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">
%NAME_FAC_3%
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1"> <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1">
<img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="..."> <div class="glow-container">
<img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="..." />
</div>
</div> </div>
<div class="col bg-dark text-white p-3 data-activefaction faction-logo faction2"> <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction2 glow-active-faction">
<img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="..."> <div class="glow-container">
<img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="..." />
</div>
</div> </div>
<div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3"> <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3">
<img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="..."> <div class="glow-container">
<img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="..." />
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div id="time_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">0</div> <div id="time_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">
<div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">0</div> 0
<div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">0</div> </div>
<div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">
0
</div>
<div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">
0
</div>
</div> </div>
<div class="row mt-3"> <div class="row mt-3">
<div class="col text-center"><button id="faction1" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div> <div class="col text-center">
<div class="col text-center"><button id="faction2" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div> <button id="faction1" class="btn-wsevent btn btn-outline-primary">
<div class="col text-center"><button id="faction3" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div> Aktivieren
</button>
</div>
<div class="col text-center">
<button id="faction2" class="btn-wsevent btn btn-outline-primary">
Aktivieren
</button>
</div>
<div class="col text-center">
<button id="faction3" class="btn-wsevent btn btn-outline-primary">
Aktivieren
</button>
</div>
</div> </div>
</div> </div>
</p>
<!-- Div GroupFaction Points --> <!-- Div GroupFaction Points -->
<!-- Div Group DTC Table --> <!-- Div Group DTC Table -->
<div id="dtc_container" hidden> <div id="dtc_container" hidden>
<hr /> <hr />
<p>
<h4>Fehlercodes</h4> <h4>Fehlercodes</h4>
<table class="table" id="dtc_table"> <table class="table" id="dtc_table">
<tbody> <tbody>
@ -134,262 +161,251 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</p>
</div> </div>
<!-- Div Group DTC Table --> <!-- Div Group DTC Table -->
</div> </div>
<!-- Div Tab Home--> <!-- Div Tab Home-->
<!-- Div Tab Maintenance --> <!-- Div Tab Maintenance -->
<div id="tab_maintenance" class="tab-pane fade" role="tabpanel"> <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
<h3>Wartung</h3> <h3>Wartung</h3>
<!-- Div Group Reset Timers --> <!-- Div Group Reset Timers -->
<hr /> <hr />
<p>
<h4>Punkte zur&uuml;cksetzen</h4> <h4>Punkte zur&uuml;cksetzen</h4>
<div class="form-group row"> <div class="form-group row">
<div class="col text-center"> <div class="col text-center">
<button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">Timer zurücksetzen</button> <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">
Timer zurücksetzen
</button>
</div> </div>
</div> </div>
</p>
<!-- Div Group Reset Timers --> <!-- Div Group Reset Timers -->
<!-- Div Group LiveDebug --> <!-- Div Group LiveDebug -->
<hr /> <hr />
<p> <h4>Live Debug</h4>
<h4>Live Debug</h4> <div class="form-group row">
<div class="form-group row"> <input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control" />
<input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control"> </div>
</div> <div class="form-group row">
<div class="form-group row"> <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
<textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea> </div>
</div> <div class="form-group row">
<div class="form-group row"> <div class="col text-center">
<div class="col text-center"> <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">
<button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">Start</button> Start
<button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">Stop</button> </button>
</div> <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">
</div> Stop
</p> </button>
<!-- Div Group LiveDebug --> </div>
<!-- Div Group Device Reboot --> </div>
<hr /> <!-- Div Group LiveDebug -->
<p> <!-- Div Group Device Reboot -->
<h4>Ger&auml;t neustarten</h4> <hr />
<div class="form-group row"> <h4>Ger&auml;t neustarten</h4>
<div class="col text-center"> <div class="form-group row">
<button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">Reboot</button> <div class="col text-center">
</div> <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">
</div> Reboot
</p> </button>
<!-- Div Group Device Reboot --> </div>
</div> </div>
<!-- Div Tab Maintenance --> <!-- Div Group Device Reboot -->
</div>
<!-- Div Tab Settings--> <!-- Div Tab Maintenance -->
<div id="tab_source" class="tab-pane fade" role="tabpanel"> <!-- Div Tab Settings-->
<h3>Einstellungen</h3> <div id="tab_source" class="tab-pane fade" role="tabpanel">
<!-- Div Group Battery Type --> <h3>Einstellungen</h3>
<hr /> <!-- Div Group Battery Type -->
<p> <hr />
<h4>Akku</h4> <h4>Akku</h4>
<div class="form-group row"> <div class="form-group row">
<label for="batterytype" class="control-label col-4">Akku-Variante</label> <label for="batterytype" class="control-label col-4">Akku-Variante</label>
<div class="col-8"> <div class="col-8">
<select id="batterytype" class="set-wsevent data-batterytype select form-control"> <select id="batterytype" class="set-wsevent data-batterytype select form-control">
<option value="Undefined">Undefined</option> <option value="Undefined">Undefined</option>
<option value="LiPo 3S">LiPo 3S</option> <option value="LiPo 3S">LiPo 3S</option>
<option value="LiPo 2S">LiPo 2S</option> <option value="LiPo 2S">LiPo 2S</option>
</select> </select>
</div>
</div>
<!-- Div Group Battery Type -->
<!-- Div Group Timer Settings -->
<hr />
<h4>Timer Einstellungen</h4>
<div class="form-group row">
<label for="active_faction_on_reboot" class="control-label col-4">Aktive Fraktion wiederherstellen</label>
<div class="col-8">
<div class="form-check">
<input class="set-wsevent data-active_faction_on_reboot form-check-input" type="checkbox"
id="active_faction_on_reboot" />
<label class="form-check-label" for="active_faction_on_reboot">
aktivieren
</label>
</div>
</div>
</div>
<div class="form-group row">
<label for="name_faction1" class="control-label col-4">Faktion 1</label>
<div class="col-8">
<div class="input-group">
<input id="name_faction1" type="text" class="set-wsevent data-name_faction1 form-control"
required="required" />
<div class="input-group-append">
<span class="input-group-text">max. 32 Zeichen</span>
</div> </div>
</div> </div>
</p> </div>
<!-- Div Group Battery Type --> </div>
<!-- Div Group Timer Settings --> <div class="form-group row">
<hr /> <label for="name_faction2" class="control-label col-4">Faktion 2</label>
<p> <div class="col-8">
<h4>Timer Einstellungen</h4> <div class="input-group">
<div class="form-group row"> <input id="name_faction2" type="text" class="set-wsevent data-name_faction2 form-control"
<label for="active_faction_on_reboot" class="control-label col-4">Aktive Fraktion wiederherstellen</label> required="required" />
<div class="col-8"> <div class="input-group-append">
<div class="form-check"> <span class="input-group-text">max. 32 Zeichen</span>
<input class="set-wsevent data-active_faction_on_reboot form-check-input" type="checkbox" id="active_faction_on_reboot">
<label class="form-check-label" for="active_faction_on_reboot">
aktivieren
</label>
</div>
</div>
</div>
<div class="form-group row">
<label for="name_faction1" class="control-label col-4">Faktion 1</label>
<div class="col-8">
<div class="input-group">
<input id="name_faction1" type="text" class="set-wsevent data-name_faction1 form-control" required="required">
<div class="input-group-append">
<span class="input-group-text">max. 32 Zeichen</span>
</div>
</div>
</div> </div>
</div> </div>
<div class="form-group row"> </div>
<label for="name_faction2" class="control-label col-4">Faktion 2</label> </div>
<div class="col-8"> <div class="form-group row">
<div class="input-group"> <label for="name_faction3" class="control-label col-4">Faktion 3</label>
<input id="name_faction2" type="text" class="set-wsevent data-name_faction2 form-control" required="required"> <div class="col-8">
<div class="input-group-append"> <div class="input-group">
<span class="input-group-text">max. 32 Zeichen</span> <input id="name_faction3" type="text" class="set-wsevent data-name_faction3 form-control"
</div> required="required" />
</div> <div class="input-group-append">
<span class="input-group-text">max. 32 Zeichen</span>
</div> </div>
</div> </div>
<div class="form-group row"> </div>
<label for="name_faction3" class="control-label col-4">Faktion 3</label> </div>
<div class="col-8"> <!-- Div Group Timer Settings -->
<div class="input-group">
<input id="name_faction3" type="text" class="set-wsevent data-name_faction3 form-control" required="required">
<div class="input-group-append">
<span class="input-group-text">max. 32 Zeichen</span>
</div>
</div>
</div>
</div>
<!-- Div Group Timer Settings -->
<!-- Div Group Save Button--> <!-- Div Group Save Button-->
<hr /> <hr />
<p> <div class="form-group row">
<div class="form-group row"> <div class="col text-center">
<div class="col text-center"> <button id="settingssave" class="btn-wsevent btn btn-outline-primary">
<button id="settingssave" class="btn-wsevent btn btn-outline-primary">Speichern</button> Speichern
</div> </button>
</div> </div>
</p> </div>
</div> </div>
<!-- Div Tab Settings --> <!-- Div Tab Settings -->
<!-- Div Tab Firmware Update-->
<!-- Div Tab Firmware Update--> <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
<div id="tab_fwupdate" class="tab-pane fade" role="tabpanel"> <h3>Firmware</h3>
<h3>Firmware</h3> <!-- Div Group VersionInfo -->
<!-- Div Group VersionInfo --> <hr />
<hr /> <h4>Version-Info</h4>
<p> <table class="table">
<h4>Version-Info</h4> <tbody>
<table class="table"> <tr>
<tbody> <th class="col-7" scope="col">Parameter</th>
<tr> <th class="col-5" scope="col">Value</th>
<th class="col-7" scope="col">Parameter</td> </tr>
<th class="col-5" scope="col">Value</td> <tr>
</tr> <td>Firmware Version</td>
<tr> <td><span class="data-fw-version"></span></td>
<td>Firmware Version</td> </tr>
<td><span class="data-fw-version"></span></td> <tr>
</tr> <td>Flash Version</td>
<tr> <td><span class="data-flash-version"></span></td>
<td>Flash Version</td> </tr>
<td><span class="data-flash-version"></span></td> <tr>
</tr> <td>Git Revision</td>
<tr> <td><span class="data-git-revision"></span></td>
<td>Git Revision</td> </tr>
<td><span class="data-git-revision"></span></td> </tbody>
</tr> </table>
</table> <!-- Div Group VersionInfo -->
</p> <!-- Div Group EEPROM Backup -->
<!-- Div Group VersionInfo --> <hr />
<!-- Div Group EEPROM Backup --> <h4>EEPROM-Backup</h4>
<hr />
<p>
<h4>EEPROM-Backup</h4>
<div class="form-group row">
<div class="col text-center">
<a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
</div>
</div>
</p>
<!-- Div Group EEPROM Backup -->
<!-- Div Group EEPROM Restore -->
<hr />
<p>
<h4>EEPROM-Restore</h4>
<form method='POST' action='eeRestore' enctype='multipart/form-data'>
<div class="form-group row">
<div class="custom-file">
<input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
required />
<label class="custom-file-label" for="ee-restore-file">EEPROM-Backup ausw&auml;hlen</label>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col text-center"> <div class="col text-center">
<button name="submit" type="submit" class="btn btn-outline-primary">Restore starten</button> <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
</div> </div>
</div> </div>
</form> <!-- Div Group EEPROM Backup -->
</p> <!-- Div Group EEPROM Restore -->
<!-- Div Group EEPROM Restore --> <hr />
<!-- Div Group Firmware Update --> <h4>EEPROM-Restore</h4>
<hr /> <form method="POST" action="eeRestore" enctype="multipart/form-data">
<p> <div class="form-group row">
<h4>Firmware-Update</h4> <div class="custom-file">
<form method='POST' action='doUpdate' enctype='multipart/form-data'> <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
<div class="form-group row"> required />
<div class="custom-file"> <label class="custom-file-label" for="ee-restore-file">EEPROM-Backup ausw&auml;hlen</label>
<input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file" </div>
accept=".fw.bin,.fs.gz" required />
<label class="custom-file-label" for="fw-update-file">Firmware-Update ausw&auml;hlen</label>
</div> </div>
</div> <div class="form-group row">
<div class="form-group row"> <div class="col text-center">
<div class="col text-center"> <button name="submit" type="submit" class="btn btn-outline-primary">
<button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button> Restore starten
</button>
</div>
</div> </div>
</div> </form>
</form> <!-- Div Group EEPROM Restore -->
</p> <!-- Div Group Firmware Update -->
<!-- Div Group Firmware Update --> <hr />
</div> <h4>Firmware-Update</h4>
<!-- Div Tab Firmware Update--> <form method="POST" action="doUpdate" enctype="multipart/form-data">
</div> <div class="form-group row">
<!-- Tabs Content --> <div class="custom-file">
</main> <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
accept=".fw.bin,.fs.gz" required />
<!-- Footer --> <label class="custom-file-label" for="fw-update-file">Firmware-Update ausw&auml;hlen</label>
</div>
<footer class="page-footer navbar-dark bg-primary font-small fixed-bottom"> </div>
<div class="container-fluid text-center"> <div class="form-group row">
<div class="footer-copyright text-center py-3"> <div class="col text-center">
<span class="text-muted">© 2023 - <button name="submit" type="submit" class="btn btn-outline-primary">
<a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span> Update starten
</div> </button>
</div> </div>
</footer> </div>
</form>
<!-- Footer --> <!-- Div Group Firmware Update -->
<!-- Modal Dialog -->
<div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="dtcModalLabel">DTC-Description</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <!-- Div Tab Firmware Update-->
<p class="dtc-desc">DTC Description</p> </div>
<p class="dtc-debugval">DTC DebugVal</p> <!-- Tabs Content -->
</main>
<!-- Footer -->
<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 -
<a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
</div> </div>
<div class="modal-footer"> </div>
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button> </footer>
<!-- Footer -->
<!-- Modal Dialog -->
<div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="dtcModalLabel">DTC-Description</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p class="dtc-desc">DTC Description</p>
<p class="dtc-debugval">DTC DebugVal</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
Close
</button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!-- Modal Dialog -->
<!-- Modal Dialog -->
</body> </body>
</html> </html>

3832
Software/data_src/static/css/custom.css
View File

File diff suppressed because it is too large Load Diff

6
Software/src/webui.cpp
View File

@ -474,15 +474,15 @@ void Websocket_HandleButtons(uint8_t *data)
{ {
globals.systemStatus = sysStat_Shutdown; globals.systemStatus = sysStat_Shutdown;
} }
else if (strcmp(identifier, "set-faction1") == 0) else if (strcmp(identifier, "faction1") == 0)
{ {
PersistenceData.activeFaction = FACTION_1; PersistenceData.activeFaction = FACTION_1;
} }
else if (strcmp(identifier, "set-faction2") == 0) else if (strcmp(identifier, "faction2") == 0)
{ {
PersistenceData.activeFaction = FACTION_2; PersistenceData.activeFaction = FACTION_2;
} }
else if (strcmp(identifier, "set-faction3") == 0) else if (strcmp(identifier, "faction3") == 0)
{ {
PersistenceData.activeFaction = FACTION_3; PersistenceData.activeFaction = FACTION_3;
} }