Skip to content

Commit dc6c3c1

Browse files
3 1 changes (#100)
* added method that refreshes the relative turning encoder every 0.1 seconds * added DIO ports and leds for auto selector * fixed issues with overlapping DIO ports * fixed auto selector to display correct value * added the rest of the auto routines * ran spotless
1 parent df80317 commit dc6c3c1

File tree

5 files changed

+26
-9
lines changed

5 files changed

+26
-9
lines changed

src/main/java/frc/lib/AutoSelector.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public int getBinarySwitchPosition() {
6666
int sum = 0;
6767
for (int i = 0; i < switchPositions.length; i++) {
6868
if (!switchPositions[i].get()) {
69-
sum += 2 ^ i;
69+
sum += (1 << (i));
7070
}
7171
}
7272
return sum;
@@ -113,6 +113,10 @@ public void disabledPeriodic() {
113113
eventLoop.poll();
114114
SmartDashboard.putNumber("AutoSelectorSwitchPosition", getBinarySwitchPosition());
115115

116+
SmartDashboard.putBoolean("AutoSelectorDIOPort0", !switchPositions[0].get());
117+
SmartDashboard.putBoolean("AutoSelectorDIOPort1", !switchPositions[1].get());
118+
SmartDashboard.putBoolean("AutoSelectorDIOPort2", !switchPositions[2].get());
119+
116120
currentAutoOption.ifPresentOrElse(
117121
ao -> {
118122
SmartDashboard.putString("SelectedAutonomousMode", ao.getName());

src/main/java/frc/robot/Constants.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ public static final class DpadDirection {
234234
}
235235

236236
public static final class AutoConstants {
237-
public static final int kAllianceColorSelectorPort = 10;
237+
public static final int kAllianceColorSelectorPort = 3;
238238

239239
// max length is 8
240-
public static final int[] kAutonomousModeSelectorPorts = {11, 12, 13, 18, 19};
240+
public static final int[] kAutonomousModeSelectorPorts = {0, 1, 2};
241241

242242
// public static final double kMaxSpeedMetersPerSecond = 3.0;
243243
// public static final double kMaxAccelerationMetersPerSecondSquared = 3.0;
@@ -266,7 +266,7 @@ public static final class ClimberConstants {
266266
public static final double kEngagedPosition = 600.0 / 1024.0;
267267
public static final double kDisengedPosition = 475.0 / 1024.0;
268268

269-
public static final int kCageSensorPort = 1;
269+
public static final int kCageSensorPort = 6;
270270

271271
public static final double kP = 0.1;
272272
public static final double kI = 0;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
import frc.robot.LEDs.LEDs;
3131
import frc.robot.auto.BlueL4AlgaeAuto;
3232
import frc.robot.auto.BlueNoProcess3PieceAuto;
33-
import frc.robot.auto.ExampleAuto;
33+
import frc.robot.auto.BlueProcess3PieceAuto;
3434
import frc.robot.auto.RedL4AlgaeAuto;
35+
import frc.robot.auto.RedNoProcess3PieceAuto;
36+
import frc.robot.auto.RedProcess3PieceAuto;
3537
import frc.robot.climber.Climber;
3638
import frc.robot.drivetrain.Drivetrain;
3739
import frc.robot.drivetrain.commands.DriveToPoseCommand;
@@ -88,6 +90,8 @@ public Robot() {
8890
SmartDashboard.putData(
8991
"Align Encoders",
9092
new InstantCommand(() -> swerve.zeroAbsTurningEncoderOffsets()).ignoringDisable(true));
93+
94+
addPeriodic(() -> swerve.refreshRelativeTurningEncoder(), 0.1);
9195
}
9296

9397
@Override
@@ -283,9 +287,14 @@ private void configureEventBindings() {
283287
private void configureAutoOptions() {
284288
autoSelector.addAuto(new AutoOption(Alliance.Red, 1, new RedL4AlgaeAuto(swerve, elevator)));
285289
autoSelector.addAuto(new AutoOption(Alliance.Blue, 1, new BlueL4AlgaeAuto(swerve, elevator)));
290+
autoSelector.addAuto(
291+
new AutoOption(Alliance.Red, 2, new RedNoProcess3PieceAuto(swerve, elevator)));
286292
autoSelector.addAuto(
287293
new AutoOption(Alliance.Blue, 2, new BlueNoProcess3PieceAuto(swerve, elevator)));
288-
autoSelector.addAuto(new AutoOption(Alliance.Blue, 3, new ExampleAuto(swerve)));
294+
autoSelector.addAuto(
295+
new AutoOption(Alliance.Red, 3, new RedProcess3PieceAuto(swerve, elevator)));
296+
autoSelector.addAuto(
297+
new AutoOption(Alliance.Blue, 3, new BlueProcess3PieceAuto(swerve, elevator)));
289298
}
290299

291300
/**

src/main/java/frc/robot/drivetrain/Drivetrain.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public void periodic() {
8989
m_visionPosePublisher.set(poseEstimator.getEstimatedPosition());
9090

9191
for (SwerveModule module : SwerveModule.values()) {
92-
module.refreshRelativeTurningEncoder();
93-
9492
SmartDashboard.putNumber(
9593
module.getName() + "/RelativeTurningPosition",
9694
module.getRelativeTurningPosition().getDegrees());
@@ -142,6 +140,12 @@ public void zeroAbsTurningEncoderOffsets() {
142140
}
143141
}
144142

143+
public void refreshRelativeTurningEncoder() {
144+
for (SwerveModule module : SwerveModule.values()) {
145+
module.refreshRelativeTurningEncoder();
146+
}
147+
}
148+
145149
public Rotation2d getHeading() {
146150
return poseEstimator.getEstimatedPosition().getRotation();
147151
}

src/main/java/frc/robot/elevator/ElevatorConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private LifterState(double inches) {
7070

7171
public static final class CoralRollerConstants {
7272
public static final int kMotorPort = 23;
73-
public static final int kCoralSensorPort = 3;
73+
public static final int kCoralSensorPort = 5;
7474

7575
public static final double kGearRatio = 5.0;
7676
public static final double kRollerDiameter = 2.0; // inches

0 commit comments

Comments
 (0)