Skip to content

Commit

Permalink
Merge branch 'robototes:main' into LED-
Browse files Browse the repository at this point in the history
  • Loading branch information
Jetblackdragon authored Mar 27, 2024
2 parents 5f7d964 + aed571f commit 36fe49a
Show file tree
Hide file tree
Showing 84 changed files with 2,199 additions and 625 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "com.diffplug.spotless" version "6.15.0"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "net.ltgt.errorprone" version "3.1.0"
}

Expand Down
13 changes: 8 additions & 5 deletions src/main/deploy/launcher_data.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

# DISTANCE (meters), ANGLE (degrees), RPM (velocity)

1.397, 298, 4000
2.05, 285, 4300
3, 278, 4800
6, 265, 5500
12, 264, 6000
1.397, 252, 3300
2.05, 249, 3500
2.6, 245, 4000
3.2, 243, 4000
5, 240, 5000
5.64,239, 5000
6, 238, 4500
14, 233, 5000
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/5mForwardRotate180.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.4,
"y": 7.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "5mForwardRotate"
}
}
]
}
},
"folder": "Test",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 6.62
},
"rotation": -120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerPassAutoline2"
}
}
]
}
},
"folder": "Preset Autos",
"choreoAuto": false
}
31 changes: 31 additions & 0 deletions src/main/deploy/pathplanner/autos/PresetAmpSide2Score.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 6.62
},
"rotation": -120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerHighNoteReturn"
}
}
]
}
},
"folder": "Preset Autos",
"choreoAuto": false
}
61 changes: 61 additions & 0 deletions src/main/deploy/pathplanner/autos/PresetAmpSideAutoline4Score.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 6.62
},
"rotation": -120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerHighNoteReturn"
}
},
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerHighNote2Return"
}
},
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerLowNoteReturn"
}
},
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
}
]
}
},
"folder": "Preset Autos",
"choreoAuto": false
}
6 changes: 0 additions & 6 deletions src/main/deploy/pathplanner/autos/PresetMid1Score.auto
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "MidSpeakerPassAutoLine"
}
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"startingPose": {
"position": {
"x": 0.73,
"y": 4.46
"y": 4.47
},
"rotation": 120.0
},
Expand All @@ -16,12 +16,6 @@
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "LowSpeakerCenterLine"
}
}
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 4.47
},
"rotation": 120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "LowSpeakerPassAutoLine"
}
}
]
}
},
"folder": "Preset Autos",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"startingPose": {
"position": {
"x": 0.73,
"y": 4.46
"y": 4.47
},
"rotation": 120.0
},
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/TunePID.auto
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"type": "path",
"data": {
"pathName": "tunePID"
"pathName": null
}
}
]
Expand Down
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/TuneRotationalPID.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2.3,
"y": 7.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "TuneRotationPID"
}
}
]
}
},
"folder": "Test",
"choreoAuto": false
}
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/TuneTranslationalPID.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2.3,
"y": 7.0
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "TuneTranslationalPID"
}
}
]
}
},
"folder": "Test",
"choreoAuto": false
}
67 changes: 67 additions & 0 deletions src/main/deploy/pathplanner/autos/VisionAmpSide5Score.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 6.62
},
"rotation": -120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SubwooferLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighSpeakerToHighNoteLaunch2"
}
},
{
"type": "named",
"data": {
"name": "VisionLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "HighNoteLaunch2ToFarHighNoteToLaunch"
}
},
{
"type": "named",
"data": {
"name": "VisionLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "launchSecondNoteCenterLineLaunch"
}
},
{
"type": "named",
"data": {
"name": "VisionLaunch"
}
},
{
"type": "path",
"data": {
"pathName": "SpeakerToMidNote"
}
}
]
}
},
"folder": "Vision Autos",
"choreoAuto": false
}
Loading

0 comments on commit 36fe49a

Please sign in to comment.