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

Most working recent code after bensalem #17

Open
wants to merge 19 commits into
base: dev
Choose a base branch
from
Open

Most working recent code after bensalem #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
212f4e5
fixed turn to angle for speaker, removed continuous input from retrac…
mattperls-code Mar 15, 2024
721e96b
Merge branch 'dev-command-composition' of https://github.com/RoboLanc…
mattperls-code Mar 15, 2024
cd555a6
working changes, shoot from distance with auto handoff and rev within…
mattperls-code Mar 20, 2024
1b96a3a
working auto using handoff and auto pickup note, needs a lot of touch…
mattperls-code Mar 21, 2024
d9e40dd
fender shots, no longer auto handoff, new aim table, in shop auto tha…
mattperls-code Mar 21, 2024
a5002e4
pathplanner paths, organized auto folders, made pp autos, retune auto…
AT727 Mar 22, 2024
0c5deb0
adjusted autos, left bumper driver only intakes, don't need touch sen…
mattperls-code Mar 23, 2024
175130e
init climber code
AT727 Jan 15, 2024
8703a9d
smartDashBoard logging, softLimits
AT727 Jan 20, 2024
878e4ef
tuning methods for climber BY MR SIR VINCENT ZHENG
AT727 Jan 23, 2024
ff4685b
changed smartdashboard names
AT727 Feb 16, 2024
5d2b364
reformat constantst, changed tuning method, added climberSetpoint enum
AT727 Mar 18, 2024
c8f29c7
add solenoids for locking climb, enable soft limits, increase current…
Vncero Feb 16, 2024
1be10f8
removed solenoids
AT727 Mar 18, 2024
7d3a60c
comp: Added climb
AT727 Mar 23, 2024
e4070d0
chore: Fixed minor bugs
AT727 Mar 23, 2024
91c7b33
moved shooter shift angle up, added climb, ScoreSpeakerAutoFixed pivo…
AT727 Mar 24, 2024
04b1136
WIP add intaking notes from source, preparing to branch for code w/o …
AT727 Mar 24, 2024
a622257
fixed first auto shots, removed timeout for shoot from distance
AT727 Mar 26, 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
6 changes: 6 additions & 0 deletions .DataLogTool/datalogtool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"download": {
"localDir": "C:\\Users\\321 Drive Station\\Downloads\\Logsbenssalme",
"serverTeam": "321"
}
}
18,502 changes: 9,957 additions & 8,545 deletions Autos.chor
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions simgui-ds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
"visible": false
}
},
"Joysticks": {
"window": {
"visible": false
}
},
"System Joysticks": {
"window": {
"visible": false
Expand Down
311 changes: 156 additions & 155 deletions src/main/deploy/choreo/3NB-Close.1.traj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,157 +1,158 @@
{
"samples": [
{
"x": 0.756615161895752,
"y": 4.431221961975098,
"heading": -1.034985029325618,
"angularVelocity": -1.2153572582704763e-25,
"velocityX": -8.099282150741186e-25,
"velocityY": 3.9386843631996907e-25,
"timestamp": 0
},
{
"x": 0.7825301409073798,
"y": 4.426111948589589,
"heading": -1.0184480247142116,
"angularVelocity": 0.25729744903186014,
"velocityX": 0.4032083287203581,
"velocityY": -0.079506140289953,
"timestamp": 0.06427193380125104
},
{
"x": 0.8343681989936829,
"y": 4.4158863120476,
"heading": -0.9855108542950051,
"angularVelocity": 0.5124658380601789,
"velocityX": 0.8065426854371999,
"velocityY": -0.1590995623938954,
"timestamp": 0.12854386760250208
},
{
"x": 0.912137967019861,
"y": 4.4005383558351046,
"heading": -0.9362991408222285,
"angularVelocity": 0.765679676372499,
"velocityX": 1.210011328843265,
"velocityY": -0.2387971748283722,
"timestamp": 0.19281580140375312
},
{
"x": 1.0158503745896044,
"y": 4.380061388038885,
"heading": -0.8709611243682479,
"angularVelocity": 1.0165870635855798,
"velocityX": 1.6136500247597099,
"velocityY": -0.31859890600991186,
"timestamp": 0.25708773520500416
},
{
"x": 1.145523011747702,
"y": 4.354449737528758,
"heading": -0.7897691851783357,
"angularVelocity": 1.2632565163043505,
"velocityX": 2.0175624022623317,
"velocityY": -0.39848887368670943,
"timestamp": 0.32135966900625523
},
{
"x": 1.3011913004178595,
"y": 4.32369771075132,
"heading": -0.6934250833799015,
"angularVelocity": 1.499007359827703,
"velocityX": 2.422025905608079,
"velocityY": -0.4784674267392117,
"timestamp": 0.3856316028075063
},
{
"x": 1.4829411037935518,
"y": 4.287786779701849,
"heading": -0.58418273386785,
"angularVelocity": 1.6996897876118522,
"velocityX": 2.827825345005485,
"velocityY": -0.558734254994066,
"timestamp": 0.44990353660875737
},
{
"x": 1.6909603916353093,
"y": 4.2465633189263965,
"heading": -0.47548948460818546,
"angularVelocity": 1.6911463967425988,
"velocityX": 3.236549385382092,
"velocityY": -0.6413913249121974,
"timestamp": 0.5141754704100084
},
{
"x": 1.8728106274219034,
"y": 4.211006125740984,
"heading": -0.36224313486482546,
"angularVelocity": 1.761987590003954,
"velocityX": 2.829387961920238,
"velocityY": -0.5532304861927155,
"timestamp": 0.5784474042112595
},
{
"x": 2.0285640030407976,
"y": 4.180677932000477,
"heading": -0.2611966487318228,
"angularVelocity": 1.572171244224113,
"velocityX": 2.4233497641526145,
"velocityY": -0.47187305479700664,
"timestamp": 0.6427193380125106
},
{
"x": 2.1583029244219367,
"y": 4.155482855052808,
"heading": -0.17529966695510088,
"angularVelocity": 1.3364617601571205,
"velocityX": 2.018593711250895,
"velocityY": -0.39200745111512536,
"timestamp": 0.7069912718137616
},
{
"x": 2.262065112690402,
"y": 4.135371482146998,
"heading": -0.10573833466683616,
"angularVelocity": 1.082297173496758,
"velocityX": 1.6144245572154519,
"velocityY": -0.3129106550302491,
"timestamp": 0.7712632056150127
},
{
"x": 2.339870608422664,
"y": 4.120312466180706,
"heading": -0.05311299136785256,
"angularVelocity": 0.8187919700956509,
"velocityX": 1.2105672123210285,
"velocityY": -0.2343015850878145,
"timestamp": 0.8355351394162638
},
{
"x": 2.3917318142501975,
"y": 4.110284912416539,
"heading": -0.017780765488657927,
"angularVelocity": 0.5497302444400217,
"velocityX": 0.8069028386154424,
"velocityY": -0.15601761408291742,
"timestamp": 0.8998070732175149
},
{
"x": 2.4176580905914307,
"y": 4.1052751541137695,
"heading": 8.497464730716836e-25,
"angularVelocity": 0.27664898871164556,
"velocityX": 0.4033841026381037,
"velocityY": -0.0779462824047118,
"timestamp": 0.9640790070187659
},
{
"x": 2.4176580905914307,
"y": 4.1052751541137695,
"heading": 4.243816717185121e-25,
"angularVelocity": -1.1560345853556316e-25,
"velocityX": 1.998362528445031e-20,
"velocityY": -7.254658147615057e-21,
"timestamp": 1.0283509408200169
}
]
"samples": [
{
"x": 0.756615161895752,
"y": 4.431221961975098,
"heading": -1.034985029325618,
"angularVelocity": -1.961874517295051e-23,
"velocityX": -2.5970441302166065e-22,
"velocityY": 5.105371283529665e-23,
"timestamp": 0
},
{
"x": 0.7825301409047063,
"y": 4.426111948590587,
"heading": -1.0184480246298762,
"angularVelocity": 0.25729744969514157,
"velocityX": 0.4032083276619061,
"velocityY": -0.07950614007390834,
"timestamp": 0.06427193396333879
},
{
"x": 0.8343681989861416,
"y": 4.415886312050359,
"heading": -0.985510854051432,
"angularVelocity": 0.5124658392453514,
"velocityX": 0.8065426833274402,
"velocityY": -0.15909956196526012,
"timestamp": 0.12854386792667757
},
{
"x": 0.9121379670058766,
"y": 4.400538355840114,
"heading": -0.9362991403570211,
"angularVelocity": 0.7656796778899132,
"velocityX": 1.2100113256914826,
"velocityY": -0.23879717419115062,
"timestamp": 0.19281580189001635
},
{
"x": 1.0158503745684888,
"y": 4.380061388046335,
"heading": -0.8709611236376253,
"angularVelocity": 1.0165870651514102,
"velocityX": 1.6136500205792885,
"velocityY": -0.31859890516844774,
"timestamp": 0.25708773585335515
},
{
"x": 1.1455230117202089,
"y": 4.354449737538486,
"heading": -0.7897691841708067,
"angularVelocity": 1.2632565174268937,
"velocityX": 2.0175623970750025,
"velocityY": -0.39848887264631083,
"timestamp": 0.32135966981669395
},
{
"x": 1.3011913003873716,
"y": 4.323697710762477,
"heading": -0.693425082150836,
"angularVelocity": 1.4990073594942097,
"velocityX": 2.4220258994533617,
"velocityY": -0.47846742551033306,
"timestamp": 0.38563160378003275
},
{
"x": 1.4829411037686462,
"y": 4.287786779711243,
"heading": -0.5841827326518846,
"angularVelocity": 1.6996897831215725,
"velocityX": 2.8278253379608267,
"velocityY": -0.5587342536124528,
"timestamp": 0.44990353774337155
},
{
"x": 1.6909603916117941,
"y": 4.246563318917121,
"heading": -0.47548948476305697,
"angularVelocity": 1.6911463711489865,
"velocityX": 3.2365493772414533,
"velocityY": -0.641391323585123,
"timestamp": 0.5141754717067103
},
{
"x": 1.8728106274143186,
"y": 4.211006125726801,
"heading": -0.36224313530829055,
"angularVelocity": 1.7619875810701922,
"velocityX": 2.8293879550326473,
"velocityY": -0.553230484873885,
"timestamp": 0.578447405670049
},
{
"x": 2.02856400304081,
"y": 4.180677931986541,
"heading": -0.2611966491996238,
"angularVelocity": 1.5721712398806051,
"velocityX": 2.423349758159363,
"velocityY": -0.47187305360313536,
"timestamp": 0.6427193396333878
},
{
"x": 2.1583029244247567,
"y": 4.1554828550414715,
"heading": -0.17529966734085803,
"angularVelocity": 1.3364617580632023,
"velocityX": 2.0185937062038724,
"velocityY": -0.3920074500860744,
"timestamp": 0.7069912735967265
},
{
"x": 2.262065112693461,
"y": 4.135371482139177,
"heading": -0.10573833493309602,
"angularVelocity": 1.082297172626552,
"velocityX": 1.614424553147735,
"velocityY": -0.3129106541864265,
"timestamp": 0.7712632075600653
},
{
"x": 2.3398706084247696,
"y": 4.120312466176368,
"heading": -0.053112991515314595,
"angularVelocity": 0.8187919698790974,
"velocityX": 1.210567209253252,
"velocityY": -0.23430158444273003,
"timestamp": 0.835535141523404
},
{
"x": 2.3917318142510666,
"y": 4.110284912414974,
"heading": -0.017780765541901875,
"angularVelocity": 0.549730244519583,
"velocityX": 0.80690283656128,
"velocityY": -0.15601761364631664,
"timestamp": 0.8998070754867428
},
{
"x": 2.4176580905914307,
"y": 4.1052751541137695,
"heading": -5.808270810959106e-23,
"angularVelocity": 0.27664898884237965,
"velocityX": 0.40338410160727944,
"velocityY": -0.07794628218378681,
"timestamp": 0.9640790094500815
},
{
"x": 2.4176580905914307,
"y": 4.1052751541137695,
"heading": -2.865629237125059e-23,
"angularVelocity": 1.7135832602031387e-23,
"velocityX": 2.5159532277910445e-22,
"velocityY": -5.259673883843831e-23,
"timestamp": 1.0283509434134204
}
],
"eventMarkers": []
}
Loading
Loading