Skip to content

March break+ changes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Mar 26, 2024
Merged

March break+ changes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
375ed0c
2024-03-16
Dangosaurus Mar 17, 2024
3c7f138
2024-03-17-A
Dangosaurus Mar 17, 2024
30f4332
2023-03-17-B
Dangosaurus Mar 18, 2024
b6e34bf
2024-03-17-B
Dangosaurus Mar 18, 2024
29e9a04
Bump PPLib
Dangosaurus Mar 18, 2024
f4cb995
2024-03-18
Dangosaurus Mar 19, 2024
a4fde4e
Bump REVLib
Dangosaurus Mar 19, 2024
2dd2ef0
2024-03-19
Dangosaurus Mar 20, 2024
30d96a8
2024-03-20-A
Dangosaurus Mar 21, 2024
6ff83aa
2024-03-20-B
Dangosaurus Mar 21, 2024
c5c4a99
2024-03-21-A
Dangosaurus Mar 21, 2024
3733a51
2024-03-21-B
Dangosaurus Mar 21, 2024
ca1ee96
2024-03-21-C
Dangosaurus Mar 22, 2024
02567cc
2024-03-21-D
Dangosaurus Mar 22, 2024
84f4483
2024-03-21-E
Dangosaurus Mar 22, 2024
6b2aca4
2024-03-21-F
Dangosaurus Mar 22, 2024
0769cc7
Delete old autos
Dangosaurus Mar 22, 2024
44d2ec4
2024-03-21-G
Dangosaurus Mar 22, 2024
001cbfe
Update autos
Dangosaurus Mar 22, 2024
777d23e
Fix updated autos
Dangosaurus Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .pathplanner/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"pathFolders": [],
"autoFolders": [
"2 Note",
"3 Note"
"3 Note",
"4 Note"
],
"defaultMaxVel": 1.5,
"defaultMaxAccel": 2.5,
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.5,
"defaultMaxAngVel": 360.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 5.0
"defaultMaxAngAccel": 450.0,
"maxModuleSpeed": 4.5
}
1 change: 1 addition & 0 deletions simgui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"NTProvider": {
"types": {
"/AdvantageKit/RealOutputs/Arm/Mechanism2d/ArmPivot": "Mechanism2d",
"/AdvantageKit/RealOutputs/Mechanism2d/ArmShooter": "Mechanism2d",
"/FMSInfo": "FMSInfo",
"/SmartDashboard/Autonomous Routine Chooser": "String Chooser"
Expand Down
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/autos/CenterSub2Note.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.35,
"y": 5.55
},
"rotation": 0.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "CenSub_CenNote"
}
},
{
"type": "named",
"data": {
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "QueueRevShoot"
}
},
{
"type": "named",
"data": {
"name": "ArmStow"
}
}
]
}
},
"folder": "2 Note",
"choreoAuto": false
}
73 changes: 73 additions & 0 deletions src/main/deploy/pathplanner/autos/CenterSub3NoteLower.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.35,
"y": 5.55
},
"rotation": 0.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "CenSub_CenNote"
}
},
{
"type": "named",
"data": {
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "CenNote_AngledLowerNote"
}
},
{
"type": "named",
"data": {
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "QueueRevShoot"
}
},
{
"type": "named",
"data": {
"name": "ArmStow"
}
}
]
}
},
"folder": "3 Note",
"choreoAuto": false
}
56 changes: 16 additions & 40 deletions ...ploy/pathplanner/autos/Lower2_3NoteC.auto → ...loy/pathplanner/autos/CenterSub4Note.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"x": 1.35,
"y": 5.55
},
"rotation": 0
"rotation": 0.0
},
"command": {
"type": "sequential",
Expand All @@ -14,102 +14,78 @@
{
"type": "named",
"data": {
"name": "armSubwoofer"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.5
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "simpleShoot"
}
},
{
"type": "named",
"data": {
"name": "armStow"
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "CenterSub_CenterNote"
"pathName": "CenSub_AngledUpNote"
}
},
{
"type": "path",
"type": "named",
"data": {
"pathName": "CenterNote_CenterSub"
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "armSubwoofer"
"name": "QueueRevShoot"
}
},
{
"type": "wait",
"type": "path",
"data": {
"waitTime": 0.5
"pathName": "AngledUpNote_CenNote"
}
},
{
"type": "named",
"data": {
"name": "simpleShoot"
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "armStow"
}
},
{
"type": "path",
"data": {
"pathName": "CenterSub_LowerNote"
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "LowerNote_CenterSub"
"pathName": "CenNote_AngledLowerNote"
}
},
{
"type": "named",
"data": {
"name": "armSubwoofer"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.5
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "simpleShoot"
"name": "QueueRevShoot"
}
},
{
"type": "named",
"data": {
"name": "armStow"
"name": "ArmStow"
}
}
]
}
},
"folder": "3 Note",
"folder": "4 Note",
"choreoAuto": false
}
32 changes: 16 additions & 16 deletions ...deploy/pathplanner/autos/Center2Note.auto → ...athplanner/autos/CenterSubMid1-3Note.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,66 +14,66 @@
{
"type": "named",
"data": {
"name": "armSubwoofer"
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "wait",
"type": "named",
"data": {
"waitTime": 0.5
"name": "QueueRevShoot"
}
},
{
"type": "named",
"type": "path",
"data": {
"name": "simpleShoot"
"pathName": "CenSub_AngledUpNote"
}
},
{
"type": "named",
"data": {
"name": "armStow"
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "path",
"type": "named",
"data": {
"pathName": "CenterSub_CenterNote"
"name": "QueueRevShoot"
}
},
{
"type": "path",
"data": {
"pathName": "CenterNote_CenterSub"
"pathName": "AngledUpNote_Mid1Note"
}
},
{
"type": "named",
"type": "path",
"data": {
"name": "armSubwoofer"
"pathName": "Mid1Note_AngledUpNote"
}
},
{
"type": "wait",
"type": "named",
"data": {
"waitTime": 0.5
"name": "ArmInterpolateSpeaker"
}
},
{
"type": "named",
"data": {
"name": "simpleShoot"
"name": "QueueRevShoot"
}
},
{
"type": "named",
"data": {
"name": "armStow"
"name": "ArmStow"
}
}
]
}
},
"folder": "2 Note",
"folder": "3 Note",
"choreoAuto": false
}
Loading