Skip to content
This repository was archived by the owner on Oct 26, 2024. It is now read-only.

Commit fbf24b5

Browse files
authored
Merge pull request #17 from Spikes-2212-Programming-Guild/dev
Dev
2 parents e0f798f + dc10a93 commit fbf24b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4875
-173
lines changed

.idea/gradle.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 32 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/uiDesigner.xml

Lines changed: 124 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.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+
}

.wpilib/wpilib_preferences.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": false,
33
"currentLanguage": "java",
4-
"projectYear": "2023",
4+
"projectYear": "2024",
55
"teamNumber": 2212
66
}

build.gradle

Lines changed: 1 addition & 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.1.1"
3+
id "edu.wpi.first.GradleRIO" version "2024.3.1"
44
}
55

66
java {
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 1.4993411183403562,
6+
"y": 5.507946742389212
7+
},
8+
"rotation": 0
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "reset-gyro"
18+
}
19+
},
20+
{
21+
"type": "named",
22+
"data": {
23+
"name": "reset-placer"
24+
}
25+
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "reset-adjuster"
30+
}
31+
},
32+
{
33+
"type": "named",
34+
"data": {
35+
"name": "open-intake"
36+
}
37+
},
38+
{
39+
"type": "named",
40+
"data": {
41+
"name": "shoot-close"
42+
}
43+
},
44+
{
45+
"type": "parallel",
46+
"data": {
47+
"commands": [
48+
{
49+
"type": "named",
50+
"data": {
51+
"name": "intake-note"
52+
}
53+
},
54+
{
55+
"type": "sequential",
56+
"data": {
57+
"commands": [
58+
{
59+
"type": "wait",
60+
"data": {
61+
"waitTime": 4.0
62+
}
63+
},
64+
{
65+
"type": "path",
66+
"data": {
67+
"pathName": "2-1"
68+
}
69+
}
70+
]
71+
}
72+
}
73+
]
74+
}
75+
},
76+
{
77+
"type": "named",
78+
"data": {
79+
"name": "shoot-middle"
80+
}
81+
},
82+
{
83+
"type": "named",
84+
"data": {
85+
"name": "close-intake"
86+
}
87+
},
88+
{
89+
"type": "path",
90+
"data": {
91+
"pathName": "2-2"
92+
}
93+
}
94+
]
95+
}
96+
},
97+
"folder": null,
98+
"choreoAuto": false
99+
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.7743035429090798,
6+
"y": 4.397002070357417
7+
},
8+
"rotation": -62.27174257768086
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "reset-gyro"
18+
}
19+
},
20+
{
21+
"type": "named",
22+
"data": {
23+
"name": "reset-adjuster"
24+
}
25+
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "reset-placer"
30+
}
31+
},
32+
{
33+
"type": "named",
34+
"data": {
35+
"name": "shoot-close"
36+
}
37+
},
38+
{
39+
"type": "path",
40+
"data": {
41+
"pathName": "escpae from long"
42+
}
43+
}
44+
]
45+
}
46+
},
47+
"folder": null,
48+
"choreoAuto": false
49+
}

0 commit comments

Comments
 (0)