From 6050c84ae5ca912fbe6bd76022d8d86265be8a41 Mon Sep 17 00:00:00 2001
From: "marco.locatelli@steamware.net" <marco.locatelli@steamware.net>
Date: Thu, 27 May 2021 09:22:04 +0200
Subject: [PATCH] V1.1.0 - fix vari

---
 sampler/FTSampler.py           |   6 ++++--
 server/templates/about.html    |   2 +-
 server/templates/settings.html |   2 +-
 uptime.py                      |   8 --------
 uptime.pyc                     | Bin 284 -> 0 bytes
 5 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 uptime.py
 delete mode 100644 uptime.pyc

diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py
index 5704085..c12e83e 100644
--- a/sampler/FTSampler.py
+++ b/sampler/FTSampler.py
@@ -65,8 +65,10 @@ redSamPer='SETTINGS:LOG:EXETIME'
 #se non c'è un valore nei campi di redis, popolo il db
 redSrv0.set('SETTINGS:DECIMALS:COUNT',2)
 redSrv0.set('SETTINGS:LOG:STATUS',0)
-redSrv0.set('SETTINGS:POWER:CH', 10)
-redSrv0.set('SETTINGS:POWER:UPTIME', 180)
+if redSrv0.get('SETTINGS:POWER:UPTIME') is None:
+    redSrv0.set('SETTINGS:POWER:UPTIME', 300)
+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', "-")
 if redSrv0.get('SETTINGS:LOG:EXETIME') is None:
diff --git a/server/templates/about.html b/server/templates/about.html
index 4103e47..e7f7806 100644
--- a/server/templates/about.html
+++ b/server/templates/about.html
@@ -30,7 +30,7 @@
                 <br>
                 Software di lettura e scrittura per canali analogici e digitali
                 <br>
-                V 1.0.1
+                V 1.1.0
             </div>
         </div>
 </main>
diff --git a/server/templates/settings.html b/server/templates/settings.html
index 229b93c..aa8a0ed 100644
--- a/server/templates/settings.html
+++ b/server/templates/settings.html
@@ -444,7 +444,7 @@
                             </div>
                             <div class="input-group">
                                 <span class="input-group-text">Tempo minimo prima dello spegnimento (s): &nbsp;</span>
-                                <input type="number" min="180" class="form-control" id="MinUptime" name="MinUptime"></input>
+                                <input type="number" min="300" class="form-control" id="MinUptime" name="MinUptime"></input>
                             </div>
                                 <div class="row">
                                     <div class="col-2"></div>
diff --git a/uptime.py b/uptime.py
deleted file mode 100644
index 4e1ddc6..0000000
--- a/uptime.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-raspbUptime = os.popen("awk '{print $1}' /proc/uptime").readline()
-print(raspbUptime)
-if float(raspbUptime) > 2000:
-    print("yo")
\ No newline at end of file
diff --git a/uptime.pyc b/uptime.pyc
deleted file mode 100644
index aa53771c91bda4f867aa6f970e2bdd3427010c5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 284
zcmYLDyK2Kg5S-OXCKfWNPMtzkaBB!5MIf$R*hN6Zkf1xv3B4knz^?T>{tbVT-8;K-
zz{}n2%<S&%sq-w1Psi^J|KW3f<J)~PXg-7jD1j6p(H;syO4u)8JZJ^&Lk9>4h4<|f
zQUwF#z`!FujE|3{A>@HH4Fvj~<C7oRBokg>uN(<6b0Yi3+0v{mQ`igJR!U>%T0AGe
zlNJ{+X@9ESjb(LTxzUqiJF>1Yrb%S#4&9XHZOL<Ua1X3r%3Ak@c~#82kRhhXd!&d0
F`U3?kGClwR