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.

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

Jump to bottom

test branch changes pre-event and changes during the event #9

Merged
merged 28 commits into from
Mar 20, 2024
Merged

test branch changes pre-event and changes during the event #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6ed184c
Created lights subsystem and created the logging for lights.
lncompetant Feb 21, 2024
83a8670
attempted to do lights
RushaliBetala Mar 12, 2024
1c26ef8
Merge branch 'test' into Lights
RushaliBetala Mar 12, 2024
829c1ff
set lights
RushaliBetala Mar 12, 2024
425e103
updated piecevision to not crash. Also maybe swerve half fix and lime…
shinthebinn Mar 13, 2024
70d9d51
Shooter speed control is voltage control, vision target pos log, made…
shinthebinn Mar 14, 2024
9b814d8
moved dpad controls from test to operator
lncompetant Mar 14, 2024
d6bc1cd
moved dpad pov controls to operator driver align note
RushaliBetala Mar 15, 2024
87e86b8
added april tag alignment
RushaliBetala Mar 15, 2024
51c0a5b
change april tag vision to right bumper
RushaliBetala Mar 15, 2024
4edabb6
April tag vision blows up in the counstructor
RushaliBetala Mar 15, 2024
fa9eea8
Merge branch 'test' into Lights
shinthebinn Mar 15, 2024
64f72f3
pp named command changes and intake command fixes
shinthebinn Mar 15, 2024
3a375e3
friday 3/15 comp changes!
shinthebinn Mar 16, 2024
460530a
Changes pre-quals 3/16
shinthebinn Mar 16, 2024
d966584
forgor to stage this
shinthebinn Mar 16, 2024
f3ef43f
Merge branch 'test' into Lights
shinthebinn Mar 16, 2024
6e6994a
reset lights command and do it in init
shinthebinn Mar 16, 2024
8f3509e
Merge pull request #8 from FIRSTTeam102/Lights
shinthebinn Mar 16, 2024
d180c62
Merge branch 'test' into event_mhs
shinthebinn Mar 16, 2024
eb45a63
auto updates and yaw for red side (no time for testing lets hope!)
shinthebinn Mar 16, 2024
3a44001
end of quals
shinthebinn Mar 17, 2024
3b8eff6
final comp changes
shinthebinn Mar 17, 2024
1f56dbb
removed some testing changes that shouldn't have stayed in
shinthebinn Mar 18, 2024
00ecfa8
switched lights order + individual bit logging
RushaliBetala Mar 19, 2024
f186510
comments for DIO -> leo pin connections
RushaliBetala Mar 19, 2024
6cda2ef
rumble operator once we spin up shooter
shinthebinn Mar 19, 2024
3203039
updated to wpilib 2024.3.2 and library updates
shinthebinn Mar 20, 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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "com.peterabeles.gversion" version "1.10"
id "io.freefair.lombok" version "8.4"
id "io.freefair.lombok" version "8.6"
}

java {
Expand Down
2,772 changes: 2,628 additions & 144 deletions choreo.chor
View file
Open in desktop

Large diffs are not rendered by default.

157 changes: 157 additions & 0 deletions src/main/deploy/choreo/2 piece left.1.traj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"samples": [
{
"x": 0.7669039964675903,
"y": 6.639083385467529,
"heading": 1.0074798594118668,
"angularVelocity": -7.087535479777707e-19,
"velocityX": 7.50401412133545e-18,
"velocityY": 1.4256736684497237e-18,
"timestamp": 0
},
{
"x": 0.7981646775700082,
"y": 6.645820413966075,
"heading": 1.0074794822217241,
"angularVelocity": -0.000004891992156933861,
"velocityX": 0.4054374425885426,
"velocityY": 0.08737633054596244,
"timestamp": 0.07710358693768382
},
{
"x": 0.8606860382778649,
"y": 6.659294470675445,
"heading": 1.0074786780539715,
"angularVelocity": -0.000010429706123137783,
"velocityX": 0.8108748657619178,
"velocityY": 0.17475265736028606,
"timestamp": 0.15420717387536764
},
{
"x": 0.9544680756755046,
"y": 6.679505554656715,
"heading": 1.00747734637885,
"angularVelocity": -0.000017271247347385705,
"velocityX": 1.2163122511205047,
"velocityY": 0.2621289719971706,
"timestamp": 0.23131076081305146
},
{
"x": 1.0795107812763696,
"y": 6.706453661799292,
"heading": 1.007475162920361,
"angularVelocity": -0.000028318507292526304,
"velocityX": 1.6217495264121258,
"velocityY": 0.3495052333214708,
"timestamp": 0.3084143477507353
},
{
"x": 1.2151823459896474,
"y": 6.735692436676619,
"heading": 0.9400813447765213,
"angularVelocity": -0.8740685202921675,
"velocityX": 1.7596012079558552,
"velocityY": 0.37921419791997063,
"timestamp": 0.3855179346884191
},
{
"x": 1.3508539216363087,
"y": 6.764931160821833,
"heading": 0.8025402930124232,
"angularVelocity": -1.7838476422019192,
"velocityX": 1.7596013497570884,
"velocityY": 0.37921353994654156,
"timestamp": 0.4626215216261029
},
{
"x": 1.4865254934430294,
"y": 6.794169902784878,
"heading": 0.6117409589886299,
"angularVelocity": -2.4745844078304686,
"velocityX": 1.7596012999547292,
"velocityY": 0.3792137710360449,
"timestamp": 0.5397251085637867
},
{
"x": 1.6221970645812445,
"y": 6.8234086478498766,
"heading": 0.3987348321748914,
"angularVelocity": -2.7625968553952354,
"velocityX": 1.7596012912844983,
"velocityY": 0.3792138112670414,
"timestamp": 0.6168286955014706
},
{
"x": 1.757868635365604,
"y": 6.852647394556811,
"heading": 0.20722880927427756,
"angularVelocity": -2.4837498553133672,
"velocityX": 1.7596012866951443,
"velocityY": 0.37921383256224117,
"timestamp": 0.6939322824391544
},
{
"x": 1.8935401957987985,
"y": 6.881886189294451,
"heading": 0.06863797850596423,
"angularVelocity": -1.7974628194706992,
"velocityX": 1.7596011524450381,
"velocityY": 0.3792144554995873,
"timestamp": 0.7710358693768382
},
{
"x": 2.029211813519273,
"y": 6.911124718210696,
"heading": 0.000004762891013022644,
"angularVelocity": -0.8901429666355407,
"velocityX": 1.7596018954361505,
"velocityY": 0.37921100791168616,
"timestamp": 0.848139456314522
},
{
"x": 2.1542545037959298,
"y": 6.938072896534997,
"heading": 0.00000255375105981851,
"angularVelocity": -0.00002865158471797654,
"velocityX": 1.6217493276638106,
"velocityY": 0.34950615651748473,
"timestamp": 0.9252430432522059
},
{
"x": 2.2480365342099393,
"y": 6.958284012920916,
"heading": 0.0000012010318378255,
"angularVelocity": -0.000017544180183003836,
"velocityX": 1.2163121605458629,
"velocityY": 0.26212939227137494,
"timestamp": 1.0023466301898898
},
{
"x": 2.3105578914207334,
"y": 6.971758085856952,
"heading": 3.834757266936798e-7,
"angularVelocity": -0.000010603347309739972,
"velocityX": 0.8108748204065306,
"velocityY": 0.1747528678130866,
"timestamp": 1.0794502171275737
},
{
"x": 2.3418185710906982,
"y": 6.978495121002197,
"heading": 3.134962737955188e-18,
"angularVelocity": -0.000004973513450108379,
"velocityX": 0.405437424010253,
"velocityY": 0.08737641675075283,
"timestamp": 1.1565538040652577
},
{
"x": 2.3418185710906982,
"y": 6.978495121002197,
"heading": 2.0846959931491773e-18,
"angularVelocity": -8.557421751891334e-20,
"velocityX": -4.987723153383344e-19,
"velocityY": -9.652716908345432e-20,
"timestamp": 1.2336573910029416
}
]
}
157 changes: 157 additions & 0 deletions src/main/deploy/choreo/2 piece left.2.traj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"samples": [
{
"x": 2.3418185710906982,
"y": 6.978495121002197,
"heading": 2.0846959931491773e-18,
"angularVelocity": -8.557421751891334e-20,
"velocityX": -4.987723153383344e-19,
"velocityY": -9.652716908345432e-20,
"timestamp": 0
},
{
"x": 2.3105578909850855,
"y": 6.971758087878447,
"heading": 3.828776753639658e-7,
"angularVelocity": 0.000004965756984393634,
"velocityX": -0.40543742966046686,
"velocityY": -0.08737639053285204,
"timestamp": 0.07710358693767327
},
{
"x": 2.2480365327877774,
"y": 6.958284019520034,
"heading": 0.0000011992649992501823,
"angularVelocity": 0.000010588188647324088,
"velocityX": -0.8108748332013094,
"velocityY": -0.17475280844332217,
"timestamp": 0.15420717387534655
},
{
"x": 2.154254500585808,
"y": 6.938072911430576,
"heading": 0.0000025503266632355084,
"angularVelocity": 0.000017522682376308707,
"velocityX": -1.2163121837350852,
"velocityY": -0.2621292846699298,
"timestamp": 0.23131076081301982
},
{
"x": 2.0292118068653178,
"y": 6.911124749085196,
"heading": 0.000004757557407174423,
"angularVelocity": 0.000028626823103883053,
"velocityX": -1.6217493723290508,
"velocityY": -0.34950594927788836,
"timestamp": 0.3084143477506931
},
{
"x": 1.8935401996566608,
"y": 6.881886171392507,
"heading": 0.06878997325201827,
"angularVelocity": 0.8921143415832743,
"velocityX": -1.7596017591026925,
"velocityY": -0.3792116405210038,
"timestamp": 0.38551793468836637
},
{
"x": 1.7578686367778409,
"y": 6.852647388002959,
"heading": 0.20749385875571683,
"angularVelocity": 1.7989290902357107,
"velocityX": -1.7596011841639752,
"velocityY": -0.379214308319837,
"timestamp": 0.46262152162603964
},
{
"x": 1.6221970666934797,
"y": 6.823408638048033,
"heading": 0.39902661142653667,
"angularVelocity": 2.484096528811891,
"velocityX": -1.7596012776167158,
"velocityY": -0.3792138746873246,
"timestamp": 0.5397251085637129
},
{
"x": 1.4865254965870125,
"y": 6.794169888195682,
"heading": 0.6119135529013362,
"angularVelocity": 2.7610510733681806,
"velocityX": -1.7596012779034225,
"velocityY": -0.37921387335696644,
"timestamp": 0.6168286955013862
},
{
"x": 1.3508539260055112,
"y": 6.7649311405475485,
"heading": 0.8026194720400166,
"angularVelocity": 2.473372857385191,
"velocityX": -1.7596012840644037,
"velocityY": -0.37921384476922,
"timestamp": 0.6939322824390595
},
{
"x": 1.2151823556967136,
"y": 6.735692391634036,
"heading": 0.9401132494355333,
"angularVelocity": 1.7832345141952992,
"velocityX": -1.7596012805275563,
"velocityY": -0.37921386118065376,
"timestamp": 0.7710358693767327
},
{
"x": 1.0795107810200666,
"y": 6.706453662988116,
"heading": 1.0074751648495315,
"angularVelocity": 0.873654755756699,
"velocityX": -1.7596013371766643,
"velocityY": -0.37921359831878204,
"timestamp": 0.848139456314406
},
{
"x": 0.9544680762714443,
"y": 6.679505551891246,
"heading": 1.007477347596638,
"angularVelocity": 0.000028309280971946704,
"velocityX": -1.6217495153591333,
"velocityY": -0.34950528460696234,
"timestamp": 0.9252430432520793
},
{
"x": 0.8606860387160242,
"y": 6.659294468642213,
"heading": 1.007478678720387,
"angularVelocity": 0.000017264096285479253,
"velocityX": -1.2163122531670139,
"velocityY": -0.26212896250040785,
"timestamp": 1.0023466301897526
},
{
"x": 0.7981646777386805,
"y": 6.645820413183375,
"heading": 1.007479482462847,
"angularVelocity": 0.000010424190260479305,
"velocityX": -0.8108748692571571,
"velocityY": -0.17475264114145156,
"timestamp": 1.0794502171274258
},
{
"x": 0.7669039964675903,
"y": 6.639083385467529,
"heading": 1.0074798594118668,
"angularVelocity": 0.0000048888648998734084,
"velocityX": -0.4054374447762054,
"velocityY": -0.08737632039468787,
"timestamp": 1.1565538040650991
},
{
"x": 0.7669039964675903,
"y": 6.639083385467529,
"heading": 1.0074798594118668,
"angularVelocity": 6.720704922337583e-19,
"velocityX": -1.755081189133287e-18,
"velocityY": -1.4248543300928555e-19,
"timestamp": 1.2336573910027724
}
]
}
Loading