Skip to content

Commit 537f123

Browse files
authored
Merge pull request #4 from FRC5190/limelight
Limelight
2 parents fbb1cb4 + a66df58 commit 537f123

40 files changed

+3464
-581
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+
}

Hardware.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ This document details all of the hardware (motors, motor controllers, sensors, e
2222
| 13 | Shooter L | NEO | SPARK MAX | ? |
2323
| 14 | Shooter R | NEO | SPARK MAX | ? |
2424
| 15 | Feeder | NEO 550 | SPARK MAX | ? |
25+
| 16 | Climber L | NEO | SPARK MAX | ? |
26+
| 17 | Climber R | NEO | SPARK MAX | ? |
2527

2628

2729

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.json

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,60 @@
11
{
2+
"HALProvider": {
3+
"Other Devices": {
4+
"navX-Sensor[0]": {
5+
"header": {
6+
"open": true
7+
}
8+
}
9+
}
10+
},
211
"NTProvider": {
312
"types": {
4-
"/FMSInfo": "FMSInfo"
13+
"/FMSInfo": "FMSInfo",
14+
"/Shuffleboard/2024/Field": "Field2d",
15+
"/Shuffleboard/2024/SendableChooser[0]": "String Chooser",
16+
"/Shuffleboard/2024/SendableChooser[1]": "String Chooser",
17+
"/Shuffleboard/2024/Superstructure": "Mechanism2d",
18+
"/SmartDashboard/Field": "Field2d",
19+
"/SmartDashboard/SendableChooser[0]": "String Chooser",
20+
"/SmartDashboard/SendableChooser[1]": "String Chooser",
21+
"/SmartDashboard/field": "Field2d"
522
}
623
},
724
"NetworkTables": {
8-
"Retained Values": {
9-
"open": false
10-
},
1125
"transitory": {
26+
"AdvantageKit": {
27+
"RealOutputs": {
28+
"PathFollowing": {
29+
"open": true
30+
},
31+
"open": true
32+
},
33+
"open": true
34+
},
1235
"Shuffleboard": {
1336
".metadata": {
14-
"open": true
37+
"open": false
1538
},
1639
".recording": {
17-
"open": true
40+
"open": false
1841
}
19-
},
20-
"SmartDashboard": {
21-
"open": true
2242
}
2343
}
2444
},
2545
"NetworkTables Info": {
46+
"AdvantageScope@1": {
47+
"Publishers": {
48+
"open": false
49+
},
50+
"Subscribers": {
51+
"open": false
52+
},
53+
"open": false
54+
},
55+
"DartClient_13310512@1": {
56+
"open": false
57+
},
2658
"visible": true
2759
}
2860
}
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"waypoints": [
3+
{
4+
"anchorPoint": {
5+
"x": 1.0,
6+
"y": 3.0
7+
},
8+
"prevControl": null,
9+
"nextControl": {
10+
"x": 2.0,
11+
"y": 3.0
12+
},
13+
"holonomicAngle": 0,
14+
"isReversal": false,
15+
"velOverride": null,
16+
"isLocked": false,
17+
"isStopPoint": false,
18+
"stopEvent": {
19+
"names": [],
20+
"executionBehavior": "parallel",
21+
"waitBehavior": "none",
22+
"waitTime": 0
23+
}
24+
},
25+
{
26+
"anchorPoint": {
27+
"x": 3.0,
28+
"y": 5.0
29+
},
30+
"prevControl": {
31+
"x": 3.0,
32+
"y": 4.0
33+
},
34+
"nextControl": {
35+
"x": 3.0,
36+
"y": 4.0
37+
},
38+
"holonomicAngle": 0,
39+
"isReversal": true,
40+
"velOverride": null,
41+
"isLocked": false,
42+
"isStopPoint": false,
43+
"stopEvent": {
44+
"names": [],
45+
"executionBehavior": "parallel",
46+
"waitBehavior": "none",
47+
"waitTime": 0
48+
}
49+
},
50+
{
51+
"anchorPoint": {
52+
"x": 5.0,
53+
"y": 3.0
54+
},
55+
"prevControl": {
56+
"x": 4.0,
57+
"y": 3.0
58+
},
59+
"nextControl": null,
60+
"holonomicAngle": 0,
61+
"isReversal": false,
62+
"velOverride": null,
63+
"isLocked": false,
64+
"isStopPoint": false,
65+
"stopEvent": {
66+
"names": [],
67+
"executionBehavior": "parallel",
68+
"waitBehavior": "none",
69+
"waitTime": 0
70+
}
71+
}
72+
],
73+
"markers": []
74+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": null,
4+
"command": {
5+
"type": "sequential",
6+
"data": {
7+
"commands": [
8+
{
9+
"type": "path",
10+
"data": {
11+
"pathName": "left_intake"
12+
}
13+
},
14+
{
15+
"type": "path",
16+
"data": {
17+
"pathName": "middle_intake"
18+
}
19+
}
20+
]
21+
}
22+
},
23+
"folder": null,
24+
"choreoAuto": false
25+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 14.05,
7+
"y": 4.35
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 15.05,
12+
"y": 4.35
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 4.0,
20+
"y": 6.0
21+
},
22+
"prevControl": {
23+
"x": 3.0,
24+
"y": 6.0
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 3.0,
36+
"maxAcceleration": 3.0,
37+
"maxAngularVelocity": 540.0,
38+
"maxAngularAcceleration": 720.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": 0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": null,
47+
"previewStartingState": {
48+
"rotation": 0,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": true
52+
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 1.3674521584632144,
7+
"y": 5.555162990025228
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 2.3674521584632147,
12+
"y": 5.555162990025228
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 3.3529085604537125,
20+
"y": 5.555162990025228
21+
},
22+
"prevControl": {
23+
"x": 2.3529085604537125,
24+
"y": 5.555162990025228
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 2.0,
36+
"maxAcceleration": 1.0,
37+
"maxAngularVelocity": 540.0,
38+
"maxAngularAcceleration": 720.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": 0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": null,
47+
"previewStartingState": {
48+
"rotation": 0,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": false
52+
}

0 commit comments

Comments
 (0)