From 44f5ec2c082f1677f9dd01f52d2f9451eca698ff Mon Sep 17 00:00:00 2001 From: Marco Locatelli Date: Thu, 29 Apr 2021 17:09:08 +0200 Subject: [PATCH] soglia spegnimento e processing data --- PyLog.txt | 388 +++++++++++++++++++++++++++++++++ sampler/FTDInOut.py | 9 +- sampler/FTSampler.py | 171 +++++++++++---- server/FTServer.py | 36 ++- server/templates/logger.html | 16 +- server/templates/settings.html | 153 +++++++++---- 6 files changed, 669 insertions(+), 104 deletions(-) create mode 100644 PyLog.txt diff --git a/PyLog.txt b/PyLog.txt new file mode 100644 index 0000000..bada0f5 --- /dev/null +++ b/PyLog.txt @@ -0,0 +1,388 @@ +29/04/2021 11:48:05 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:11 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:16 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:22 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:27 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:33 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:38 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:44 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:49 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:48:55 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:00 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:06 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:12 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:17 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:23 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:28 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:34 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:39 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:45 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:48 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:50 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:49:56 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:01 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:07 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:12 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:18 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:23 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:29 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:34 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:40 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:45 FTSampler caught error: rpop() takes 2 positional arguments but 3 were given +29/04/2021 11:50:50 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:50:51 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:50:56 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:02 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:07 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:13 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:18 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:24 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:29 FTSampler caught error: can't multiply sequence by non-int of type 'bytes' +29/04/2021 11:51:35 FTSampler caught error: invalid literal for int() with base 10: b'0.0004' +29/04/2021 11:51:35 FTSampler caught error: invalid literal for int() with base 10: b'0.0004' +29/04/2021 11:51:40 FTSampler caught error: invalid literal for int() with base 10: b'0.0003' +29/04/2021 11:51:46 FTSampler caught error: invalid literal for int() with base 10: b'0.0004' +29/04/2021 11:51:51 FTSampler caught error: invalid literal for int() with base 10: b'0.0004' +29/04/2021 11:51:57 FTSampler caught error: invalid literal for int() with base 10: b'0.0004' +29/04/2021 11:52:00 FTSampler caught error: 'list' object has no attribute 'decode' +29/04/2021 11:52:02 FTSampler caught error: 'list' object has no attribute 'decode' +29/04/2021 11:52:08 FTSampler caught error: 'list' object has no attribute 'decode' +29/04/2021 11:52:13 FTSampler caught error: invalid literal for int() with base 10: '0.0004' +29/04/2021 11:52:13 FTSampler caught error: invalid literal for int() with base 10: '0.0004' +29/04/2021 11:52:19 FTSampler caught error: invalid literal for int() with base 10: '0.0004' +29/04/2021 11:52:24 FTSampler caught error: invalid literal for int() with base 10: '0.0004' +29/04/2021 11:52:30 FTSampler caught error: invalid literal for int() with base 10: '0.0004' +29/04/2021 11:52:35 FTSampler end. Ctrl+C from user +29/04/2021 12:01:50 FTSampler end. Ctrl+C from user +29/04/2021 12:01:58 FTSampler end. Ctrl+C from user +29/04/2021 12:02:03 FTSampler end. Ctrl+C from user +29/04/2021 12:02:17 FTSampler caught error: can only concatenate str (not "float") to str +29/04/2021 12:03:03 FTSampler end. Ctrl+C from user +29/04/2021 12:03:04 FTSampler caught error: bad operand type for unary +: 'str' +29/04/2021 12:03:51 FTSampler end. Ctrl+C from user +29/04/2021 12:07:59 FTSampler end. Ctrl+C from user +29/04/2021 12:09:17 FTSampler end. Ctrl+C from user +29/04/2021 12:13:36 FTSampler end. Ctrl+C from user +29/04/2021 12:14:48 FTSampler end. Ctrl+C from user +29/04/2021 12:15:42 FTSampler end. Ctrl+C from user +29/04/2021 12:17:09 FTSampler end. Ctrl+C from user +29/04/2021 12:19:46 FTSampler end. Ctrl+C from user +29/04/2021 12:19:46 FTSampler caught error: list index out of range +29/04/2021 12:20:24 FTSampler caught error: list index out of range +29/04/2021 12:20:58 FTSampler caught error: list index out of range +29/04/2021 12:21:29 FTSampler caught error: list index out of range +29/04/2021 12:22:05 FTSampler caught error: list index out of range +29/04/2021 12:22:32 FTSampler caught error: list index out of range +29/04/2021 12:22:46 FTSampler caught error: list index out of range +29/04/2021 12:23:46 FTSampler caught error: list index out of range +29/04/2021 12:24:01 FTSampler caught error: list index out of range +29/04/2021 12:24:57 FTSampler caught error: list index out of range +29/04/2021 12:25:04 FTSampler caught error: list index out of range +29/04/2021 12:25:06 FTSampler caught error: list index out of range +29/04/2021 12:25:07 FTSampler caught error: list index out of range +29/04/2021 12:25:08 FTSampler caught error: list index out of range +29/04/2021 12:25:09 FTSampler caught error: list index out of range +29/04/2021 12:25:10 FTSampler caught error: list index out of range +29/04/2021 12:25:11 FTSampler caught error: list index out of range +29/04/2021 12:25:12 FTSampler caught error: list index out of range +29/04/2021 12:25:13 FTSampler caught error: list index out of range +29/04/2021 12:25:14 FTSampler caught error: list index out of range +29/04/2021 12:25:14 FTSampler caught error: list index out of range +29/04/2021 12:25:15 FTSampler caught error: list index out of range +29/04/2021 12:25:15 FTSampler caught error: list index out of range +29/04/2021 12:25:16 FTSampler caught error: list index out of range +29/04/2021 12:25:16 FTSampler caught error: list index out of range +29/04/2021 12:25:17 FTSampler caught error: list index out of range +29/04/2021 12:25:17 FTSampler caught error: list index out of range +29/04/2021 12:25:17 FTSampler caught error: list index out of range +29/04/2021 12:25:18 FTSampler caught error: list index out of range +29/04/2021 12:25:18 FTSampler caught error: list index out of range +29/04/2021 12:25:19 FTSampler caught error: list index out of range +29/04/2021 12:25:19 FTSampler caught error: list index out of range +29/04/2021 12:25:19 FTSampler caught error: list index out of range +29/04/2021 12:25:20 FTSampler caught error: list index out of range +29/04/2021 12:25:20 FTSampler caught error: list index out of range +29/04/2021 12:25:20 FTSampler caught error: list index out of range +29/04/2021 12:25:21 FTSampler caught error: list index out of range +29/04/2021 12:25:21 FTSampler caught error: list index out of range +29/04/2021 12:25:22 FTSampler caught error: list index out of range +29/04/2021 12:25:22 FTSampler caught error: list index out of range +29/04/2021 12:25:22 FTSampler caught error: list index out of range +29/04/2021 12:25:23 FTSampler caught error: list index out of range +29/04/2021 12:25:23 FTSampler caught error: list index out of range +29/04/2021 12:25:24 FTSampler caught error: list index out of range +29/04/2021 12:25:24 FTSampler caught error: list index out of range +29/04/2021 12:26:04 FTSampler end. Ctrl+C from user +29/04/2021 12:26:42 FTSampler end. Ctrl+C from user +29/04/2021 12:26:59 FTSampler end. Ctrl+C from user +29/04/2021 12:28:13 FTSampler end. Ctrl+C from user +29/04/2021 12:28:29 FTSampler end. Ctrl+C from user +29/04/2021 12:35:52 FTSampler end. Ctrl+C from user +29/04/2021 12:35:55 FTSampler end. Ctrl+C from user +29/04/2021 14:37:57 FTSampler caught error: list index out of range +29/04/2021 14:38:03 FTSampler caught error: list index out of range +29/04/2021 14:38:08 FTSampler caught error: list index out of range +29/04/2021 14:38:13 FTSampler caught error: list index out of range +29/04/2021 14:38:33 FTSampler caught error: list index out of range +29/04/2021 14:38:38 FTSampler caught error: list index out of range +29/04/2021 14:38:44 FTSampler caught error: list index out of range +29/04/2021 14:39:45 FTSampler caught error: list index out of range +29/04/2021 14:39:50 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:39:56 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:01 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:07 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:12 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:18 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:23 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:28 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:34 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:40 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:45 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:51 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:40:56 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:41:00 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:41:01 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:41:07 FTSampler caught error: 'builtin_function_or_method' object cannot be interpreted as an integer +29/04/2021 14:41:13 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:13 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:18 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:24 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:29 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:35 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'builtin_function_or_method' +29/04/2021 14:41:40 FTSampler end. Ctrl+C from user +29/04/2021 14:41:55 FTSampler end. Ctrl+C from user +29/04/2021 14:41:56 FTSampler caught error: count() takes exactly one argument (0 given) +29/04/2021 14:44:07 FTSampler end. Ctrl+C from user +29/04/2021 14:44:08 FTSampler caught error: count() takes exactly one argument (0 given) +29/04/2021 14:44:20 FTSampler caught error: count() takes exactly one argument (0 given) +29/04/2021 14:45:20 FTSampler end. Ctrl+C from user +29/04/2021 14:45:57 FTSampler end. Ctrl+C from user +29/04/2021 14:46:00 FTSampler end. Ctrl+C from user +29/04/2021 14:46:20 FTSampler end. Ctrl+C from user +29/04/2021 16:21:23 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'NoneType' +29/04/2021 16:21:28 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:21:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:21:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:21:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:01 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:12 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:28 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:50 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:22:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:01 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:12 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:17 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:28 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:50 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:23:55 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:01 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:06 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:12 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:28 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:50 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:24:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:01 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:12 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:28 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:50 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:25:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:01 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:12 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:29 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:35 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:40 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:51 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:26:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:02 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:13 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:29 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:34 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:40 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:51 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:27:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:02 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:13 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:23 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:29 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:35 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:40 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:51 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:28:56 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:02 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:07 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:13 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:24 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:29 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:35 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:40 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:46 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:51 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:29:57 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:02 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:08 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:13 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:18 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:24 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:29 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:35 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:40 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:52 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:30:57 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:03 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:08 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:13 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:19 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:24 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:31 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:36 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:42 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:47 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:31:58 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:03 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:09 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:14 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:20 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:25 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:31 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:36 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:42 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:47 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:32:59 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:04 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:09 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:15 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:20 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:26 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:31 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:37 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:42 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:48 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:33:59 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:04 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:09 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:15 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:20 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:26 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:31 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:32 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:38 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:43 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:45 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:48 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:54 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:34:59 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:04 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:10 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:15 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:21 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:26 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:32 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:37 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:43 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:48 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:35:59 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:04 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:10 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:15 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:21 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:26 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:32 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:37 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:43 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:48 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:54 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:36:59 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:05 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:10 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:16 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:21 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:27 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:32 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:38 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:43 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:49 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:37:54 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:00 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:05 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:11 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:16 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:22 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:27 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:33 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:38 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:44 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:49 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:38:54 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:00 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:05 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:11 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:16 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:22 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:26 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:31 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:37 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:39 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:42 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:48 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:39:53 FTSampler caught error: invalid literal for int() with base 10: '' +29/04/2021 16:49:00 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'NoneType' +29/04/2021 16:58:28 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'NoneType' +29/04/2021 17:01:54 FTSampler caught error: int() argument must be a string, a bytes-like object or a number, not 'NoneType' +29/04/2021 17:03:13 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:18 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:23 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:29 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:34 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:40 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:45 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:51 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:03:56 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:02 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:07 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:13 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:18 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:24 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:29 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:35 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:40 FTSampler caught error: can only concatenate str (not "int") to str +29/04/2021 17:04:46 FTSampler caught error: can only concatenate str (not "int") to str diff --git a/sampler/FTDInOut.py b/sampler/FTDInOut.py index be05bbb..0b50ab9 100644 --- a/sampler/FTDInOut.py +++ b/sampler/FTDInOut.py @@ -1,9 +1,11 @@ #!/usr/bin/python +from os import getrandom from gpiozero import LED,Button import time from datetime import datetime import redis +import os #configurazione per lavorare su server redis locale REDIS_PORT = 6379 @@ -65,5 +67,8 @@ while (1): else: led.off() - time.sleep(.1) - \ No newline at end of file + if(getRedisVal('SETTINGS:POWER:OFF') == "1"): + redSrv0.set('SETTINGS:POWER:OFF',0) + os.system("sudo shutdown -h now") + + time.sleep(.1) \ No newline at end of file diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index f2223cf..6d8e8a1 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -1,5 +1,6 @@ #!/usr/bin/python +import math import time import datetime import ADS1256 @@ -20,6 +21,35 @@ def getRedisVal(redisKey): else: return redSrv0.get(redisKey).decode('utf-8') +def echoList(redisKey, numVal): + currList = redSrv0.lrange(redisKey, 0, numVal) + currString = '' + for curVal in range(0,numVal,+1): + currString = currString + ' ' + str(curVal) + ': ' + str((float)(currList[curVal].decode('utf-8'))) + ' | ' + print(currString) + +def putRedisListVal(redisKey, value, maxLen): + #echoList(redisKey, maxLen) + redSrv0.lpush(redisKey, value) + # se supero lunghezza --> rimuovo + redSrv0.ltrim(redisKey, 0, maxLen) + #echoList(redisKey, maxLen) + +def getRmsVal(redisKey, numVal): + # leggo lista da redis + currList = redSrv0.lrange(redisKey, 0, numVal) + numVal= len(currList) + # print (len(currList)) + sumSquare=0 + # per ogni elemento calcolo quadrato + for curVal in range(0,numVal,+1): + sumSquare = sumSquare + (float)(currList[curVal].decode('utf-8'))*(float)(currList[curVal].decode('utf-8')) + + # divido e faccio radice quadrata + rmsVal = math.sqrt(sumSquare / numVal) + + return rmsVal + #assegno director log per file di debug LOG_path = "/home/pi/Flythis/" @@ -28,10 +58,25 @@ startingSampleFreq = 250 redSampleFreq = 'SETTINGS:LOG:FREQ' redSrv0.set(redSampleFreq,startingSampleFreq) +#definizioni variabili +redRmsList ='RTDATA:RMSLIST' + #se non c'รจ un valore nei campi di redis, popolo il db redSrv0.set('SETTINGS:DECIMALS:COUNT',3) redSrv0.set('SETTINGS:LOG:STATUS',0) + +if redSrv0.get('SETTINGS:POWER:CH') is None: + redSrv0.set('SETTINGS:POWER:CH', 10) +if redSrv0.get('SETTINGS:POWER:THRESH') is None: + redSrv0.set('SETTINGS:POWER:THRESH', 100) +if redSrv0.get('SETTINGS:POWER:OFF') is None: + redSrv0.set('SETTINGS:POWER:OFF', 0) +if redSrv0.get('SETTINGS:SMOOTHING:FUNCTION') is None: + redSrv0.set('SETTINGS:SMOOTHING:FUNCTION', 0) +if redSrv0.get('SETTINGS:SMOOTHING:FACTOR') is None: + redSrv0.set('SETTINGS:SMOOTHING:FACTOR', 10) + if redSrv0.get('SETTINGS:PASSWORD:CURRENT') is None: redSrv0.set('SETTINGS:PASSWORD:CURRENT',"-") if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None: @@ -61,56 +106,84 @@ for numCh in range(0,8,+1): if redSrv0.get('RTDATA:OUT:'+str(numCh)) is None: redSrv0.set('RTDATA:OUT:'+str(numCh),1) +#funzione salva time+data di log e otto valori su redis +def redisSave(CHvalue): + decimalsCount = int(getRedisVal('SETTINGS:DECIMALS:COUNT')) + smoothFunction= int(getRedisVal('SETTINGS:SMOOTHING:FUNCTION')) + smoothFact= int(getRedisVal('SETTINGS:SMOOTHING:FACTOR')) + redLastLog = 'RTDATA:TIME:LOG' + dateFormat ="%d/%m/%Y %H:%M:%S" + rawLastLog = datetime.datetime.now() + lastLog = rawLastLog.strftime(dateFormat) + redSrv0.set(redLastLog,str(lastLog)) + for chIndex in range(0,8,+1): + redAreaIn = 'RTDATA:CH:'+str(chIndex) + redAreaOut = 'RTDATA:OUT:'+str(chIndex) + redRmsArea = redRmsList+':'+str(chIndex) + innovazione = float("%.4f" % (CHvalue[chIndex]*5.0/0x7fffff)) + strValIn = innovazione + # verifico il TIPO di Smoothing richiesto: 0 none, 1 EWMA, 2 RMS + if (smoothFunction == 1): + # EWMA: RILEGGO DA REDIS vecchio valore + oldVal = float(redSrv0.get(redAreaIn)) + # effettuo smoothing valore + strValIn = (innovazione/smoothFact) + (oldVal * (smoothFact-1) / smoothFact) + + elif (smoothFunction == 2): + # accodo innovazioni + putRedisListVal(redRmsArea, innovazione, smoothFact) + # calcolo valore RMS + strValIn = getRmsVal(redRmsArea, smoothFact) + else: + # nessuno smooting + strValIn = innovazione + + #salvo valore IN filtrato + redSrv0.set(redAreaIn,round(strValIn,8)) + + # salvo i valori scalati in OUT + roundedOut = round(scaleVal(CHvalue[chIndex]*5.0/0x7fffff, chIndex), decimalsCount) + redSrv0.set(redAreaOut,roundedOut) + +#funzione di refresh valori scalati +def scaleVal(inValue, chIndex): + #rileggo da redis i valori min/max secondo chIndex + chInMin = float(0) + if (redSrv0.get('SETTINGS:IN:MIN:'+str(chIndex)) != 0): + chInMin = float(redSrv0.get('SETTINGS:IN:MIN:'+str(chIndex))) + chInMax = float(3.3) + if (redSrv0.get('SETTINGS:IN:MAX:'+str(chIndex)) != 100): + chInMax = float(redSrv0.get('SETTINGS:IN:MAX:'+str(chIndex))) + chOutMin = float(0) + if (redSrv0.get('SETTINGS:OUT:MIN:'+str(chIndex)) != 0): + chOutMin = float(redSrv0.get('SETTINGS:OUT:MIN:'+str(chIndex))) + chOutMax = float(1000) + if (redSrv0.get('SETTINGS:OUT:MAX:'+str(chIndex)) != 100): + chOutMax = float(redSrv0.get('SETTINGS:OUT:MAX:'+str(chIndex))) + # check denom zero + deltaOut = (chOutMax - chOutMin) + deltaIn = (chInMax - chInMin) + if(deltaIn==0): + deltaIn = 1 + # calcolo scalato + outVal = chOutMin + ((inValue-chInMin) * (deltaOut / deltaIn)) + return outVal + +def checkPowerOff(): + powerChannel = getRedisVal('SETTINGS:POWER:CH') + if(int(powerChannel) < 10): + if(getRedisVal('SETTINGS:POWER:OFF')=="0"): + limitVal = float(getRedisVal('SETTINGS:POWER:THRESH')) + actVal = float(getRedisVal('RTDATA:CH:' + str(powerChannel))) + if(actVal > limitVal): + # chiedo spognimento + redSrv0.set('SETTINGS:POWER:OFF',1) + # init oggetto lettura da try: CH = ADS1256.ADS1256() CH.ADS1256_init() - #funzione salva time+data di log e otto valori su redis - def redisSave(CHvalue): - decimalsCount = int(getRedisVal('SETTINGS:DECIMALS:COUNT')) - redLastLog = 'RTDATA:TIME:LOG' - dateFormat ="%d/%m/%Y %H:%M:%S" - rawLastLog = datetime.datetime.now() - lastLog = rawLastLog.strftime(dateFormat) - redSrv0.set(redLastLog,str(lastLog)) - for chIndex in range(0,8,+1): - redAreaIn = 'RTDATA:CH:'+str(chIndex) - redAreaOut = 'RTDATA:OUT:'+str(chIndex) - innovazione = float("%.4f" % (CHvalue[chIndex]*5.0/0x7fffff)) - # RILEGGO DA REDIS vecchio valore - oldVal = float(redSrv0.get(redAreaIn)) - # effettuo smoothing valore - strValIn = (innovazione/3) + (oldVal*2/3) - roundedIn = round(strValIn, decimalsCount) - redSrv0.set(redAreaIn,roundedIn) - # salvo i valori scalati in OUT - roundedOut = round(scaleVal(CHvalue[chIndex]*5.0/0x7fffff, chIndex), decimalsCount) - redSrv0.set(redAreaOut,roundedOut) - - #funzione di refresh valori scalati - def scaleVal(inValue, chIndex): - #rileggo da redis i valori min/max secondo chIndex - chInMin = float(0) - if (redSrv0.get('SETTINGS:IN:MIN:'+str(chIndex)) != 0): - chInMin = float(redSrv0.get('SETTINGS:IN:MIN:'+str(chIndex))) - chInMax = float(3.3) - if (redSrv0.get('SETTINGS:IN:MAX:'+str(chIndex)) != 100): - chInMax = float(redSrv0.get('SETTINGS:IN:MAX:'+str(chIndex))) - chOutMin = float(0) - if (redSrv0.get('SETTINGS:OUT:MIN:'+str(chIndex)) != 0): - chOutMin = float(redSrv0.get('SETTINGS:OUT:MIN:'+str(chIndex))) - chOutMax = float(1000) - if (redSrv0.get('SETTINGS:OUT:MAX:'+str(chIndex)) != 100): - chOutMax = float(redSrv0.get('SETTINGS:OUT:MAX:'+str(chIndex))) - # check denom zero - deltaOut = (chOutMax - chOutMin) - deltaIn = (chInMax - chInMin) - if(deltaIn==0): - deltaIn = 1 - # calcolo scalato - outVal = chOutMin + ((inValue-chInMin) * (deltaOut / deltaIn)) - return outVal - + #ciclo principale while(1): redisTime = 'RTDATA:TIME:SRV' @@ -119,16 +192,20 @@ try: lastLog = now.strftime(dateFormat) redSrv0.set(redisTime,str(lastLog)) CHvalue = CH.ADS1256_GetAll() + # salvo valori redisSave(CHvalue) + # controllo soglia spegnimento + checkPowerOff() # riporto ultima esecuzione ad adesso endExec = datetime.datetime.now() # calcolo il delta time dovuto alle esecuzioni delta = endExec - now - waitTime = int(redSrv0.get(redSampleFreq)) / 1000 - delta.microseconds/1000000 + waitTime = int(getRedisVal(redSampleFreq)) / 1000 - delta.microseconds/1000000 if(waitTime < 0.1): waitTime = 0.1 # attesa time.sleep(waitTime) + #print('read done: ' + str(getRedisVal(redSampleFreq)) + ' | ' + str(waitTime)) #eccezione da ctrl+c in terminale e chiusura except KeyboardInterrupt: diff --git a/server/FTServer.py b/server/FTServer.py index 1925107..c00e33d 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -109,7 +109,9 @@ def api_channels_all(): 'LastSessionName' : getRedisVal('RTDATA:SESSION:NAME'), 'GateOpen': getRedisVal('RTDATA:GATE_OPEN'), 'CurrentWorkFolder' : getRedisVal('SETTINGS:FOLDER:CURRENT'), - 'RealDateStatus' : getRedisVal('SETTINGS:TIME:REAL') + 'RealDateStatus' : getRedisVal('SETTINGS:TIME:REAL'), + 'SmoothingFactor' : getRedisVal('SETTINGS:SMOOTHING:FACTOR'), + 'ChannelThreshold' : getRedisVal('SETTINGS:POWER:THRESH') } # restituisce in formato json i dati letti da redis return jsonify(channelsData) @@ -281,7 +283,7 @@ def insertDateTime(): def insertPassword(): #funzione inserimento password currentPassword = request.form['PasswordForm'] - redSrv0.set('SETTINGS:PASSWORD:CURRENT', currentPassword, ex=6000) + redSrv0.set('SETTINGS:PASSWORD:CURRENT', currentPassword, ex=3600) return redirect("/settings") @flaskApp.route("/api/v1/setup/saveInMin", methods=['PUT']) @@ -302,22 +304,43 @@ def setupInMax(): @flaskApp.route("/api/v1/setup/selectChannelA/", methods=['PUT']) def selectChannelA(numChA): - print(numChA) redSrv0.set('SETTINGS:CHANNEL:A', numChA) return "OK" @flaskApp.route("/api/v1/setup/selectChannelB/", methods=['PUT']) def selectChannelB(numChB): - print(numChB) redSrv0.set('SETTINGS:CHANNEL:B', numChB) return "OK" @flaskApp.route("/api/v1/setup/selectChannel/", methods=['PUT']) def setChannel(numCh): - print(numCh) redSrv0.set('SETTINGS:SELECTED_CH', numCh) return redirect("/settings") +@flaskApp.route("/api/v1/setup/selectPowerChannel/", methods=['PUT']) +def setPowerChannel(numPowerCh): + redSrv0.set('SETTINGS:POWER:CH', numPowerCh) + return "OK" + +@flaskApp.route("/api/v1/setup/selectProcessing/", methods=['PUT']) +def setProcessing(processingType): + redSrv0.set('SETTINGS:SMOOTHING:FUNCTION', processingType) + return "OK" + +@flaskApp.route("/api/v1/threshold", methods=['POST']) +def setPowerThreshold(): + powerThreshold = request.form['ChThreshold'] + redSrv0.set('SETTINGS:POWER:THRESH', powerThreshold) + # rimando in settings + return redirect("/settings") + +@flaskApp.route("/api/v1/smoothFact", methods=['POST']) +def setSmoothFact(): + smoothingFactor = request.form['smoothFact'] + redSrv0.set('SETTINGS:SMOOTHING:FACTOR', smoothingFactor) + # rimando in settings + return redirect("/settings") + @flaskApp.route("/api/v1/frequency", methods=['POST']) def setWriteFrequency(): #funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq @@ -378,10 +401,9 @@ def resetSetup(): return redirect("/settings") @flaskApp.route("/api/v1/setup/poweroff", methods=['PUT']) - #spegne il sistema def FTShutdown(): redSrv0.set('SETTINGS:TIME:REAL',0) - os.system("sudo shutdown -h now") + redSrv0.set('SETTINGS:POWER:OFF',1) #spegne il sistema #dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket) diff --git a/server/templates/logger.html b/server/templates/logger.html index 7f1ef35..cc519f9 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -9,23 +9,31 @@ var intTimeSlow=2000; // fix visualizzazioni - fixTables(); - dataRefresh(); + fixTables(); + dataRefresh(); + + function fixFloat(actVal, numCount) + { + return parseFloat(actVal).toFixed(numCount) + } function dataRefresh() { // scarico i dati aggioranti $.ajax({url: "/api/v1/channels/all", success: function(result){ + numCount = parseInt(result.DecimalsCount) var divWidth = document.getElementById("divChA").offsetWidth // compilo i dati scaricati $("#SelChannelA").html(result.ChA); - $("#OutputA").html(result.Outs[result.ChA]); + $("#OutputA").html(fixFloat(result.Outs[result.ChA],numCount)); + // $("#OutputA").html(result.Outs[result.ChA]); setGaugeA(divWidth,result.Outs[result.ChA],result.Outmin[result.ChA],result.Outmax[result.ChA]); $("#SelChannelB").html(result.ChB); - $("#OutputB").html(result.Outs[result.ChB]); + $("#OutputB").html(fixFloat(result.Outs[result.ChB],numCount)); + // $("#OutputB").html(result.Outs[result.ChB]); setGaugeB(divWidth,result.Outs[result.ChB],result.Outmin[result.ChB],result.Outmax[result.ChB]); diff --git a/server/templates/settings.html b/server/templates/settings.html index a3b6001..947ab3d 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -3,19 +3,25 @@ {% block content %}
@@ -303,35 +333,72 @@
-
- Selezione canale +
+ Impostazione canale analogico a soglia per gestione autospegnimento.
-
- -
-
-
-
- Soglia spegnimento:   - -
-
-
-
- +
+
+
+
+ Selezione canale +
+
-
- +
+
+
+ Soglia spegnimento:   +
+ +
+ +
+
+
+
+
+
+
+
+ Tipo processing +
+
+
+
+
+
+ Selezione Processing +
+ +
+
+
+
+
+ Fattore di Smoothing:   +
+ +
+ +
+
+
+
@@ -341,16 +408,14 @@
-
- Decimals Count:   - -
-
-
-
- +
+
+ Decimals Count:   +
+ +
+
-