Skip to content

Commit

Permalink
Merge pull request #8 from HighlanderRobotics/choreo
Browse files Browse the repository at this point in the history
Choreo
  • Loading branch information
Lewis-Seiden committed Sep 27, 2023
2 parents dbb90be + b63af8f commit 81b0292
Show file tree
Hide file tree
Showing 32 changed files with 22,361 additions and 37 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.gradle text eol=lf
*.java text eol=lf
*.md text eol=lf
*.xml text eol=lf
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ dependencies {

def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
annotationProcessor "org.littletonrobotics.akit.junction:junction-autolog:$akitJson.version"

compileOnly 'org.projectlombok:lombok:1.18.28'
annotationProcessor 'org.projectlombok:lombok:1.18.28'

testCompileOnly 'org.projectlombok:lombok:1.18.28'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.28'

implementation 'com.google.code.gson:gson:2.10.1'
}

test {
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.
5 changes: 0 additions & 5 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"Keyboard 0 Settings": {
"window": {
"visible": true
}
},
"Keyboard 1 Settings": {
"window": {
"visible": true
Expand Down
28 changes: 22 additions & 6 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"0": {
"columns": 50,
"serpentine": true
},
"window": {
"visible": true
}
},
"Other Devices": {
Expand All @@ -17,6 +20,9 @@
"/AdvantageKit/RealOutputs/Elevator Mech 2D": "Mechanism2d",
"/FMSInfo": "FMSInfo",
"/SmartDashboard/Auto Chooser": "String Chooser",
"/SmartDashboard/Auto System Type": "String Chooser",
"/SmartDashboard/Choreo Auto Chooser": "String Chooser",
"/SmartDashboard/ChoreoSwerveControllerCommand_field": "Field2d",
"/SmartDashboard/Field": "Field2d",
"/SmartDashboard/Grabber intake cone double substation no extend": "Command",
"/SmartDashboard/Grabber intake cone single substation no extend": "Command",
Expand All @@ -34,7 +40,7 @@
"/SmartDashboard/Spline": "Command",
"/SmartDashboard/autoBalance": "Command",
"/SmartDashboard/autoChooser": "String Chooser",
"/SmartDashboard/camera Sim Field": "Field2d",
"/SmartDashboard/choreo field": "Field2d",
"/SmartDashboard/elevatorsim": "Mechanism2d",
"/SmartDashboard/extend to 0": "Command",
"/SmartDashboard/extend to 12": "Command",
Expand All @@ -53,6 +59,16 @@
"visible": true
}
},
"/SmartDashboard/Auto System Type": {
"window": {
"visible": true
}
},
"/SmartDashboard/Choreo Auto Chooser": {
"window": {
"visible": true
}
},
"/SmartDashboard/Field": {
"Robot": {
"color": [
Expand Down Expand Up @@ -102,11 +118,6 @@
"visible": true
}
},
"/SmartDashboard/Path 1": {
"window": {
"visible": true
}
},
"/SmartDashboard/elevatorsim": {
"window": {
"visible": true
Expand All @@ -116,6 +127,11 @@
},
"NetworkTables": {
"transitory": {
"AdvantageKit": {
"DashboardInputs": {
"open": true
}
},
"Shuffleboard": {
"open": true
},
Expand Down
3 changes: 0 additions & 3 deletions src/main/deploy/example.txt

This file was deleted.

Loading

0 comments on commit 81b0292

Please sign in to comment.