Merge remote-tracking branch 'origin/develop'

sampler/FTSampler.py

@@ -14,6 +14,8 @@ redSrv0 = redis.Redis(
     port=REDIS_PORT,
     db=0)
 
+numReqPowerOff = 0
+
 #funzione per leggere e decodificare da redis
 def getRedisVal(redisKey):
    if redSrv0.get(redisKey) is None:
@@ -74,7 +76,7 @@ if redSrv0.get('RTDATA:VALUE') is None:
 if redSrv0.get('SETTINGS:POWER:CH') is None:
     redSrv0.set('SETTINGS:POWER:CH', 10)
 if redSrv0.get('SETTINGS:POWER:THRESH') is None:
-    redSrv0.set('SETTINGS:POWER:THRESH', 100)
+    redSrv0.set('SETTINGS:POWER:THRESH', 1)
 if redSrv0.get('SETTINGS:POWER:OFF') is None:
     redSrv0.set('SETTINGS:POWER:OFF', 0)
 if redSrv0.get('SETTINGS:SMOOTHING:FUNCTION') is None:
@@ -180,8 +182,13 @@ def checkPowerOff():
             limitVal = float(getRedisVal('SETTINGS:POWER:THRESH'))
             actVal = float(getRedisVal('RTDATA:CH:' + str(powerChannel)))
             if(actVal > limitVal):
-                # chiedo spognimento
-                redSrv0.set('SETTINGS:POWER:OFF',1)
+                # resetto contatore
+                numReqPowerOff = 0
+            else:
+                numReqPowerOff += 1
+                if(numReqPowerOff > 10): 
+                    # chiedo spognimento
+                    redSrv0.set('SETTINGS:POWER:OFF',1)
 
 def calculateValue():
     ch1 = getRedisVal('SETTINGS:CHANNEL:A')