Skip to content

Commit eb64ed0

Browse files
committed
fixed stuff
1 parent bd98958 commit eb64ed0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/frc/trigon/robot/subsystems/arm/Arm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void prepareForState(ArmConstants.ArmState targetState, boolean isStateReversed)
150150
this.targetState = targetState;
151151

152152
if (isStateReversed) {
153-
subtractFrom360(targetState.targetAngle);
153+
setTargetAngle(subtractFrom360(targetState.targetAngle));
154154
return;
155155
}
156156
setTargetAngle(targetState.targetAngle);

src/main/java/frc/trigon/robot/subsystems/elevator/Elevator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ public boolean isElevatorAboveSafeZone() {
8585
return getPositionMeters() >= ElevatorConstants.MAXIMUM_ELEVATOR_SAFE_ZONE_METERS;
8686
}
8787

88-
void loadCoralFromElevator() {
88+
void prepareLoadCoral() {
8989
this.targetState = ElevatorConstants.ElevatorState.LOAD_CORAL;
9090
scalePositionRequestSpeed(targetState.speedScalar);
91-
masterMotor.setControl(positionRequest.withPosition(ElevatorConstants.ElevatorState.LOAD_CORAL.targetPositionMeters));
91+
masterMotor.setControl(positionRequest.withPosition(metersToRotations(ElevatorConstants.ElevatorState.LOAD_CORAL.targetPositionMeters)));
9292
}
9393

9494
void setTargetState(ElevatorConstants.ElevatorState targetState) {

src/main/java/frc/trigon/robot/subsystems/elevator/ElevatorCommands.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public static Command getDebbugingCommand() {
1919
);
2020
}
2121

22-
public static Command getLoadCoralFromElevatorCommand() {
22+
public static Command getPrepareLoadCoral() {
2323
return new StartEndCommand(
24-
RobotContainer.ELEVATOR::loadCoralFromElevator,
24+
RobotContainer.ELEVATOR::prepareLoadCoral,
2525
RobotContainer.ELEVATOR::stop,
2626
RobotContainer.ELEVATOR
2727
).onlyIf(() -> RobotContainer.ARM.atState(ArmConstants.ArmState.REST));

0 commit comments

Comments
 (0)