Skip to content

Commit 2d4a8cd

Browse files
CarvalhoJeoCarvalhoJeo
committed
feat: update do beta de 2025
1 parent e47557b commit 2d4a8cd

28 files changed

+489
-114
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,6 @@ ctre_sim/
182182
# clangd
183183
/.cache
184184
compile_commands.json
185+
186+
# Eclipse generated file for annotation processors
187+
.factorypath

‎.vscode/settings.json‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,36 @@
2525
}
2626
},
2727
],
28-
"java.test.defaultConfig": "WPIlibUnitTests"
28+
"java.test.defaultConfig": "WPIlibUnitTests",
29+
"java.import.gradle.annotationProcessing.enabled": false,
30+
"java.completion.favoriteStaticMembers": [
31+
"org.junit.Assert.*",
32+
"org.junit.Assume.*",
33+
"org.junit.jupiter.api.Assertions.*",
34+
"org.junit.jupiter.api.Assumptions.*",
35+
"org.junit.jupiter.api.DynamicContainer.*",
36+
"org.junit.jupiter.api.DynamicTest.*",
37+
"org.mockito.Mockito.*",
38+
"org.mockito.ArgumentMatchers.*",
39+
"org.mockito.Answers.*",
40+
"edu.wpi.first.units.Units.*"
41+
],
42+
"java.completion.filteredTypes": [
43+
"java.awt.*",
44+
"com.sun.*",
45+
"sun.*",
46+
"jdk.*",
47+
"org.graalvm.*",
48+
"io.micrometer.shaded.*",
49+
"java.beans.*",
50+
"java.util.Base64.*",
51+
"java.util.Timer",
52+
"java.sql.*",
53+
"javax.swing.*",
54+
"javax.management.*",
55+
"javax.smartcardio.*",
56+
"edu.wpi.first.math.proto.*",
57+
"edu.wpi.first.math.**.proto.*",
58+
"edu.wpi.first.math.**.struct.*",
59+
]
2960
}

‎.wpilib/wpilib_preferences.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": false,
33
"currentLanguage": "java",
4-
"projectYear": "2025beta",
5-
"teamNumber": 0
4+
"projectYear": "2025",
5+
"teamNumber": 9999
66
}

‎README.md‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
3+
id "edu.wpi.first.GradleRIO" version "2025.2.1"
44
}
55

66
java {
@@ -34,7 +34,7 @@ deploy {
3434
files = project.fileTree('src/main/deploy')
3535
directory = '/home/lvuser/deploy'
3636
deleteOldFiles = false // Change to true to delete files on roboRIO that no
37-
// longer exist in deploy directory on roboRIO
37+
// longer exist in deploy directory of this project
3838
}
3939
}
4040
}

‎settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pluginManagement {
2020
}
2121
def frcHomeMaven = new File(frcHome, 'maven')
2222
maven {
23-
name 'frcHome'
24-
url frcHomeMaven
23+
name = 'frcHome'
24+
url = frcHomeMaven
2525
}
2626
}
2727
}

‎simgui-ds.json‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
{
2+
"keyboardJoysticks": [
3+
{
4+
"axisConfig": [
5+
{
6+
"decKey": 65,
7+
"incKey": 68
8+
},
9+
{
10+
"decKey": 87,
11+
"incKey": 83
12+
},
13+
{
14+
"decKey": 69,
15+
"decayRate": 0.0,
16+
"incKey": 82,
17+
"keyRate": 0.009999999776482582
18+
}
19+
],
20+
"axisCount": 3,
21+
"buttonCount": 4,
22+
"buttonKeys": [
23+
90,
24+
88,
25+
67,
26+
86
27+
],
28+
"povConfig": [
29+
{
30+
"key0": 328,
31+
"key135": 323,
32+
"key180": 322,
33+
"key225": 321,
34+
"key270": 324,
35+
"key315": 327,
36+
"key45": 329,
37+
"key90": 326
38+
}
39+
],
40+
"povCount": 1
41+
},
42+
{
43+
"axisConfig": [
44+
{
45+
"decKey": 74,
46+
"incKey": 76
47+
},
48+
{
49+
"decKey": 73,
50+
"incKey": 75
51+
}
52+
],
53+
"axisCount": 2,
54+
"buttonCount": 4,
55+
"buttonKeys": [
56+
77,
57+
44,
58+
46,
59+
47
60+
],
61+
"povCount": 0
62+
},
63+
{
64+
"axisConfig": [
65+
{
66+
"decKey": 263,
67+
"incKey": 262
68+
},
69+
{
70+
"decKey": 265,
71+
"incKey": 264
72+
}
73+
],
74+
"axisCount": 2,
75+
"buttonCount": 6,
76+
"buttonKeys": [
77+
260,
78+
268,
79+
266,
80+
261,
81+
269,
82+
267
83+
],
84+
"povCount": 0
85+
},
86+
{
87+
"axisCount": 0,
88+
"buttonCount": 0,
89+
"povCount": 0
90+
}
91+
]
92+
}

‎src/main/deploy/swerve/controllerproperties.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"angleJoystickRadiusDeadband": 0.5,
3+
"heading": {
4+
"p": 0.4,
5+
"i": 0,
6+
"d": 0.01
7+
}
8+
}

‎src/main/deploy/swerve/modules/backleft.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"drive": {
3+
"type": "sparkmax_neo",
4+
"id": 7,
5+
"canbus": null
6+
},
7+
"angle": {
8+
"type": "sparkmax_neo",
9+
"id": 8,
10+
"canbus": null
11+
},
12+
"encoder": {
13+
"type": "cancoder",
14+
"id": 12,
15+
"canbus": null
16+
},
17+
"inverted": {
18+
"drive": false,
19+
"angle": false
20+
},
21+
"absoluteEncoderOffset": 6.504,
22+
"location": {
23+
"front": -12,
24+
"left": 12
25+
}
26+
}

‎src/main/deploy/swerve/modules/backright.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"drive": {
3+
"type": "sparkmax_neo",
4+
"id": 5,
5+
"canbus": null
6+
},
7+
"angle": {
8+
"type": "sparkmax_neo",
9+
"id": 6,
10+
"canbus": null
11+
},
12+
"encoder": {
13+
"type": "cancoder",
14+
"id": 11,
15+
"canbus": null
16+
},
17+
"inverted": {
18+
"drive": false,
19+
"angle": false
20+
},
21+
"absoluteEncoderOffset": -18.281,
22+
"location": {
23+
"front": -12,
24+
"left": -12
25+
}
26+
}

0 commit comments

Comments
 (0)