|
20 | 20 | import edu.wpi.first.math.system.plant.DCMotor; |
21 | 21 | import edu.wpi.first.wpilibj.DataLogManager; |
22 | 22 | import edu.wpi.first.wpilibj.RobotBase; |
| 23 | +import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; |
23 | 24 | import swervelib.encoders.SwerveAbsoluteEncoder; |
24 | 25 | import swervelib.parser.PIDFConfig; |
25 | 26 | import swervelib.telemetry.SwerveDriveTelemetry; |
@@ -229,7 +230,7 @@ public SwerveMotor setAbsoluteEncoder(SwerveAbsoluteEncoder encoder) |
229 | 230 | public void configureIntegratedEncoder(double positionConversionFactor) |
230 | 231 | { |
231 | 232 | this.positionConversionFactor = positionConversionFactor; |
232 | | - this.velocityConversionFactor = positionConversionFactor * 60.0; |
| 233 | + this.velocityConversionFactor = positionConversionFactor; |
233 | 234 |
|
234 | 235 | motor.useEncoderType(EncoderType.INTERNAL); |
235 | 236 | configureCANStatusFrames(0.25, 0.01, 0.01, 0.02, 0.20); |
@@ -368,7 +369,9 @@ public void setReference(double setpoint, double feedforward, double position) |
368 | 369 | if (RobotBase.isReal()) { |
369 | 370 | if (isDriveMotor) |
370 | 371 | { |
371 | | - setVoltage(feedforward); |
| 372 | + double convertedSetpoint = setpoint / velocityConversionFactor; |
| 373 | + double motorSetpoint = velocityConversion.toMotor(convertedSetpoint); |
| 374 | + motor.setVelocity(motorSetpoint, feedforward); |
372 | 375 | } else |
373 | 376 | { |
374 | 377 | double convertedSetpoint = absoluteEncoder.map(it -> setpoint).orElse(setpoint / positionConversionFactor); |
@@ -519,19 +522,20 @@ public boolean usingExternalFeedbackSensor() |
519 | 522 | */ |
520 | 523 | private void checkErrors(String message) |
521 | 524 | { |
522 | | - if (SwerveDriveTelemetry.verbosity.ordinal() >= TelemetryVerbosity.INFO.ordinal()) |
| 525 | + if (SwerveDriveTelemetry.verbosity.ordinal() >= TelemetryVerbosity.HIGH.ordinal()) |
523 | 526 | { |
524 | 527 | List<ThriftyNova.Error> errors = motor.getErrors(); |
525 | 528 | if (errors.size() > 0) |
526 | 529 | { |
527 | 530 | for (ThriftyNova.Error error : errors) |
528 | 531 | { |
529 | | - if (SwerveDriveTelemetry.verbosity.ordinal() >= TelemetryVerbosity.HIGH.ordinal()) { |
| 532 | + if (SwerveDriveTelemetry.verbosity.ordinal() >= TelemetryVerbosity.MACHINE.ordinal()) { |
530 | 533 | System.out.println(this.getClass().getSimpleName() + ": " + message + error.toString()); |
531 | 534 | } |
532 | 535 | DataLogManager.log(this.getClass().getSimpleName() + ": " + message + error.toString()); |
533 | 536 | } |
534 | 537 | } |
| 538 | + motor.clearErrors(); |
535 | 539 | } |
536 | 540 | } |
537 | 541 |
|
|
0 commit comments