Skip to content

changes from states #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SpectrumFRC3847 merged 4 commits into from
Apr 20, 2026
Merged

changes from states #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c0fbab
after practice matches
SpectrumFRC3847 Apr 16, 2026
7331d64
changes before quals
SpectrumFRC3847 Apr 16, 2026
143c2d4
end of quals changes
SpectrumFRC3847 Apr 18, 2026
28707cf
end of comp changes
SpectrumFRC3847 Apr 18, 2026
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
2 changes: 1 addition & 1 deletion simgui-window.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"###Joysticks": {
"Collapsed": "0",
"Pos": "6,824",
"Size": "976,278"
"Size": "976,82"
},
"###Keyboard 0 Settings": {
"Collapsed": "0",
Expand Down
4 changes: 4 additions & 0 deletions simgui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
}
},
"/SmartDashboard/Field2d": {
"Auto Routine": {
"arrows": false,
"style": "Line"
},
"Robot": {
"arrowColor": [
1.0,
Expand Down
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/Trench-Trench 1.auto
View file
Open in desktop
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": "OLD - Trench-Trench Left 1"
}
}
]
}
},
"resetOdom": true,
"folder": "Neutral Zone Autos",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/Trench-Trench 2.auto
View file
Open in desktop
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": "OLD - Trench-Trench Left 2"
}
}
]
}
},
"resetOdom": false,
"folder": "Neutral Zone Autos",
"choreoAuto": false
}
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/Trench-Trench Full.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "OLD - Trench-Trench Left 1"
}
},
{
"type": "path",
"data": {
"pathName": "OLD - Trench-Trench Left 2"
}
}
]
}
},
"resetOdom": true,
"folder": "Neutral Zone Autos",
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/1 Meter.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/3 Meter.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/5 Meter.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Depot to Climb.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Depot to Outpost.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
Expand Down
46 changes: 23 additions & 23 deletions ...aths/FUDGE - Neutral Zone Trench L 1.path → ...ner/paths/OLD - Trench-Trench Left 1.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
"waypoints": [
{
"anchor": {
"x": 4.38,
"y": 6.470000000000001
"x": 4.46,
"y": 7.49
},
"prevControl": null,
"nextControl": {
"x": 5.38,
"y": 6.470000000000001
"x": 5.46,
"y": 7.49
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 6.890449438202247,
"y": 6.470000000000001
"y": 7.49
},
"prevControl": {
"x": 5.890449438202247,
"y": 6.470000000000001
"y": 7.49
},
"nextControl": {
"x": 7.890449438202247,
"y": 6.470000000000001
"y": 7.49
},
"isLocked": false,
"linkedName": null
Expand All @@ -49,59 +49,59 @@
{
"anchor": {
"x": 7.801938202247191,
"y": 4.05
"y": 5.05
},
"prevControl": {
"x": 7.806044007490637,
"y": 4.606864682725821
"x": 7.801938202247191,
"y": 5.606879818725751
},
"nextControl": {
"x": 7.797832397003745,
"y": 3.493135317274179
"x": 7.801938202247191,
"y": 4.35
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 6.73,
"y": 4.05
"y": 5.05
},
"prevControl": {
"x": 6.73,
"y": 3.55
"y": 4.35
},
"nextControl": {
"x": 6.73,
"y": 4.55
"y": 5.55
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 6.73,
"y": 5.96
"y": 7.11435393258427
},
"prevControl": {
"x": 6.73,
"y": 5.46
"y": 6.61435393258427
},
"nextControl": {
"x": 6.73,
"y": 6.46
"y": 7.61435393258427
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 3.38,
"y": 6.29
"y": 7.32
},
"prevControl": {
"x": 5.38,
"y": 6.29
"y": 7.32
},
"nextControl": null,
"isLocked": false,
Expand Down Expand Up @@ -129,7 +129,7 @@
"constraintZones": [
{
"name": "Constraints Zone",
"minWaypointRelativePos": 4.804228660924045,
"minWaypointRelativePos": 4.400156617071261,
"maxWaypointRelativePos": 6.0,
"constraints": {
"maxVelocity": 2.0,
Expand Down Expand Up @@ -161,12 +161,12 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 115.0
"rotation": 110.0
},
"reversed": false,
"folder": "Neutral Zone - Left Trench Start",
Expand Down
46 changes: 23 additions & 23 deletions ...aths/FUDGE - Neutral Zone Trench L 2.path → ...ner/paths/OLD - Trench-Trench Left 2.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
{
"anchor": {
"x": 3.38,
"y": 6.29
"y": 7.32
},
"prevControl": null,
"nextControl": {
"x": 5.380000000000001,
"y": 6.29
"y": 7.32
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 5.749035580524344,
"y": 6.29
"x": 5.93,
"y": 7.32
},
"prevControl": {
"x": 5.249035580524344,
"y": 6.29
"x": 5.43,
"y": 7.32
},
"nextControl": {
"x": 6.349035580524344,
"y": 6.29
"x": 6.529999999999999,
"y": 7.32
},
"isLocked": false,
"linkedName": null
Expand All @@ -48,44 +48,44 @@
},
{
"anchor": {
"x": 7.44062734082397,
"x": 7.6623408239700375,
"y": 4.03
},
"prevControl": {
"x": 7.44062734082397,
"x": 7.6623408239700375,
"y": 3.5300000000000002
},
"nextControl": {
"x": 7.44062734082397,
"x": 7.6623408239700375,
"y": 4.529999999999995
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 6.96435393258427,
"y": 6.408155430711611
"x": 7.013623595505618,
"y": 7.138988764044944
},
"prevControl": {
"x": 7.76435393258427,
"y": 6.408155430711611
"x": 7.7653776921343445,
"y": 6.865372649384409
},
"nextControl": {
"x": 6.31735393258427,
"y": 6.408155430711611
"x": 6.405642469857136,
"y": 7.3602757967766514
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 3.38,
"y": 6.29
"y": 7.32
},
"prevControl": {
"x": 5.379999999999999,
"y": 6.29
"y": 7.32
},
"nextControl": null,
"isLocked": false,
Expand Down Expand Up @@ -147,7 +147,7 @@
},
{
"name": "intake",
"waypointRelativePos": 0.44831636648397183,
"waypointRelativePos": 0.18206734534065672,
"endWaypointRelativePos": null,
"command": null
},
Expand All @@ -163,18 +163,18 @@
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 540.0,
"nominalVoltage": 10.0,
"nominalVoltage": 9.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 115.0
"rotation": 110.0
},
"reversed": false,
"folder": "Neutral Zone - Left Trench Start",
"idealStartingState": {
"velocity": 0,
"rotation": 115.0
"rotation": 110.0
},
"useDefaultConstraints": true
}
Loading