From 2e623658ca582d967446201b9f41dd39d61998cc Mon Sep 17 00:00:00 2001 From: Hendrik van Wyk Date: Sat, 16 Sep 2017 12:05:15 +0200 Subject: [PATCH] Use time provided by data poller instead of getting time again. --- webgui/webgui.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webgui/webgui.go b/webgui/webgui.go index 8ff60f8..d7fa36f 100644 --- a/webgui/webgui.go +++ b/webgui/webgui.go @@ -119,7 +119,7 @@ type templateInput struct { func (w *WebGui) ServeHTTP(rw http.ResponseWriter, r *http.Request) { statusErr := <-w.respChan - tmpInput := buildTemplateInput(&statusErr, time.Now()) + tmpInput := buildTemplateInput(&statusErr, statusErr.timestamp) err := w.template.Execute(rw, tmpInput) if err != nil { @@ -170,6 +170,7 @@ type statusProcessed struct { status datasource.MultiplusStatus chargeLevel float64 err error + timestamp time.Time } // dataPoll waits for data from the w.poller channel. It will send its currently stored status @@ -187,6 +188,7 @@ func (w *WebGui) dataPoll(batteryCapacity float64) { } else { statusP.status = s.MpStatus statusP.err = nil + statusP.timestamp = s.Time tracker.Update(s.MpStatus.BatCurrent, s.Time) if s.MpStatus.Leds[Float] == 1 { tracker.Reset()