Remove clock / clock diff row from status template; also remove from js and go.

pull/463/head
Eric Gideon 2016-07-15 01:28:30 -07:00
rodzic eebf4be15c
commit 80b373a7a4
3 zmienionych plików z 2 dodań i 26 usunięć

Wyświetl plik

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

Wyświetl plik

@ -40,7 +40,7 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
console.log('Received status update.') console.log('Received status update.')
var status = JSON.parse(msg.data) var status = JSON.parse(msg.data)
// Update Status // Update Status
$scope.Version = status.Version; $scope.Version = status.Version;
$scope.Build = status.Build.substr(0, 10); $scope.Build = status.Build.substr(0, 10);
$scope.Devices = status.Devices; $scope.Devices = status.Devices;
@ -54,19 +54,13 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
$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.RY835AI_connected = status.RY835AI_connected; $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. // Errors array.
if (status.Errors.length > 0) { if (status.Errors.length > 0) {
$scope.visible_errors = true; $scope.visible_errors = true;
$scope.Errors = status.Errors; $scope.Errors = status.Errors;
} }
var uptime = status.Uptime; var uptime = status.Uptime;
if (uptime != undefined) { if (uptime != undefined) {
var up_d = parseInt((uptime/1000) / 86400), var up_d = parseInt((uptime/1000) / 86400),

Wyświetl plik

@ -93,22 +93,6 @@
<span class="col-xs-7">{{CPUTemp}}</span> <span class="col-xs-7">{{CPUTemp}}</span>
</div> </div>
</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> </div>
</div> </div>