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

Sus #42

Merged
merged 43 commits into from
Sep 7, 2024
Merged

Sus #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4cea3c5
fix swerveDrive.stop(), fix naming and place SwerveDriveToShoot in co…
IanShiii Aug 13, 2024
5bdde91
changed points locations on pathplanner, fixed imports, added last pa…
jopy-wng Aug 14, 2024
4818827
changing pathplanner paths
jopy-wng Aug 16, 2024
1fece2a
first redirection added, changed pathplanner robot locations to cente…
jopy-wng Aug 19, 2024
3fd8e5f
name change
jopy-wng Aug 21, 2024
d396417
trying out simulation stuff
jopy-wng Aug 29, 2024
d5bf56c
Merge branch 'main' into auton-redirection
jopy-wng Aug 29, 2024
08da479
auton stuff bca
jopy-wng Aug 30, 2024
9814c18
8/28 (#37) (#38)
IanShiii Sep 2, 2024
f5ee841
hgf auton chooser
jopy-wng Aug 30, 2024
db9445d
added test autons, made tweaks to adef, hgf, and bca auton code.
jopy-wng Sep 2, 2024
67868d0
n/a
jopy-wng Sep 3, 2024
7a9b490
Merge remote-tracking branch 'origin/main' into auton-redirection
jopy-wng Sep 3, 2024
7e1014f
fix ShootRoutine, add FollowPathPointSpeaker
IanShiii Sep 3, 2024
24cc80f
fix subsystem requirement conflicts with automatic command scheduling…
IanShiii Sep 3, 2024
64dc8b7
sussy
IanShiii Sep 3, 2024
ac11820
Merge branch 'auton-redirection' of https://github.com/StuyPulse/SELF…
IanShiii Sep 3, 2024
4dd8479
oopsies!
IanShiii Sep 3, 2024
5f7ad3d
Vision fixes (#39)
IanShiii Sep 4, 2024
28823a1
automatic state machine for flywheel, move some triggers to subsystem…
IanShiii Sep 4, 2024
64dc3f8
Merge branch 'auton-redirection' into sus
IanShiii Sep 4, 2024
8420e92
resolve errors
IanShiii Sep 4, 2024
0a207a4
move handoff automation to subsystem periodics
IanShiii Sep 4, 2024
aed4760
remove unecessary commands that are automated with intake logic, impr…
IanShiii Sep 4, 2024
4a326f9
ferry alignment fixes
IanShiii Sep 4, 2024
dcda269
skibidi (update autons to use new subsystem logic)
IanShiii Sep 4, 2024
ca3834a
fix deacquire button
IanShiii Sep 5, 2024
d083b15
skibidi
IanShiii Sep 5, 2024
9e1d0a3
automatically bring arm back to feed after letting go of speaker/ferr…
IanShiii Sep 5, 2024
651c9ee
sus
IanShiii Sep 5, 2024
57d1fd5
add fake data for low ferry interpolation so it doesnt crash
IanShiii Sep 5, 2024
32216eb
skibidi (fix intake side as front, fix intake)
IanShiii Sep 5, 2024
3dc37af
tests and stuff
jopy-wng Sep 5, 2024
cdd1d3c
Merge branch 'sus' of https://github.com/StuyPulse/SELF-REINFORCED-VE…
IanShiii Sep 5, 2024
ffe7cb7
tune alignment (sorta)
IanShiii Sep 5, 2024
791c030
straight line
jopy-wng Sep 5, 2024
0b6d567
Merge branch 'sus' of https://github.com/StuyPulse/SELF-REINFORCED-VE…
IanShiii Sep 5, 2024
a321a55
buzz controller on intake
IanShiii Sep 5, 2024
359646f
change name for intakeAcquire command
IanShiii Sep 7, 2024
4a3d2aa
update intake led colors
IanShiii Sep 7, 2024
b6ea2ed
add low ferry data
IanShiii Sep 7, 2024
60f6955
configure auto builder, trust angle from vision data more
IanShiii Sep 7, 2024
86666b2
revert to original method to find arm angle
IanShiii Sep 7, 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
5 changes: 4 additions & 1 deletion .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
"pathFolders": [
"ABCDE",
"HGF",
"Tests",
"Reroutes"
],
"autoFolders": [],
"autoFolders": [
"Tests"
],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 540.0,
Expand Down
1 change: 1 addition & 0 deletions networktables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
103 changes: 103 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"Joysticks": {
"window": {
"visible": false
}
},
"System Joysticks": {
"window": {
"visible": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
"decKey": 87,
"incKey": 83
},
{
"decKey": 69,
"decayRate": 0.0,
"incKey": 82,
"keyRate": 0.009999999776482582
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
],
"povCount": 1
},
{
"axisConfig": [
{
"decKey": 74,
"incKey": 76
},
{
"decKey": 73,
"incKey": 75
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonKeys": [
77,
44,
46,
47
],
"povCount": 0
},
{
"axisConfig": [
{
"decKey": 263,
"incKey": 262
},
{
"decKey": 265,
"incKey": 264
}
],
"axisCount": 2,
"buttonCount": 6,
"buttonKeys": [
260,
268,
266,
261,
269,
267
],
"povCount": 0
},
{
"axisCount": 0,
"buttonCount": 0,
"povCount": 0
}
],
"zeroDisconnectedJoysticks": false
}
74 changes: 74 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"HALProvider": {
"Addressable LEDs": {
"0": {
"serpentine": true
}
},
"Other Devices": {
"window": {
"visible": false
}
}
},
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo",
"/Pose": "Field2d",
"/SmartDashboard/Autonomous": "String Chooser",
"/SmartDashboard/Module 0": "Mechanism2d",
"/SmartDashboard/Module 1": "Mechanism2d",
"/SmartDashboard/Module 2": "Mechanism2d",
"/SmartDashboard/Module 3": "Mechanism2d",
"/SmartDashboard/Scheduler": "Scheduler"
},
"windows": {
"/Pose": {
"bottom": 1476,
"height": 8.210550308227539,
"left": 150,
"right": 2961,
"robotPose": {
"width": 0.8679999709129333
},
"top": 79,
"width": 16.541748046875,
"window": {
"visible": true
}
},
"/SmartDashboard/Autonomous": {
"window": {
"visible": true
}
}
}
},
"NetworkTables": {
"retained": {
"SmartDashboard": {
"Autonomous": {
"open": true
},
"open": true
}
},
"transitory": {
"Pose": {
"open": true
},
"SmartDashboard": {
"Alignment": {
"open": true
},
"Autonomous": {
"open": true
},
"open": true
}
}
},
"NetworkTables Info": {
"visible": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.4365936349060198,
"y": 5.5179740558513855
"x": 1.4053936459807443,
"y": 5.5301848373414
},
"rotation": 0
"rotation": 179.43822267700324
},
"command": {
"type": "sequential",
Expand All @@ -14,19 +14,19 @@
{
"type": "path",
"data": {
"pathName": "Center to C"
"pathName": "Center to B"
}
},
{
"type": "path",
"data": {
"pathName": "C to B"
"pathName": "B to C"
}
},
{
"type": "path",
"data": {
"pathName": "B to A"
"pathName": "C to A"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/BFAC.auto
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
"type": "path",
"data": {
"pathName": "A to C"
"pathName": "C to A"
}
}
]
Expand Down
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/autos/HGF Red.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7437038962619593,
"y": 4.320740582515391
},
"rotation": -59.682052822906385
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Source to H"
}
},
{
"type": "path",
"data": {
"pathName": "H to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "H Shoot to G"
}
},
{
"type": "path",
"data": {
"pathName": "G to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "G Shoot to F"
}
},
{
"type": "path",
"data": {
"pathName": "F to Shoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/HGF.auto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"x": 0.7437038962619593,
"y": 4.320740582515391
},
"rotation": -59.682052822906385
"rotation": 116.80625971086718
},
"command": {
"type": "sequential",
Expand Down
51 changes: 51 additions & 0 deletions src/main/deploy/pathplanner/autos/Square Test.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2,
"y": 7.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Square Top"
}
},
{
"type": "path",
"data": {
<<<<<<<< HEAD:src/main/deploy/pathplanner/autos/Square Test.auto
"pathName": "Square Right"
========
"pathName": "B to C"
>>>>>>>> 7a9b4902c6973903cb64552237778325b95eeb47:src/main/deploy/pathplanner/autos/BCA Red.auto
}
},
{
"type": "path",
"data": {
<<<<<<<< HEAD:src/main/deploy/pathplanner/autos/Square Test.auto
"pathName": "Square Bottom"
}
},
{
"type": "path",
"data": {
"pathName": "Square Left"
========
"pathName": "C to A"
>>>>>>>> 7a9b4902c6973903cb64552237778325b95eeb47:src/main/deploy/pathplanner/autos/BCA Red.auto
}
}
]
}
},
"folder": "Tests",
"choreoAuto": false
}
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/Sraight Line.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.5,
"y": 5.55
},
"rotation": -179.56356838292098
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Straight Line"
}
}
]
}
},
"folder": "Tests",
"choreoAuto": false
}
Loading
Loading