From ee6ca139af786a52590adf04d29ecafa1e508df5 Mon Sep 17 00:00:00 2001 From: Eric Gideon Date: Fri, 15 Jul 2016 00:36:14 -0700 Subject: [PATCH] add horizontal GPS precision to the "GPS solution" row on the status page --- main/gen_gdl90.go | 4 +++- web/plates/js/status.js | 3 ++- web/plates/status.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/main/gen_gdl90.go b/main/gen_gdl90.go index 2fff888a..5a08bb67 100644 --- a/main/gen_gdl90.go +++ b/main/gen_gdl90.go @@ -707,7 +707,7 @@ func cpuTempMonitor() { func updateStatus() { if mySituation.Quality == 2 { - globalStatus.GPS_solution = "GPS + SBAS (WAAS / EGNOS)" + globalStatus.GPS_solution = "GPS + SBAS (WAAS)" } else if mySituation.Quality == 1 { globalStatus.GPS_solution = "3D GPS" } else if mySituation.Quality == 6 { @@ -735,6 +735,7 @@ func updateStatus() { globalStatus.GPS_satellites_locked = mySituation.Satellites globalStatus.GPS_satellites_seen = mySituation.SatellitesSeen globalStatus.GPS_satellites_tracked = mySituation.SatellitesTracked + globalStatus.GPS_position_accuracy = mySituation.Accuracy // Update Uptime value globalStatus.Uptime = int64(stratuxClock.Milliseconds) @@ -973,6 +974,7 @@ type status struct { GPS_satellites_locked uint16 GPS_satellites_seen uint16 GPS_satellites_tracked uint16 + GPS_position_accuracy float32 GPS_connected bool GPS_solution string RY835AI_connected bool diff --git a/web/plates/js/status.js b/web/plates/js/status.js index 365b1fdd..6e2e6eaa 100755 --- a/web/plates/js/status.js +++ b/web/plates/js/status.js @@ -53,6 +53,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) { $scope.GPS_satellites_tracked = status.GPS_satellites_tracked; $scope.GPS_satellites_seen = status.GPS_satellites_seen; $scope.GPS_solution = status.GPS_solution; + $scope.GPS_position_accuracy = String(status.GPS_solution ? ", " + status.GPS_position_accuracy.toFixed(1) : ""); $scope.RY835AI_connected = status.RY835AI_connected; var tempClock = new Date(Date.parse(status.Clock)); var clockString = tempClock.toUTCString(); @@ -66,7 +67,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) { $scope.visible_errors = true; $scope.Errors = status.Errors; } - + var uptime = status.Uptime; if (uptime != undefined) { var up_d = parseInt((uptime/1000) / 86400), diff --git a/web/plates/status.html b/web/plates/status.html index aadf4f9e..532fdd7f 100755 --- a/web/plates/status.html +++ b/web/plates/status.html @@ -68,7 +68,7 @@
- {{GPS_solution}} + {{GPS_solution}}{{GPS_position_accuracy}}