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

Merge pull request #463 from egid/egid-cleanup-426 

Clean out clock UI
pull/470/merge
cyoung 2016-08-05 17:07:02 -04:00 zatwierdzone przez GitHub
rodzic 973f576a54 80b373a7a4
commit ff79aa5555
3 zmienionych plików z 1 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
main/gen_gdl90.go
Wyświetl plik

@ -745,7 +745,6 @@ func updateStatus() {
// Update Uptime value
globalStatus.Uptime = int64(stratuxClock.Milliseconds)
globalStatus.UptimeClock = stratuxClock.Time
globalStatus.Clock = time.Now()
usage = du.NewDiskUsage("/")
globalStatus.DiskBytesFree = usage.Free()
@ -989,7 +988,6 @@ type status struct {
GPS_solution string
RY835AI_connected bool
Uptime int64
Clock time.Time
UptimeClock time.Time
CPUTemp float32
NetworkDataMessagesSent uint64

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

@ -40,7 +40,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
console.log('Received status update.')
var status = JSON.parse(msg.data)
// Update Status
// Update Status
$scope.Version = status.Version;
$scope.Build = status.Build.substr(0, 10);
$scope.Devices = status.Devices;
@ -56,12 +56,6 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
$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();
$scope.Clock = clockString;
var tempLocalClock = new Date;
$scope.LocalClock = tempLocalClock.toUTCString();
$scope.SecondsFast = (Math.round(tempClock-tempLocalClock)/1000).toFixed(2);
// Errors array.
if (status.Errors.length > 0) {

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

@ -100,22 +100,6 @@
<span class="col-xs-7">{{CPUTemp}}</span>
</div>
</div>
<div class="separator"></div>
<div class="row">
<div class="col-sm-4 label_adj">
<span class="col-xs-4"><strong>Stratux Clock:</strong></span>
<span class="col-xs-8">{{Clock}}</span>
</div>
<div class="col-sm-4 label_adj">
<span class="col-xs-4"><strong>Device Clock:</strong></span>
<span class="col-xs-8">{{LocalClock}}</span>
</div>
<div class="col-sm-4 label_adj">
<span class="col-xs-4"><strong>Difference:</strong></span>
<span class="col-xs-8">{{SecondsFast}} sec</span>
</div>
</div>
</div>
</div>
</div>