Compare commits

..

No commits in common. "c0e8d9e2711f1105180647acd45cf08ee5d20637" and "9b5e9c232014876040e6365d9246221170d5a69a" have entirely different histories.

2 changed files with 8 additions and 12 deletions

View File

@ -84,9 +84,6 @@ func main() {
sc := arduino.NewAsymetricPWMSteeringConfig(steeringLeftPWM, steeringRightPWM, steeringCenterPWM) sc := arduino.NewAsymetricPWMSteeringConfig(steeringLeftPWM, steeringRightPWM, steeringCenterPWM)
a := arduino.NewPart(client, device, baud, throttleTopic, steeringTopic, driveModeTopic, switchRecordTopic, pubFrequency, sc) a := arduino.NewPart(client, device, baud, throttleTopic, steeringTopic, driveModeTopic, switchRecordTopic, pubFrequency, sc)
cli.HandleExit(a)
err = a.Start() err = a.Start()
if err != nil { if err != nil {
zap.S().Errorw("unable to start service", "error", err) zap.S().Errorw("unable to start service", "error", err)

View File

@ -91,7 +91,6 @@ func (a *Part) Start() error {
break break
} }
zap.L().Debug("raw line: %s", zap.String("raw", line))
if !serialLineRegex.MatchString(line) { if !serialLineRegex.MatchString(line) {
zap.S().Errorf("invalid line: '%v'", line) zap.S().Errorf("invalid line: '%v'", line)
continue continue
@ -126,10 +125,10 @@ func (a *Part) Stop() {
} }
func (a *Part) processChannel1(v string) { func (a *Part) processChannel1(v string) {
zap.L().Debug("process new value for steering on channel1", zap.String("value", v)) zap.L().Debug("process new value for channel1", zap.String("value", v))
value, err := strconv.Atoi(v) value, err := strconv.Atoi(v)
if err != nil { if err != nil {
zap.S().Errorf("invalid steering value for channel1, should be an int: %v", err) zap.S().Errorf("invalid value for channel1, should be an int: %v", err)
} }
a.steering = convertPwmSteeringToPercent(value, a.pwmSteeringConfig.Left, a.pwmSteeringConfig.Right, a.pwmSteeringConfig.Center) a.steering = convertPwmSteeringToPercent(value, a.pwmSteeringConfig.Left, a.pwmSteeringConfig.Right, a.pwmSteeringConfig.Center)
} }
@ -151,10 +150,10 @@ func convertPwmSteeringToPercent(value int, minPwm int, maxPwm int, middlePwm in
} }
func (a *Part) processChannel2(v string) { func (a *Part) processChannel2(v string) {
zap.L().Debug("process new throttle value on channel2", zap.String("value", v)) zap.L().Debug("process new value for channel2", zap.String("value", v))
value, err := strconv.Atoi(v) value, err := strconv.Atoi(v)
if err != nil { if err != nil {
zap.S().Errorf("invalid throttle value for channel2, should be an int: %v", err) zap.S().Errorf("invalid value for channel2, should be an int: %v", err)
} }
if value < MinPwmThrottle { if value < MinPwmThrottle {
value = MinPwmThrottle value = MinPwmThrottle
@ -177,7 +176,7 @@ func (a *Part) processChannel5(v string) {
value, err := strconv.Atoi(v) value, err := strconv.Atoi(v)
if err != nil { if err != nil {
zap.S().Errorf("invalid value for channel5 'record', should be an int: %v", err) zap.S().Errorf("invalid value for channel5, should be an int: %v", err)
} }
if value < 1800 { if value < 1800 {
@ -197,17 +196,17 @@ func (a *Part) processChannel6(v string) {
zap.L().Debug("process new value for channel6", zap.String("value", v)) zap.L().Debug("process new value for channel6", zap.String("value", v))
value, err := strconv.Atoi(v) value, err := strconv.Atoi(v)
if err != nil { if err != nil {
zap.S().Errorf("invalid value for channel6 'drive-mode', should be an int: %v", err) zap.S().Errorf("invalid value for channel6, should be an int: %v", err)
return return
} }
if value > 1800 { if value > 1800 {
if a.driveMode != events.DriveMode_PILOT { if a.driveMode != events.DriveMode_PILOT {
zap.S().Infof("Update channel 6 'drive-mode' with value %v, new user_mode: %v", value, events.DriveMode_PILOT) zap.S().Infof("Update channel 6 with value %v, new user_mode: %v", value, events.DriveMode_PILOT)
a.driveMode = events.DriveMode_PILOT a.driveMode = events.DriveMode_PILOT
} }
} else { } else {
if a.driveMode != events.DriveMode_USER { if a.driveMode != events.DriveMode_USER {
zap.S().Infof("Update channel 6 'drive-mode' with value %v, new user_mode: %v", value, events.DriveMode_USER) zap.S().Infof("Update channel 6 with value %v, new user_mode: %v", value, events.DriveMode_USER)
} }
a.driveMode = events.DriveMode_USER a.driveMode = events.DriveMode_USER
} }