fix and comments
This commit is contained in:
Marco Locatelli
@@ -66,7 +66,6 @@ try:
|
||||
redisSave(CHvalue)
|
||||
#videoPrint(CHvalue)
|
||||
#fileSave(CHvalue)
|
||||
|
||||
time.sleep(int(redSrv0.get(redSampleFreq))/1000)
|
||||
|
||||
#eccezione da ctrl+c in terminale e chiusura
|
||||
|
||||
+2
-1
@@ -52,4 +52,5 @@ Caught error: 'NoneType' object has no attribute 'decode' at time: 2021-03-23 12
|
||||
Program end. Ctrl+C from user at time: 2021-03-23 14:12:15.324783
|
||||
Program end. Ctrl+C from user at time: 2021-03-23 15:23:23.456196
|
||||
Program end. Ctrl+C from user at time: 2021-03-23 15:31:55.154641
|
||||
Program end. Ctrl+C from user at time: 2021-03-23 15:33:33.517326
|
||||
Program end. Ctrl+C from user at time: 2021-03-23 15:33:33.517326
|
||||
Program end. Ctrl+C from user at time: 2021-03-24 12:35:48.198605
|
||||
@@ -149,7 +149,7 @@ def setFrequency():
|
||||
newFrequency = request.form['LogFreq']
|
||||
redSrv0.set('RTDATA:LOG:FREQ', newFrequency)
|
||||
# rimando in settings
|
||||
return redirect("/logger")
|
||||
return redirect("/settings")
|
||||
|
||||
#dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket)
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
{% block content %}
|
||||
<main>
|
||||
<div class="container-fluid py-2">
|
||||
<div class="row">
|
||||
<br>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<a href="logger" class="btn btn-block btn-primary text-uppercase">Logger</a>
|
||||
|
||||
@@ -92,10 +92,10 @@
|
||||
<div class="collapse navbar-collapse" id="collapsibleNavbar">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="settings">Setup</a>
|
||||
<a class="nav-link" href="logger">Logger</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="logger">Logger</a>
|
||||
<a class="nav-link" href="settings">Setup</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="about">About</a>
|
||||
@@ -110,13 +110,13 @@
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
<!--fine contenuto main, inizio footer-->
|
||||
<!--fine contenuto main, inizio footer (data, ora, logo)-->
|
||||
<footer class="py-1 bg-light bg-dark text-light fixed-bottom">
|
||||
<div class="container-fluid">
|
||||
<div class="d-flex align-items-center justify-content-between small">
|
||||
<div>DataOra</div>
|
||||
<div><span id="ServerTime"></span></div>
|
||||
<div>Copyright © Steamware srl 2021
|
||||
<img src="../static/img/steam.ico" height="16" width="16">
|
||||
<img src="../static/img/steam.ico" height="24" width="24">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -39,16 +39,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<div class="alert alert-info text-center">
|
||||
<i class="fas fa-table mr-1"></i>
|
||||
Logger Time: <span id="LoggerTime"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<strong>Logger Time: </strong> <span id="LoggerTime"></span>
|
||||
<i class="fas fa-table mr-1"></i>
|
||||
Log frequency (edit in <a href="/settings">Settings</a>): <span id="LogFrequency"></span> (ms)
|
||||
<strong>Log frequency</strong> (edit in <a href="/settings">Settings</a>): <span id="LogFrequency"></span> (ms)
|
||||
</div>
|
||||
</div>
|
||||
<!--pulsanti start log e stop log-->
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<i class="fas fa-table mr-1"></i>
|
||||
Logging Frequency
|
||||
Logger Timer
|
||||
</div>
|
||||
<div class="row" id="setFrequency">
|
||||
<form class="col-12" method="POST" action="/api/v1/frequency">
|
||||
<div class="input-group">
|
||||
<span class="input-group-text">Frequenza</span>
|
||||
<input type="text" class="form-control" id="LogFreq" name="LogFreq"></input>
|
||||
<span class="input-group-text">Periodo di campionamento (ms)</span>
|
||||
<input type="number" class="form-control" id="LogFreq" name="LogFreq"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
@@ -27,24 +27,27 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="col-2 alert alert-info text-center">
|
||||
Valori Reali
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<form method="POST" action="/api/v1/min1">
|
||||
<div class="input-group mb-3">
|
||||
<span class="input-group-text">MIN</span>
|
||||
<span class="input-group-text">Valore Minimo</span>
|
||||
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
|
||||
<input type="text" class="form-control" id="MinCh1" name="MinCh1"></input>
|
||||
<input type="number" class="form-control" id="MinCh1" name="MinCh1"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="col-5">
|
||||
<form method="POST" action="/api/v1/max1">
|
||||
<div class="input-group mb-3">
|
||||
<span class="input-group-text">MAX</span>
|
||||
<span class="input-group-text">Valore Massimo</span>
|
||||
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
|
||||
<input type="text" class="form-control" id="MaxCh1" name="MaxCh1"></input>
|
||||
<input type="number" class="form-control" id="MaxCh1" name="MaxCh1"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
@@ -52,32 +55,28 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<i class="fas fa-table mr-1"></i>
|
||||
Channel 2 Settings
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<form method="POST" action="/api/v1/min2">
|
||||
<div class="col-2 alert alert-info text-center">
|
||||
Valori Scalati
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<form method="POST" action="/api/v1/min1">
|
||||
<div class="input-group mb-3">
|
||||
<span class="input-group-text">MIN</span>
|
||||
<span class="input-group-text">Valore Minimo</span>
|
||||
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
|
||||
<input type="text" class="form-control" id="MinCh2" name="MinCh2"></input>
|
||||
<input type="number" class="form-control" id="MinCh1" name="MinCh1"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<form method="POST" action="/api/v1/max2">
|
||||
<div class="col-5">
|
||||
<form method="POST" action="/api/v1/max1">
|
||||
<div class="input-group mb-3">
|
||||
<span class="input-group-text">MAX</span>
|
||||
<span class="input-group-text">Valore Massimo</span>
|
||||
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
|
||||
<input type="text" class="form-control" id="MaxCh2" name="MaxCh2"></input>
|
||||
<input type="number" class="form-control" id="MaxCh1" name="MaxCh1"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
@@ -87,6 +86,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user