From 08ccf6549870ea826c5ded740010a9b78db0e10b Mon Sep 17 00:00:00 2001 From: Kevin Lyda <kevin@ie.suberic.net> Date: Tue, 31 Jan 2017 22:41:58 +0000 Subject: [PATCH] Now SetTime works. --- cmd/gqgmc/main.go | 2 -- devices/geiger/gqgmc.go | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cmd/gqgmc/main.go b/cmd/gqgmc/main.go index 8261436..1f2f2f8 100644 --- a/cmd/gqgmc/main.go +++ b/cmd/gqgmc/main.go @@ -33,8 +33,6 @@ func main() { return } - gc.SetTime(time.Now()) - t, err = gc.GetTime() if err != nil { fmt.Printf("Failed: '%s'\n", err) diff --git a/devices/geiger/gqgmc.go b/devices/geiger/gqgmc.go index 02a0191..9ee2de0 100644 --- a/devices/geiger/gqgmc.go +++ b/devices/geiger/gqgmc.go @@ -221,7 +221,7 @@ func (gc *GQGMCCounter) setTimeParts(t time.Time) { cmd string unit int }{ - {"<SETDATEYY", t.Year()}, + {"<SETDATEYY", t.Year() - 2000}, {"<SETDATEMM", int(t.Month())}, {"<SETDATEDD", t.Day()}, {"<SETTIMEHH", t.Hour()}, @@ -233,25 +233,23 @@ func (gc *GQGMCCounter) setTimeParts(t time.Time) { copy(cmd[:], c.cmd) cmd[10] = uint8(c.unit) copy(cmd[11:], ">>") - fmt.Printf("%s: %+v\n", c.cmd, cmd) - //gc.port.Write(cmd) - //gc.readCmd(1) + gc.port.Write(cmd) + gc.readCmd(1) } } func (gc *GQGMCCounter) setTimeAll(t time.Time) { cmd := make([]byte, 20) copy(cmd[:], "<SETDATETIME") - cmd[12] = uint8(t.Year()) + cmd[12] = uint8(t.Year() - 2000) cmd[13] = uint8(int(t.Month())) cmd[14] = uint8(t.Day()) cmd[15] = uint8(t.Hour()) cmd[16] = uint8(t.Minute()) cmd[17] = uint8(t.Second()) copy(cmd[18:], ">>") - fmt.Printf("setTimeAll: %+v\n", cmd) - //gc.port.Write(cmd) - //gc.readCmd(1) + gc.port.Write(cmd) + gc.readCmd(1) } // GetTime gets the time -- GitLab