Skip to content
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.

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

Autons #43

Merged
merged 62 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
b4e1d5b
utilize ChassisSpeeds
IanShiii Sep 7, 2024
37f84ee
increase vision ambiguity threshold
IanShiii Sep 7, 2024
0ba2591
add field
IanShiii Sep 7, 2024
99992f7
made all bca shots right in front of subwoofer
jopy-wng Sep 7, 2024
f905c8b
side autos + tweaked bfca/ac
jopy-wng Sep 7, 2024
879baab
side autos
jopy-wng Sep 7, 2024
df4f17b
OMG MAYBE WORKING AUTONS?
IanShiii Sep 7, 2024
506a0ea
Merge branch 'autons' of https://github.com/StuyPulse/SELF-REINFORCED…
IanShiii Sep 7, 2024
75a252b
fix path flipping
IanShiii Sep 7, 2024
407a1e4
set up some autos + side autos
jopy-wng Sep 7, 2024
dd57fce
added side autos
jopy-wng Sep 7, 2024
936c740
give more time to align to speaker
IanShiii Sep 8, 2024
a32a922
run shoot routine regardless of having a note or not, add logging for…
IanShiii Sep 8, 2024
87fb353
Merge branch 'autons' of https://github.com/StuyPulse/SELF-REINFORCED…
IanShiii Sep 8, 2024
7f34886
fix flipping rotation for path
IanShiii Sep 8, 2024
457e582
super skibidi
IanShiii Sep 9, 2024
1aa3977
fixed path bot direction
jopy-wng Sep 9, 2024
bb9aa00
switch to follow path commands for bca
IanShiii Sep 9, 2024
b424004
flip rotation??
IanShiii Sep 9, 2024
208da75
moved bot locations
jopy-wng Sep 9, 2024
546756f
Merge branch 'autons' of https://github.com/StuyPulse/SELF-REINFORCED…
k4limul Sep 9, 2024
f7f9cc1
9/9 changes
jopy-wng Sep 9, 2024
742f114
bca tweaks, rotation added, shooter timeout tweaks. i love the word t…
jopy-wng Sep 10, 2024
50fbe7a
more tweaks
jopy-wng Sep 10, 2024
3df313f
made new bca, also lowered to and from b/c paths from 3 to 1.5. test …
jopy-wng Sep 11, 2024
9b71978
wait until doesnt have note instead of waiting for a certain time for…
IanShiii Sep 11, 2024
7eba27d
tweaked paths, need to make last shoot forever
jopy-wng Sep 11, 2024
e39a1a3
get rid of tests, make five piece bfac
IanShiii Sep 11, 2024
1468613
follow path then shoot
IanShiii Sep 11, 2024
1344757
worked on bca, sstarted adef, made arm move up earlier.
jopy-wng Sep 11, 2024
3b09ef5
add preload + mobilities, start linking waypoints, remove tests
IanShiii Sep 12, 2024
9138665
tweaked bca and adef paths
jopy-wng Sep 12, 2024
3e53680
whoops
IanShiii Sep 12, 2024
69448ca
update led length, fix adef driving into the wall :skull:
IanShiii Sep 12, 2024
05a5bee
reduce logging :D
IanShiii Sep 12, 2024
ec61bdf
made red hgf, red adef, added waypoints for hgf adef and bca, removed…
jopy-wng Sep 12, 2024
13d3d56
reduce logging, removed limelight and notevision stuff
IanShiii Sep 12, 2024
2622161
Merge branch 'autons' of https://github.com/StuyPulse/SELF-REINFORCED…
IanShiii Sep 12, 2024
efceb3d
disable voltage compensation, decrease current limit for intake, decr…
IanShiii Sep 13, 2024
e5d3878
increase drive deadband a bit
IanShiii Sep 13, 2024
6ff26ee
get rid of RobotType
IanShiii Sep 13, 2024
2687c21
duplicate paths for opposite alliances and begin sorting into better …
IanShiii Sep 13, 2024
f6c965c
put everything into folders
IanShiii Sep 13, 2024
7d72147
pushing so jophy can do stuff :D
IanShiii Sep 13, 2024
24345e8
got rid of useless paths, autons, and waypoints. started workign in u…
jopy-wng Sep 13, 2024
42ed5ba
added registerblue and red in robotcontainer
jopy-wng Sep 13, 2024
94784af
e to shoot fix
jopy-wng Sep 13, 2024
637f70c
bruh vscode sucks
IanShiii Sep 13, 2024
51d2e3b
vscode sucks pt 2
IanShiii Sep 13, 2024
d632dfd
bruh
IanShiii Sep 13, 2024
80ebe91
bruh pt2
IanShiii Sep 13, 2024
7a15149
put autons in folders
IanShiii Sep 13, 2024
b6b87d5
finished adding all the waypoints. put waypoints in a folder for easy…
jopy-wng Sep 13, 2024
0fc1d12
forogt smth lol
jopy-wng Sep 13, 2024
34506f4
organize stuff into folders again
IanShiii Sep 13, 2024
2d39858
FIX ARM
IanShiii Sep 13, 2024
5477956
driver cam!
IanShiii Sep 13, 2024
5f6674a
testing
IanShiii Sep 13, 2024
b393c97
skibidi
jopy-wng Sep 13, 2024
ec8f8e5
w
jopy-wng Sep 13, 2024
4ab8196
add back autons, add back logging for important things, but stop logg…
IanShiii Sep 14, 2024
a2266e1
update RC for driving
IanShiii Sep 14, 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
21 changes: 13 additions & 8 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
{
"robotWidth": 0.9,
"robotLength": 0.9,
"robotWidth": 0.92,
"robotLength": 0.82,
"holonomicMode": true,
"pathFolders": [
"ABCDE",
"HGF",
"Tests",
"Reroutes"
"Blue To Notes",
"Blue To Shoots",
"Blue To Subwoofers",
"Misc",
"Red To Notes",
"Red To Shoots",
"Red To Subwoofers",
"Utils"
],
"autoFolders": [
"Tests"
"Blue Autons",
"Red Autons"
],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAccel": 4.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 4.5
Expand Down
9 changes: 9 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ deploy {
// getTargetTypeClass is a shortcut to get the class type using a string

frcJava(getArtifactTypeClass('FRCJavaArtifact')) {
// Enable VisualVM connection
// jvmArgs.add("-Dcom.sun.management.jmxremote=true")
// jvmArgs.add("-Dcom.sun.management.jmxremote.port=1198")
// jvmArgs.add("-Dcom.sun.management.jmxremote.local.only=false")
// jvmArgs.add("-Dcom.sun.management.jmxremote.ssl=false")
// jvmArgs.add("-Dcom.sun.management.jmxremote.authenticate=false")
// jvmArgs.add("-Djava.rmi.server.hostname=10.6.94.2")
jvmArgs.add("-XX:+HeapDumpOnOutOfMemoryError")
jvmArgs.add("-XX:HeapDumpPath=/u/frc-usercode.hprof")
}

// Static files artifact
Expand Down
31 changes: 13 additions & 18 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
{
"Joysticks": {
"window": {
"visible": false
}
},
"System Joysticks": {
"window": {
"visible": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
"decKey": 83,
"incKey": 87
},
{
"decKey": 87,
"incKey": 83
"decKey": 68,
"incKey": 65
},
{
"decKey": 69,
Expand All @@ -30,10 +20,10 @@
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
-1,
-1,
-1,
-1
],
"povConfig": [
{
Expand Down Expand Up @@ -99,5 +89,10 @@
"povCount": 0
}
],
"robotJoysticks": [
{
"guid": "Keyboard0"
}
],
"zeroDisconnectedJoysticks": false
}
12 changes: 12 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"/FMSInfo": "FMSInfo",
"/Pose": "Field2d",
"/SmartDashboard/Autonomous": "String Chooser",
"/SmartDashboard/Field": "Field2d",
"/SmartDashboard/Module 0": "Mechanism2d",
"/SmartDashboard/Module 1": "Mechanism2d",
"/SmartDashboard/Module 2": "Mechanism2d",
Expand All @@ -41,6 +42,17 @@
"window": {
"visible": true
}
},
"/SmartDashboard/Field": {
"bottom": 1476,
"height": 8.210550308227539,
"left": 150,
"right": 2961,
"top": 79,
"width": 16.541748046875,
"window": {
"visible": true
}
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.435487934219916,
"y": 6.595791855088175
"x": 1.3334750274411264,
"y": 7.002978151231599
},
"rotation": 1.3048503501930353
"rotation": 41.18642861701727
},
"command": {
"type": "sequential",
Expand All @@ -14,48 +14,48 @@
{
"type": "path",
"data": {
"pathName": "Amp to A"
"pathName": "Blue Amp to A"
}
},
{
"type": "path",
"data": {
"pathName": "A to D"
"pathName": "Blue A to D"
}
},
{
"type": "path",
"data": {
"pathName": "D to Shoot"
"pathName": "Blue D to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "D Shoot to E"
"pathName": "Blue D Shoot to E"
}
},
{
"type": "path",
"data": {
"pathName": "E to Shoot"
"pathName": "Blue E to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "E Shoot to F"
"pathName": "Blue E Shoot to F"
}
},
{
"type": "path",
"data": {
"pathName": "F to Shoot"
"pathName": "Blue F to Shoot"
}
}
]
}
},
"folder": null,
"folder": "Blue Autons",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.4053936459807443,
"y": 5.5301848373414
"x": 1.3334750274411264,
"y": 7.002978151231599
},
"rotation": 0
},
Expand All @@ -14,48 +14,48 @@
{
"type": "path",
"data": {
"pathName": "Center to B"
"pathName": "Red Amp to A"
}
},
{
"type": "path",
"data": {
"pathName": "B to F"
"pathName": "Red A to D"
}
},
{
"type": "path",
"data": {
"pathName": "F to Shoot ALT"
"pathName": "Red D to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "F Shoot ALT to E"
"pathName": "Red D Shoot to E"
}
},
{
"type": "path",
"data": {
"pathName": "E to Shoot"
"pathName": "Red E to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "E Shoot to D"
"pathName": "Red E Shoot to F"
}
},
{
"type": "path",
"data": {
"pathName": "D to Shoot"
"pathName": "Red F to Shoot"
}
}
]
}
},
"folder": null,
"folder": "Red Autons",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.4053936459807443,
"x": 1.5588456716347956,
"y": 5.5301848373414
},
"rotation": 0
"rotation": 0.7711444982014979
},
"command": {
"type": "sequential",
Expand All @@ -14,48 +14,42 @@
{
"type": "path",
"data": {
"pathName": "Center to B"
"pathName": "Blue Center to B"
}
},
{
"type": "path",
"data": {
"pathName": "B to F"
"pathName": "Blue B to Center"
}
},
{
"type": "path",
"data": {
"pathName": "F to Shoot"
"pathName": "Blue Center to C"
}
},
{
"type": "path",
"data": {
"pathName": "F Shoot to G"
"pathName": "Blue C to Shoot Before A"
}
},
{
"type": "path",
"data": {
"pathName": "G to Shoot"
"pathName": "Blue Center to A"
}
},
{
"type": "path",
"data": {
"pathName": "G Shoot to H"
}
},
{
"type": "path",
"data": {
"pathName": "H to Shoot"
"pathName": "Blue A to Center"
}
}
]
}
},
"folder": null,
"folder": "Blue Autons",
"choreoAuto": false
}
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/autos/BCA RED.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.5588456716347956,
"y": 5.5301848373414
},
"rotation": 0.7711444982014979
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Red Center to B"
}
},
{
"type": "path",
"data": {
"pathName": "Red B to Center"
}
},
{
"type": "path",
"data": {
"pathName": "Red Center to C"
}
},
{
"type": "path",
"data": {
"pathName": "Red C to Shoot Before A"
}
},
{
"type": "path",
"data": {
"pathName": "Red Center to A"
}
},
{
"type": "path",
"data": {
"pathName": "Red A to Center"
}
}
]
}
},
"folder": "Red Autons",
"choreoAuto": false
}
Loading
Loading