From 80b373a7a4d38e5bf1dd43ba22d290b3c67aecdb Mon Sep 17 00:00:00 2001 From: Eric Gideon Date: Fri, 15 Jul 2016 01:28:30 -0700 Subject: [PATCH] Remove clock / clock diff row from status template; also remove from js and go. --- main/gen_gdl90.go | 2 -- web/plates/js/status.js | 10 ++-------- web/plates/status.html | 16 ---------------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/main/gen_gdl90.go b/main/gen_gdl90.go index 2fff888a..92b46c09 100644 --- a/main/gen_gdl90.go +++ b/main/gen_gdl90.go @@ -739,7 +739,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() @@ -977,7 +976,6 @@ type status struct { GPS_solution string RY835AI_connected bool Uptime int64 - Clock time.Time UptimeClock time.Time CPUTemp float32 NetworkDataMessagesSent uint64 diff --git a/web/plates/js/status.js b/web/plates/js/status.js index 365b1fdd..259c47fb 100755 --- a/web/plates/js/status.js +++ b/web/plates/js/status.js @@ -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; @@ -54,19 +54,13 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) { $scope.GPS_satellites_seen = status.GPS_satellites_seen; $scope.GPS_solution = status.GPS_solution; $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) { $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..891b0aec 100755 --- a/web/plates/status.html +++ b/web/plates/status.html @@ -93,22 +93,6 @@ {{CPUTemp}} - -
-
-
- Stratux Clock: - {{Clock}} -
-
- Device Clock: - {{LocalClock}} -
-
- Difference: - {{SecondsFast}} sec -
-