From 01733649d94e113f356646bbc9e9beb8656aea95 Mon Sep 17 00:00:00 2001 From: Marco Locatelli Date: Mon, 11 Jul 2022 14:53:40 +0200 Subject: [PATCH 1/2] Check input variabili; Add flushall nelle settings --- sampler/FTSampler.py | 12 +++++------ server/FTServer.py | 17 +++------------- server/templates/about.html | 6 ++---- server/templates/home.html | 2 +- server/templates/layout.html | 8 ++++++-- server/templates/settings.html | 37 ++++++++++++++++++++-------------- 6 files changed, 40 insertions(+), 42 deletions(-) diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index 9533ceb..962b224 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -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: diff --git a/server/FTServer.py b/server/FTServer.py index dcda749..2016517 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -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(): diff --git a/server/templates/about.html b/server/templates/about.html index 754f803..9b6a1a6 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -22,14 +22,12 @@
-

FT Logger

+

FTLogger

Egalware 2022
- Software di lettura e scrittura per canali analogici e digitali -
- V 1.6.0 + Versione 1.6.1
diff --git a/server/templates/home.html b/server/templates/home.html index 06b141f..1334417 100644 --- a/server/templates/home.html +++ b/server/templates/home.html @@ -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){ diff --git a/server/templates/layout.html b/server/templates/layout.html index ab22bfc..1c863d6 100644 --- a/server/templates/layout.html +++ b/server/templates/layout.html @@ -51,11 +51,15 @@ Data e ora
+
+ +
+
- + - +
diff --git a/server/templates/settings.html b/server/templates/settings.html index 23d82a8..da56242 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -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: "" + })}; }; @@ -186,7 +197,7 @@
Password:   - +
@@ -320,13 +331,9 @@
OUT
-
- -
+
-
- -
+
@@ -420,7 +427,7 @@
Fattore di Smoothing:  
- +
@@ -440,7 +447,7 @@
Numero di cifre decimali:  
- +
@@ -475,11 +482,11 @@
Soglia spegnimento:   - +
- Tempo minimo prima dello spegnimento (s):   - + Attesa minima prima dello spegnimento:   +
@@ -529,17 +536,17 @@ Ripristina impostazioni predefinite
-
- +
-
+
+
{% endblock %} \ No newline at end of file From f4213b5a9853d1fb5e15eec18b6a1de7a90616f1 Mon Sep 17 00:00:00 2001 From: Marco Locatelli Date: Mon, 11 Jul 2022 14:57:41 +0200 Subject: [PATCH 2/2] 1.6.1 --- server/templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/templates/about.html b/server/templates/about.html index 9b6a1a6..24402b6 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -27,7 +27,7 @@
Egalware 2022
- Versione 1.6.1 + Ver 1.6.1