Skip to content

Commit 61bad45

Browse files
committed
Some changes
Some changes
1 parent baa9485 commit 61bad45

File tree

12 files changed

+438
-96
lines changed

12 files changed

+438
-96
lines changed

.pathplanner/settings.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"robotWidth": 0.9,
3+
"robotLength": 0.9,
4+
"holonomicMode": true,
5+
"pathFolders": [],
6+
"autoFolders": [],
7+
"defaultMaxVel": 3.0,
8+
"defaultMaxAccel": 3.0,
9+
"defaultMaxAngVel": 540.0,
10+
"defaultMaxAngAccel": 720.0,
11+
"maxModuleSpeed": 4.5
12+
}

build.gradle

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

66
java {
@@ -69,6 +69,9 @@ dependencies {
6969

7070
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
7171
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
72+
73+
def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
74+
annotationProcessor "org.littletonrobotics.akit.junction:junction-autolog:$akitJson.version"
7275
}
7376

7477
test {
@@ -90,6 +93,22 @@ jar {
9093
duplicatesStrategy = DuplicatesStrategy.INCLUDE
9194
}
9295

96+
repositories {
97+
maven {
98+
url = uri("https://maven.pkg.github.com/Mechanical-Advantage/AdvantageKit")
99+
credentials {
100+
username = "Mechanical-Advantage-Bot"
101+
password = "\u0067\u0068\u0070\u005f\u006e\u0056\u0051\u006a\u0055\u004f\u004c\u0061\u0079\u0066\u006e\u0078\u006e\u0037\u0051\u0049\u0054\u0042\u0032\u004c\u004a\u006d\u0055\u0070\u0073\u0031\u006d\u0037\u004c\u005a\u0030\u0076\u0062\u0070\u0063\u0051"
102+
}
103+
}
104+
}
105+
106+
configurations.all {
107+
exclude group: "edu.wpi.first.wpilibj"
108+
}
109+
110+
111+
93112
// Configure jar and deploy tasks
94113
deployArtifact.jarTask = jar
95114
wpi.java.configureExecutableTasks(jar)

simgui-ds.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"Joysticks": {
3-
"window": {
4-
"visible": false
5-
}
6-
},
7-
"System Joysticks": {
8-
"window": {
9-
"visible": false
10-
}
11-
},
122
"keyboardJoysticks": [
133
{
144
"axisConfig": [

simgui.json

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
11
{
22
"HALProvider": {
33
"Other Devices": {
4-
"window": {
5-
"visible": false
4+
"navX-Sensor[0]": {
5+
"header": {
6+
"open": true
7+
}
68
}
79
}
810
},
911
"NTProvider": {
1012
"types": {
1113
"/FMSInfo": "FMSInfo",
1214
"/Shuffleboard/2024/Field": "Field2d",
15+
"/Shuffleboard/2024/SendableChooser[0]": "String Chooser",
16+
"/Shuffleboard/2024/SendableChooser[1]": "String Chooser",
1317
"/Shuffleboard/2024/Superstructure": "Mechanism2d",
18+
"/SmartDashboard/Field": "Field2d",
19+
"/SmartDashboard/SendableChooser[0]": "String Chooser",
20+
"/SmartDashboard/SendableChooser[1]": "String Chooser",
1421
"/SmartDashboard/field": "Field2d"
15-
},
16-
"windows": {
17-
"/Shuffleboard/2024/Field": {
18-
"bottom": 1476,
19-
"height": 8.210550308227539,
20-
"left": 150,
21-
"right": 2961,
22-
"top": 79,
23-
"width": 16.541748046875,
24-
"window": {
25-
"visible": true
26-
}
27-
}
2822
}
2923
},
3024
"NetworkTables": {
31-
"Retained Values": {
32-
"open": false
33-
},
3425
"transitory": {
26+
"AdvantageKit": {
27+
"RealOutputs": {
28+
"PathFollowing": {
29+
"open": true
30+
},
31+
"open": true
32+
},
33+
"open": true
34+
},
3535
"Shuffleboard": {
3636
".metadata": {
37-
"open": true
37+
"open": false
3838
},
3939
".recording": {
40-
"open": true
40+
"open": false
4141
}
42-
},
43-
"SmartDashboard": {
44-
"open": true
4542
}
4643
}
4744
},
4845
"NetworkTables Info": {
49-
"Clients": {
50-
"open": true
46+
"AdvantageScope@1": {
47+
"Publishers": {
48+
"open": false
49+
},
50+
"Subscribers": {
51+
"open": false
52+
},
53+
"open": false
5154
},
5255
"DartClient_13310512@1": {
53-
"open": true
54-
}
56+
"open": false
57+
},
58+
"visible": true
5559
}
5660
}

0 commit comments

Comments
 (0)