diff --git a/radar/main.go b/radar/main.go index 781702f..c43d069 100644 --- a/radar/main.go +++ b/radar/main.go @@ -18,6 +18,7 @@ func init() { r = radar_lib.New(config.C.Radar.Port, config.C.Radar.Baud) r.SetEventHandler(onEvent) r.SetSpeedHandler(onSpeedEvent) + SetCommunicationConfig() } func onSpeedEvent(speed int) { @@ -42,15 +43,19 @@ func onEvent(speed int) { printer.PrintTicket(speedingTicket) } -func SetConfig(height int, angle int) { - r.SetBaseConfig(height, angle, 0) +func SetConfig(height int, angle int, waveform bool) { + if waveform { + r.SetBaseConfig(height, angle, 1) + } else { + r.SetBaseConfig(height, angle, 0) + } } func SetSpeedConfig(speed int, minDistance, maxDistance, minSpeed, maxSpeed, triggerDistance int) { - r.SetTargetSpeedConfig(radar_lib.DirectionBidirectional, minDistance*2, maxDistance*2, minSpeed, maxSpeed, speed, radar_lib.OutputLogicMostPlausible) + r.SetTargetSpeedConfig(radar_lib.DirectionIncoming, minDistance*2, maxDistance*2, minSpeed, maxSpeed, speed, radar_lib.OutputLogicMostPlausible) } -func SetBaseConfig() { +func SetCommunicationConfig() { r.SetCommunicationConfig(radar_lib.PortRS485, radar_lib.Baud115200, radar_lib.OutputTypeNoOutput, radar_lib.OutputTypeNoOutput, radar_lib.OutputTypeNoOutput, 50) } diff --git a/radar_lib/main.go b/radar_lib/main.go index 058368a..872f13d 100644 --- a/radar_lib/main.go +++ b/radar_lib/main.go @@ -108,6 +108,7 @@ func (r *Radar) write(data []byte) error { if err != nil { return err } + log.Printf("data written") return r.port.Drain() } diff --git a/webserver/setup.go b/webserver/setup.go index 1f8d3c8..d22d0e9 100644 --- a/webserver/setup.go +++ b/webserver/setup.go @@ -37,5 +37,6 @@ func HandleSetupSave(ctx *gin.Context) { if err != nil { logrus.Error(err) } - radar.SetConfig(cfg.RadarHeight, cfg.RadarAngle) + radar.SetConfig(cfg.RadarHeight, cfg.RadarAngle, cfg.RadarWaveform) + }