diff --git a/logger/FTLogger.py b/logger/FTLogger.py index 3296c40..15cff90 100644 --- a/logger/FTLogger.py +++ b/logger/FTLogger.py @@ -22,10 +22,20 @@ def getRedisVal(redisKey): LOG_path = "/home/pi/Flythis/logger/log/" DATA_path = "/home/pi/data/" +startingSampleFreq = 250 +startingWriteFreq = 1000 + +#intervallo in millisecondi fra un campionamento e il successivo +redSampleFreq = 'SETTINGS:LOG:FREQ' +redSrv0.set(redSampleFreq,startingSampleFreq) + +#intervallo in millisecondi fra una scrittura su file e la successiva +redWriteFreq = 'SETTINGS:WRITE:FREQ' +redSrv0.set(redWriteFreq,startingWriteFreq) + #se non c'รจ un valore nei campi di redis, popolo il db redSrv0.set('SETTINGS:LOG:STATUS',0) - redisTime = 'RTDATA:TIME:SRV' if redSrv0.get('SETTINGS:SELECTED_CH') is None: @@ -45,11 +55,6 @@ if redSrv0.get('SETTINGS:SELECTED_CH') is None: if redSrv0.get('SETTINGS:OUT:MIN:'+str(numCh)) is None: redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0) -#intervallo in millisecondi fra un campionamento e il successivo -redSampleFreq = 'SETTINGS:LOG:FREQ' -startingFreq = 1000 -redSrv0.set(redSampleFreq,startingFreq) - try: CH = ADS1256.ADS1256() CH.ADS1256_init() diff --git a/logger/log/PyLog.txt b/logger/log/PyLog.txt index 1efa869..94ef983 100644 --- a/logger/log/PyLog.txt +++ b/logger/log/PyLog.txt @@ -74,3 +74,4 @@ 2021-03-31 12:55:31.352004 Caught error: unsupported operand type(s) for -: 'datetime.datetime' and 'str' 2021-03-31 13:00:46.530922 Program end. Ctrl+C from user 2021-03-31 13:22:12.133149 Program end. Ctrl+C from user +2021-04-01 10:28:30.317253 Caught error: Error while reading from socket: (104, 'Connection reset by peer') diff --git a/server/FTServer.py b/server/FTServer.py index e7404ab..07f24a0 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -52,7 +52,8 @@ def logger(): 'title' : 'Logger', 'timeSrv' : getRedisVal('RTDATA:TIME:SRV'), 'timeLog' : getRedisVal('RTDATA:TIME:LOG'), - 'Freq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'LogFreq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'), 'Ch0' : getRedisVal('RTDATA:CH:0'), 'Ch1' : getRedisVal('RTDATA:CH:1'), 'Ch2' : getRedisVal('RTDATA:CH:2'), @@ -78,7 +79,8 @@ def logger(): def setup(): channelsData = { 'title' : 'Settings', - 'Freq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'LogFreq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'), 'Ch0' : getRedisVal('RTDATA:CH:0'), 'Ch1' : getRedisVal('RTDATA:CH:1'), 'Ch2' : getRedisVal('RTDATA:CH:2'), @@ -116,7 +118,8 @@ def api_channels_all(): channelsData = { 'timeSrv' : getRedisVal('RTDATA:TIME:SRV'), 'timeLog' : getRedisVal('RTDATA:TIME:LOG'), - 'Freq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'LogFreq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'), 'Ch0' : getRedisVal('RTDATA:CH:0'), 'Ch1' : getRedisVal('RTDATA:CH:1'), 'Ch2' : getRedisVal('RTDATA:CH:2'), @@ -151,7 +154,8 @@ def api_channels_current(): 'numCh' : numCh, 'timeSrv' : getRedisVal('RTDATA:TIME:SRV'), 'timeLog' : getRedisVal('RTDATA:TIME:LOG'), - 'Freq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'LogFreq' : getRedisVal('SETTINGS:LOG:FREQ'), + 'WriteFreq' : getRedisVal('SETTINGS:WRITE:FREQ'), 'CurrIn' : getRedisVal('RTDATA:CH:'+str(numCh)), 'CurrOut' : getRedisVal('RTDATA:OUT:'+str(numCh)), 'MaxOut' : getRedisVal('SETTINGS:OUT:MAX:'+str(numCh)), @@ -219,10 +223,13 @@ def selectChannel(numCh): return "OK" @flaskApp.route("/api/v1/frequency", methods=['POST']) -def setFrequency(): +def setWriteFrequency(): #funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq - newFrequency = request.form['LogFreq'] - redSrv0.set('SETTINGS:LOG:FREQ', newFrequency) + newWriteFrequency = request.form['WriteFreq'] + redSrv0.set('SETTINGS:WRITE:FREQ', newWriteFrequency) + #funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq + newLogFrequency = request.form['LogFreq'] + redSrv0.set('SETTINGS:LOG:FREQ', newLogFrequency) # rimando in settings return redirect("/settings") @@ -236,6 +243,21 @@ def setScale(): # rimando in settings return redirect("/settings") +@flaskApp.route("/api/v1/setup/resetSettings", methods=['POST']) +def resetSetup(): + #setto i campi di redis alla situazione di partenza + redSrv0.set('SETTINGS:LOG:FREQ',250) + redSrv0.set('SETTINGS:WRITE:FREQ',1000) + redSrv0.set('SETTINGS:LOG:STATUS',0) + redSrv0.set('SETTINGS:SELECTED_CH',0) + for numCh in range(0,8,+1): + redSrv0.set('SETTINGS:IN:MAX:'+str(numCh),100) + redSrv0.set('SETTINGS:IN:MIN:'+str(numCh),0) + redSrv0.set('SETTINGS:OUT:MAX:'+str(numCh),100) + redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0) + # rimando in settings + return redirect("/settings") + #dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket) if __name__ == "__main__": flaskApp.run(host=ipv4, port=80, debug=True) \ No newline at end of file diff --git a/server/templates/logger.html b/server/templates/logger.html index 5ead724..1bf9a1b 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -3,7 +3,7 @@ {% block content %}
-
+
+ Channel 1
@@ -124,8 +125,9 @@
-
+
+ Channel 2
@@ -138,7 +140,9 @@
- Log period: ms + Logger period: ms +
+ File Write period: ms
@@ -149,7 +153,7 @@
- + Record Log
diff --git a/server/templates/settings.html b/server/templates/settings.html index 20c831f..f8917de 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -3,7 +3,7 @@ {% block content %}