diff --git a/cmd/gqgmc/main.go b/cmd/gqgmc/main.go index 9ae1acbe3956d1e1f4ae679c5f89b26f18671611..e22f9eb2c0f95ac0c757baca02ff1c452d903a0b 100644 --- a/cmd/gqgmc/main.go +++ b/cmd/gqgmc/main.go @@ -36,20 +36,23 @@ func main() { t, err = gc.GetTime() if err != nil { fmt.Printf("Failed: '%s'\n", err) + } else { + fmt.Printf("Time: %s\n", t) } - fmt.Printf("Time: %s\n", t) cpm, err = gc.GetCPM() if err != nil { fmt.Printf("CPM failed: '%s'\n", err) + } else { + fmt.Printf("CPM: %d\n", cpm) } - fmt.Printf("CPM: %d\n", cpm) cps, err = gc.GetCPS() if err != nil { fmt.Printf("CPS failed: '%s'\n", err) + } else { + fmt.Printf("CPS: %d\n", cps) } - fmt.Printf("CPS: %d\n", cps) fmt.Printf("Version: %s\n", gc.Version()) fmt.Printf("Model: %s\n", gc.Model()) @@ -58,15 +61,20 @@ func main() { volts, err = gc.Volts() if err != nil { fmt.Printf("Volts failed: '%s'\n", err) + } else { + fmt.Printf("Volts: %d\n", volts) } - fmt.Printf("Volts: %d\n", volts) temp, err = gc.GetTemp() if err != nil { fmt.Printf("Temp failed: '%s'\n", err) + } else { + fmt.Printf("Temp: %g\n", temp) } - fmt.Printf("Temp: %g\n", temp) - gc.GetConfiguration() + err = gc.GetConfiguration() + if err != nil { + fmt.Printf("Failed to get config: '%s'\n", err) + } } diff --git a/devices/geiger/geiger.go b/devices/geiger/geiger.go index 27e2e2e2d22084bbba4113ca154169eee28284fa..60d1e60b862508a1e8ed0430c30254875be48df2 100644 --- a/devices/geiger/geiger.go +++ b/devices/geiger/geiger.go @@ -32,7 +32,7 @@ type Counter interface { TurnOffCPS() error GetAutoCPS() (uint16, error) TurnOffPower() - GetConfiguration() + GetConfiguration() error SetConfiguration() SetTime(time.Time) GetTime() (time.Time, error) diff --git a/devices/geiger/gqgmc.go b/devices/geiger/gqgmc.go index 11c365ccffbf25b3018996cd3a5d565da5b944ff..717f118d34a1c0e27aec8b02db3a1f8988d42380 100644 --- a/devices/geiger/gqgmc.go +++ b/devices/geiger/gqgmc.go @@ -235,19 +235,20 @@ func (gc *GQGMCCounter) TurnOffPower() { } // GetConfiguration reads configuration data -func (gc *GQGMCCounter) GetConfiguration() { +func (gc *GQGMCCounter) GetConfiguration() error { if !gc.supportedModels(mod280n300) { - return + return errors.New("Unsupported Model") } if gc.versionLT("Re 2.10") { - return + return errors.New("Unsupported version") } cfg, err := gc.communicate(cmdGetCfg, 256) if err != nil { - return + return err } - fmt.Printf("%+v\n", cfg) + fmt.Printf("Configuration: %+v\n", cfg) + return nil } // SetConfiguration writes configuration data