diff --git a/logger/PyLog.txt b/logger/PyLog.txt index 15b26df..49783b4 100644 --- a/logger/PyLog.txt +++ b/logger/PyLog.txt @@ -49,4 +49,7 @@ Caught error: 'NoneType' object has no attribute 'decode' at time: 2021-03-23 12 Program end. Ctrl+C from user at time: 2021-03-23 12:48:33.227212 Program end. Ctrl+C from user at time: 2021-03-23 12:52:51.386359 Caught error: 'NoneType' object has no attribute 'decode' at time: 2021-03-23 12:53:15.167221 -Program end. Ctrl+C from user at time: 2021-03-23 14:12:15.324783 \ No newline at end of file +Program end. Ctrl+C from user at time: 2021-03-23 14:12:15.324783 +Program end. Ctrl+C from user at time: 2021-03-23 15:23:23.456196 +Program end. Ctrl+C from user at time: 2021-03-23 15:31:55.154641 +Program end. Ctrl+C from user at time: 2021-03-23 15:33:33.517326 \ No newline at end of file diff --git a/server/FlythisServer.py b/server/FlythisServer.py index a8f7ee9..04e02c4 100644 --- a/server/FlythisServer.py +++ b/server/FlythisServer.py @@ -37,6 +37,7 @@ def main(): 'title' : 'Home', 'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'), 'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'), + 'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'), 'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'), 'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'), 'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'), @@ -49,7 +50,6 @@ def main(): #assegno il template html di riferimento return render_template('home.html', **channelsData) - @flaskApp.route("/logger") #funzione logger, route a pagina /logger def logger(): @@ -57,6 +57,7 @@ def logger(): 'title' : 'Logger', 'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'), 'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'), + 'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'), 'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'), 'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'), 'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'), @@ -69,7 +70,6 @@ def logger(): #assegno il template html di riferimento return render_template('logger.html', **channelsData) - @flaskApp.route("/settings") #funzione setup, route a pagina /setup def setup(): @@ -77,6 +77,7 @@ def setup(): 'title' : 'Settings', 'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'), 'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'), + 'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'), 'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'), 'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'), 'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'), @@ -86,10 +87,10 @@ def setup(): 'Ch6' : redSrv0.get('RTDATA:CH:6').decode('utf-8'), 'Ch7' : redSrv0.get('RTDATA:CH:7').decode('utf-8') } + #assegno il template html di riferimento return render_template('settings.html', **channelsData) - @flaskApp.route("/about") #funzione setup, route a pagina /setup def about(): @@ -108,6 +109,7 @@ def api_channels_all(): 'title' : 'Home', 'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'), 'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'), + 'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'), 'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'), 'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'), 'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'), @@ -138,8 +140,16 @@ 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 HOME - return redirect("/") + # 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 + newFrequency = request.form['LogFreq'] + redSrv0.set('RTDATA:LOG:FREQ', newFrequency) + # rimando in settings + return redirect("/logger") #dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket) if __name__ == "__main__": diff --git a/server/templates/about.html b/server/templates/about.html index a0ec101..df0e263 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -16,11 +16,11 @@

Analog and Digital reader and logger software

-

Version 0.1.0

+

Version 0.1.1

Last Patched:
- 22 March 2021

+ 23 March 2021

diff --git a/server/templates/home.html b/server/templates/home.html index c08eb11..71f472f 100644 --- a/server/templates/home.html +++ b/server/templates/home.html @@ -7,23 +7,22 @@
-
+
Logger

-
+
Setup

-
+
About
-
{% endblock %} \ No newline at end of file diff --git a/server/templates/layout.html b/server/templates/layout.html index 127d2c5..723edb4 100644 --- a/server/templates/layout.html +++ b/server/templates/layout.html @@ -38,6 +38,7 @@ $("#Chan5").html(result.Ch5); $("#Chan6").html(result.Ch6); $("#Chan7").html(result.Ch7); + $("#LogFrequency").html(result.Freq); $("#ServerTime").html(result.timeSrv); $("#LoggerTime").html(result.timeLog); //console.log(result); @@ -76,11 +77,11 @@ //console.log(name); $('#NewSessionName').val(name); } - +
+