mirror
/
stratux
kopia lustrzana https://github.com/cyoung/stratux
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #461 from egid/egid-gps-tweak 

GPS accuracy on Status page
pull/470/merge
cyoung 2016-08-05 17:05:59 -04:00 zatwierdzone przez GitHub
rodzic 1a7405ee32 ee6ca139af
commit 973f576a54
3 zmienionych plików z 6 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
main/gen_gdl90.go
Wyświetl plik

@ -712,7 +712,7 @@ func cpuTempMonitor() {
func updateStatus() { func updateStatus() {
if mySituation.Quality == 2 { if mySituation.Quality == 2 {
globalStatus.GPS_solution = "GPS + SBAS (WAAS / EGNOS)" globalStatus.GPS_solution = "GPS + SBAS (WAAS)"
} else if mySituation.Quality == 1 { } else if mySituation.Quality == 1 {
globalStatus.GPS_solution = "3D GPS" globalStatus.GPS_solution = "3D GPS"
} else if mySituation.Quality == 6 { } else if mySituation.Quality == 6 {
@ -740,6 +740,7 @@ func updateStatus() {
globalStatus.GPS_satellites_locked = mySituation.Satellites globalStatus.GPS_satellites_locked = mySituation.Satellites
globalStatus.GPS_satellites_seen = mySituation.SatellitesSeen globalStatus.GPS_satellites_seen = mySituation.SatellitesSeen
globalStatus.GPS_satellites_tracked = mySituation.SatellitesTracked globalStatus.GPS_satellites_tracked = mySituation.SatellitesTracked
globalStatus.GPS_position_accuracy = mySituation.Accuracy
// Update Uptime value // Update Uptime value
globalStatus.Uptime = int64(stratuxClock.Milliseconds) globalStatus.Uptime = int64(stratuxClock.Milliseconds)
@ -983,6 +984,7 @@ type status struct {
GPS_satellites_locked uint16 GPS_satellites_locked uint16
GPS_satellites_seen uint16 GPS_satellites_seen uint16
GPS_satellites_tracked uint16 GPS_satellites_tracked uint16
GPS_position_accuracy float32
GPS_connected bool GPS_connected bool
GPS_solution string GPS_solution string
RY835AI_connected bool RY835AI_connected bool

1
web/plates/js/status.js
Wyświetl plik

@ -54,6 +54,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
$scope.GPS_satellites_tracked = status.GPS_satellites_tracked; $scope.GPS_satellites_tracked = status.GPS_satellites_tracked;
$scope.GPS_satellites_seen = status.GPS_satellites_seen; $scope.GPS_satellites_seen = status.GPS_satellites_seen;
$scope.GPS_solution = status.GPS_solution; $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; $scope.RY835AI_connected = status.RY835AI_connected;
var tempClock = new Date(Date.parse(status.Clock)); var tempClock = new Date(Date.parse(status.Clock));
var clockString = tempClock.toUTCString(); var clockString = tempClock.toUTCString();

2
web/plates/status.html
Wyświetl plik

@ -75,7 +75,7 @@
</div> </div>
<div class="row" ng-class="{'section_invisible': !visible_gps}"> <div class="row" ng-class="{'section_invisible': !visible_gps}">
<label class="col-xs-6">GPS solution:</label> <label class="col-xs-6">GPS solution:</label>
<span class="col-xs-6">{{GPS_solution}}</span> <span class="col-xs-6">{{GPS_solution}}{{GPS_position_accuracy}}</span>
</div> </div>
<div class="row" ng-class="{'section_invisible': !visible_gps}"> <div class="row" ng-class="{'section_invisible': !visible_gps}">
<label class="col-xs-6">GPS satellites:</label> <label class="col-xs-6">GPS satellites:</label>