moar pointers
This commit is contained in:
parent
f66d5d3224
commit
e5faad5879
3 changed files with 5 additions and 3 deletions
|
@ -12,7 +12,7 @@ import (
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
var r radar_lib.Radar
|
var r *radar_lib.Radar
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
r = radar_lib.New(config.C.Radar.Port, config.C.Radar.Baud)
|
r = radar_lib.New(config.C.Radar.Port, config.C.Radar.Baud)
|
||||||
|
|
|
@ -74,7 +74,7 @@ var (
|
||||||
endSequence = []byte{0x0D, 0x0A}
|
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{
|
s, err := serial.Open(port, &serial.Mode{
|
||||||
BaudRate: baudrate,
|
BaudRate: baudrate,
|
||||||
DataBits: 8,
|
DataBits: 8,
|
||||||
|
@ -83,7 +83,7 @@ func New(port string, baudrate int) Radar {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
r := Radar{
|
r := &Radar{
|
||||||
port: s,
|
port: s,
|
||||||
baudrate: baudrate,
|
baudrate: baudrate,
|
||||||
configResponseChannel: make(chan configResponse),
|
configResponseChannel: make(chan configResponse),
|
||||||
|
|
|
@ -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)
|
log.Printf("Speed: %dkm/h (%s, Over: %s, Valid: %s)", buf[3], dir, overspeed, valid)
|
||||||
if r.speedHandler != nil {
|
if r.speedHandler != nil {
|
||||||
r.speedHandler(int(buf[3]))
|
r.speedHandler(int(buf[3]))
|
||||||
|
} else {
|
||||||
|
log.Printf("speedhandler = nil")
|
||||||
}
|
}
|
||||||
if overspeed == "yes" && valid == "yes" && r.handler != nil {
|
if overspeed == "yes" && valid == "yes" && r.handler != nil {
|
||||||
r.handler(int(buf[3]))
|
r.handler(int(buf[3]))
|
||||||
|
|
Loading…
Add table
Reference in a new issue