diff --git a/logger/FTLogger.py b/logger/FTLogger.py index 93f7af1..8d5487f 100644 --- a/logger/FTLogger.py +++ b/logger/FTLogger.py @@ -47,7 +47,7 @@ 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) -#funzione salva time+data e otto valori letti su file (SE LOG è 1) +#funzione salva time+data e otto valori letti su file SE LOG è 1 def fileSave(): currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT') workingDirectory = (DATA_path+currentFolder) diff --git a/sampler/FTDInOut.py b/sampler/FTDInOut.py index 13efbcb..be05bbb 100644 --- a/sampler/FTDInOut.py +++ b/sampler/FTDInOut.py @@ -51,11 +51,11 @@ while (1): redSrv0.set('RTDATA:SESSION:NAME', "") if cancello.is_pressed: - # print("CANCELLO CHIUSO") + # CANCELLO CHIUSO redSrv0.set('RTDATA:GATE_OPEN', 0) else: - # print("CANCELLO APERTO") + # CANCELLO APERTO redSrv0.set('RTDATA:GATE_OPEN', 1) redSrv0.set('SETTINGS:LOG:STATUS', 0) redSrv0.set('RTDATA:SESSION:NAME', "") diff --git a/server/FTServer.py b/server/FTServer.py index f6dddab..81811a9 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -16,7 +16,7 @@ from gpiozero import LED 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/static/img/arrow-90deg-up.svg b/server/static/img/arrow-90deg-up.svg new file mode 100644 index 0000000..6c95e3d --- /dev/null +++ b/server/static/img/arrow-90deg-up.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/server/static/img/download.svg b/server/static/img/download.svg new file mode 100644 index 0000000..80a5817 --- /dev/null +++ b/server/static/img/download.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/server/static/img/folder-plus.svg b/server/static/img/folder-plus.svg new file mode 100644 index 0000000..29b5115 --- /dev/null +++ b/server/static/img/folder-plus.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/server/static/img/folder-x.svg b/server/static/img/folder-x.svg new file mode 100644 index 0000000..d571d08 --- /dev/null +++ b/server/static/img/folder-x.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/server/static/img/play-fill.svg b/server/static/img/play-fill.svg new file mode 100644 index 0000000..28f2e67 --- /dev/null +++ b/server/static/img/play-fill.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/server/static/img/stop-fill.svg b/server/static/img/stop-fill.svg new file mode 100644 index 0000000..e00085a --- /dev/null +++ b/server/static/img/stop-fill.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/server/templates/logger.html b/server/templates/logger.html index 2c0cb7d..4555dca 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -168,6 +168,7 @@ ,url: "/api/v1/data/export" ,data: "" }) + confirm("Cartella attuale copiata su USB drive.") // fix table dataRefresh(); }; @@ -321,15 +322,19 @@