diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index a012b87..f9914cd 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -71,9 +71,9 @@ if redSrv0.get('SETTINGS:POWER:THRESH') is None: if redSrv0.get('SETTINGS:SMOOTHING:FUNCTION') is None: redSrv0.set('SETTINGS:SMOOTHING:FUNCTION', 2) if redSrv0.get('SETTINGS:SMOOTHING:FACTOR') is None: - redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 5) + redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 10) if redSrv0.get('SETTINGS:SMOOTHING:EFACT') is None: - redSrv0.set('SETTINGS:SMOOTHING:EFACT', 8) + redSrv0.set('SETTINGS:SMOOTHING:EFACT', 3) if redSrv0.get('SETTINGS:PASSWORD:CURRENT') is None: redSrv0.set('SETTINGS:PASSWORD:CURRENT', "-") if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None: diff --git a/server/FTServer.py b/server/FTServer.py index b563461..b9c9f62 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -362,6 +362,20 @@ def insertPassword(): redSrv0.set('SETTINGS:PASSWORD:CURRENT', currentPassword, ex=3600) return redirect("/settings") +@flaskApp.route("/api/v1/setup/setupValues", methods=['PUT']) +def setupValues(): + redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 100) + redSrv0.set('SETTINGS:LOG:FREQ', 10) + redSrv0.save() + return redirect("/settings") + +@flaskApp.route("/api/v1/setup/workingValues", methods=['PUT']) +def workingValues(): + redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 25) + redSrv0.set('SETTINGS:LOG:FREQ', 20) + redSrv0.save() + return redirect("/settings") + @flaskApp.route("/api/v1/setup/saveInMin", methods=['PUT']) def setupInMin(): # devo leggere il channel attualmente selezionato @@ -446,10 +460,10 @@ def setEFact(): @flaskApp.route("/api/v1/frequency", methods=['POST']) def setWriteFrequency(): #funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq - newWriteFrequency = request.form['WriteFreq'] - redSrv0.set('SETTINGS:WRITE:FREQ', newWriteFrequency) newLogFrequency = request.form['LogFreq'] redSrv0.set('SETTINGS:LOG:FREQ', newLogFrequency) + newWriteFrequency = request.form['WriteFreq'] + redSrv0.set('SETTINGS:WRITE:FREQ', newWriteFrequency) timeBeforeWrite = request.form['TimeBeforeWrite'] redSrv0.set('SETTINGS:LOG:WAITIME', timeBeforeWrite) redSrv0.save() diff --git a/server/templates/about.html b/server/templates/about.html index 684e032..251b8a4 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -27,7 +27,7 @@
Egalware 2023
- Ver 1.8.5 + Ver 1.8.7
diff --git a/server/templates/settings.html b/server/templates/settings.html index 38a344d..f0847eb 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -45,15 +45,18 @@ $("#CalcUMeasure").val(result.CalcUMeasure); $("#MinUptime").val(result.MinUptime); // inizio nascondendo div2 e div3 + $("#Div1").show(); $("#Div2").hide(); $("#Div3").hide(); if(result.ShowDiv02 == "1") { $("#Div2").show(); + $("#Div1").hide(); } if(result.ShowDiv03 == "1") { $("#Div3").show(); + $("#Div1").hide(); } }}); } @@ -101,6 +104,34 @@ }}); }; + function setupValues(){ + $.ajax({ + type: 'PUT' + ,url: "/api/v1/setup/setupValues" + ,data: "" + ,success: function(){ + alert('Setup Values'); + } + }) + refreshInput(); + refreshSettings(); + dataRefresh(); + }; + + function workingValues(){ + $.ajax({ + type: 'PUT' + ,url: "/api/v1/setup/workingValues" + ,data: "" + ,success: function(){ + alert('Working Values'); + } + }) + refreshInput(); + refreshSettings(); + dataRefresh(); + }; + function saveMin(){ $.ajax({ type: 'PUT' @@ -182,7 +213,7 @@ }); }; - //funzione powerOff: chiede conferma per spegnimento. + //funzione Settings Reset chiede conferma prima di flushare DB redis function settingsReset(){ var R = confirm("Reset impostazioni?"); if (R == true){ @@ -288,6 +319,11 @@
+
+
+
+
+
@@ -314,7 +350,7 @@
-
+
@@ -453,6 +489,37 @@
+
+
+ + Impostazioni Timer +
+
+
+
+ Periodo di campionamento (ms):   + +
+
+ Periodo di scrittura su file (ms):   + +
+
+
+ Ritardo prima scrittura su file (s):   + +
+
+
+
+
+ +
+
+
+
+
+
@@ -527,37 +594,6 @@
-
-
- - Impostazioni Timer -
-
-
-
- Periodo di campionamento (ms):   - -
-
- Periodo di scrittura su file (ms):   - -
-
-
- Ritardo prima scrittura su file (s):   - -
-
-
-
-
- -
-
-
-
-
-