Skip to content

Commit df53b43

Browse files
day 1
1 parent 8b472f7 commit df53b43

File tree

6 files changed

+168
-2
lines changed

6 files changed

+168
-2
lines changed
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"waypoints": [
3+
{
4+
"anchorPoint": {
5+
"x": 1.0,
6+
"y": 3.0
7+
},
8+
"prevControl": null,
9+
"nextControl": {
10+
"x": 2.0,
11+
"y": 3.0
12+
},
13+
"holonomicAngle": 0,
14+
"isReversal": false,
15+
"velOverride": null,
16+
"isLocked": false,
17+
"isStopPoint": false,
18+
"stopEvent": {
19+
"names": [],
20+
"executionBehavior": "parallel",
21+
"waitBehavior": "none",
22+
"waitTime": 0
23+
}
24+
},
25+
{
26+
"anchorPoint": {
27+
"x": 3.0,
28+
"y": 5.0
29+
},
30+
"prevControl": {
31+
"x": 3.0,
32+
"y": 4.0
33+
},
34+
"nextControl": {
35+
"x": 3.0,
36+
"y": 4.0
37+
},
38+
"holonomicAngle": 0,
39+
"isReversal": true,
40+
"velOverride": null,
41+
"isLocked": false,
42+
"isStopPoint": false,
43+
"stopEvent": {
44+
"names": [],
45+
"executionBehavior": "parallel",
46+
"waitBehavior": "none",
47+
"waitTime": 0
48+
}
49+
},
50+
{
51+
"anchorPoint": {
52+
"x": 5.0,
53+
"y": 3.0
54+
},
55+
"prevControl": {
56+
"x": 4.0,
57+
"y": 3.0
58+
},
59+
"nextControl": null,
60+
"holonomicAngle": 0,
61+
"isReversal": false,
62+
"velOverride": null,
63+
"isLocked": false,
64+
"isStopPoint": false,
65+
"stopEvent": {
66+
"names": [],
67+
"executionBehavior": "parallel",
68+
"waitBehavior": "none",
69+
"waitTime": 0
70+
}
71+
}
72+
],
73+
"markers": []
74+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.74,
6+
"y": 4.48
7+
},
8+
"rotation": -59.45431809626428
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "AutoStart"
18+
}
19+
},
20+
{
21+
"type": "named",
22+
"data": {
23+
"name": "ShootNote"
24+
}
25+
},
26+
{
27+
"type": "path",
28+
"data": {
29+
"pathName": "SourceSpeaker-Mobility"
30+
}
31+
}
32+
]
33+
}
34+
},
35+
"folder": "Source Speaker",
36+
"choreoAuto": false
37+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 0.7352600952201659,
7+
"y": 4.484967101535422
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 1.1905904713351545,
12+
"y": 1.3049178174275693
13+
},
14+
"isLocked": false,
15+
"linkedName": "SourceSpeaker"
16+
},
17+
{
18+
"anchor": {
19+
"x": 3.858855262194511,
20+
"y": 1.022510230073842
21+
},
22+
"prevControl": {
23+
"x": 3.2258727388154664,
24+
"y": 1.0419866154085826
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 3.8,
36+
"maxAcceleration": 4.0,
37+
"maxAngularVelocity": 500.0,
38+
"maxAngularAcceleration": 2000.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": -60.0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": "Source Speaker",
47+
"previewStartingState": {
48+
"rotation": -60.0,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": true
52+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public static class WristConstants {
229229
public static final double WRIST_GEAR_RATIO = 25.0 * 42.0 / 18.0;
230230

231231
public static final Rotation2d WRIST_MAX = new Rotation2d(Units.degreesToRadians(60));
232-
public static final Rotation2d WRIST_MIN = Rotation2d.fromRadians(0.12799356352873126);
232+
public static final Rotation2d WRIST_MIN = Rotation2d.fromRadians(0.10695095737072258);
233233

234234
public static final double WRIST_OFFSET = 0.805 + Math.PI / 2.0;
235235
public static final int WRIST_ENCODER_PORT = 7;

src/main/java/frc/robot/RobotContainer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,13 @@ private void evaluateDriveStyle(Command newCommand) {
323323
if (oldCommand != null) {
324324
// We have to cancel the command so the new default one will run
325325
oldCommand.cancel();
326+
326327
}
327328
}
328329

329330
public Command getAutonomousCommand() {
330331
return autos.getAutoChooser().getSelected();
332+
333+
331334
}
332335
}

src/main/java/frc/robot/commands/ScoringCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static Command shootSetpointIdleCommand(ShooterSubsystem shooterSubsystem
3030

3131
public static Command shootSetpointAmpCommand(ShooterSubsystem shooterSubsystem) {
3232
// return shooterSubsystem.setVoltageCommand(8.0);
33-
return shooterSubsystem.runVelocityCommand(Units.rotationsPerMinuteToRadiansPerSecond(1000.0));
33+
return shooterSubsystem.runVelocityCommand(Units.rotationsPerMinuteToRadiansPerSecond(2000.0));
3434
}
3535

3636
public static Command transportCloseSpeakerCommand(TransportSubsystem transportSubsystem) {

0 commit comments

Comments
 (0)