Skip to content

Commit 154f5cb

Browse files
committed
Working
1 parent 18915d1 commit 154f5cb

10 files changed

+22
-18
lines changed

src/main/deploy/paths/AmpInitial3_MiddleNote1_Part1.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
max_velocity = 2.0 #m/s
2-
max_acceleration = 2.5 #m/s
2+
max_acceleration = 1.0 #m/s
33
start_velocity = 0.0 #m/s
44
end_velocity = 2.0 #m/s
55
is_reversed = false
@@ -14,4 +14,4 @@ target_yaw = 90.0 #degrees
1414

1515
[[internal_points]]
1616
x = 1.93 #1.93
17-
y = 7.66
17+
y = 7.60 # 7.66

src/main/deploy/paths/MiddleInitial1_WingNote2.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ target_yaw = 0.0 #degrees
1111
angle = 0.0
1212
[end_pose]
1313
dataPoint "W2"
14+
dX = 0.15
1415

1516
[[internal_points]]
1617
x = 2.0

src/main/deploy/paths/MiddleInitial1_WingNote3.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ target_yaw = -30.0 #degrees
1010
angle = 0.0
1111
[end_pose]
1212
dataPoint "W3"
13-
dX = -0.1
14-
dY = 0.25
13+
dX = 0.0
14+
dY = 0.1
1515
angle = -30.0
1616

1717
[[internal_points]]

src/main/deploy/paths/MiddleNote3_MiddleShoot3.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ target_yaw = 0.0 #degrees
2323

2424
[[internal_points]]
2525
x = 4.0
26-
y = 5.0
26+
y = 5.05
2727

2828
[[internal_points]]
2929
x = 3.007
30-
y = 5.113
30+
y = 5.163

src/main/deploy/paths/MiddleShoot3_WingNote3.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ target_yaw = -30.0 #degrees
1010
angle = -30.0
1111
[end_pose]
1212
dataPoint = "W3"
13-
dX = -0.1
14-
dY = 0.0
13+
dX = 0.1
14+
dY = 0.15
1515
angle = -30.0
1616

1717
[[internal_points]]

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public MiddleNote3AndWingNotesCommand(
103103
new AutoWaitNoteStagedCommand(robotStateSubsystem),
104104
new PrepShooterCommand(
105105
superStructure, robotStateSubsystem, AutonConstants.Setpoints.MS3))),
106+
new WaitCommand(0.02),
106107
new SubWooferCommand(robotStateSubsystem, superStructure, magazineSubsystem),
107108
middleShoot3WingNote3,
108109
new ParallelCommandGroup(
@@ -118,14 +119,14 @@ public MiddleNote3AndWingNotesCommand(
118119
robotStateSubsystem, superStructure, magazineSubsystem, intakeSubsystem),
119120
new DeadeyeHuntCommand(deadeye, driveSubsystem, robotStateSubsystem, ledSubsystem),
120121
new AutoWaitNoteStagedCommand(robotStateSubsystem),
121-
new VisionShootCommand(
122-
robotStateSubsystem, superStructure, magazineSubsystem, intakeSubsystem),
123-
124-
// Backup
125-
new DeadeyeHuntCommand(deadeye, driveSubsystem, robotStateSubsystem, ledSubsystem),
126-
new AutoWaitNoteStagedCommand(robotStateSubsystem),
127122
new VisionShootCommand(
128123
robotStateSubsystem, superStructure, magazineSubsystem, intakeSubsystem));
124+
125+
// Backup
126+
// new DeadeyeHuntCommand(deadeye, driveSubsystem, robotStateSubsystem, ledSubsystem),
127+
// new AutoWaitNoteStagedCommand(robotStateSubsystem),
128+
// new VisionShootCommand(
129+
// robotStateSubsystem, superStructure, magazineSubsystem, intakeSubsystem));
129130
}
130131

131132
public void generateTrajectory() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ public void execute() {
103103
case NORM_DRIVE:
104104
driveSubsystem.calculateController(desiredState, robotHeading);
105105
if (deadeye.getNumTargets() > 0
106-
&& timer.hasElapsed(trajectory.getTotalTimeSeconds() * AutonConstants.kPercentLeft)
106+
&& timer.hasElapsed(
107+
trajectory.getTotalTimeSeconds() * AutonConstants.kWingPercentLeft)
107108
&& ((robotStateSubsystem.getAllianceColor() == Alliance.Blue
108109
&& curX >= AutonConstants.kWingSwitchXLine)
109110
|| (robotStateSubsystem.getAllianceColor() == Alliance.Red

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public final class AutonConstants {
2020
public static final double kSwitchXLine = 6.5;
2121
public static final double kWingSwitchXLine = 1.4;
2222
public static final double kPercentLeft = 0.65;
23+
public static final double kWingPercentLeft = 0.5;
2324
public static final double kDeadeyeHuntOmegaRadps = -1.5;
2425
public static final double kFoundNoteLoopCounts = 3;
2526

@@ -163,7 +164,7 @@ public final class Setpoints {
163164
new Pose2d(3.052, 3.063, Rotation2d.fromDegrees(-47.39)); // Disrupt auto
164165

165166
// Path Midpoints
166-
public static final Pose2d MP1 = new Pose2d(2.5, 7.67, Rotation2d.fromDegrees(0.0)); // 5,7.61
167+
public static final Pose2d MP1 = new Pose2d(2.7, 7.67, Rotation2d.fromDegrees(0.0)); // 5,7.61
167168
public static final Pose2d MP2 = new Pose2d(3.89, 7.2, Rotation2d.fromDegrees(-90)); // AS4
168169
}
169170

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public final class MagazineConstants {
2727
public static final double kTrapReleaseTime = 0.75;
2828
public static final double kAmpReleaseSpeed = 40.0; // 20.0
2929
public static final double kPodiumRumbleSpeed = 80;
30-
public static final double kFastEmptyingSpeed = -75;
30+
public static final double kFastEmptyingSpeed = -55; // -75
3131

3232
public static final TalonFXConfiguration getMagazineConfig() {
3333
TalonFXConfiguration config = new TalonFXConfiguration();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ public final class SuperStructureConstants {
107107
// Auto Ignore Note
108108
public static final double kElbowIgnoreNoteSetPoint = kElbowSubwooferSetPoint;
109109
public static final double kBlueLeftShooterIgnoreNoteSetPoint = 10;
110-
public static final double kBlueRightShooterIgnoreNoteSetPoint = 60; // 50
110+
public static final double kBlueRightShooterIgnoreNoteSetPoint = 50;
111111
public static final double kWristIgnoreNoteSetPoint = kWristSubwooferSetPoint;
112112
}

0 commit comments

Comments
 (0)