diff --git a/logger/FTLogger.py b/logger/FTLogger.py index 7ce3a45..4028662 100644 --- a/logger/FTLogger.py +++ b/logger/FTLogger.py @@ -58,6 +58,7 @@ if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None: #funzione salva time+data e otto valori letti su file SE LOG รจ 1 def fileSave(): + cleanValue = getRedisVal('RTDATA:VALUE:CLEAN') resultValue = getRedisVal('RTDATA:VALUE:REAL') smoothedValue = getRedisVal('RTDATA:VALUE:SMOOTHED') currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT') @@ -82,7 +83,9 @@ def fileSave(): chB = getRedisVal('SETTINGS:CHANNEL:B') chBOut = getRedisVal('RTDATA:OUT:'+str(chB)) csvRow += chBOut+";" - #aggiungo il valore risultante calcolato V1/(V2-V1) + #aggiungo il valore pulito + csvRow += cleanValue+";" + #aggiungo il valore corretto con k1 k2 offset csvRow += resultValue+";" #aggiungo il valore risultante MEDIATO csvRow += smoothedValue diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index a7524cb..b540870 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -56,6 +56,8 @@ if redSrv0.get('SETTINGS:LOG:EXETIME') is None: redSrv0.set('SETTINGS:LOG:EXETIME', 1) if redSrv0.get('RTDATA:VALUE:SMOOTHED') is None: redSrv0.set('RTDATA:VALUE:SMOOTHED', 1) +if redSrv0.get('RTDATA:VALUE:CLEAN') is None: + redSrv0.set('RTDATA:VALUE:CLEAN', 1) if redSrv0.get('RTDATA:VALUE:REAL') is None: redSrv0.set('RTDATA:VALUE:REAL', 1) if redSrv0.get('SETTINGS:POWER:THRESH') is None: @@ -182,8 +184,10 @@ def calculateValue(): den = abs(float(v1)-float(v2)) if(den < 0.01): den = 0.01 + # calcolo il valore risultante pulito (senza correzioni) XVal = (float(v2)/float(den)) - # applicare costanti k1*x^2, k2*x e offset + redSrv0.set('RTDATA:VALUE:CLEAN',round(XVal,decimalsCount)) + # applicare correzioni (costanti k1*x^2, k2*x e offset) newValue = (float(k1)*float(XVal)*float(XVal))+(float(k2)*float(XVal))+float(offset) redSrv0.set('RTDATA:VALUE:REAL',round(newValue,decimalsCount)) strValIn = newValue @@ -223,7 +227,7 @@ try: for counter in range(0,smoothFact,+1): # leggo gli 8 valori CHvalue = CH.ADS1256_GetAll() - floatArray = np.array(CHvalue, dtype=np.float) + floatArray = np.array(CHvalue, dtype=float) dataBox[counter] = floatArray*float(5.0/0x7fffff) # calcolo e scrittura ogni NUM PERIOD cicli if counter == (smoothFact-1): @@ -241,8 +245,6 @@ try: delta = endExec - now # attesa viene fatta sempre waitTime = (int(sampleFreq)*smoothFact)/1000 - delta.microseconds/1000000 - #redSrv0.set('SETTINGS:MONITOR:WAITIME',waitTime) - #redSrv0.set('SETTINGS:MONITOR:DELTATIME',str(delta.microseconds/1000)) if(waitTime < 0.0): redSrv0.set('SETTINGS:WARNING:EXETIME',1) else: diff --git a/server/FTServer.py b/server/FTServer.py index 438370b..8cc0fbd 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -26,6 +26,7 @@ led = LED(26) #assegno ipv4 statico ipv4 = '10.10.10.210' +#ipv4 = '10.74.82.210' #definisco directory /data dataDir='/home/pi/data/' diff --git a/server/templates/about.html b/server/templates/about.html index b119da5..c909413 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -25,11 +25,11 @@