diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py
index cd9862b..ae7acfe 100644
--- a/sampler/FTSampler.py
+++ b/sampler/FTSampler.py
@@ -32,16 +32,18 @@ redSamPer='SETTINGS:LOG:EXETIME'
redSampleFreq = 'SETTINGS:LOG:FREQ'
#se non c'รจ un valore nei campi di redis, popolo il db
-redSrv0.set('SETTINGS:LOG:STATUS',0)
-redSrv0.set('SETTINGS:POWER:OFF',0)
+redSrv0.set('SETTINGS:LOG:STATUS', 0)
+redSrv0.set('SETTINGS:POWER:OFF', 0)
if redSrv0.get('SETTINGS:WARNING:EXETIME') is None:
- redSrv0.set('SETTINGS:WARNING:EXETIME',0)
+ redSrv0.set('SETTINGS:WARNING:EXETIME', 0)
if redSrv0.get('RTDATA:EWMA:VETO') is None:
- redSrv0.set('RTDATA:EWMA:VETO',0)
+ redSrv0.set('RTDATA:EWMA:VETO', 0)
if redSrv0.get('SETTINGS:LOG:FREQ') is None:
- redSrv0.set('SETTINGS:LOG:FREQ', 70)
+ redSrv0.set('SETTINGS:LOG:FREQ', 100)
if redSrv0.get('SETTINGS:DECIMALS:COUNT') is None:
- redSrv0.set('SETTINGS:DECIMALS:COUNT',1)
+ redSrv0.set('SETTINGS:DECIMALS:COUNT', 5)
+if redSrv0.get('SETTINGS:DECIMALS:DISPLAY') is None:
+ redSrv0.set('SETTINGS:DECIMALS:DISPLAY', 2)
if redSrv0.get('RTDATA:VALUE:K1CONST') is None:
redSrv0.set('RTDATA:VALUE:K1CONST', 0)
if redSrv0.get('RTDATA:VALUE:K2CONST') is None:
@@ -67,23 +69,23 @@ if redSrv0.get('RTDATA:VALUE:SMRAW') is None:
if redSrv0.get('SETTINGS:POWER:THRESH') is None:
redSrv0.set('SETTINGS:POWER:THRESH', 0)
if redSrv0.get('SETTINGS:SMOOTHING:FUNCTION') is None:
- redSrv0.set('SETTINGS:SMOOTHING:FUNCTION', 0)
+ redSrv0.set('SETTINGS:SMOOTHING:FUNCTION', 2)
if redSrv0.get('SETTINGS:SMOOTHING:FACTOR') is None:
redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 5)
if redSrv0.get('SETTINGS:SMOOTHING:EFACT') is None:
- redSrv0.set('SETTINGS:SMOOTHING:EFACT', 3)
+ redSrv0.set('SETTINGS:SMOOTHING:EFACT', 8)
if redSrv0.get('SETTINGS:PASSWORD:CURRENT') is None:
- redSrv0.set('SETTINGS:PASSWORD:CURRENT',"-")
+ redSrv0.set('SETTINGS:PASSWORD:CURRENT', "-")
if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
redSrv0.set('SETTINGS:FOLDER:CURRENT', "")
if redSrv0.get('SETTINGS:SELECTED_CH') is None:
- redSrv0.set('SETTINGS:SELECTED_CH',0)
+ redSrv0.set('SETTINGS:SELECTED_CH', 0)
if redSrv0.get('SETTINGS:CHANNEL:A') is None:
- redSrv0.set('SETTINGS:CHANNEL:A',2)
+ redSrv0.set('SETTINGS:CHANNEL:A', 2)
if redSrv0.get('SETTINGS:CHANNEL:B') is None:
- redSrv0.set('SETTINGS:CHANNEL:B',3)
+ redSrv0.set('SETTINGS:CHANNEL:B', 3)
if redSrv0.get('RTDATA:SESSION:NAME') is None:
- redSrv0.set('RTDATA:SESSION:NAME',"")
+ redSrv0.set('RTDATA:SESSION:NAME', "")
for numCh in range(0,8,+1):
if redSrv0.get('SETTINGS:IN:MAX:'+str(numCh)) is None:
diff --git a/server/FTServer.py b/server/FTServer.py
index 7c05da5..b563461 100644
--- a/server/FTServer.py
+++ b/server/FTServer.py
@@ -118,6 +118,7 @@ def api_channels_all():
'timeSrv' : getRedisVal('RTDATA:TIME:SRV'),
'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'),
'DecimalsCount' : getRedisVal('SETTINGS:DECIMALS:COUNT'),
+ 'DecimalsDisplay' : getRedisVal('SETTINGS:DECIMALS:DISPLAY'),
'Status' : getRedisVal('SETTINGS:LOG:STATUS'),
'Channels': CH,
'Outs': OUT,
@@ -181,6 +182,7 @@ def api_channels_current():
'timeSrv' : getRedisVal('RTDATA:TIME:SRV'),
'LogFreq' : getRedisVal('SETTINGS:LOG:FREQ'),
'DecimalsCount' : getRedisVal('SETTINGS:DECIMALS:COUNT'),
+ 'DecimalsDisplay' : getRedisVal('SETTINGS:DECIMALS:DISPLAY'),
'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'),
'TimeBeforeWrite' : getRedisVal('SETTINGS:LOG:WAITIME'),
'CurrIn' : getRedisVal('RTDATA:CH:'+str(numCh)),
@@ -454,15 +456,24 @@ def setWriteFrequency():
# rimando in settings
return redirect("/settings")
-@flaskApp.route("/api/v1/decimals", methods=['POST'])
+@flaskApp.route("/api/v1/decimalsCount", methods=['POST'])
def setDecimalsCount():
- #funzione set decimali, scrive su SETTINGS:DECIMALS:COUNT
+ #funzione set decimali per i calcoli, scrive su SETTINGS:DECIMALS:COUNT
newDecimalsCount = request.form['DecimalsCount']
redSrv0.set('SETTINGS:DECIMALS:COUNT', newDecimalsCount)
redSrv0.save()
# rimando in settings
return redirect("/settings")
+@flaskApp.route("/api/v1/decimalsDisplay", methods=['POST'])
+def setDecimalsDisplay():
+ #funzione set decimali da mostrare, scrive su SETTINGS:DECIMALS:DISPLAY
+ newDecimalsDisplay = request.form['DecimalsDisplay']
+ redSrv0.set('SETTINGS:DECIMALS:DISPLAY', newDecimalsDisplay)
+ redSrv0.save()
+ # rimando in settings
+ return redirect("/settings")
+
@flaskApp.route("/api/v1/kconst", methods=['POST'])
def setKConst():
#scrive su redis la costante K
diff --git a/server/templates/about.html b/server/templates/about.html
index 02cbaea..684e032 100644
--- a/server/templates/about.html
+++ b/server/templates/about.html
@@ -27,7 +27,7 @@
Egalware 2023
- Ver 1.8.4
+ Ver 1.8.5
diff --git a/server/templates/settings.html b/server/templates/settings.html
index b278d21..b4cba46 100644
--- a/server/templates/settings.html
+++ b/server/templates/settings.html
@@ -20,12 +20,14 @@
$.ajax({url: "/api/v1/channels/current", success: function(result){
// compilo i dati scaricati
numCount = parseInt(result.DecimalsCount)
+ numDisplay = parseInt(result.DecimalsDisplay)
$("#CurrIn").html(fixFloat(result.CurrIn,numCount));
$("#CurrOut").html(fixFloat(result.CurrOut, numCount));
$("#LogFreq").val(result.LogFreq);
$("#WriteFreq").val(result.WriteFreq);
$("#TimeBeforeWrite").val(result.TimeBeforeWrite);
$("#DecimalsCount").val(result.DecimalsCount);
+ $("#DecimalsDispay").val(result.DecimalsDisplay);
$("#ServerTime").html(result.timeSrv);
$("#ddlChannels").val(result.numCh);
$("#MinOut").val(result.MinOut);
@@ -60,6 +62,7 @@
$.ajax({url: "/api/v1/channels/current", success: function(result){
// compilo i dati scaricati
numCount = parseInt(result.DecimalsCount)
+ numDisplay = parseInt(result.DecimalsDisplay)
$("#CurrIn").html(fixFloat(result.CurrIn,numCount));
$("#CurrOut").html(fixFloat(result.CurrOut, numCount));
$("#LoggerTime").html(result.timeLog);
@@ -74,6 +77,7 @@
$.ajax({url: "/api/v1/channels/all", success: function(result){
numCount = parseInt(result.DecimalsCount)
+ numDisplay = parseInt(result.DecimalsDisplay)
$("#SelChannelA").val(result.ChA);
$("#ChannelA").html(fixFloat(result.Channels[result.ChA],numCount+1));
$("#OutputA").html(fixFloat(result.Outs[result.ChA],numCount));
@@ -87,6 +91,7 @@
$("#LogFrequency").html(result.LogFreq);
$("#WriteFrequency").html(result.WriteFreq);
$("#DecimalsCount").html(result.DecimalsCount);
+ $("#DecimalsDisplay").html(result.DecimalsDisplay);
$("#ServerTime").html(result.timeSrv);
$("#ChanScaleMin").html(result.ChScaleMin);
$("#ChanScaleMax").html(result.ChScaleMax);
@@ -454,12 +459,25 @@
Numero Decimali
+