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

Tuned cameras and a whole lot of auto #45

Merged
merged 30 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
91a9eb2
removed extra datalogging, double checked odometry calcs
GearBoxFox Mar 11, 2024
8765be3
created and tuned a lot of auto stuff
GearBoxFox Mar 12, 2024
34a6146
move and auto align at the same time
GearBoxFox Mar 12, 2024
fc384e1
use average rotation from last 5 updates for aimbot
GearBoxFox Mar 12, 2024
8bde48a
use a secondary variable for velocity multipliers on arm
GearBoxFox Mar 12, 2024
e7bfe10
aim back further for aimbot
GearBoxFox Mar 12, 2024
0334ef7
finish alignment drive
GearBoxFox Mar 12, 2024
cb1f9ec
new auto factory
GearBoxFox Mar 12, 2024
e820639
configured autofactory and set defaults
GearBoxFox Mar 12, 2024
862d713
initialize and end alignmentDrive
GearBoxFox Mar 12, 2024
4f2b8f5
fix build errors and drive after alignment
GearBoxFox Mar 13, 2024
218527a
moved some files to auto
GearBoxFox Mar 13, 2024
c35367b
setup data to log with Dan
GearBoxFox Mar 13, 2024
39d1796
check aimbot util and manual antidefense setpoint
GearBoxFox Mar 13, 2024
e36fb61
static arm and wrist angle for shooting test
GearBoxFox Mar 13, 2024
770abd1
removed uneeded logging method
GearBoxFox Mar 13, 2024
fb38b37
more data collection, rough distance->wrist model
GearBoxFox Mar 14, 2024
587574f
initial wrist alg fix and nudge factor
GearBoxFox Mar 14, 2024
fc0299c
changed default nudge value and deviances + tolerences
GearBoxFox Mar 14, 2024
8445c25
update WPILib and better aimbot command
GearBoxFox Mar 14, 2024
0d33fb2
update advantagekit to match wpilib
GearBoxFox Mar 14, 2024
d09e7f4
created new paths
GearBoxFox Mar 14, 2024
e4da026
mockup of shooting on the move
GearBoxFox Mar 14, 2024
968e731
better wrist alg and simple ff on aimbot alignment
GearBoxFox Mar 16, 2024
e9cec3b
track width is different?
GearBoxFox Mar 16, 2024
cbe52ad
new wrist angle model
GearBoxFox Mar 16, 2024
094cb92
logger for aimbot and fixed swapped drive motor
GearBoxFox Mar 16, 2024
91bd7d2
autos, driver practice, i forgot to commit
GearBoxFox Mar 16, 2024
f424b0d
tuned some values and added manual override if lose cameras
GearBoxFox Mar 17, 2024
282c1c9
removed whitespace
GearBoxFox Mar 17, 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 .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"holonomicMode": true,
"pathFolders": [],
"autoFolders": [],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxVel": 1.5,
"defaultMaxAccel": 1.5,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 4.5
Expand Down
750 changes: 0 additions & 750 deletions 2024Crescendo.chor

This file was deleted.

8,618 changes: 6,531 additions & 2,087 deletions Crescendo2024.chor

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "org.sonarqube" version "4.4.1.3373"
id "com.peterabeles.gversion" version "1.10"
}
Expand Down
176 changes: 176 additions & 0 deletions src/main/deploy/choreo/AmpWing3.1.traj
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
{
"samples": [
{
"x": 0.875186562538147,
"y": 6.525386810302734,
"heading": -2.143762813465651,
"angularVelocity": 7.837232067421535e-25,
"velocityX": -1.3869968870640015e-24,
"velocityY": -1.5166283413174535e-25,
"timestamp": 0
},
{
"x": 0.8969727039190931,
"y": 6.531365834673865,
"heading": -2.166346916414201,
"angularVelocity": -0.3175047636593087,
"velocityX": 0.3062864035806097,
"velocityY": 0.08405774292624062,
"timestamp": 0.07112996569961132
},
{
"x": 0.9406148218819743,
"y": 6.543392626223336,
"heading": -2.210869956131151,
"angularVelocity": -0.6259392828189381,
"velocityX": 0.6135546043588166,
"velocityY": 0.16908192533455152,
"timestamp": 0.14225993139922263
},
{
"x": 1.0062172991621152,
"y": 6.561523867966903,
"heading": -2.2764288840652025,
"angularVelocity": -0.9216780479118013,
"velocityX": 0.9222902982575069,
"velocityY": 0.25490300136143174,
"timestamp": 0.21338989709883394
},
{
"x": 1.093969891095599,
"y": 6.585785930725148,
"heading": -2.36133395682105,
"angularVelocity": -1.1936610951621995,
"velocityX": 1.2336937192416417,
"velocityY": 0.3410948187534151,
"timestamp": 0.28451986279844527
},
{
"x": 1.2042232731861569,
"y": 6.6162032972801414,
"heading": -2.461705007120923,
"angularVelocity": -1.4110937537035995,
"velocityX": 1.5500272073259296,
"velocityY": 0.42763083400670887,
"timestamp": 0.3556498284980566
},
{
"x": 1.3374731837843992,
"y": 6.652906460035935,
"heading": -2.567532529869651,
"angularVelocity": -1.4878050580770381,
"velocityX": 1.8733301680612304,
"velocityY": 0.5160014122710946,
"timestamp": 0.4267797941976679
},
{
"x": 1.4887376373930754,
"y": 6.6960750532748765,
"heading": -2.6261176444741485,
"angularVelocity": -0.8236347934133412,
"velocityX": 2.1265925284918663,
"velocityY": 0.6068974280297831,
"timestamp": 0.49790975989727926
},
{
"x": 1.6559451101368896,
"y": 6.7447998856875095,
"heading": -2.6266322508442816,
"angularVelocity": -0.007234733843487786,
"velocityX": 2.3507318061975107,
"velocityY": 0.685011330082775,
"timestamp": 0.5690397255968905
},
{
"x": 1.8243976661229355,
"y": 6.7896009456539,
"heading": -2.626632286559664,
"angularVelocity": -5.021144321983056e-7,
"velocityX": 2.368236148143772,
"velocityY": 0.6298479062339171,
"timestamp": 0.6401696912965018
},
{
"x": 1.9921751026428776,
"y": 6.83686703905938,
"heading": -2.6266327970809837,
"angularVelocity": -0.000007177303057357513,
"velocityX": 2.358744797213626,
"velocityY": 0.6645032503613142,
"timestamp": 0.7112996569961131
},
{
"x": 2.144093876666576,
"y": 6.878851502304941,
"heading": -2.6858581481034687,
"angularVelocity": -0.8326357315087016,
"velocityX": 2.135791470296306,
"velocityY": 0.5902500139373705,
"timestamp": 0.7824296226957244
},
{
"x": 2.277702419689923,
"y": 6.914840816688254,
"heading": -2.79218877780944,
"angularVelocity": -1.4948781242917446,
"velocityX": 1.8783720997081357,
"velocityY": 0.505965580460125,
"timestamp": 0.8535595883953356
},
{
"x": 2.3883482703840326,
"y": 6.944322663737028,
"heading": -2.894178661554579,
"angularVelocity": -1.4338525646961797,
"velocityX": 1.5555448341051872,
"velocityY": 0.41447857817447836,
"timestamp": 0.9246895540949469
},
{
"x": 2.4764066005629384,
"y": 6.967574702744683,
"heading": -2.9819793987887278,
"angularVelocity": -1.2343705830667766,
"velocityX": 1.2379920236540676,
"velocityY": 0.3268951247052539,
"timestamp": 0.9958195197945582
},
{
"x": 2.5421906012565776,
"y": 6.984807873214321,
"heading": -3.0509427511393503,
"angularVelocity": -0.9695400760048395,
"velocityX": 0.9248422946167467,
"velocityY": 0.24227722170451613,
"timestamp": 1.0669494854941695
},
{
"x": 2.5859077991162414,
"y": 6.996185319772124,
"heading": -3.098476979135992,
"angularVelocity": -0.6682728935563261,
"velocityX": 0.6146101355409838,
"velocityY": 0.1599529318747363,
"timestamp": 1.1380794511937808
},
{
"x": 2.6077051162719727,
"y": 7.001829624176025,
"heading": -3.122903212305612,
"angularVelocity": -0.34340285320499864,
"velocityX": 0.30644352125493224,
"velocityY": 0.0793519910825985,
"timestamp": 1.2092094168933922
},
{
"x": 2.6077051162719727,
"y": 7.001829624176025,
"heading": -3.122903212305612,
"angularVelocity": -1.2711795884725035e-24,
"velocityX": 1.0813970849471872e-24,
"velocityY": 4.939088142936104e-25,
"timestamp": 1.2803393825930036
}
],
"eventMarkers": []
}
113 changes: 113 additions & 0 deletions src/main/deploy/choreo/AmpWing3.2.traj
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"samples": [
{
"x": 2.6077051162719727,
"y": 7.001829624176025,
"heading": -3.122903212305612,
"angularVelocity": -1.2711795884725035e-24,
"velocityX": 1.0813970849471872e-24,
"velocityY": 4.939088142936104e-25,
"timestamp": 0
},
{
"x": 2.588497605107588,
"y": 6.99102525005929,
"heading": -3.105999231961874,
"angularVelocity": 0.2434967604471089,
"velocityX": -0.27667843014925436,
"velocityY": -0.15563376450908756,
"timestamp": 0.06942178743035177
},
{
"x": 2.550087465438114,
"y": 6.9694228225612935,
"heading": -3.0720638130010824,
"angularVelocity": 0.4888295190445427,
"velocityX": -0.5532865270576512,
"velocityY": -0.31117648072184184,
"timestamp": 0.13884357486070353
},
{
"x": 2.4924860648996834,
"y": 6.937030311414511,
"heading": -3.0208719743457277,
"angularVelocity": 0.7374030624998452,
"velocityX": -0.8297308765813584,
"velocityY": -0.46660439533166076,
"timestamp": 0.2082653622910553
},
{
"x": 2.415713178984927,
"y": 6.893852911543239,
"heading": -2.9521086467399438,
"angularVelocity": 0.9905150839680044,
"velocityX": -1.1058903660724633,
"velocityY": -0.621957478617077,
"timestamp": 0.27768714972140707
},
{
"x": 2.3197977520281423,
"y": 6.8398868515705145,
"heading": -2.865405613995347,
"angularVelocity": 1.248931149051482,
"velocityX": -1.3816329211202274,
"velocityY": -0.7773648874550575,
"timestamp": 0.34710893715175883
},
{
"x": 2.2244467831783776,
"y": 6.785620081909038,
"heading": -2.773269561572217,
"angularVelocity": 1.327192165940218,
"velocityX": -1.3735020716000237,
"velocityY": -0.781696520215938,
"timestamp": 0.4165307245821106
},
{
"x": 2.14818394170963,
"y": 6.7421795937838125,
"heading": -2.6995256157206273,
"angularVelocity": 1.0622593940781788,
"velocityX": -1.0985433289982525,
"velocityY": -0.6257471859077053,
"timestamp": 0.48595251201246237
},
{
"x": 2.090994438671986,
"y": 6.709584746202325,
"heading": -2.6442247517444515,
"angularVelocity": 0.7965923382721457,
"velocityX": -0.8237976167787333,
"velocityY": -0.46951899091028315,
"timestamp": 0.5553742994428141
},
{
"x": 2.052870310008216,
"y": 6.687849855649161,
"heading": -2.607365454456659,
"angularVelocity": 0.5309471082802596,
"velocityX": -0.5491666244119513,
"velocityY": -0.3130845712517861,
"timestamp": 0.6247960868731659
},
{
"x": 2.03380823135376,
"y": 6.676982402801514,
"heading": -2.588935989400422,
"angularVelocity": 0.2654709096150401,
"velocityX": -0.2745835185183043,
"velocityY": -0.1565423946848157,
"timestamp": 0.6942178743035177
},
{
"x": 2.03380823135376,
"y": 6.676982402801514,
"heading": -2.588935989400422,
"angularVelocity": -5.507504748429065e-28,
"velocityX": -9.813305241361081e-27,
"velocityY": 1.6191757102806756e-26,
"timestamp": 0.7636396617338694
}
],
"eventMarkers": []
}
Loading
Loading