Skip to content

Commit

Permalink
Merge DCMP changes to main (#184)
Browse files Browse the repository at this point in the history 
* Automated commit at 04/02/2024 20:16:50

* Automated commit at 04/04/2024 08:36:30

* Automated commit at 04/04/2024 09:39:54

* Automated commit at 04/04/2024 10:27:52

* Automated commit at 04/04/2024 10:31:54

* Automated commit at 04/04/2024 14:59:22

* Automated commit at 04/04/2024 15:50:06

* Automated commit at 04/04/2024 17:49:13

* Automated commit at 04/05/2024 08:41:21

* Automated commit at 04/05/2024 10:51:04

* Automated commit at 04/05/2024 12:29:49

* Automated commit at 04/05/2024 12:30:49

* Automated commit at 04/05/2024 15:12:09

* Automated commit at 04/05/2024 15:13:22

* Automated commit at 04/05/2024 16:01:57

* Automated commit at 04/05/2024 16:03:03

* Automated commit at 04/05/2024 16:04:18

* Automated commit at 04/05/2024 16:05:31

* Automated commit at 04/05/2024 16:07:36

* Automated commit at 04/05/2024 16:08:34

* Automated commit at 04/05/2024 16:09:31

* Automated commit at 04/05/2024 17:58:39

* Automated commit at 04/05/2024 18:14:32

* Automated commit at 04/05/2024 18:26:59

* Automated commit at 04/05/2024 18:43:17

* Automated commit at 04/06/2024 08:51:51

* Automated commit at 04/06/2024 09:43:24

* Automated commit at 04/06/2024 09:45:01

* Automated commit at 04/06/2024 09:54:54

* Automated commit at 04/06/2024 11:27:18

* Automated commit at 04/06/2024 11:40:33

* Automated commit at 04/06/2024 12:42:21

* Automated commit at 04/06/2024 13:33:29

* Automated commit at 04/06/2024 14:03:10

* mark last-minute hacks

* Removes commitOnDeploy

---------

Co-authored-by: charlesmackenzie <charlesmackenzie@mcps.org>
  • Loading branch information
@honzikschenk @charlesmackenzie
honzikschenk and charlesmackenzie authored Apr 11, 2024
1 parent 30e4346 commit 5d9d8f7
Show file tree
Hide file tree
Showing 32 changed files with 502 additions and 159 deletions.
25 changes: 0 additions & 25 deletions src/main/deploy/pathplanner/autos/New New Auto.auto
View file

This file was deleted.

16 changes: 14 additions & 2 deletions src/main/deploy/pathplanner/autos/S2-C1-C2-C3.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.4
"waitTime": 0.5
}
},
{
Expand All @@ -23,6 +23,12 @@
"name": "Override Shoot"
}
},
{
"type": "named",
"data": {
"name": "OverrideStageAvoidance"
}
},
{
"type": "path",
"data": {
Expand All @@ -32,7 +38,7 @@
{
"type": "wait",
"data": {
"waitTime": 0.4
"waitTime": 0.5
}
},
{
Expand All @@ -41,6 +47,12 @@
"pathName": "W2-C1"
}
},
{
"type": "named",
"data": {
"name": "Un-OverrideStageAvoidance"
}
},
{
"type": "named",
"data": {
Expand Down
56 changes: 55 additions & 1 deletion src/main/deploy/pathplanner/autos/S3-C5-C4-C3.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,94 @@
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "named",
"data": {
"name": "Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "S3-C5"
}
},
{
"type": "named",
"data": {
"name": "Un-Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "C5-E2"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.6
}
},
{
"type": "named",
"data": {
"name": "Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "E2-C4"
}
},
{
"type": "named",
"data": {
"name": "Un-Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "C4-E1"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.6
}
},
{
"type": "named",
"data": {
"name": "Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "E1-C3-Stage"
}
},
{
"type": "named",
"data": {
"name": "Un-Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "C3-E1"
"pathName": "C3-E2"
}
}
]
Expand Down
38 changes: 34 additions & 4 deletions src/main/deploy/pathplanner/autos/S3-C5-C4.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,22 @@
"x": 0.6679855613232356,
"y": 4.350348982388106
},
"rotation": 120.0
"rotation": 121.12182293312829
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.4
}
},
{
"type": "named",
"data": {
"name": "Shoot Scoring"
"name": "Override Shoot"
}
},
{
Expand All @@ -23,22 +29,46 @@
"pathName": "S3-C5"
}
},
{
"type": "named",
"data": {
"name": "Un-Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "C5-E2"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.8
}
},
{
"type": "named",
"data": {
"name": "Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "E2-C4_fast"
"pathName": "E2-C4-No-Stage"
}
},
{
"type": "named",
"data": {
"name": "Un-Override Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "C4-E2_fast"
"pathName": "C4-E2"
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C1-E1-Slow.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.68,
"y": 7.43
"x": 8.4,
"y": 7.4
},
"prevControl": null,
"nextControl": {
"x": 7.824635146413151,
"y": 7.2980648789869
"x": 7.544635146413151,
"y": 7.268064878986901
},
"isLocked": false,
"linkedName": null
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C1-E1.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.68,
"y": 7.43
"x": 8.40219166152618,
"y": 7.403026234623898
},
"prevControl": null,
"nextControl": {
"x": 7.824635146413151,
"y": 7.2980648789869
"x": 7.546826807939331,
"y": 7.271091113610798
},
"isLocked": false,
"linkedName": null
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C2-E1-Close.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.58,
"y": 5.58
"x": 8.4,
"y": 5.64
},
"prevControl": null,
"nextControl": {
"x": 6.66494106426905,
"y": 6.688911975789438
"x": 6.484941064269051,
"y": 6.748911975789437
},
"isLocked": false,
"linkedName": null
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C2-E1-Slow.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.58,
"y": 5.58
"x": 8.4,
"y": 5.64
},
"prevControl": null,
"nextControl": {
"x": 6.66494106426905,
"y": 6.688911975789438
"x": 6.484941064269051,
"y": 6.748911975789437
},
"isLocked": false,
"linkedName": null
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C2-E1.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 8.58,
"y": 5.58
"x": 8.40219166152618,
"y": 5.6438912877825755
},
"prevControl": null,
"nextControl": {
"x": 6.66494106426905,
"y": 6.688911975789438
"x": 6.48713272579523,
"y": 6.752803263572013
},
"isLocked": false,
"linkedName": null
Expand Down
Loading

0 comments on commit 5d9d8f7

Please sign in to comment.