Merge branch 'master' of https://github.com/FRC830/2024Robot

FRC830 · Mar 14, 2024 · 484c5d3 · 484c5d3
2 parents 88f6043 + 9d0b318
commit 484c5d3
Show file tree

Hide file tree

Showing 45 changed files with 518 additions and 724 deletions.
diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json
@@ -3,9 +3,13 @@
  "robotLength": 0.5715,
  "holonomicMode": true,
  "pathFolders": [
+ "BLUEPATH",
+ "REDPATH",
  "Test Paths"
  ],
  "autoFolders": [
+ "BLUEAUTON",
+ "REDAUTON",
  "Test Autos"
  ],
  "defaultMaxVel": 3.0,

diff --git a/...loy/pathplanner/autos/Middle_2_Piece.auto → ...athplanner/autos/BLUE_Bottom_4_Piece.auto b/...loy/pathplanner/autos/Middle_2_Piece.auto → ...athplanner/autos/BLUE_Bottom_4_Piece.auto
@@ -2,10 +2,10 @@
  "version": 1.0,
  "startingPose": {
  "position": {
- "x": 1.0055648106551263,
- "y": 5.545975061415772
+ "x": 0.48918041856440025,
+ "y": 4.731312058043963
  },
- "rotation": 0
+ "rotation": -60.0
  },
  "command": {
  "type": "sequential",
@@ -33,37 +33,42 @@
  {
  "type": "path",
  "data": {
- "pathName": "Sub_TopNote"
+ "pathName": "BLUE_Path1"
  }
  },
  {
  "type": "path",
  "data": {
- "pathName": "TopNote_Sub"
+ "pathName": "BLUE_Path5"
  }
  },
  {
- "type": "parallel",
+ "type": "named",
  "data": {
- "commands": [
- {
- "type": "named",
- "data": {
- "name": "SubShoot"
- }
- },
- {
- "type": "named",
- "data": {
- "name": "IntakeDown"
- }
- }
- ]
+ "name": "VisionShoot"
+ }
+ },
+ {
+ "type": "path",
+ "data": {
+ "pathName": "BLUE_Path2"
+ }
+ },
+ {
+ "type": "path",
+ "data": {
+ "pathName": "BLUE_Path3"
+ }
+ },
+ {
+ "type": "named",
+ "data": {
+ "name": "VisionShoot"
  }
  }
  ]
  }
  },
- "folder": null,
+ "folder": "BLUEAUTON",
  "choreoAuto": false
 }
diff --git a/...deploy/pathplanner/autos/Top_4_Piece.auto → ...y/pathplanner/autos/BLUE_Top_4_Piece.auto b/...deploy/pathplanner/autos/Top_4_Piece.auto → ...y/pathplanner/autos/BLUE_Top_4_Piece.auto
@@ -2,10 +2,10 @@
  "version": 1.0,
  "startingPose": {
  "position": {
- "x": 1.18,
- "y": 5.55
+ "x": 0.5868225259582199,
+ "y": 6.456421738466253
  },
- "rotation": 0
+ "rotation": 60.0
  },
  "command": {
  "type": "sequential",
@@ -33,81 +33,54 @@
  {
  "type": "path",
  "data": {
- "pathName": "Sub_TopNote"
+ "pathName": "BLUE_3_Piece_Path_1"
  }
  },
  {
- "type": "path",
- "data": {
- "pathName": "TopNote_Sub"
- }
- },
- {
- "type": "parallel",
+ "type": "named",
  "data": {
- "commands": [
- {
- "type": "named",
- "data": {
- "name": "SubShoot"
- }
- }
- ]
+ "name": "VisionShoot"
  }
  },
  {
  "type": "path",
  "data": {
- "pathName": "Sub_Note1"
+ "pathName": "BLUE_3_Piece_Path_2"
  }
  },
  {
  "type": "path",
  "data": {
- "pathName": "Note1_Sub"
+ "pathName": "BLUE_3_Piece_Path_3"
  }
  },
  {
- "type": "parallel",
+ "type": "named",
  "data": {
- "commands": [
- {
- "type": "named",
- "data": {
- "name": "SubShoot"
- }
- }
- ]
+ "name": "VisionShoot"
  }
  },
  {
  "type": "path",
  "data": {
- "pathName": "Sub_Note2"
+ "pathName": "BLUE_3_Piece_Path_4"
  }
  },
  {
  "type": "path",
  "data": {
- "pathName": "Note2_Sub"
+ "pathName": "BLUE_3_Piece_Path_5"
  }
  },
  {
- "type": "parallel",
+ "type": "named",
  "data": {
- "commands": [
- {
- "type": "named",
- "data": {
- "name": "SubShoot"
- }
- }
- ]
+ "name": "VisionShoot"
  }
  }
  ]
  }
  },
- "folder": null,
+ "folder": "BLUEAUTON",
  "choreoAuto": false
 }
diff --git a/src/main/deploy/pathplanner/autos/IntakeDown_Test.auto b/src/main/deploy/pathplanner/autos/IntakeDown_Test.auto
@@ -14,7 +14,7 @@
  {
  "type": "path",
  "data": {
- "pathName": "Forward Path"
+ "pathName": null
  }
  },
  {
@@ -26,7 +26,7 @@
  {
  "type": "path",
  "data": {
- "pathName": "Backwards Path"
+ "pathName": null
  }
  }
  ]

diff --git a/src/main/deploy/pathplanner/autos/Middle_3_Piece.auto b/src/main/deploy/pathplanner/autos/Middle_3_Piece.auto
diff --git a/src/main/deploy/pathplanner/autos/New_4_Piece.auto b/src/main/deploy/pathplanner/autos/New_4_Piece.auto