diff --git a/logger/FTLogger.py b/logger/FTLogger.py index 305f427..170362c 100644 --- a/logger/FTLogger.py +++ b/logger/FTLogger.py @@ -16,7 +16,10 @@ redSrv0 = redis.Redis( #funzione per leggere e decodificare da redis def getRedisVal(redisKey): - return redSrv0.get(redisKey).decode('utf-8') + if redSrv0.get(redisKey) is None: + return redSrv0.get(redisKey) + else: + return redSrv0.get(redisKey).decode('utf-8') #assegno directory per file di data output DATA_path = "/home/pi/data/" diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index 29ba41a..0be510b 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -16,7 +16,10 @@ redSrv0 = redis.Redis( #funzione per leggere e decodificare da redis def getRedisVal(redisKey): - return redSrv0.get(redisKey).decode('utf-8') + if redSrv0.get(redisKey) is None: + return redSrv0.get(redisKey) + else: + return redSrv0.get(redisKey).decode('utf-8') #assegno director log per file di debug LOG_path = "/home/pi/Flythis/logger/log/" diff --git a/server/FTServer.py b/server/FTServer.py index 60adf6c..984e0c2 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -27,7 +27,10 @@ redSrv0 = redis.Redis( #funzione per leggere e decodificare da redis def getRedisVal(redisKey): - return redSrv0.get(redisKey).decode('utf-8') + if redSrv0.get(redisKey) is None: + return redSrv0.get(redisKey) + else: + return redSrv0.get(redisKey).decode('utf-8') flaskApp = Flask(__name__) flaskApp.config['JSON_SORT_KEYS'] = False diff --git a/server/templates/about.html b/server/templates/about.html index 9ccbcef..5bce330 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -6,24 +6,16 @@ var intTime=2000;
-
+
- - About Analogger +

Steamware Srl

-

Steamware Srl

+ FT Logger Software 2021
-

Analog and Digital reader and logger software

-
-
-

Version 1.0.1

-
-
-

Last Patched:
- 06/04/2021

+ Analog and Digital reader and logger software
diff --git a/server/templates/layout.html b/server/templates/layout.html index 3c6e341..51b4f0a 100644 --- a/server/templates/layout.html +++ b/server/templates/layout.html @@ -4,8 +4,8 @@ - - + + {{ title }} diff --git a/server/templates/settings.html b/server/templates/settings.html index 3a6ce6c..f33947d 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -24,14 +24,9 @@ $("#MinIn").html(result.MinIn); $("#MaxIn").html(result.MaxIn); $("#CurrentFolder").html(result.CurrentWorkFolder); - // inizio nascondendo - $("#Div1").show(); + // inizio nascondendo div2 e div3 $("#Div2").hide(); $("#Div3").hide(); - // if(result.ShowDiv01 == "0") - // { - // $("#Div1").hide(); - // } if(result.ShowDiv02 == "1") { $("#Div2").show(); @@ -93,7 +88,7 @@ } }) }; - + function saveMax(){ $.ajax({ type: 'PUT' @@ -137,9 +132,9 @@
-
+
-
+
Autenticazione utente
@@ -154,12 +149,10 @@
-
-
-
+
+
+
Canale A -
-
-
Nativo:
@@ -181,12 +173,11 @@
-
-
-
+
+
+
+
Canale B -
-
-
Nativo: @@ -207,32 +197,31 @@ Scalato:
+
-
+
-
-
-
- - Impostazioni scala canale -
-
- -
-
-
- -
+
+
+ + Impostazioni scala canale +
+
+ +
+
+
+
@@ -300,13 +289,11 @@
-
- Selezione cartella -
- Cartella attuale:   -
+
+ Selezione folder salvataggio file
-
+
+ Cartella attuale:  
Insert new:   @@ -317,7 +304,7 @@
-
+
Impostazioni Timer
@@ -337,7 +324,7 @@
-
+
Reset impostazioni predefinite