Skip to content

Commit 7001db8

Browse files
committed
Climber one more edit bc I forgot to save
1 parent 22290c0 commit 7001db8

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

src/main/java/frc/robot/subsystems/climber/ClimberIO.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ public interface ClimberIO {
66
@AutoLog
77
class ClimberIOInputs {
88
public double hangAppliedVolts = 0.0;
9+
910
public double leftCurrentAmps = 0.0;
1011
public double rightCurrentAmps = 0.0;
12+
1113
public double encoderRight = 0.0;
1214
public double encoderLeft = 0.0;
1315

16+
public double leftPositionRad = 0.0;
17+
public AngularVelocity leftAngularVelocity;
18+
19+
1420
}
1521

1622
default void updateInputs(ClimberIOInputs inputs) {}
1723

18-
default void hangSetVoltage(double voltage) {}
24+
default void hangRunVoltage(double voltage) {}
1925
}

src/main/java/frc/robot/subsystems/climber/ClimberIOSIM.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class ClimberIOSIM implements ClimberIO{
77
private static final double LOOP_PERIOD_SECS = 0.02;
88

99
private static final DCMotor leftExtentionMotor = DCMotor.DCMotor.getVex775Pro(1);
10-
private static final DCMotor rightExtentionMotor = DCMotorgetNEO(1);
10+
private static final DCMotor rightExtentionMotor = DCMotor.DCMotor.getNEO(1);
1111

1212
private DCMotorSim intakeSpinMotor =
1313
new DCMotorSim(
@@ -30,26 +30,28 @@ public void updateInputs(EndEffectorIOInputs inputs) {
3030
inputs.leftCurrentAmps = leftCurrentAmps;
3131
inputs.rightCurrentAmps = rightCurrentAmps;
3232

33-
inputs.spinAppliedVolts = intakeSpinMotor.getInputVoltage();
34-
inputs.rightCurrentAmps = intakeSpinMotor.getCurrentDrawAmps();
33+
inputs.hangAppliedVolts = leftExtentionMotor.getInputVoltage();
3534

36-
inputs.spinPositionRad = intakeSpinMotor.getAngularPositionRad();
37-
inputs.spinAngularVelocity = intakeSpinMotor.getAngularVelocity();
35+
inputs.rightCurrentAmps = rightExtentionMotor.getCurrentDrawAmps();
36+
inputs.leftCurentAmps = leftExtentionMotor.getCurrentDrawAmps();
3837

39-
inputs.articulationPositionRad = intakeRotateMotor.getAngularPositionRad();
40-
inputs.articulationAngularVelocity = intakeSpinMotor.getAngularVelocity();
38+
inputs.spinPositionRad = leftExtentionMotor.getAngularPositionRad();
39+
inputs.spinAngularVelocity = leftExtentionMotor.getAngularVelocity();
40+
41+
inputs.leftPositionRad = leftExtentionMotor.getAngularPositionRad();
42+
inputs.leftAngularVelocity = leftExtentionMotor.getAngularVelocity();
4143
}
4244

4345
@Override
44-
public void articulationRunVoltage(double voltage) {
45-
articulationAppliedVolts = voltage;
46-
intakeRotateMotor.setInputVoltage(voltage); //why setINPUTVoltage?
46+
public void hangRunVoltage(double voltage) {
47+
hangAppliedVolts = voltage;
48+
leftExtentionMotor.setInputVoltage(voltage);
4749
}
4850

4951
@Override
5052
public void spinRunVoltage(double voltage) {
5153
spinAppliedVolts = voltage;
52-
intakeSpinMotor.setInputVoltage(voltage); //why setINPUTVoltage?
54+
intakeSpinMotor.setInputVoltage(voltage);
5355

5456
}
5557

0 commit comments

Comments
 (0)