Skip to content

Commit 3b7ea8c

Browse files
authored
Merge pull request #104 from errorcodexero/work_april_1
Retune shooter
2 parents 890149e + 3fe7b70 commit 3b7ea8c

1 file changed

Lines changed: 49 additions & 33 deletions

File tree

src/main/deploy/tuning/arc.json

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"points" : [
77
{
88
// Shoot cmd
9-
"distance" : 1.48,
10-
"velocity" : 54.0
9+
"distance" : 1.18,
10+
"velocity" : 50.0
1111
},
1212
{
1313
// Shoot cmd
14-
"distance" : 1.61,
15-
"velocity" : 56.0
14+
"distance" : 1.4,
15+
"velocity" : 54.0
1616
},
1717
{
1818
// Shoot cmd
19-
"distance" : 1.82,
20-
"velocity" : 61.0
19+
"distance" : 1.7,
20+
"velocity" : 55.0
2121
}
2222
]
2323
},
@@ -26,79 +26,95 @@
2626
"points" : [
2727
{
2828
// Shoot cmd
29-
"distance" : 2.0,
30-
"velocity" : 54.0
31-
},
29+
"distance" : 1.9,
30+
"velocity" : 51.0
31+
},
3232
{
3333
// Shoot cmd
34-
"distance" : 2.22,
35-
"velocity" : 56.0
34+
"distance" : 2.11,
35+
"velocity" : 52.0
3636
},
3737
{
3838
// Shoot mode
39-
"distance" : 2.43,
40-
"velocity" : 59.0
39+
"distance" : 2.3,
40+
"velocity" : 54.5
4141
},
4242
{
4343
// Shoot mode
44-
"distance" : 2.60,
45-
"velocity" : 61.0
44+
"distance" : 2.50,
45+
"velocity" : 56.0
4646
}
4747
]
4848
},
4949
{
5050
"hood" : 25.0,
5151
"points" : [
52+
// {
53+
// "distance": 2.7,
54+
// "velocity": 55.0
55+
// },
5256
{
5357
// Shoot cmd
54-
"distance" : 2.81,
55-
"velocity" : 56
58+
"distance" : 2.7,
59+
"velocity" : 53
5660
},
5761
{
5862
// Shoot cmd
59-
"distance" : 3.02,
60-
"velocity" : 57
63+
"distance" : 2.9,
64+
"velocity" : 54
6165
},
6266
{
6367
// Shoot cmd
64-
"distance" : 3.21,
65-
"velocity" : 58
68+
"distance" : 3.1,
69+
"velocity" : 55.5
6670
},
6771
{
6872
// Shoot cmd
69-
"distance" : 3.4,
70-
"velocity" : 59
73+
"distance" : 3.29,
74+
"velocity" : 56.0
7175
},
7276
{
7377
// Shoot cmd
74-
"distance" : 3.60,
75-
"velocity" : 60.0
78+
"distance" : 3.50,
79+
"velocity" : 57.0
7680
},
7781
{
7882
// Shoot cmd
79-
"distance" : 3.81,
80-
"velocity" : 61.0
83+
"distance" : 3.71,
84+
"velocity" : 58.0
8185
}
8286
]
8387
},
8488
{
85-
"hood" : 35.0,
89+
"hood" : 30.0,
8690
"points" : [
8791
{
8892
// Shoot cmd
89-
"distance" : 4.00,
93+
"distance" : 3.90,
9094
"velocity" : 58.0
9195
},
9296
{
9397
// Shoot cmd
94-
"distance" : 4.3,
98+
"distance" : 4.1,
9599
"velocity" : 60.0
96100
},
97101
{
98102
// Shoot cmd
99-
"distance" : 4.6,
100-
"velocity" : 62.0
101-
}
103+
"distance" : 4.3,
104+
"velocity" : 62.5
105+
},
106+
{
107+
"distance": 4.5,
108+
"velocity": 64
109+
},
110+
{
111+
"distance": 4.8,
112+
"velocity": 65.5
113+
},
114+
{
115+
"distance": 5.3,
116+
"velocity": 68.5
117+
}
102118
]
103119
}
104120
]

0 commit comments

Comments
 (0)