Skip to content

Commit

Permalink
Merge pull request #32 from wildstang/2024_drive_updates
Browse files Browse the repository at this point in the history
Updates to 2024
  • Loading branch information
smccrorie authored Jan 20, 2024
2 parents e9a1865 + ba62e65 commit dc3989e
Show file tree
Hide file tree
Showing 20 changed files with 763 additions and 233 deletions.
339 changes: 339 additions & 0 deletions src/main/deploy/ChoreoTest.chor
Original file line number Diff line number Diff line change
@@ -0,0 +1,339 @@
{
"version": "v0.2",
"robotConfiguration": {
"mass": 74.08797700309194,
"rotationalInertia": 6,
"motorMaxTorque": 1.162295081967213,
"motorMaxVelocity": 4800,
"gearing": 6.75,
"wheelbase": 0.5778496879611685,
"trackWidth": 0.5778496879611685,
"bumperLength": 0.8762995267982555,
"bumperWidth": 0.8762995267982555,
"wheelRadius": 0.050799972568014815
},
"paths": {
"NewPath": {
"waypoints": [
{
"x": 1.516043782234192,
"y": 6.048449993133545,
"heading": 0,
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": true,
"controlIntervalCount": 14
},
{
"x": 4.966033935546875,
"y": 6.034252166748047,
"heading": 0,
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": false,
"controlIntervalCount": 14
},
{
"x": 8.046889305114746,
"y": 7.38301420211792,
"heading": 0.03446874200424958,
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": false,
"controlIntervalCount": 40
}
],
"trajectory": [
{
"x": 1.516043782234192,
"y": 6.048449993133545,
"heading": 0,
"angularVelocity": -5.616222481494911e-34,
"velocityX": 0,
"velocityY": 0,
"timestamp": 0
},
{
"x": 1.5689918861311904,
"y": 6.041742709222571,
"heading": 1.7320605916854142e-18,
"angularVelocity": 2.164930009457222e-17,
"velocityX": 0.6618067709704044,
"velocityY": -0.0838354082657972,
"timestamp": 0.08000538256712138
},
{
"x": 1.674888092013089,
"y": 6.028328141588193,
"heading": 5.3628603397712685e-18,
"angularVelocity": 4.538194194512376e-17,
"velocityX": 1.3236135180411834,
"velocityY": -0.16767081418712054,
"timestamp": 0.16001076513424276
},
{
"x": 1.8337323966917567,
"y": 6.00820629053172,
"heading": 1.348635415654735e-17,
"angularVelocity": 1.0153683887404342e-16,
"velocityX": 1.9854202252630093,
"velocityY": -0.25150621634232706,
"timestamp": 0.24001614770136415
},
{
"x": 2.045524793787084,
"y": 5.9813771566214315,
"heading": 2.433299140239317e-17,
"angularVelocity": 1.3557384048762761e-16,
"velocityX": 2.647226852738829,
"velocityY": -0.3353416113945366,
"timestamp": 0.3200215302684855
},
{
"x": 2.310265264143279,
"y": 5.947840741407273,
"heading": 2.260717365870024e-17,
"angularVelocity": -2.1571269494463164e-17,
"velocityX": 3.3090332407833563,
"velocityY": -0.4191769870737364,
"timestamp": 0.4000269128356069
},
{
"x": 2.610521353119515,
"y": 5.909805323031019,
"heading": 4.8135092825176995e-17,
"angularVelocity": 3.1907752137876316e-16,
"velocityX": 3.7529486059807464,
"velocityY": -0.4754107430753506,
"timestamp": 0.48003229540272824
},
{
"x": 2.9107774433163662,
"y": 5.871769914197476,
"heading": 6.24252782188136e-17,
"angularVelocity": 1.786152998099576e-16,
"velocityX": 3.752948621237419,
"velocityY": -0.4754106237995001,
"timestamp": 0.5600376779698496
},
{
"x": 3.211033539929165,
"y": 5.833734556012231,
"heading": 7.712485241307502e-17,
"angularVelocity": 1.837323155342597e-16,
"velocityX": 3.752948701431361,
"velocityY": -0.47540999073837625,
"timestamp": 0.640043060536971
},
{
"x": 3.5112895699805415,
"y": 5.795698672383656,
"heading": 7.731072853436173e-17,
"angularVelocity": 2.323295199929432e-18,
"velocityX": 3.7529478694695495,
"velocityY": -0.47541655833818114,
"timestamp": 0.7200484431040924
},
{
"x": 3.8115452577055744,
"y": 5.7576600865062035,
"heading": 8.924634060936324e-17,
"angularVelocity": 1.491851134514383e-16,
"velocityX": 3.752943590678222,
"velocityY": -0.47545033417601923,
"timestamp": 0.8000538256712139
},
{
"x": 4.114067448261845,
"y": 5.74867476858727,
"heading": 9.151658267980815e-17,
"angularVelocity": 2.8376116676155395e-17,
"velocityX": 3.7812729700088354,
"velocityY": -0.11230891760765513,
"timestamp": 0.8800592082383353
},
{
"x": 4.413465286590688,
"y": 5.792961837418458,
"heading": 9.662300919714382e-17,
"angularVelocity": 6.382603711758541e-17,
"velocityX": 3.7422211946509836,
"velocityY": 0.5535511163143739,
"timestamp": 0.9600645908054567
},
{
"x": 4.70042867087072,
"y": 5.889151349339845,
"heading": 1.0577588545582453e-16,
"angularVelocity": 1.1440325594345242e-16,
"velocityX": 3.586800976037853,
"velocityY": 1.2022880065686599,
"timestamp": 1.040069973372578
},
{
"x": 4.966033935546875,
"y": 6.034252166748047,
"heading": 1.1810473008141205e-16,
"angularVelocity": 1.5410018963717133e-16,
"velocityX": 3.3198424425171944,
"velocityY": 1.8136381922362341,
"timestamp": 1.1200753559396994
},
{
"x": 5.252959048672674,
"y": 6.159867104652286,
"heading": 1.0235097224031542e-16,
"angularVelocity": -1.902689017809633e-16,
"velocityX": 3.4653907162015996,
"velocityY": 1.5171374679871226,
"timestamp": 1.2028726901001303
},
{
"x": 5.539885183870477,
"y": 6.285479707950682,
"heading": 1.0490001664894045e-16,
"angularVelocity": 3.07865516984631e-17,
"velocityX": 3.4654030604638333,
"velocityY": 1.517109271356542,
"timestamp": 1.2856700242605612
},
{
"x": 5.826811303900968,
"y": 6.411092345894509,
"heading": 1.0303646789418264e-16,
"angularVelocity": -2.250735212255695e-17,
"velocityX": 3.465402877277821,
"velocityY": 1.5171096897931027,
"timestamp": 1.368467358420992
},
{
"x": 6.1137374416581745,
"y": 6.5367049433466695,
"heading": 1.05436904406349e-16,
"angularVelocity": 2.8991712553391995e-17,
"velocityX": 3.465403091375503,
"velocityY": 1.5171092007475724,
"timestamp": 1.451264692581423
},
{
"x": 6.4006635777953305,
"y": 6.662317544499379,
"heading": 1.1381876389339637e-16,
"angularVelocity": 1.0123344636684088e-16,
"velocityX": 3.4654030718090296,
"velocityY": 1.517109245441621,
"timestamp": 1.5340620267418539
},
{
"x": 6.687589712169014,
"y": 6.787930149680236,
"heading": 1.1918775537339967e-16,
"angularVelocity": 6.484498002798231e-17,
"velocityX": 3.4654030505103846,
"velocityY": 1.5171092940923214,
"timestamp": 1.6168593609022848
},
{
"x": 6.974515845835931,
"y": 6.913542756475502,
"heading": 1.1963051570385433e-16,
"angularVelocity": 5.3475191555896805e-18,
"velocityX": 3.4654030419742634,
"velocityY": 1.5171093135906424,
"timestamp": 1.6996566950627157
},
{
"x": 7.261441979058808,
"y": 7.03915536428499,
"heading": 1.0776952637382632e-16,
"angularVelocity": -1.4325327560722868e-16,
"velocityX": 3.4654030366112965,
"velocityY": 1.5171093258400845,
"timestamp": 1.7824540292231466
},
{
"x": 7.523257733803789,
"y": 7.153774967847139,
"heading": 1.0846889639282341e-16,
"angularVelocity": 8.446769767248965e-18,
"velocityX": 3.1621278317690638,
"velocityY": 1.3843392993796007,
"timestamp": 1.8652513633835774
},
{
"x": 7.732710355752492,
"y": 7.2454706586781,
"heading": 1.1245375296114802e-16,
"angularVelocity": 4.8127836587122814e-17,
"velocityX": 2.529702484658026,
"velocityY": 1.1074715358985852,
"timestamp": 1.9480486975440083
},
{
"x": 7.889799828203823,
"y": 7.314242429424352,
"heading": 1.138891148318788e-16,
"angularVelocity": 1.733584644100212e-17,
"velocityX": 1.897276935836479,
"velocityY": 0.8306036836041001,
"timestamp": 2.030846031704439
},
{
"x": 7.994526145586872,
"y": 7.360090277643585,
"heading": 1.1238374728274862e-16,
"angularVelocity": -1.818135287078146e-17,
"velocityX": 1.264851319731227,
"velocityY": 0.5537358018121276,
"timestamp": 2.1136433658648697
},
{
"x": 8.046889305114746,
"y": 7.38301420211792,
"heading": 1.1171214697229466e-16,
"angularVelocity": -8.111376015476875e-18,
"velocityX": 0.6324256699667837,
"velocityY": 0.2768679053110117,
"timestamp": 2.1964407000253003
},
{
"x": 8.046889305114746,
"y": 7.38301420211792,
"heading": 1.1171214697229466e-16,
"angularVelocity": 0,
"velocityX": 2.503814251943729e-32,
"velocityY": 6.027790426796588e-32,
"timestamp": 2.279238034185731
}
],
"constraints": [
{
"scope": [
"first"
],
"type": "StopPoint",
"uuid": "5bb57e5b-91f1-4dab-8de2-7ef4e0d413bb"
},
{
"scope": [
"last"
],
"type": "StopPoint",
"uuid": "8d61c2cb-9047-4206-84d7-45306fd123fb"
},
{
"scope": [
1
],
"type": "WptVelocityDirection",
"uuid": "2eacc351-bafb-401c-a1ed-b2450f184efb",
"direction": 0.5
}
],
"usesControlIntervalGuessing": true,
"defaultControlIntervalCount": 40,
"usesDefaultFieldObstacles": true,
"circleObstacles": []
}
}
}
Loading

0 comments on commit dc3989e

Please sign in to comment.