Merge remote-tracking branch 'origin/develop'
This commit is contained in:
Samuele Locatelli
@@ -37,11 +37,11 @@ redSrv0.set('SETTINGS:POWER:OFF',0)
|
||||
if redSrv0.get('SETTINGS:WARNING:EXETIME') is None:
|
||||
redSrv0.set('SETTINGS:WARNING:EXETIME',0)
|
||||
if redSrv0.get('SETTINGS:LOG:FREQ') is None:
|
||||
redSrv0.set('SETTINGS:LOG:FREQ', 50)
|
||||
redSrv0.set('SETTINGS:LOG:FREQ', 100)
|
||||
if redSrv0.get('SETTINGS:DECIMALS:COUNT') is None:
|
||||
redSrv0.set('SETTINGS:DECIMALS:COUNT',1)
|
||||
if redSrv0.get('RTDATA:VALUE:K1CONST') is None:
|
||||
redSrv0.set('RTDATA:VALUE:K1CONST', 1)
|
||||
redSrv0.set('RTDATA:VALUE:K1CONST', 0)
|
||||
if redSrv0.get('RTDATA:VALUE:K2CONST') is None:
|
||||
redSrv0.set('RTDATA:VALUE:K2CONST', 1)
|
||||
if redSrv0.get('RTDATA:VALUE:OFFSET') is None:
|
||||
@@ -51,7 +51,7 @@ if redSrv0.get('SETTINGS:POWER:UPTIME') is None:
|
||||
if redSrv0.get('SETTINGS:POWER:CH') is None:
|
||||
redSrv0.set('SETTINGS:POWER:CH', 10)
|
||||
if redSrv0.get('RTDATA:VALUE:UMEASURE') is None:
|
||||
redSrv0.set('RTDATA:VALUE:UMEASURE', "-")
|
||||
redSrv0.set('RTDATA:VALUE:UMEASURE', "kOhm")
|
||||
if redSrv0.get('SETTINGS:LOG:EXETIME') is None:
|
||||
redSrv0.set('SETTINGS:LOG:EXETIME', 1)
|
||||
if redSrv0.get('RTDATA:VALUE:SMOOTHED') is None:
|
||||
@@ -75,9 +75,9 @@ if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
|
||||
if redSrv0.get('SETTINGS:SELECTED_CH') is None:
|
||||
redSrv0.set('SETTINGS:SELECTED_CH',0)
|
||||
if redSrv0.get('SETTINGS:CHANNEL:A') is None:
|
||||
redSrv0.set('SETTINGS:CHANNEL:A',0)
|
||||
redSrv0.set('SETTINGS:CHANNEL:A',2)
|
||||
if redSrv0.get('SETTINGS:CHANNEL:B') is None:
|
||||
redSrv0.set('SETTINGS:CHANNEL:B',1)
|
||||
redSrv0.set('SETTINGS:CHANNEL:B',3)
|
||||
if redSrv0.get('RTDATA:SESSION:NAME') is None:
|
||||
redSrv0.set('RTDATA:SESSION:NAME',"")
|
||||
|
||||
@@ -91,7 +91,7 @@ for numCh in range(0,8,+1):
|
||||
if redSrv0.get('SETTINGS:OUT:MIN:'+str(numCh)) is None:
|
||||
redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0)
|
||||
if redSrv0.get('SETTINGS:UNIT:MEASURE:'+str(numCh)) is None:
|
||||
redSrv0.set('SETTINGS:UNIT:MEASURE:'+str(numCh),"-")
|
||||
redSrv0.set('SETTINGS:UNIT:MEASURE:'+str(numCh),"V")
|
||||
if redSrv0.get('RTDATA:CH:'+str(numCh)) is None:
|
||||
redSrv0.set('RTDATA:CH:'+str(numCh),1)
|
||||
if redSrv0.get('RTDATA:OUT:'+str(numCh)) is None:
|
||||
|
||||
+3
-14
@@ -484,20 +484,9 @@ def setScale():
|
||||
|
||||
@flaskApp.route("/api/v1/setup/resetSettings", methods=['POST'])
|
||||
def resetSetup():
|
||||
#resetto i campi di redis alla situazione di partenza
|
||||
redSrv0.set('SETTINGS:LOG:FREQ',100)
|
||||
redSrv0.set('SETTINGS:WRITE:FREQ',1000)
|
||||
redSrv0.set('SETTINGS:LOG:STATUS',0)
|
||||
redSrv0.set('SETTINGS:SELECTED_CH',0)
|
||||
for numCh in range(0,8,+1):
|
||||
redSrv0.set('SETTINGS:IN:MAX:'+str(numCh),100)
|
||||
redSrv0.set('SETTINGS:IN:MIN:'+str(numCh),0)
|
||||
redSrv0.set('SETTINGS:OUT:MAX:'+str(numCh),100)
|
||||
redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0)
|
||||
redSrv0.set('SETTINGS:UNIT:MEASURE:'+str(numCh),"-")
|
||||
# rimando in settings
|
||||
redSrv0.save()
|
||||
return redirect("/settings")
|
||||
FTL.FTLog.Write(" FTServer asked redis flushall")
|
||||
os.system("sudo redis-cli flushall")
|
||||
return redirect("/logger")
|
||||
|
||||
@flaskApp.route("/api/v1/setup/poweroff", methods=['PUT'])
|
||||
def FTShutdown():
|
||||
|
||||
@@ -22,14 +22,12 @@
|
||||
</script>
|
||||
<div class="card my-2">
|
||||
<div class="card-header">
|
||||
<h4>FT Logger</h4>
|
||||
<h4>FTLogger</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
Egalware 2022
|
||||
<br>
|
||||
Software di lettura e scrittura per canali analogici e digitali
|
||||
<br>
|
||||
V 1.6.0
|
||||
Ver 1.6.1
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
timeout = setTimeout(dataRefresh, intTime);
|
||||
};
|
||||
|
||||
//funzione deleteData: chiamata per eliminare il contenuto della cartella /data
|
||||
//funzione powerOff: chiede conferma per spegnimento.
|
||||
function powerOff(){
|
||||
var R = confirm("Spegnere il sistema?");
|
||||
if (R == true){
|
||||
|
||||
@@ -51,11 +51,15 @@
|
||||
<strong>Data e ora</strong>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="col-12 row input-group my-2">
|
||||
<label for="dateTimeInput" class="input-group-text col-4">Data Interna: </label>
|
||||
<div class="col-8"><span id="ServerTime" class="input-group-text"></span></div>
|
||||
</div>
|
||||
<form class="col-12" method="POST" action="/api/v1/setup/dateTime">
|
||||
<div class="row input-group my-2">
|
||||
<label for="dateTimeInput" class="input-group-text col-3">Data e Ora: </label>
|
||||
<label for="dateTimeInput" class="input-group-text col-4">Imposta Data: </label>
|
||||
<input type="datetime-local" class="col-6" id="dateTimeInput" name="dateTimeInput">
|
||||
<input type="submit" value="Conferma" class="btn btn-success col-3">
|
||||
<input type="submit" value="SET" class="btn btn-success col-2">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -174,6 +174,17 @@
|
||||
,url: "/api/v1/setup/selectProcessing/" + ddlProcessing.value
|
||||
,data: ""
|
||||
});
|
||||
};
|
||||
|
||||
//funzione powerOff: chiede conferma per spegnimento.
|
||||
function settingsReset(){
|
||||
var R = confirm("Reset impostazioni?");
|
||||
if (R == true){
|
||||
$.ajax({
|
||||
type: 'POST'
|
||||
,url: "/api/v1/setup/resetSettings"
|
||||
,data: ""
|
||||
})};
|
||||
};
|
||||
|
||||
</script>
|
||||
@@ -186,7 +197,7 @@
|
||||
<form class="col-12" method="POST" action="/api/v1/setup/passwordInput">
|
||||
<div class="row input-group my-2">
|
||||
<span class="input-group-text col-3">Password: </span>
|
||||
<input type="password" class=" form-control col-6" id="PasswordForm" name="PasswordForm"></input>
|
||||
<input type="password" placeholder="Password" class=" form-control col-6" id="PasswordForm" name="PasswordForm"></input>
|
||||
<input type="submit" value="Login" class="btn btn-success col-3"></input>
|
||||
</div>
|
||||
</form>
|
||||
@@ -320,13 +331,9 @@
|
||||
<div class="col-2 text-center">OUT</div>
|
||||
<div class="col-8">
|
||||
<div class="row">
|
||||
<div class="col-5 px-0">
|
||||
<input type="number" step="0.0000001" class="form-control text-center" id="MinOut" name="MinOut"></input>
|
||||
</div>
|
||||
<div class="col-5 px-0"><input type="number" step="0.0000001" class="form-control text-center" id="MinOut" name="MinOut"></input></div>
|
||||
<div class="col-2"></div>
|
||||
<div class="col-5 px-0">
|
||||
<input type="number" step="0.0000001" class="form-control text-center" id="MaxOut" name="MaxOut"></input>
|
||||
</div>
|
||||
<div class="col-5 px-0"><input type="number" step="0.0000001" class="form-control text-center" id="MaxOut" name="MaxOut"></input></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@@ -420,7 +427,7 @@
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">Fattore di Smoothing: </span>
|
||||
</div>
|
||||
<input type="number" min="1" max="50" class="form-control" id="SmoothFact" name="SmoothFact"></input>
|
||||
<input type="number" min="1" max="40" class="form-control" id="SmoothFact" name="SmoothFact"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success "></input>
|
||||
</div>
|
||||
@@ -440,7 +447,7 @@
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">Numero di cifre decimali: </span>
|
||||
</div>
|
||||
<input type="number" class="form-control" id="DecimalsCount" name="DecimalsCount"></input>
|
||||
<input type="number" min="1" max="4" class="form-control" id="DecimalsCount" name="DecimalsCount"></input>
|
||||
<div class="input-group-append">
|
||||
<input type="submit" value="SET" class="btn btn-success"></input>
|
||||
</div>
|
||||
@@ -475,11 +482,11 @@
|
||||
<form class="col-12" method="POST" action="/api/v1/threshold">
|
||||
<div class="input-group">
|
||||
<span class="input-group-text">Soglia spegnimento: </span>
|
||||
<input type="number" step="0.1" min="0" max="3.3" class="form-control" id="ChanThresh" name="ChanThresh"></input>
|
||||
<input type="number" step="0.1" min="0" max="3" class="form-control" id="ChanThresh" name="ChanThresh"></input>
|
||||
</div>
|
||||
<div class="input-group">
|
||||
<span class="input-group-text">Tempo minimo prima dello spegnimento (s): </span>
|
||||
<input type="number" min="300" class="form-control" id="MinUptime" name="MinUptime"></input>
|
||||
<span class="input-group-text">Attesa minima prima dello spegnimento: </span>
|
||||
<input type="number" min="360" class="form-control" id="MinUptime" name="MinUptime"></input>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-2"></div>
|
||||
@@ -529,17 +536,17 @@
|
||||
<strong>Ripristina impostazioni predefinite</strong>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="/api/v1/setup/resetSettings">
|
||||
<div class="row text-center">
|
||||
<div class="col-2"></div>
|
||||
<div class="col-8">
|
||||
<input type="submit" value="RESET IMPOSTAZIONI" class="btn btn-danger btn-block mt-2"></input>
|
||||
<input type="submit" value="RESET IMPOSTAZIONI" class="btn btn-danger btn-block mt-2" onclick="settingsReset()"></input>
|
||||
</div>
|
||||
<div class="col-2"></div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
</main>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user