Skip to content

Commit 7593f03

Browse files
Merge pull request #42 from FRC5188/REEF-250-v2-and-pathplanning
Reef 250 v2 and pathplanning
2 parents 2772d89 + 0a0cd82 commit 7593f03

86 files changed

Lines changed: 2006 additions & 802 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@
5656
"edu.wpi.first.math.proto.*",
5757
"edu.wpi.first.math.**.proto.*",
5858
"edu.wpi.first.math.**.struct.*",
59-
]
59+
],
60+
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
6061
}

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1"
3+
id "edu.wpi.first.GradleRIO" version "2025.3.1"
44
}
55

66
java {
@@ -33,7 +33,7 @@ deploy {
3333
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
3434
files = project.fileTree('src/main/deploy')
3535
directory = '/home/lvuser/deploy'
36-
deleteOldFiles = false // Change to true to delete files on roboRIO that no
36+
deleteOldFiles = true // Change to true to delete files on roboRIO that no
3737
// longer exist in deploy directory of this project
3838
}
3939
}
@@ -47,7 +47,7 @@ def deployArtifact = deploy.targets.roborio.artifacts.frcJava
4747
wpi.java.debugJni = false
4848

4949
// Set this to true to enable desktop support.
50-
def includeDesktopSupport = false
50+
def includeDesktopSupport = true
5151

5252
// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
5353
// Also defines JUnit 5.

gradlew

100644100755
File mode changed.

simgui-ds.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"System Joysticks": {
3+
"window": {
4+
"enabled": false
5+
}
6+
},
27
"keyboardJoysticks": [
38
{
49
"axisConfig": [

src/main/deploy/pathplanner/autos/3Piece-A.auto

Lines changed: 0 additions & 73 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "A_R2"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "HP2_R6"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "LeaveA"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "TestPath"
11+
}
12+
}
13+
]
14+
}
15+
},
16+
"resetOdom": true,
17+
"folder": null,
18+
"choreoAuto": false
19+
}

src/main/deploy/pathplanner/paths/A_R1.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"pointTowardsZones": [],
5555
"eventMarkers": [],
5656
"globalConstraints": {
57-
"maxVelocity": 3.0,
57+
"maxVelocity": 5.0,
5858
"maxAcceleration": 3.0,
5959
"maxAngularVelocity": 540.0,
6060
"maxAngularAcceleration": 720.0,

0 commit comments

Comments
 (0)