Skip to content

Commit 809f564

Browse files
committed
pathhandler bug, logging, barge bug
1 parent 9a34f42 commit 809f564

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

src/main/java/frc/robot/Robot.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ public void teleopInit() {
9696
m_autonomousCommand.cancel();
9797
}
9898
if (!m_robotContainer.hasElevatorZeroed()) m_robotContainer.zeroElevator();
99-
99+
else if (m_robotContainer.wasScoringCoral()) {
100+
m_robotContainer.finishAuto();
101+
} else {
102+
m_robotContainer.stow();
103+
}
104+
100105
m_robotContainer.setIsAuto(false);
101106
m_robotContainer.setIsAutoPlacing(true);
102107
m_robotContainer.setScoringSide(ScoreSide.LEFT);
103108
m_robotContainer.disableNoMotionCal();
104109

105-
if (m_robotContainer.wasScoringCoral()) {
106-
m_robotContainer.finishAuto();
107-
} else {
108-
m_robotContainer.stow();
109-
}
110110
}
111111

112112
@Override

src/main/java/frc/robot/commands/auton/NonProcessorShallowSlowAutonCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public void reassignAlliance() {
119119
pathHandler.setNodeNames(NodeNames);
120120
pathHandler.setNodeLevels(NodeLevels);
121121
pathHandler.setStartNode(startNode);
122+
pathHandler.setGetAlgaeLast(false);
122123
// pathHandler.reassignAlliance();
123124
}
124125
}

src/main/java/frc/robot/commands/auton/ProcessorShallowSlowAutonCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public void reassignAlliance() {
116116
pathHandler.setNodeNames(NodeNames);
117117
pathHandler.setNodeLevels(NodeLevels);
118118
pathHandler.setStartNode(startNode);
119+
pathHandler.setGetAlgaeLast(false);
119120
// pathHandler.reassignAlliance();
120121
}
121122
}

src/main/java/frc/robot/subsystems/climb/ClimbIOServoFX.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static edu.wpi.first.units.Units.Rotations;
44

5+
import com.ctre.phoenix6.BaseStatusSignal;
56
import com.ctre.phoenix6.StatusSignal;
67
import com.ctre.phoenix6.configs.CurrentLimitsConfigs;
78
import com.ctre.phoenix6.configs.TalonFXConfiguration;
@@ -12,6 +13,7 @@
1213
import com.ctre.phoenix6.hardware.TalonFX;
1314
import com.ctre.phoenix6.signals.NeutralModeValue;
1415
import edu.wpi.first.units.measure.Angle;
16+
import edu.wpi.first.units.measure.AngularVelocity;
1517
import edu.wpi.first.wpilibj.Servo;
1618
import frc.robot.constants.ClimbConstants;
1719
import frc.robot.subsystems.climb.ClimbIO.ClimbIOInputs;
@@ -36,7 +38,8 @@ public class ClimbIOServoFX implements ClimbIO {
3638
new MotionMagicDutyCycle(0).withEnableFOC(false).withFeedForward(0).withSlot(0);
3739
private VoltageOut voltageRequest = new VoltageOut(0).withEnableFOC(false);
3840

39-
StatusSignal<Angle> currPosition;
41+
private StatusSignal<Angle> currPosition;
42+
private StatusSignal<AngularVelocity> currVelocity;
4043

4144
public ClimbIOServoFX() {
4245
logger = LoggerFactory.getLogger(this.getClass());
@@ -52,6 +55,7 @@ public ClimbIOServoFX() {
5255
configuratorFront.apply(ClimbConstants.getPivotArmFxConfig());
5356

5457
currPosition = talonFxPivotArmFront.getPosition();
58+
currVelocity = talonFxPivotArmFront.getVelocity();
5559
}
5660

5761
// @Override
@@ -83,7 +87,9 @@ public void setPinServoPosition(double position) {
8387

8488
@Override
8589
public void updateInputs(ClimbIOInputs inputs) {
86-
inputs.position = currPosition.refresh().getValueAsDouble();
90+
BaseStatusSignal.refreshAll(currVelocity, currPosition);
91+
inputs.position = currPosition.getValueAsDouble();
92+
inputs.velocity = currVelocity.getValueAsDouble();
8793
inputs.ratchetServoPosition = ratchetServo.getPosition();
8894
inputs.pinServoPosition = pinServo.getPosition();
8995
}

src/main/java/frc/robot/subsystems/robotState/RobotStateSubsystem.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@ public void periodic() {
726726

727727
case TO_STOW -> {
728728
if (biscuitSubsystem.isFinished() && elevatorSubsystem.isFinished()) {
729+
driveSubsystem.removeDriveMultiplier();
729730
setState(RobotStates.STOW);
730731
}
731732
}

0 commit comments

Comments
 (0)