From bd5a327d60edbd425ff037b6cc08bd004a218d60 Mon Sep 17 00:00:00 2001 From: Marco Locatelli Date: Mon, 29 Mar 2021 15:11:45 +0200 Subject: [PATCH] salvataggio nome sessione, pulizia codice --- logger/FlythisLogger.py | 17 ++++---- logger/log/PyLog.txt | 14 ++++++ server/FlythisServer.py | 21 ++++----- server/templates/logger.html | 85 +++++------------------------------- 4 files changed, 44 insertions(+), 93 deletions(-) diff --git a/logger/FlythisLogger.py b/logger/FlythisLogger.py index b07fc4b..1c12388 100644 --- a/logger/FlythisLogger.py +++ b/logger/FlythisLogger.py @@ -14,14 +14,13 @@ redSrv0 = redis.Redis( port=REDIS_PORT, db=0) +redSrv0.set('SETTINGS:LOG:STATUS',0) + #se non c'è un valore nei campi di redis, popolo il db LOG_path = "/home/pi/Flythis/logger/log/" DATA_path = "/home/pi/Flythis/logger/data/" -if redSrv0.get('SETTINGS:LOG:STATUS') is None: - redSrv0.set('SETTINGS:LOG:STATUS',1) - if redSrv0.get('SETTINGS:SELECTED_CH') is None: redSrv0.set('SETTINGS:SELECTED_CH',0) @@ -115,12 +114,12 @@ try: redSrv0.set(redTime,str(now)) #print(logStatus) # solo se su redis LOG è 1 eseguo il ciclo principale - logStatus = redSrv0.get('SETTINGS:LOG:STATUS').decode('utf-8') - if logStatus == "1" : - CHvalue = CH.ADS1256_GetAll() - #videoPrint(CHvalue) - #fileSave(CHvalue) - redisSave(CHvalue) + #logStatus = redSrv0.get('SETTINGS:LOG:STATUS').decode('utf-8') + #if logStatus == "1" : + CHvalue = CH.ADS1256_GetAll() + #videoPrint(CHvalue) + #fileSave(CHvalue) + redisSave(CHvalue) time.sleep(int(redSrv0.get(redSampleFreq))/1000) #eccezione da ctrl+c in terminale e chiusura diff --git a/logger/log/PyLog.txt b/logger/log/PyLog.txt index c54af4c..8c5a17d 100644 --- a/logger/log/PyLog.txt +++ b/logger/log/PyLog.txt @@ -7,3 +7,17 @@ 2021-03-29 11:36:32.642389 Program end. Ctrl+C from user 2021-03-29 11:36:39.298257 Program end. Ctrl+C from user 2021-03-29 11:37:09.962049 Program end. Ctrl+C from user +2021-03-29 12:26:08.253892 Program end. Ctrl+C from user +2021-03-29 12:34:34.762399 Program end. Ctrl+C from user +2021-03-29 12:35:59.824375 Program end. Ctrl+C from user +2021-03-29 12:41:24.933798 Program end. Ctrl+C from user +2021-03-29 12:43:32.139821 Program end. Ctrl+C from user +2021-03-29 12:45:05.686145 Program end. Ctrl+C from user +2021-03-29 12:46:23.743580 Program end. Ctrl+C from user +2021-03-29 12:53:23.943793 Program end. Ctrl+C from user +2021-03-29 13:04:38.212360 Program end. Ctrl+C from user +2021-03-29 13:11:50.548529 Program end. Ctrl+C from user +2021-03-29 13:12:03.872367 Program end. Ctrl+C from user +2021-03-29 13:12:47.701751 Program end. Ctrl+C from user +2021-03-29 14:49:22.191222 Program end. Ctrl+C from user +2021-03-29 15:04:18.258773 Program end. Ctrl+C from user diff --git a/server/FlythisServer.py b/server/FlythisServer.py index c3d80fa..fa8cbcf 100644 --- a/server/FlythisServer.py +++ b/server/FlythisServer.py @@ -1,7 +1,7 @@ #!/usr/bin/python from flask import Flask, render_template, jsonify, request -import datetime +from datetime import datetime from flask.wrappers import Request import redis import socket @@ -133,7 +133,8 @@ def api_channels_all(): 'ChScaleMax' : getRedisVal('SETTINGS:IN:MAX:'+str(numCh)), 'ChScaleMin' : getRedisVal('SETTINGS:IN:MIN:'+str(numCh)), 'ChRealMax' : getRedisVal('SETTINGS:OUT:MAX:'+str(numCh)), - 'ChRealMin' : getRedisVal('SETTINGS:OUT:MIN:'+str(numCh)) + 'ChRealMin' : getRedisVal('SETTINGS:OUT:MIN:'+str(numCh)), + 'LastSessionName' : getRedisVal('RTDATA:SESSION:NAME') } # restituisce in formato json i dati letti da redis return jsonify(channelsData) @@ -163,12 +164,20 @@ def api_channels_current(): def start_log(): #funzione start_log: scrive su redis LOG:STATUS -> 1 redSrv0.set('SETTINGS:LOG:STATUS', 1) + #data e time ora + lastDate = datetime.now() + #formato per data e time: dd/mm/YYYY H:M:S + format = "%d/%m/%Y_%H:%M:%S" + #format date e time adando strftime() + nameDate = lastDate.strftime(format) + ".csv" + redSrv0.set('RTDATA:SESSION:NAME', nameDate) return "OK" @flaskApp.route("/api/v1/log/stop", methods=['PUT']) def stop_log(): #funzione stop_log: scrive su redis LOG:STATUS -> 0 redSrv0.set('SETTINGS:LOG:STATUS', 0) + redSrv0.set('RTDATA:SESSION:NAME', "-") return "OK" @flaskApp.route("/api/v1/setup/saveInMin", methods=['PUT']) @@ -196,14 +205,6 @@ def selectChannel(numCh): redSrv0.set('SETTINGS:SELECTED_CH', numCh) return "OK" -@flaskApp.route("/api/v1/sessions", methods=['POST']) -def sessionCreate(): - #funzione creazione sessione: scrive su redis SESSION:NAME prendendolo dall'input in pagina html con nome NewSessionName - sessionName = request.form['NewSessionName'] - redSrv0.set('RTDATA:SESSION:NAME', sessionName) - # rimando in logger - return redirect("/logger") - @flaskApp.route("/api/v1/frequency", methods=['POST']) def setFrequency(): #funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq diff --git a/server/templates/logger.html b/server/templates/logger.html index 57e681b..ffb7c25 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -40,22 +40,19 @@ $("#ChanScaleMax").html(result.ChScaleMax); $("#ChanRealMin").html(result.ChRealMin); $("#ChanRealMax").html(result.ChRealMax); + $("#LastSessionName").html(result.LastSessionName); }}); timeout = setTimeout(dataRefresh, intTime); }; - // Funzione startLog: fa chiamata per settare a 1 il LOG:STATUS + // Funzione startLog: chiamata /api/v1/log/start per avviare log e dare nome function startLog(){ $.ajax({ type: 'PUT' ,url: "/api/v1/log/start" ,data: "" - ,success: function(){ - alert('Log Started'); - } }) - intTime= 200; }; // Funzione stopLog: fa chiamata per settare a 0 il LOG:STATUS @@ -64,20 +61,9 @@ type: 'PUT' ,url: "/api/v1/log/stop" ,data: "" - ,success: function(){ - alert('Log Stopped'); - } }) - intTime = 5000; }; - // Funzione startNewRec: assegna nuovo nome con data e ora al file .csv di record - function startNewRec(){ - var d = new Date(); - var name= d.toISOString().replace('T','_').replace('-','_').replace('-','_').replace(':','_').replace(':','_').replace('.','_').replace('Z','')+'.csv'; - //console.log(name); - $('#NewSessionName').val(name); - }
@@ -92,7 +78,6 @@
-
Channel 2 @@ -105,54 +90,17 @@
- - - -
- Logger Time: -
- Log frequency (edit in Settings): (ms) -
+
+ Logger Time: +
+ Log frequency (edit in Settings): (ms)
+ -
+
-
+
@@ -161,22 +109,11 @@ Record Log
-
- -
-
-
-
- Nuova sessione - -
- -
-
-
+
+ Session:  
check