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 @@
Software di lettura e scrittura per canali analogici e digitali
- V 1.0.1 + V 1.1.0 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 @@
Tempo minimo prima dello spegnimento (s):   - +
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 aa53771..0000000 Binary files a/uptime.pyc and /dev/null differ