diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-04-28 22:15:18 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-04-28 22:15:18 +0200 |
| commit | 98e0de7863633b68b52b883016c23e35f647583e (patch) | |
| tree | e6772f4dd4d24e1a65dd00be3af12634a9b1fafd | |
| parent | e831fe2f99bc6ad8f030b86ffc566072b695904f (diff) | |
| download | glutte-serial-web-98e0de7863633b68b52b883016c23e35f647583e.tar.gz glutte-serial-web-98e0de7863633b68b52b883016c23e35f647583e.tar.bz2 glutte-serial-web-98e0de7863633b68b52b883016c23e35f647583e.zip | |
Fix re flags and /stats route
| -rwxr-xr-x | glutte_serial_web.py | 2 | ||||
| -rw-r--r-- | serialrx.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/glutte_serial_web.py b/glutte_serial_web.py index b5552dc..f9ef067 100755 --- a/glutte_serial_web.py +++ b/glutte_serial_web.py @@ -41,7 +41,7 @@ adsl = adsl.ADSL(ser) def index(): return render_template('index.html', last_lines=ser.get_last_lines()) -@sockets.route('/stats') +@app.route('/stats') def stats(): t_now = time.time() values = ser.get_parsed_values() diff --git a/serialrx.py b/serialrx.py index f5bce5f..07a55b1 100644 --- a/serialrx.py +++ b/serialrx.py @@ -30,11 +30,10 @@ import time import config -flags = re.ASCII -re_cc_capa = re.compile(r"\[\d+\] CC: CAPA,\d+,(\d+)", flags) -re_cc_vbat_plus = re.compile(r"\[\d+\] CC: VBAT\+,\d+,(\d+)", flags) -re_num_sv = re.compile(r"\[\d+\] T_GPS.+ (\d+) SV tracked", flags) -re_alim = re.compile(r"\[\d+\] ALIM (\d+) mV", flags) +re_cc_capa = re.compile(r"\[\d+\] CC: CAPA,\d+,(\d+)") +re_cc_vbat_plus = re.compile(r"\[\d+\] CC: VBAT\+,\d+,(\d+)") +re_num_sv = re.compile(r"\[\d+\] T_GPS.+ (\d+) SV tracked") +re_alim = re.compile(r"\[\d+\] ALIM (\d+) mV") class MessageParser: def __init__(self): |