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

Compare commits

base: souko:e04351931bb86fc4ae06bb83b183d57fc3c6c232
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:7d669dc04fd5af1f42c4ad1324c1191d679e3f85
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. "e04351931bb86fc4ae06bb83b183d57fc3c6c232" and "7d669dc04fd5af1f42c4ad1324c1191d679e3f85" have entirely different histories.
e04351931b ... 7d669dc04f

8 changed files with 75 additions and 80 deletions
Show Stats Expand all files Collapse all files

134
Software/data_src/index.htm
View File

@ -20,7 +20,7 @@
<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" alt="">
KTM CAN ChainLube KTM CAN ChainLube
</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"
@ -51,7 +51,7 @@
<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">KTM CAN Chain Lube</h3> <h3>KTM CAN Chain Lube</h3>
</div> </div>
</div> </div>
<hr /> <hr />
@ -85,8 +85,8 @@
</tbody> </tbody>
</table> </table>
<p> <p>
<button class="btn btn-outline-primary" type="button" data-toggle="collapse" <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#collapseDTCDescription"
data-target="#collapseDTCDescription" aria-expanded="false" aria-controls="collapseDTCDescription"> aria-expanded="false" aria-controls="collapseDTCDescription">
DTC Beschreibung DTC Beschreibung
</button> </button>
</p> </p>
@ -102,40 +102,37 @@
<!-- Div Tab Home--> <!-- Div Tab Home-->
<!-- Div Tab Source Settings--> <!-- Div Tab Source Settings-->
<div id="tab_source" class="tab-pane fade" role="tabpanel"> <div id="tab_source" class="tab-pane fade" role="tabpanel">
<h3>Wegstreckenerfassung</h3> <h3>Erfassung Wegstrecke</h3>
<hr /> <hr />
<p> <p>
<h4>Signalquelle</h4> <h4>Signalquelle</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="sourceselect" class="control-label col-4">Schnittstelle</label> <label for="sourceselect" class="control-label col-4">Wegstrecke Quelle</label>
<div class="col-8"> <div class="col-8">
<select id="sourceselect" name="sourceselect" class="select form-control"> <select id="sourceselect" name="sourceselect" class="select form-control">
%SOURCE_SELECT_OPTIONS% %SOURCE_SELECT_OPTIONS%
</select> </select>
</div> </div>
</div> </div>
<div class="alert alert-primary alert-dismissable show fade" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<strong>Achtung!</strong><br>
Bei Änderung der Signalquelle wird der CAN-Oiler neu gestartet.
Dadurch wird die WiFi-Verbindung getrennt und muss neu aufgebaut werden.
</div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="sourcesave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button> <button name="sourcesave" type="submit" class="btn btn-primary">&Uuml;bernehmen</button>
</div> </div>
</div> </div>
</form> </form>
<div class="alert alert-warning">
<strong>Achtung!</strong><br>
Bei Änderung der Wegstrecken-Quelle wird der CAN-Oiler neu gestartet.
Dadurch wird die WiFi-Verbindung getrennt und muss neu aufgebaut werden.
</div>
</p> </p>
<!-- Div Source:Impulse Settings--> <!-- Div Source:Impulse Settings-->
<div %SHOW_IMPULSE_SETTINGS%> <div %SHOW_IMPULSE_SETTINGS%>
<hr /> <hr />
<p> <p>
<h4>Einstellungen Impulseingang</h4> <h4>Einstellungen Impuls</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="tirewidth" class="control-label col-4">Reifenbreite</label> <label for="tirewidth" class="control-label col-4">Reifenbreite</label>
@ -156,9 +153,9 @@
<div class="input-group"> <div class="input-group">
<input id="tireratio" name="tireratio" type="text" required="required" class="form-control" <input id="tireratio" name="tireratio" type="text" required="required" class="form-control"
value="%TIRE_RATIO%"> value="%TIRE_RATIO%">
<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>
</div> </div>
</div> </div>
</div> </div>
@ -168,9 +165,9 @@
<div class="input-group"> <div class="input-group">
<input id="tiredia" name="tiredia" type="text" required="required" class="form-control" <input id="tiredia" name="tiredia" type="text" required="required" class="form-control"
value="%RIM_DIAMETER%"> value="%RIM_DIAMETER%">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">"</span> <span class="input-group-text">"</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -186,7 +183,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="pulsesave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="pulsesave" type="submit" class="btn btn-primary">Speichern</button>
</div> </div>
</div> </div>
</form> </form>
@ -198,7 +195,7 @@
<hr /> <hr />
<p> <p>
<h4>Einstellungen CAN-Bus</h4> <h4>Einstellungen CAN-Bus</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="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">
@ -209,7 +206,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="cansave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="cansave" type="submit" class="btn btn-primary">Speichern</button>
</div> </div>
</div> </div>
</form> </form>
@ -221,7 +218,7 @@
<hr /> <hr />
<p> <p>
<h4>Einstellungen GPS</h4> <h4>Einstellungen GPS</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="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">
@ -232,7 +229,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="gpssave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="gpssave" type="submit" class="btn btn-primary">Speichern</button>
</div> </div>
</div> </div>
</form> </form>
@ -249,32 +246,32 @@
<p> <p>
<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="lubedistancenormal" class="control-label col-4">Normal (gr&uuml;n)</label> <label for="lubedistancenormal" class="control-label col-4">Modus:normal</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="lubedistancenormal" name="lubedistancenormal" value="%LUBE_DISTANCE_NORMAL%" type="text" <input id="lubedistancenormal" name="lubedistancenormal" value="%LUBE_DISTANCE_NORMAL%" type="text"
class="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>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="lubedistancerain" class="control-label col-4">Regen (blau)</label> <label for="lubedistancerain" class="control-label col-4">Modus:rain</label>
<div class="col-8"> <div class="col-8">
<div class="input-group"> <div class="input-group">
<input id="lubedistancerain" name="lubedistancerain" value="%LUBE_DISTANCE_RAIN%" type="text" <input id="lubedistancerain" name="lubedistancerain" value="%LUBE_DISTANCE_RAIN%" type="text"
class="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>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="oilsave" type="submit" class="btn btn-primary">Speichern</button>
</div> </div>
</div> </div>
</form> </form>
@ -288,16 +285,16 @@
<hr /> <hr />
<p> <p>
<h4>&Ouml;lvorrat</h4> <h4>&Ouml;lvorrat</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="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" value="%TANK_CAPACITY%" type="text" class="form-control" <input id="tankcap" name="tankcap" value="%TANK_CAPACITY%" 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>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -307,9 +304,9 @@
<div class="input-group"> <div class="input-group">
<input id="tankwarn" name="tankwarn" value="%TANK_REMIND%" type="text" class="form-control" <input id="tankwarn" name="tankwarn" value="%TANK_REMIND%" 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>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -319,9 +316,9 @@
<div class="input-group"> <div class="input-group">
<input id="pumppulse" name="pumppulse" value="%AMOUNT_PER_DOSE%" type="text" class="form-control" <input id="pumppulse" name="pumppulse" value="%AMOUNT_PER_DOSE%" 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>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -339,8 +336,8 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8 row"> <div class="offset-4 col-8 row">
<button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="oilsave" type="submit" class="btn btn-primary">Speichern</button>
<button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button> <button name="resettank" type="submit" class="btn btn-primary">Tank zurücksetzen</button>
</div> </div>
</div> </div>
</form> </form>
@ -348,7 +345,7 @@
<hr /> <hr />
<p> <p>
<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="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label> <label for="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
<div class="col-8"> <div class="col-8">
@ -362,8 +359,8 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8 row"> <div class="offset-4 col-8 row">
<button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button> <button name="maintsave" type="submit" class="btn btn-primary">Speichern</button>
<button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button> <button name="purgenow" type="submit" class="btn btn-primary">Entlüftung starten</button>
</div> </div>
</div> </div>
</form> </form>
@ -371,10 +368,7 @@
<hr /> <hr />
<h4>EEPROM formatieren</h4> <h4>EEPROM formatieren</h4>
<p> <p>
<div class="alert alert-primary alert-dismissable show fade" role="alert"> <div class="alert alert-warning">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<strong>Achtung!</strong><br> <strong>Achtung!</strong><br>
Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist! Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren. Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
@ -401,7 +395,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="offset-4 col-8"> <div class="offset-4 col-8">
<button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button> <button name="reset_ee_btn" type="submit" class="btn btn-primary">EEPROM formatieren</button>
</div> </div>
</div> </div>
</form> </form>
@ -542,6 +536,10 @@
<p> <p>
<h4>Firmware-Update</h4> <h4>Firmware-Update</h4>
<form method='POST' action='/doUpdate' enctype='multipart/form-data'> <form method='POST' action='/doUpdate' enctype='multipart/form-data'>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="inputGroupFileAddon01">Upload</span> <span class="input-group-text" id="inputGroupFileAddon01">Upload</span>
@ -551,6 +549,12 @@
<label class="custom-file-label" for="fw-update-file">Choose file</label> <label class="custom-file-label" for="fw-update-file">Choose file</label>
</div> </div>
</div> </div>
</form> </form>
</p> </p>
</div> </div>
@ -560,16 +564,16 @@
</main> </main>
<!-- Footer --> <!-- Footer -->
<footer class="navbar-default navbar-fixed-bottom">
<footer class="page-footer navbar-dark bg-primary font-small fixed-bottom"> <div class="container-fluid">
<div class="container-fluid text-center"> <!-- Copyright -->
<div class="footer-copyright text-center py-3"> <div class="col text-center">
<span class="text-muted">© 2022 - © 2022 Copyright:
<a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span> <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a>
</div> </div>
<!-- Copyright -->
</div> </div>
</footer> </footer>
<!-- Footer --> <!-- Footer -->
<script> <script>

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

@ -1,4 +1,5 @@
/*! Themestr.app `Darkster` Bootstrap 4.3.1 theme */ /*! Themestr.app `Darkster` Bootstrap 4.3.1 theme */
@import url(https://fonts.googleapis.com/css?family=Comfortaa:200,300,400,700);
/*! Import Bootstrap 4 variables */ /*! Import Bootstrap 4 variables */
/*! /*!

10
Software/data_src/static/css/tweaks.css
View File

@ -1,14 +1,5 @@
@font-face {
font-family: 'Comfortaa';
font-style: normal;
font-weight: 300;
src: url(../fonts/comfortaa.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
body { body {
padding-top: 70px; padding-top: 70px;
margin-bottom: 56px;
} }
hr { hr {
@ -17,4 +8,3 @@ hr {
color: gray; color: gray;
background-color: gray background-color: gray
} }

BIN
Software/data_src/static/fonts/comfortaa.woff2
View File

Binary file not shown.

2
Software/data_src/version
View File

@ -1 +1 @@
1.01 1

2
Software/prepare_littlefs.py
View File

@ -44,7 +44,7 @@ def remove_prefix(text, prefix):
def gzip_webfiles(source, target, env): def gzip_webfiles(source, target, env):
# Filetypes to compress # Filetypes to compress
filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2'] filetypes_to_gzip = ['.css', '.png', '.js', '.ico']
print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n') print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n')
data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src') data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src')
data_dir_path = env.get('PROJECT_DATA_DIR') data_dir_path = env.get('PROJECT_DATA_DIR')

2
Software/src/globals.h
View File

@ -35,7 +35,7 @@ typedef struct Globals_s
uint16_t purgePulses = 0; uint16_t purgePulses = 0;
eEERequest requestEEAction = EE_IDLE; eEERequest requestEEAction = EE_IDLE;
char DeviceName[33]; char DeviceName[33];
char FlashVersion[10]; char FlashVersion[5];
uint16_t eePersistanceAdress; uint16_t eePersistanceAdress;
uint8_t TankPercentage; uint8_t TankPercentage;
bool hasDTC; bool hasDTC;

2
Software/src/webui.cpp
View File

@ -155,7 +155,7 @@ String processor(const String &var)
temp = temp + "info"; temp = temp + "info";
break; break;
} }
temp = temp + ".png></td><td>"; temp = temp + "_black.png></td><td>";
if (DTCStorage[i].active == DTC_ACTIVE) if (DTCStorage[i].active == DTC_ACTIVE)
temp = temp + "active"; temp = temp + "active";