Skip to content

Commit c0b530f

Browse files
committed
speeds
1 parent e6f3a14 commit c0b530f

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

src/main/java/frc/robot/constants/CoralConstants.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ public class CoralConstants {
2121

2222
public static final AngularVelocity kCloseEnough = RotationsPerSecond.of(0.1);
2323

24-
public static final AngularVelocity kIntakingSpeed = null;
25-
26-
public static final AngularVelocity kEjectingSpeed = null;
24+
public static final AngularVelocity kIntakingSpeed = RotationsPerSecond.of(-1);
25+
public static final AngularVelocity kEjectingSpeed = RotationsPerSecond.of(1);
2726

2827
// Coral Talon FX Config
2928
public static TalonFXSConfiguration getFXConfig() {
@@ -33,7 +32,6 @@ public static TalonFXSConfiguration getFXConfig() {
3332
new CurrentLimitsConfigs()
3433
.withStatorCurrentLimit(10)
3534
.withStatorCurrentLimitEnable(false)
36-
.withStatorCurrentLimit(20)
3735
.withSupplyCurrentLimit(10)
3836
.withSupplyCurrentLowerLimit(8)
3937
.withSupplyCurrentLowerTime(0.02)
@@ -47,7 +45,7 @@ public static TalonFXSConfiguration getFXConfig() {
4745
.withForwardLimitType(ForwardLimitTypeValue.NormallyOpen)
4846
.withForwardLimitSource(ForwardLimitSourceValue.LimitSwitchPin)
4947
.withReverseLimitAutosetPositionEnable(false)
50-
.withReverseLimitEnable(false)
48+
.withReverseLimitEnable(true)
5149
.withReverseLimitType(ReverseLimitTypeValue.NormallyOpen)
5250
.withReverseLimitSource(ReverseLimitSourceValue.LimitSwitchPin);
5351
fxsConfig.HardwareLimitSwitch = hwLimit;

src/main/java/frc/robot/subsystems/coral/CoralIO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public interface CoralIO {
1111
@AutoLog
1212
public static class CoralIOInputs {
1313
public AngularVelocity velocity = RotationsPerSecond.of(0.0);
14-
public boolean isFwdLimitSwitchClosed = false;
15-
public boolean isRevLimitSwitchClosed = false;
14+
public boolean isFwdBeamBroken = false;
15+
public boolean isRevBeamBroken = false;
1616
}
1717

1818
public default void setVelocity(AngularVelocity velocity) {}

src/main/java/frc/robot/subsystems/coral/CoralIOFX.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public void enableRevLimitSwitch(boolean enabled) {
6969
public void updateInputs(CoralIOInputs inputs) {
7070
BaseStatusSignal.refreshAll(curVelocity, fwdLimitSwitch, revLimitSwitch);
7171
inputs.velocity = curVelocity.getValue();
72-
inputs.isFwdLimitSwitchClosed = fwdLimitSwitch.getValue().value == 1; // FIXME check right value
73-
inputs.isRevLimitSwitchClosed = revLimitSwitch.getValue().value == 0; // FIXME check right value
72+
inputs.isFwdBeamBroken = fwdLimitSwitch.getValue().value == 0; // FIXME check right value
73+
inputs.isRevBeamBroken = revLimitSwitch.getValue().value == 0; // FIXME check right value
7474
}
7575

7676
@Override

src/main/java/frc/robot/subsystems/coral/CoralSubsystem.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class CoralSubsystem extends MeasurableSubsystem implements ClosedLoopSpe
1616
private final CoralIO io;
1717
private final CoralIOInputsAutoLogged inputs = new CoralIOInputsAutoLogged();
1818
private AngularVelocity setpoint = RotationsPerSecond.of(0.0);
19-
private CoralState curState;
19+
private CoralState curState = CoralState.IDLE;
2020
private org.slf4j.Logger logger = LoggerFactory.getLogger(CoralSubsystem.class);
2121

2222
public CoralSubsystem(CoralIO io) {
@@ -50,11 +50,11 @@ public boolean atSpeed() {
5050
}
5151

5252
public boolean isEnterBeamBroken() {
53-
return inputs.isFwdLimitSwitchClosed; // FIXME correct one?
53+
return inputs.isFwdBeamBroken;
5454
}
5555

5656
public boolean isExitBeamBroken() {
57-
return inputs.isRevLimitSwitchClosed; // FIXME correct one?
57+
return inputs.isRevBeamBroken;
5858
}
5959

6060
public void intake() {

0 commit comments

Comments
 (0)