Skip to content

Commit a0a1cb7

Browse files
authored
Merge pull request #115 from strykeforce/grg-hotfix
GRG Hotfix
2 parents 2c9ed3c + a9c2037 commit a0a1cb7

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

src/main/deploy/paths/MiddleNote1_MiddleShoot.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ target_yaw = 13.0 #degrees
1010
dX = -0.5
1111
angle = 180.0
1212
[end_pose]
13-
x = 4.3
14-
y = 6.5
13+
dataPoint = "MS2"
1514
angle = 180.0
1615

1716
[[internal_points]]

src/main/deploy/paths/MiddleNote5_NonAmpShoot2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
max_velocity = 5.0 #m/s
2-
max_acceleration = 1.5 #m/s
2+
max_acceleration = 3.0 #m/s 1.5
33
start_velocity = 0.0 #m/s
44
end_velocity = 0.0 #m/s
55
is_reversed = false
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
max_velocity = 5.0 #m/s
2+
max_acceleration = 4.4 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.0 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
dataPoint = "W1"
10+
dY = 0.1
11+
dX = 1.0
12+
angle = 0.0
13+
14+
[end_pose]
15+
dataPoint = "M1"
16+
dX = -0.5
17+
18+
19+
[[internal_points]]
20+
x = 5.72
21+
y = 7.4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public final class Setpoints {
204204
MI1; // new Pose2d(1.57, 4.737, Rotation2d.fromDegrees(0.0)); // y = 5.05
205205
public static final Pose2d NAS1 = new Pose2d(4.2, 2.8, Rotation2d.fromDegrees(-33.2));
206206
public static final Pose2d NAS2 =
207-
new Pose2d(4.55, 4.6, Rotation2d.fromDegrees(-12.2)); // 4,5.1, -6.7
207+
new Pose2d(4.4, 4.6, Rotation2d.fromDegrees(-12.2)); // 4.55, 4.6 -12.2 -> 4,5.1, -6.7
208208
public static final Pose2d NAS2_SPIN =
209209
new Pose2d(4.36, 4.74, Rotation2d.fromDegrees(-12.2)); // 4,5.1, -6.7
210210
public static final Pose2d NAS3 =

0 commit comments

Comments
 (0)