nathan/invertergui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use time provided by data poller instead of getting time again.

Browse Source
This commit is contained in:
Hendrik van Wyk
2017-09-16 12:05:15 +02:00
parent 74a3722b09
commit 2e623658ca
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webgui/webgui.go
View File

@@ -119,7 +119,7 @@ type templateInput struct {
func (w *WebGui) ServeHTTP(rw http.ResponseWriter, r *http.Request) { func (w *WebGui) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
statusErr := <-w.respChan statusErr := <-w.respChan
tmpInput := buildTemplateInput(&statusErr, time.Now()) tmpInput := buildTemplateInput(&statusErr, statusErr.timestamp)
err := w.template.Execute(rw, tmpInput) err := w.template.Execute(rw, tmpInput)
if err != nil { if err != nil {
@@ -170,6 +170,7 @@ type statusProcessed struct {
status datasource.MultiplusStatus status datasource.MultiplusStatus
chargeLevel float64 chargeLevel float64
err error err error
timestamp time.Time
} }
// dataPoll waits for data from the w.poller channel. It will send its currently stored status // 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 { } else {
statusP.status = s.MpStatus statusP.status = s.MpStatus
statusP.err = nil statusP.err = nil
statusP.timestamp = s.Time
tracker.Update(s.MpStatus.BatCurrent, s.Time) tracker.Update(s.MpStatus.BatCurrent, s.Time)
if s.MpStatus.Leds[Float] == 1 { if s.MpStatus.Leds[Float] == 1 {
tracker.Reset() tracker.Reset()