Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d046ace
Vision ready to test? (Added files + dependencies)
kt-h Feb 8, 2025
e017e4a
Added credits to AdvantageKit for Vision
kt-h Feb 8, 2025
d7ef141
Vision is now instantiated (oops)
kt-h Feb 9, 2025
f8bc90f
Vision - renamed cameras, updated vendordeps
kt-h Feb 10, 2025
00f8e4b
Add cameras 6 and 7
kt-h Feb 12, 2025
90eb70f
Merge main into REEF-161-Set-up-vision-subsystem-and-IO-in-ReefCode-repo
kt-h Feb 13, 2025
9223142
Remove duplicate multisubsystem intake command
kt-h Feb 13, 2025
85fe423
Update field type to Andymark, changed camera constants
kt-h Feb 16, 2025
a617f6b
Refined camera constants
kt-h Feb 16, 2025
1409b0f
flipped negative sign of cameras 5 and 6
kt-h Feb 16, 2025
b27fa1f
Merge branch 'main' into REEF-161-Set-up-vision-subsystem-and-IO-in-R…
kt-h Feb 16, 2025
006e0d3
scrimmage testing bad
kt-h Feb 16, 2025
8dd3a39
DRIVE ODOMETRY FIXED RAHHHH
kt-h Feb 20, 2025
147df76
added isFlipped that checks alliance every periodic loop
kt-h Mar 3, 2025
aff9ba8
Merge remote-tracking branch 'origin/main' into REEF-161-Set-up-visio…
kt-h Mar 7, 2025
5fd9d5d
Tuning vision and swerve
henthornlab Mar 8, 2025
5768fcd
added some auto-align to reef tag
henthornlab Mar 8, 2025
5104292
added some auto-align stuff
henthornlab Mar 8, 2025
3194649
tuning auto align and vision
henthornlab Mar 8, 2025
ef111d3
swerve gain tuning
henthornlab Mar 8, 2025
c8a6265
updates and ability to sim
henthornlab Mar 8, 2025
630cc68
updated vision constants
henthornlab Mar 9, 2025
0c3d463
simulate changes
henthornlab Mar 9, 2025
141e0ab
building first autos
henthornlab Mar 9, 2025
59c7213
basic paths added
henthornlab Mar 9, 2025
eea8596
more autos
henthornlab Mar 9, 2025
9d22504
auto init stuff
henthornlab Mar 9, 2025
1fb3797
debugging paths
henthornlab Mar 9, 2025
97f401c
enable desktop support per wpilib docs
garrett928 Mar 9, 2025
22a4879
fix path planner issue
garrett928 Mar 9, 2025
ce4fb2f
Merge branch 'REEF-250-v2-and-pathplanning' of https://github.com/FRC…
garrett928 Mar 9, 2025
9077b4d
path planner working with sim
henthornlab Mar 10, 2025
0a0cd82
Merge branch 'REEF-250-v2-and-pathplanning' of https://github.com/FRC…
henthornlab Mar 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@
"edu.wpi.first.math.proto.*",
"edu.wpi.first.math.**.proto.*",
"edu.wpi.first.math.**.struct.*",
]
],
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1"
id "edu.wpi.first.GradleRIO" version "2025.3.1"
}

java {
Expand Down Expand Up @@ -33,7 +33,7 @@ deploy {
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
files = project.fileTree('src/main/deploy')
directory = '/home/lvuser/deploy'
deleteOldFiles = false // Change to true to delete files on roboRIO that no
deleteOldFiles = true // Change to true to delete files on roboRIO that no
// longer exist in deploy directory of this project
}
}
Expand All @@ -47,7 +47,7 @@ def deployArtifact = deploy.targets.roborio.artifacts.frcJava
wpi.java.debugJni = false

// Set this to true to enable desktop support.
def includeDesktopSupport = false
def includeDesktopSupport = true

// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
// Also defines JUnit 5.
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.
5 changes: 5 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"System Joysticks": {
"window": {
"enabled": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
Expand Down
73 changes: 0 additions & 73 deletions src/main/deploy/pathplanner/autos/3Piece-A.auto

This file was deleted.

19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/A_R3.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "A_R2"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/HP2_R6.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "HP2_R6"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/Leave A.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "LeaveA"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/TestAuto.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "TestPath"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/A_R1.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/A_R2.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/A_R3.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/A_R4.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/B_R2.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/B_R3.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/B_R4.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/B_R5.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/C_R3.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/C_R4.path
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/C_R5.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/C_R6.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R1.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R2.path
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R3.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R4.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R5.path
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP1_R6.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP2_R1.path
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP2_R2.path
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/HP2_R3.path
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxVelocity": 5.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
Expand Down
Loading