diff --git a/radar/main.go b/radar/main.go index 9172a5a..781702f 100644 --- a/radar/main.go +++ b/radar/main.go @@ -12,7 +12,7 @@ import ( "github.com/sirupsen/logrus" ) -var r radar_lib.Radar +var r *radar_lib.Radar func init() { r = radar_lib.New(config.C.Radar.Port, config.C.Radar.Baud) diff --git a/radar_lib/main.go b/radar_lib/main.go index 656861d..36f484e 100644 --- a/radar_lib/main.go +++ b/radar_lib/main.go @@ -74,7 +74,7 @@ var ( endSequence = []byte{0x0D, 0x0A} ) -func New(port string, baudrate int) Radar { +func New(port string, baudrate int) *Radar { s, err := serial.Open(port, &serial.Mode{ BaudRate: baudrate, DataBits: 8, @@ -83,7 +83,7 @@ func New(port string, baudrate int) Radar { if err != nil { log.Fatal(err) } - r := Radar{ + r := &Radar{ port: s, baudrate: baudrate, configResponseChannel: make(chan configResponse), diff --git a/radar_lib/reader.go b/radar_lib/reader.go index fc7f4c7..0c00794 100644 --- a/radar_lib/reader.go +++ b/radar_lib/reader.go @@ -62,6 +62,8 @@ func (r *Radar) decodeInput(buf []byte) { log.Printf("Speed: %dkm/h (%s, Over: %s, Valid: %s)", buf[3], dir, overspeed, valid) if r.speedHandler != nil { r.speedHandler(int(buf[3])) + } else { + log.Printf("speedhandler = nil") } if overspeed == "yes" && valid == "yes" && r.handler != nil { r.handler(int(buf[3]))