Skip to content
This repository was archived by the owner on Nov 29, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into dont-set-current-position-unless-there's-n…
Browse files Browse the repository at this point in the history
…o-manual-control
  • Loading branch information
silverlightning926 authored Nov 29, 2024
2 parents eaf397a + dde36fd commit bb7187f
Show file tree
Hide file tree
Showing 39 changed files with 1,301 additions and 510 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"waypoints": [
{
"anchorPoint": {
"x": 2.072238324219872,
"y": 4.860069634547257
"x": 1.946448286619825,
"y": 1.6009641149096854
},
"prevControl": null,
"nextControl": {
"x": 2.9416340104782885,
"y": 4.860069634547257
"x": 2.3009474834926844,
"y": -0.11435457963640693
},
"holonomicAngle": 178.89829388479356,
"holonomicAngle": 0.0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
Expand All @@ -24,18 +24,18 @@
},
{
"anchorPoint": {
"x": 3.8332988506205252,
"y": 4.848634176583617
"x": 6.56487514898107,
"y": 0.9249526191360088
},
"prevControl": {
"x": 3.032081993835372,
"y": 4.848634176583617
"x": 5.688097145425064,
"y": 1.0020320040640094
},
"nextControl": {
"x": 4.634515707405679,
"y": 4.848634176583617
"x": 7.441653152537076,
"y": 0.8478732342080082
},
"holonomicAngle": 88.6677801461303,
"holonomicAngle": 0.0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
Expand All @@ -49,40 +49,15 @@
},
{
"anchorPoint": {
"x": 4.416507206766196,
"y": 3.4649437629831037
"x": 1.96,
"y": 0.41
},
"prevControl": {
"x": 4.439745522358631,
"y": 4.0824584930197005
},
"nextControl": {
"x": 4.393268891173761,
"y": 2.847429032946511
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 4.370765374911635,
"y": 1.8868505640006996
},
"prevControl": {
"x": 4.48511995454804,
"y": 3.1218800240738855
"x": 1.9407301537679995,
"y": 0.4774444618120008
},
"nextControl": null,
"holonomicAngle": -178.87669728592456,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
Expand Down
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/moveOut.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.9304771301850319,
"y": 3.285508782556027
},
"prevControl": null,
"nextControl": {
"x": 2.9304771301850314,
"y": 3.285508782556027
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 6.5663733039306305,
"y": 3.384895557237619
},
"prevControl": {
"x": 5.880245826112194,
"y": 3.355099094620442
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"markers": []
}
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/preloadParkCenter.path
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"waypoints": [
{
"anchorPoint": {
"x": 1.946448286619825,
"y": 2.744509911273745
"x": 1.9304771301850319,
"y": 3.285508782556027
},
"prevControl": null,
"nextControl": {
"x": 2.946448286619825,
"y": 2.744509911273745
"x": 2.9304771301850314,
"y": 3.285508782556027
},
"holonomicAngle": 0,
"isReversal": false,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/preloadPlusOneLeft1.path
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"waypoints": [
{
"anchorPoint": {
"x": 1.9497469764170317,
"y": 4.460969402708037
"x": 1.9350128286561847,
"y": 3.842313875783243
},
"prevControl": null,
"nextControl": {
"x": 4.28139837048905,
"y": 4.615128172564038
"x": 1.9693192025471065,
"y": 5.008730588074586
},
"holonomicAngle": 0.0,
"isReversal": false,
Expand All @@ -24,12 +24,12 @@
},
{
"anchorPoint": {
"x": 5.159811974402836,
"y": 4.677102307129007
"x": 6.5663733039306305,
"y": 4.597054101383524
},
"prevControl": {
"x": 3.3677162748268206,
"y": 4.600022922201007
"x": 4.774277604354615,
"y": 4.519974716455524
},
"nextControl": null,
"holonomicAngle": 0.0,
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/preloadPlusOneLeft2.path
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"waypoints": [
{
"anchorPoint": {
"x": 6.56,
"x": 6.57,
"y": 4.6
},
"prevControl": null,
"nextControl": {
"x": 4.9558429886090565,
"y": 4.451334479592036
"x": 4.86249006734818,
"y": 4.619925017310805
},
"holonomicAngle": 0.0,
"isReversal": false,
Expand All @@ -24,12 +24,12 @@
},
{
"anchorPoint": {
"x": 1.9497469764170317,
"y": 4.441699556476037
"x": 1.9350128286561847,
"y": 5.054472419929148
},
"prevControl": {
"x": 3.5009695980930444,
"y": 4.644032941912037
"x": 3.506244752860405,
"y": 4.930969473921829
},
"nextControl": null,
"holonomicAngle": 0.0,
Expand Down
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/preloadPlusOneLeftPark.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.94,
"y": 5.05
},
"prevControl": null,
"nextControl": {
"x": 1.7863518751288567,
"y": 2.344268882546324
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.879040682475088,
"y": 2.6873326214555413
},
"prevControl": {
"x": 2.575398474620058,
"y": 2.5844134997827766
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"markers": []
}
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/preloadPlusOneRight1.path
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"waypoints": [
{
"anchorPoint": {
"x": 1.9497469764170317,
"y": 1.0213018502960098
"x": 1.946448286619825,
"y": 1.6009641149096854
},
"prevControl": null,
"nextControl": {
"x": 5.196716066509058,
"y": 0.9345875422520085
"x": 2.3009474834926844,
"y": -0.11435457963640693
},
"holonomicAngle": 0.0,
"isReversal": false,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/preloadPlusOneRight2.path
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
},
{
"anchorPoint": {
"x": 1.9497469764170317,
"y": 1.040571696528009
"x": 1.9578837445834658,
"y": 0.4116764866910612
},
"prevControl": {
"x": 1.0729689728610257,
"y": 1.117651081456012
"x": 1.0811057410274598,
"y": 0.4887558716190642
},
"nextControl": null,
"holonomicAngle": 0.0,
Expand Down
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/preloadPlusOneRightPark.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.96,
"y": 0.41
},
"prevControl": null,
"nextControl": {
"x": 1.980754660510747,
"y": 1.097803964509497
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.798992476729604,
"y": 2.790251743128307
},
"prevControl": {
"x": 2.117980156074434,
"y": 3.018960902401119
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"markers": []
}
Loading

0 comments on commit bb7187f

Please sign in to comment.