From 2416c83976bd20f86d0546fa21605987fc7561ca Mon Sep 17 00:00:00 2001 From: martha-johnston <106617924+martha-johnston@users.noreply.github.com> Date: Thu, 21 Sep 2023 12:40:46 -0400 Subject: [PATCH] RSDK-4902: FIX (#2965) --- components/motor/gpio/motor_encoder.go | 14 ++++++-------- components/motor/gpio/setup.go | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/components/motor/gpio/motor_encoder.go b/components/motor/gpio/motor_encoder.go index fe820cb0302..14954bda44d 100644 --- a/components/motor/gpio/motor_encoder.go +++ b/components/motor/gpio/motor_encoder.go @@ -127,8 +127,6 @@ func newEncodedMotor( em.maxPowerPct = 1.0 } - rpmDebug = motorConfig.Debug - return em, nil } @@ -270,10 +268,10 @@ func (m *EncodedMotor) makeAdjustments(pos, lastPos float64, now, lastTime int64 } if rpmDebug { - m.logger.Debug("making adjustments") - m.logger.Debugf("lastPos: %v, pos: %v, goalPos: %v", lastPos, pos, m.state.goalPos) - m.logger.Debugf("lastTime: %v, now: %v", lastTime, now) - m.logger.Debugf("currentRPM: %v, goalRPM: %v", m.state.currentRPM, m.state.goalRPM) + m.logger.Info("making adjustments") + m.logger.Infof("lastPos: %v, pos: %v, goalPos: %v", lastPos, pos, m.state.goalPos) + m.logger.Infof("lastTime: %v, now: %v", lastTime, now) + m.logger.Infof("currentRPM: %v, goalRPM: %v", m.state.currentRPM, m.state.goalRPM) } dir := m.directionMovingInLock() @@ -284,7 +282,7 @@ func (m *EncodedMotor) makeAdjustments(pos, lastPos float64, now, lastTime int64 powerPct = m.state.lastPowerPct } if rpmDebug { - m.logger.Debugf("decreasing powerPct to %v", powerPct) + m.logger.Infof("decreasing powerPct to %v", powerPct) } if err := m.setPower(m.cancelCtx, powerPct, true); err != nil { return err @@ -296,7 +294,7 @@ func (m *EncodedMotor) makeAdjustments(pos, lastPos float64, now, lastTime int64 powerPct = m.state.lastPowerPct } if rpmDebug { - m.logger.Debugf("increasing powerPct to %v", powerPct) + m.logger.Infof("increasing powerPct to %v", powerPct) } if err := m.setPower(m.cancelCtx, powerPct, true); err != nil { return err diff --git a/components/motor/gpio/setup.go b/components/motor/gpio/setup.go index 6826ffc55b4..7aabf581bdb 100644 --- a/components/motor/gpio/setup.go +++ b/components/motor/gpio/setup.go @@ -39,7 +39,6 @@ type Config struct { RampRate float64 `json:"ramp_rate_rpm_per_sec,omitempty"` // how fast to ramp power to motor when using rpm control MaxRPM float64 `json:"max_rpm,omitempty"` TicksPerRotation int `json:"ticks_per_rotation,omitempty"` - Debug bool `json:"rpm_debug,omitempty"` } // Validate ensures all parts of the config are valid.