Skip to content

Commit c17f55d

Browse files
Changes from Week Zero tournament.
1 parent ada9e7d commit c17f55d

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

src/main/java/org/mayheminc/robot2020/RobotContainer.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ private void configureButtonBindings() {
106106
private void configureDriverStickButtons() {
107107

108108
DRIVER_STICK.DRIVER_STICK_BUTTON_ONE_DISABLED.whenPressed(new SystemZeroIncludingGyro());
109+
// DRIVER_STICK.DRIVER_STICK_BUTTON_ONE_ENABLED.whenPressed(new
110+
// SystemZeroIncludingGyro());
109111
// DRIVER_STICK_BUTTON_ONE_ENABLED.whenPressed(new SystemZeroWithoutGyro());
110112

111113
// // adjust auto parameters
@@ -139,6 +141,8 @@ private void configureDriverPadButtons() {
139141
// ShooterSetTurretAbs(+5500));// about +30 degrees
140142
DRIVER_PAD.DRIVER_PAD_D_PAD_LEFT.whileHeld(new ShooterSetTurretVBus(-0.2));// about -30 degrees
141143
DRIVER_PAD.DRIVER_PAD_D_PAD_RIGHT.whileHeld(new ShooterSetTurretVBus(+0.2));// about +30 degrees
144+
DRIVER_PAD.DRIVER_PAD_D_PAD_UP.whenPressed(new ShooterSetHoodAbs(Shooter.HOOD_INITIATION_LINE_POSITION));
145+
DRIVER_PAD.DRIVER_PAD_D_PAD_DOWN.whenPressed(new ShooterSetHoodAbs(Shooter.HOOD_TARGET_ZONE_POSITION));
142146

143147
// Debug Hood
144148
// DRIVER_PAD.DRIVER_PAD_D_PAD_UP.whenPressed(new ShooterSetHoodRel(+1000));
@@ -152,7 +156,7 @@ private void configureDriverPadButtons() {
152156
DRIVER_PAD.DRIVER_PAD_RED_BUTTON.whenPressed(new ShooterSetWheel(0.0));
153157
DRIVER_PAD.DRIVER_PAD_YELLOW_BUTTON.whenPressed(new ShooterSetWheel(2700));
154158

155-
DRIVER_PAD.DRIVER_PAD_LEFT_UPPER_TRIGGER_BUTTON.whileHeld(new ShooterSetFeeder(0.5));
159+
DRIVER_PAD.DRIVER_PAD_LEFT_UPPER_TRIGGER_BUTTON.whileHeld(new ShooterSetFeeder(1.0));
156160

157161
// debug climber pistons
158162
// DRIVER_PAD.DRIVER_PAD_D_PAD_UP.whenPressed(new ClimberSetPistons(true));
@@ -164,9 +168,9 @@ private void configureOperatorStickButtons() {
164168
}
165169

166170
private void configureOperatorPadButtons() {
167-
OPERATOR_PAD.OPERATOR_PAD_BUTTON_ONE.whenPressed(new MagazineSetTurntable(0.2));
171+
OPERATOR_PAD.OPERATOR_PAD_BUTTON_ONE.whileHeld(new MagazineSetTurntable(0.2));
168172
OPERATOR_PAD.OPERATOR_PAD_BUTTON_TWO.whenPressed(new IntakeSetPosition(RobotContainer.intake.PIVOT_DOWN));
169-
OPERATOR_PAD.OPERATOR_PAD_BUTTON_THREE.whenPressed(new MagazineSetTurntable(1.0));
173+
OPERATOR_PAD.OPERATOR_PAD_BUTTON_THREE.whileHeld(new MagazineSetTurntable(0.5));
170174
OPERATOR_PAD.OPERATOR_PAD_BUTTON_FOUR.whenPressed(new IntakeSetPosition(RobotContainer.intake.PIVOT_UP));
171175

172176
// new ShooterSetWheel(1000));
@@ -188,13 +192,13 @@ private void configureOperatorPadButtons() {
188192
OPERATOR_PAD.OPERATOR_PAD_D_PAD_UP.whileHeld(new ShooterSetHoodVBus(+1.0));
189193
OPERATOR_PAD.OPERATOR_PAD_D_PAD_DOWN.whileHeld(new ShooterSetHoodVBus(-1.0));
190194

191-
OPERATOR_PAD.OPERATOR_PAD_RIGHT_Y_AXIS_UP.whileHeld(new ClimberSetWinchesPower(0.7));
195+
// OPERATOR_PAD.OPERATOR_PAD_RIGHT_Y_AXIS_UP.whileHeld(new
196+
// ClimberSetWinchesPower(0.7));
192197
OPERATOR_PAD.OPERATOR_PAD_RIGHT_Y_AXIS_DOWN.whileHeld(new ClimberSetWinchesPower(-0.7));
193198

194199
// OPERATOR_PAD.OPERATOR_PAD_LEFT_Y_AXIS_UP.whenPressed(new
195200
// MagazineSetTurntable());
196-
// OPERATOR_PAD.OPERATOR_PAD_LEFT_Y_AXIS_DOWN.whenPressed(new
197-
// ClimberSetPistons(false));
201+
OPERATOR_PAD.OPERATOR_PAD_LEFT_Y_AXIS_DOWN.whileHeld(new ChimneySetChimney(-1.0));
198202
}
199203

200204
/**

src/main/java/org/mayheminc/robot2020/autonomousroutines/DriveStraight.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.mayheminc.robot2020.commands.*;
1111
import org.mayheminc.robot2020.commands.DriveStraightOnHeading.DistanceUnits;
12+
import org.mayheminc.robot2020.subsystems.Shooter;
1213

1314
import edu.wpi.first.wpilibj2.command.*;
1415

@@ -20,7 +21,8 @@ public DriveStraight() {
2021

2122
addCommands(new DriveZeroGyro());
2223
// addCommands(new DriveStraightOnHeading(0.2, DistanceUnits.INCHES, 100, 0));
23-
addCommands(new DriveStraightOnHeading(0.3, DistanceUnits.INCHES, 100, 0));
24+
addCommands(new DriveStraightOnHeading(-0.3, DistanceUnits.INCHES, 50, 0));
25+
addCommands(new ShooterSetHoodAbs(Shooter.HOOD_TARGET_ZONE_POSITION));
2426
// addCommands(new DriveStraightOnHeading(0.4, DistanceUnits.INCHES, 100, 0));
2527

2628
// addCommands(new ParallelCommandGroup(new IntakeSetPosition(true), new

src/main/java/org/mayheminc/robot2020/subsystems/Shooter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public class Shooter extends SubsystemBase implements PidTunerObject {
2828
private final double SECONDS_PER_MINUTE = 60.0;
2929
private final double HUNDRED_MS_PER_SECOND = 10.0;
3030

31+
public final static double HOOD_INITIATION_LINE_POSITION = 44000;
32+
public final static double HOOD_TARGET_ZONE_POSITION = 5000;
33+
3134
double m_targetSpeedRPM;
3235
History headingHistory = new History();
3336

0 commit comments

Comments
 (0)