Skip to content

Commit 41a944f

Browse files
authored
Merge pull request #104 from strykeforce/Adding-a-Camera
Add second camera to robot
2 parents 12a8f80 + 224123d commit 41a944f

File tree

50 files changed

+1651
-289
lines changed

Some content is hidden

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

50 files changed

+1651
-289
lines changed

build.gradle

Lines changed: 2 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 "2023.4.2"
3+
id "edu.wpi.first.GradleRIO" version "2023.4.3"
44
id "com.diffplug.spotless" version "6.12.1"
55
}
66

@@ -54,6 +54,7 @@ dependencies {
5454

5555
implementation("com.opencsv:opencsv:5.7.1")
5656
implementation("com.squareup.moshi:moshi:1.13.0")
57+
implementation 'net.jafama:jafama:2.3.2'
5758
implementation 'net.consensys.cava:cava-toml:0.5.0'
5859

5960
roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
max_velocity = 3.0 #m/s
2+
max_acceleration = 3.0 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.5 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 7.07
10+
y = 1.07
11+
angle = 180.0
12+
13+
[end_pose]
14+
x = 2.32
15+
y = 1.4 #1.17->1.27
16+
angle = 180.0
17+
18+
[[internal_points]]
19+
x = 4.5
20+
y = 0.9
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
max_velocity = 3.25 #m/s
2+
max_acceleration = 3.0 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.5 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 6.9 #7.07
10+
y = 2.14 #2.25
11+
angle = 180.0
12+
13+
[end_pose]
14+
x = 2.22 #2.32
15+
y = 1.27 #1.4
16+
angle = 180.0
17+
18+
[[internal_points]]
19+
x = 5.5
20+
y = 0.90
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
max_velocity = 2.5 #m/s
2+
max_acceleration = 2.75 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.0 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 2.02
10+
y = 0.69 #0.53
11+
angle = 0.0
12+
13+
[end_pose]
14+
x = 7.07
15+
y = 1.07 #0.92->1.02
16+
angle = 0.0
17+
18+
[[internal_points]]
19+
x = 4.5
20+
y = 0.752702
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
max_velocity = 3.25 #m/s 2.75
2+
max_acceleration = 3.0 #m/s 2.75
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.6 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 2.02
10+
y = 0.69 #0.53
11+
angle = 0.0
12+
13+
[end_pose]
14+
x = 6.77 #7.00
15+
y = 2.3 #2.34 red:2.29 blue:2.34
16+
angle = 0.0
17+
18+
[[internal_points]]
19+
x = 5.8
20+
y = 0.85
21+
22+
[[internal_points]]
23+
x = 6.2 #6.1
24+
y = 2.2
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
max_velocity = 2.5 #m/s
2+
max_acceleration = 2.75 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.0 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 2.02
10+
y = 0.69 #0.53
11+
angle = 0.0
12+
13+
[end_pose]
14+
x = 6.90
15+
y = 2.14
16+
angle = 0.0
17+
18+
[[internal_points]]
19+
x = 4.5
20+
y = 0.752702
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
max_velocity = 3.25 #m/s
2+
max_acceleration = 3.0 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.6 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 2.02
10+
y = 4.895
11+
angle = 0.0
12+
13+
[end_pose]
14+
x = 6.3 # 7
15+
y = 2.96 # cube 3
16+
angle = 0.0
17+
18+
[[internal_points]]
19+
x = 4.8
20+
y = 5.12
21+
22+
[[internal_points]]
23+
x = 5.6
24+
y = 3.8 #3.97

src/main/deploy/paths/pieceOneFetchPathBump.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
max_velocity = 2.5 #m/s
22
max_acceleration = 2.75 #m/s
33
start_velocity = 0.0 #m/s
4-
end_velocity = 0.0 #m/s
4+
end_velocity = 0.3 #m/s
55
is_reversed = false
66
target_yaw = 0.0 #degrees
77

@@ -11,8 +11,8 @@ target_yaw = 0.0 #degrees
1111
angle = 0.0
1212

1313
[end_pose]
14-
x = 7.07
15-
y = 1.07 #0.92->1.02
14+
x = 6.8
15+
y = 0.92 #0.92->1.02
1616
angle = 0.0
1717

1818
[[internal_points]]

src/main/deploy/paths/pieceOnePlaceCubeThreeBumpPt1Path.toml

Whitespace-only changes.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
max_velocity = 3.25 #m/s
2+
max_acceleration = 3.0 #m/s
3+
start_velocity = 0.0 #m/s
4+
end_velocity = 0.5 #m/s
5+
is_reversed = false
6+
target_yaw = 0.0 #degrees
7+
8+
[start_pose]
9+
x = 6.90 # 7
10+
y = 3.36 # cube 3
11+
angle = 180.0
12+
13+
[end_pose]
14+
x = 2.22 # 7
15+
y = 4.3 # cube 3 place high
16+
angle = 180.0
17+
18+
[[internal_points]]
19+
x = 5.5
20+
y = 4.6

0 commit comments

Comments
 (0)