From dac359f76e12394ffe7f591185cb2e157feec7e9 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Fri, 27 Sep 2024 16:15:43 +0930 Subject: [PATCH] Display new fields on web interface --- rx/rx_ssdv.py | 5 +++++ rx/templates/index.html | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/rx/rx_ssdv.py b/rx/rx_ssdv.py index 904d5af..48fa075 100644 --- a/rx/rx_ssdv.py +++ b/rx/rx_ssdv.py @@ -152,6 +152,11 @@ temp_f = open("rxtemp.bin",'wb') while True: + + # These reads can hang if the rtl_sdr locks up + # We should add some kind of watchdog system around this, so if we don't seee + # any packets for X minutes, the process exits, and is (hopefully) restarted by systemd. + if args.hex: # Incoming data is as a hexadecimal string. # We can read these in safely using sys.stdin.readline(), diff --git a/rx/templates/index.html b/rx/templates/index.html index 9e16ab7..afdafb3 100644 --- a/rx/templates/index.html +++ b/rx/templates/index.html @@ -100,8 +100,21 @@ var ascent = msg.ascent_rate.toFixed(1); var numSV = msg.numSV.toFixed(0); - var _new_desc = msg.timestamp + "Z " + lat + ", " + lon + " " + alt + "m " + ascent + " m/s " + numSV + " SVs"; + var _new_desc = msg.timestamp + "Z: " + lat + ", " + lon + " " + alt + "m " + ascent + " m/s " + numSV + " SVs"; $('#gps-data').html(_new_desc); + + var _new_gps_detailed = msg.timestamp + "Z: " + if(msg.hasOwnProperty('radio_temp')){ + _new_gps_detailed += "Radio Temp: " + msg.radio_temp.toFixed(1) + "˚C" + } + if(msg.hasOwnProperty('cpu_temp')){ + _new_gps_detailed += ", CPU Temp: " + msg.cpu_temp.toFixed(1) + "˚C" + } + _new_gps_detailed += ", Load Avgs: " + msg.load_avg_1.toFixed(2) + "/" + msg.load_avg_5.toFixed(2) + "/" + msg.load_avg_15.toFixed(2) + _new_gps_detailed += ", Disk Usage: " + msg.disk_percent.toFixed(2) +"%" + _new_gps_detailed += ", CPU Speed: " + msg.cpu_speed +" MHz" + $('#detail_gps_telem_data').html(_new_gps_detailed); + } }); @@ -272,6 +285,11 @@
+
+
+
+
+
Log Messages