From 0d2bf9e7c87b6e0a735964dffce7af9af5e089dd Mon Sep 17 00:00:00 2001
From: "marco.locatelli@steamware.net" <marco.locatelli@steamware.net>
Date: Thu, 9 Jun 2022 17:56:05 +0200
Subject: [PATCH] 1.4.3 intestazione file output thanks to nicola

---
 logger/FTLogger.py          | 14 ++++++++++++--
 sampler/FTSampler.py        |  6 +++---
 server/templates/about.html |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/logger/FTLogger.py b/logger/FTLogger.py
index 4028662..9fb7e55 100644
--- a/logger/FTLogger.py
+++ b/logger/FTLogger.py
@@ -56,9 +56,18 @@ if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
         if redSrv0.get('SETTINGS:OUT:MIN:'+str(numCh)) is None:
             redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0)
 
+def columnNames():
+    firstRow =  "Data Ora;"
+    firstRow += "Canale A;"
+    firstRow += "Canale B;"
+    firstRow += "Valore Grezzo;"
+    firstRow += "Valore Corretto;"
+    firstRow += "Valore Corretto e Mediato"+"\r\n"
+    return firstRow
+
 #funzione salva time+data e otto valori letti su file SE LOG è 1
 def fileSave():
-    cleanValue = getRedisVal('RTDATA:VALUE:CLEAN')
+    rawValue = getRedisVal('RTDATA:VALUE:RAW')
     resultValue = getRedisVal('RTDATA:VALUE:REAL')
     smoothedValue = getRedisVal('RTDATA:VALUE:SMOOTHED')
     currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT')
@@ -73,6 +82,7 @@ def fileSave():
         outFile = open(workingDirectory+"/"+dataFileName, "a")
     except FileNotFoundError:
         outFile = open(workingDirectory+"/"+dataFileName, "w+")
+        outFile.write(columnNames)
     # dichiaro una stringa in cui accumulo i valori
     csvRow = str(lastLog) +";"
     # scrivo le letture del canale A
@@ -84,7 +94,7 @@ def fileSave():
     chBOut = getRedisVal('RTDATA:OUT:'+str(chB))
     csvRow += chBOut+";"
     #aggiungo il valore pulito
-    csvRow += cleanValue+";"
+    csvRow += rawValue+";"
     #aggiungo il valore corretto con k1 k2 offset
     csvRow += resultValue+";"
     #aggiungo il valore risultante MEDIATO
diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py
index b540870..713ece5 100644
--- a/sampler/FTSampler.py
+++ b/sampler/FTSampler.py
@@ -56,8 +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:RAW') is None:
+    redSrv0.set('RTDATA:VALUE:RAW', 1)
 if redSrv0.get('RTDATA:VALUE:REAL') is None:
     redSrv0.set('RTDATA:VALUE:REAL', 1)
 if redSrv0.get('SETTINGS:POWER:THRESH') is None:
@@ -186,7 +186,7 @@ def calculateValue():
         den = 0.01
     # calcolo il valore risultante pulito (senza correzioni)
     XVal = (float(v2)/float(den))
-    redSrv0.set('RTDATA:VALUE:CLEAN',round(XVal,decimalsCount))
+    redSrv0.set('RTDATA:VALUE:RAW',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))
diff --git a/server/templates/about.html b/server/templates/about.html
index 3aa531b..97d7a0c 100644
--- a/server/templates/about.html
+++ b/server/templates/about.html
@@ -29,7 +29,7 @@
                 <br>
                 Software di lettura e scrittura per canali analogici e digitali
                 <br>
-                V 1.4.2
+                V 1.4.3
             </div>
         </div>
 </main>