Skip to content

Commit

Permalink
Merge pull request #76 from FRC3476/FIXSHOOTER
Browse files Browse the repository at this point in the history 
Fix Shooter + Source Rush Auto Update
  • Loading branch information
@AraknosDe
AraknosDe authored Nov 30, 2024
2 parents 614af43 + a55ed3f commit 2513f8c
Show file tree
Hide file tree
Showing 135 changed files with 157,703 additions and 29,005 deletions.
67,965 changes: 57,766 additions & 10,199 deletions FRC-2024.chor
View file

Large diffs are not rendered by default.

736 changes: 509 additions & 227 deletions src/main/deploy/choreo/1_amp_side_leave.1.traj
View file

Large diffs are not rendered by default.

736 changes: 509 additions & 227 deletions src/main/deploy/choreo/1_amp_side_leave.traj
View file

Large diffs are not rendered by default.

680 changes: 487 additions & 193 deletions src/main/deploy/choreo/1_source_side_leave.1.traj
View file

Large diffs are not rendered by default.

680 changes: 487 additions & 193 deletions src/main/deploy/choreo/1_source_side_leave.traj
View file

Large diffs are not rendered by default.

266 changes: 247 additions & 19 deletions src/main/deploy/choreo/2_far_source_blue.1.traj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,19 @@
"angularVelocity": 5.566906660912174e-27,
"velocityX": -1.073734969582464e-26,
"velocityY": -8.149406556711271e-27,
"timestamp": 0
"timestamp": 0,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.4762691900366563,
Expand All @@ -16,7 +28,19 @@
"angularVelocity": -0.14574136192669424,
"velocityX": 0.20869297514384588,
"velocityY": 0.1923528154741872,
"timestamp": 0.07461829501870401
"timestamp": 0.07461829501870401,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.5074126175393288,
Expand All @@ -25,7 +49,19 @@
"angularVelocity": -0.2914277383151454,
"velocityX": 0.41736986210775756,
"velocityY": 0.3847269209146823,
"timestamp": 0.14923659003740802
"timestamp": 0.14923659003740802,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.5541251931669816,
Expand All @@ -34,7 +70,19 @@
"angularVelocity": -0.4371037148864121,
"velocityX": 0.6260204098196521,
"velocityY": 0.5771309492389153,
"timestamp": 0.22385488505611204
"timestamp": 0.22385488505611204,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.6164040291294428,
Expand All @@ -43,7 +91,19 @@
"angularVelocity": -0.5829046497130067,
"velocityX": 0.8346322566985783,
"velocityY": 0.7695701564809041,
"timestamp": 0.29847318007481605
"timestamp": 0.29847318007481605,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.6942452049798441,
Expand All @@ -52,7 +112,19 @@
"angularVelocity": -0.7290805262674381,
"velocityX": 1.0431915635554179,
"velocityY": 0.9620442237707555,
"timestamp": 0.37309147509352003
"timestamp": 0.37309147509352003,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.7876438065598534,
Expand All @@ -61,7 +133,19 @@
"angularVelocity": -0.8760020427169181,
"velocityX": 1.2516850131271127,
"velocityY": 1.1545446885121882,
"timestamp": 0.447709770112224
"timestamp": 0.447709770112224,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 0.8965942390366481,
Expand All @@ -70,7 +154,19 @@
"angularVelocity": -1.0241330919142024,
"velocityX": 1.460103483327847,
"velocityY": 1.3470526482077878,
"timestamp": 0.522328065130928
"timestamp": 0.522328065130928,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.0210909281542,
Expand All @@ -79,7 +175,19 @@
"angularVelocity": -1.1739527770973501,
"velocityX": 1.6684472499183356,
"velocityY": 1.5395379012959582,
"timestamp": 0.596946360149632
"timestamp": 0.596946360149632,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.1611294267926418,
Expand All @@ -88,7 +196,19 @@
"angularVelocity": -1.3258252027723552,
"velocityX": 1.8767314182579398,
"velocityY": 1.7319607969060402,
"timestamp": 0.671564655168336
"timestamp": 0.671564655168336,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.285518644704163,
Expand All @@ -97,7 +217,19 @@
"angularVelocity": -1.2435834312997254,
"velocityX": 1.6670069703461037,
"velocityY": 1.5368449551317491,
"timestamp": 0.74618295018704
"timestamp": 0.74618295018704,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.3943667187188016,
Expand All @@ -106,7 +238,19 @@
"angularVelocity": -1.0889032504049063,
"velocityX": 1.458731722392669,
"velocityY": 1.3445824384729024,
"timestamp": 0.8208012452057439
"timestamp": 0.8208012452057439,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.4876716549009035,
Expand All @@ -115,7 +259,19 @@
"angularVelocity": -0.9334878690037427,
"velocityX": 1.2504297526325678,
"velocityY": 1.1523950755756502,
"timestamp": 0.8954195402244479
"timestamp": 0.8954195402244479,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.5654307208018612,
Expand All @@ -124,7 +280,19 @@
"angularVelocity": -0.7777773792325802,
"velocityX": 1.042091163855545,
"velocityY": 0.9602656442258901,
"timestamp": 0.9700378352431519
"timestamp": 0.9700378352431519,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.6276411541736195,
Expand All @@ -133,7 +301,19 @@
"angularVelocity": -0.6220424002148341,
"velocityX": 0.8337155567031451,
"velocityY": 0.7681775966198838,
"timestamp": 1.044656130261856
"timestamp": 1.044656130261856,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.6743006170265797,
Expand All @@ -142,7 +322,19 @@
"angularVelocity": -0.46641037785803874,
"velocityX": 0.6253086168916663,
"velocityY": 0.5761168747196046,
"timestamp": 1.11927442528056
"timestamp": 1.11927442528056,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.705407459684521,
Expand All @@ -151,7 +343,19 @@
"angularVelocity": -0.3108999405313931,
"velocityX": 0.4168795688797755,
"velocityY": 0.38407246438732934,
"timestamp": 1.193892720299264
"timestamp": 1.193892720299264,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.7209608554840088,
Expand All @@ -160,7 +364,19 @@
"angularVelocity": -0.15545877421127025,
"velocityX": 0.2084394423055249,
"velocityY": 0.19203587421214283,
"timestamp": 1.268511015317968
"timestamp": 1.268511015317968,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
},
{
"x": 1.7209608554840088,
Expand All @@ -169,7 +385,19 @@
"angularVelocity": 4.6417319707880016e-26,
"velocityX": 3.8537571970457346e-24,
"velocityY": 4.223111039451238e-24,
"timestamp": 1.343129310336672
"timestamp": 1.343129310336672,
"moduleForcesX": [
0,
0,
0,
0
],
"moduleForcesY": [
0,
0,
0,
0
]
}
],
"eventMarkers": []
Expand Down
Loading

0 comments on commit 2513f8c

Please sign in to comment.