dragonpilot beta3

date: 2023-10-09T10:55:55
commit: 91b6e3aecd7170f24bccacb10c515ec281c30295
This commit is contained in:
dragonpilot
2023-10-09 10:54:45 -07:00
parent a9ba3193e2
commit cfe0ae9b8a
518 changed files with 159749 additions and 17401 deletions
+6 -4
View File
@@ -63,7 +63,6 @@ struct CarEvent @0x9b1657f34caf3ad3 {
driverUnresponsive @45;
belowSteerSpeed @46;
lowBattery @48;
vehicleModelInvalid @50;
accFaulted @51;
sensorDataInvalid @52;
commIssue @53;
@@ -106,7 +105,6 @@ struct CarEvent @0x9b1657f34caf3ad3 {
roadCameraError @100;
driverCameraError @101;
wideRoadCameraError @102;
localizerMalfunction @103;
highCpuUsage @105;
cruiseMismatch @106;
lkasDisabled @107;
@@ -115,6 +113,10 @@ struct CarEvent @0x9b1657f34caf3ad3 {
resumeBlocked @113;
steerTimeLimit @115;
vehicleSensorsInvalid @116;
locationdTemporaryError @103;
locationdPermanentError @118;
paramsdTemporaryError @50;
paramsdPermanentError @119;
radarCanErrorDEPRECATED @15;
communityFeatureDisallowedDEPRECATED @62;
@@ -458,8 +460,8 @@ struct CarParams {
lateralParams @48 :LateralParams;
lateralTuning :union {
pid @26 :LateralPIDTuning;
indi @27 :LateralINDITuning;
lqr @40 :LateralLQRTuning;
indiDEPRECATED @27 :LateralINDITuning;
lqrDEPRECATED @40 :LateralLQRTuning;
torque @67 :LateralTorqueTuning;
}
+325 -311
View File
@@ -214,7 +214,7 @@ const ::capnp::_::RawSchema s_9b1657f34caf3ad3 = {
1, 11, i_9b1657f34caf3ad3, nullptr, nullptr, { &s_9b1657f34caf3ad3, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
static const ::capnp::_::AlignedData<700> b_baa8c5d505f727de = {
{ 0, 0, 0, 0, 5, 0, 6, 0,
222, 39, 247, 5, 213, 197, 168, 186,
19, 0, 0, 0, 2, 0, 0, 0,
@@ -224,7 +224,7 @@ static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
21, 0, 0, 0, 234, 0, 0, 0,
33, 0, 0, 0, 7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
29, 0, 0, 0, 23, 11, 0, 0,
29, 0, 0, 0, 71, 11, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 97, 114, 46, 99, 97, 112, 110,
@@ -232,360 +232,366 @@ static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
110, 116, 46, 69, 118, 101, 110, 116,
78, 97, 109, 101, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 1, 0,
216, 1, 0, 0, 1, 0, 2, 0,
224, 1, 0, 0, 1, 0, 2, 0,
0, 0, 0, 0, 0, 0, 0, 0,
129, 5, 0, 0, 74, 0, 0, 0,
153, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0, 0,
125, 5, 0, 0, 138, 0, 0, 0,
149, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
117, 0, 0, 0, 0, 0, 0, 0,
125, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
98, 0, 0, 0, 0, 0, 0, 0,
129, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 0,
133, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 0,
129, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
4, 0, 0, 0, 0, 0, 0, 0,
125, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
5, 0, 0, 0, 0, 0, 0, 0,
125, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
6, 0, 0, 0, 0, 0, 0, 0,
121, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
7, 0, 0, 0, 0, 0, 0, 0,
117, 5, 0, 0, 170, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0,
117, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
9, 0, 0, 0, 0, 0, 0, 0,
113, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
10, 0, 0, 0, 0, 0, 0, 0,
109, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
11, 0, 0, 0, 0, 0, 0, 0,
105, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
15, 0, 0, 0, 0, 0, 0, 0,
101, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
94, 0, 0, 0, 0, 0, 0, 0,
97, 5, 0, 0, 194, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 0, 0, 0, 0, 0, 0, 0,
97, 5, 0, 0, 170, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0,
97, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
17, 0, 0, 0, 0, 0, 0, 0,
93, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
18, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
19, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
20, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
22, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
23, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
24, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
116, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
25, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 90, 0, 0, 0,
119, 0, 0, 0, 0, 0, 0, 0,
149, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
100, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 202, 0, 0, 0,
153, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
26, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 82, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 0,
157, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
27, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 82, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 0,
153, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
28, 0, 0, 0, 0, 0, 0, 0,
69, 5, 0, 0, 114, 0, 0, 0,
4, 0, 0, 0, 0, 0, 0, 0,
149, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
29, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 130, 0, 0, 0,
5, 0, 0, 0, 0, 0, 0, 0,
149, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
30, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 106, 0, 0, 0,
6, 0, 0, 0, 0, 0, 0, 0,
145, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
101, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 186, 0, 0, 0,
7, 0, 0, 0, 0, 0, 0, 0,
141, 5, 0, 0, 170, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
31, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 114, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0,
141, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
32, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 218, 0, 0, 0,
9, 0, 0, 0, 0, 0, 0, 0,
137, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
33, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 122, 0, 0, 0,
10, 0, 0, 0, 0, 0, 0, 0,
133, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
34, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 162, 0, 0, 0,
11, 0, 0, 0, 0, 0, 0, 0,
129, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
35, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 186, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
36, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
102, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
103, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 210, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
104, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
37, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
38, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
39, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
40, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
105, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 242, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
41, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
106, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 242, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
42, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 162, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
43, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
44, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
45, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
47, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
48, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
49, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
50, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
51, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
52, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
107, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 250, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
108, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 42, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
95, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 42, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
53, 0, 0, 0, 0, 0, 0, 0,
65, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
54, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
55, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 34, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
56, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 130, 0, 0, 0,
15, 0, 0, 0, 0, 0, 0, 0,
125, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
96, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 202, 0, 0, 0,
121, 5, 0, 0, 194, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
97, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 242, 0, 0, 0,
101, 0, 0, 0, 0, 0, 0, 0,
121, 5, 0, 0, 170, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
57, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 154, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0,
121, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
58, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 106, 0, 0, 0,
17, 0, 0, 0, 0, 0, 0, 0,
117, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
59, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 146, 0, 0, 0,
18, 0, 0, 0, 0, 0, 0, 0,
113, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
60, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 138, 0, 0, 0,
19, 0, 0, 0, 0, 0, 0, 0,
109, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
12, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 162, 0, 0, 0,
20, 0, 0, 0, 0, 0, 0, 0,
109, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
61, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 74, 0, 0, 0,
22, 0, 0, 0, 0, 0, 0, 0,
109, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
62, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 66, 0, 0, 0,
23, 0, 0, 0, 0, 0, 0, 0,
109, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
63, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 106, 0, 0, 0,
24, 0, 0, 0, 0, 0, 0, 0,
105, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 138, 0, 0, 0,
118, 0, 0, 0, 0, 0, 0, 0,
101, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
65, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 114, 0, 0, 0,
25, 0, 0, 0, 0, 0, 0, 0,
101, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
67, 0, 0, 0, 0, 0, 0, 0,
29, 5, 0, 0, 34, 0, 0, 0,
102, 0, 0, 0, 0, 0, 0, 0,
97, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
68, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 122, 0, 0, 0,
26, 0, 0, 0, 0, 0, 0, 0,
101, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
109, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 2, 1, 0, 0,
27, 0, 0, 0, 0, 0, 0, 0,
97, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
114, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 202, 0, 0, 0,
28, 0, 0, 0, 0, 0, 0, 0,
93, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
110, 0, 0, 0, 0, 0, 0, 0,
25, 5, 0, 0, 218, 0, 0, 0,
29, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
69, 0, 0, 0, 0, 0, 0, 0,
29, 5, 0, 0, 138, 0, 0, 0,
30, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
70, 0, 0, 0, 0, 0, 0, 0,
29, 5, 0, 0, 50, 0, 0, 0,
103, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 186, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
111, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 234, 0, 0, 0,
31, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
71, 0, 0, 0, 0, 0, 0, 0,
25, 5, 0, 0, 130, 0, 0, 0,
32, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
112, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 234, 0, 0, 0,
33, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
72, 0, 0, 0, 0, 0, 0, 0,
25, 5, 0, 0, 114, 0, 0, 0,
34, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 162, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
73, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 114, 0, 0, 0,
35, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 186, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
74, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 122, 0, 0, 0,
36, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
75, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 146, 0, 0, 0,
104, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
113, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 210, 0, 0, 0,
105, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 210, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
77, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 122, 0, 0, 0,
106, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
78, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 146, 0, 0, 0,
37, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
79, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 98, 0, 0, 0,
38, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
115, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 18, 1, 0, 0,
39, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
80, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 170, 0, 0, 0,
40, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
81, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 74, 0, 0, 0,
107, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 242, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
82, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 130, 0, 0, 0,
41, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
83, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 146, 0, 0, 0,
108, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 242, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
84, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 162, 0, 0, 0,
94, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
85, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 170, 0, 0, 0,
42, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
66, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 98, 0, 0, 0,
43, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
86, 0, 0, 0, 0, 0, 0, 0,
5, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
87, 0, 0, 0, 0, 0, 0, 0,
1, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
88, 0, 0, 0, 0, 0, 0, 0,
253, 4, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
13, 0, 0, 0, 0, 0, 0, 0,
249, 4, 0, 0, 154, 0, 0, 0,
44, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
46, 0, 0, 0, 0, 0, 0, 0,
249, 4, 0, 0, 138, 0, 0, 0,
81, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
47, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
48, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
49, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
50, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
51, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 90, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
109, 0, 0, 0, 0, 0, 0, 0,
69, 5, 0, 0, 250, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
110, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 42, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
97, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 42, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
52, 0, 0, 0, 0, 0, 0, 0,
89, 5, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
53, 0, 0, 0, 0, 0, 0, 0,
85, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
54, 0, 0, 0, 0, 0, 0, 0,
81, 5, 0, 0, 34, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
55, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
98, 0, 0, 0, 0, 0, 0, 0,
69, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 242, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
56, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
57, 0, 0, 0, 0, 0, 0, 0,
77, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
58, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
59, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
12, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 162, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
60, 0, 0, 0, 0, 0, 0, 0,
73, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
61, 0, 0, 0, 0, 0, 0, 0,
69, 5, 0, 0, 66, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
62, 0, 0, 0, 0, 0, 0, 0,
61, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
63, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0,
57, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
66, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 34, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
67, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
111, 0, 0, 0, 0, 0, 0, 0,
41, 5, 0, 0, 2, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
116, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
112, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
68, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
69, 0, 0, 0, 0, 0, 0, 0,
53, 5, 0, 0, 50, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
113, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 234, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
70, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
114, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 234, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
71, 0, 0, 0, 0, 0, 0, 0,
49, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
72, 0, 0, 0, 0, 0, 0, 0,
45, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
73, 0, 0, 0, 0, 0, 0, 0,
41, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
74, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
115, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 210, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
76, 0, 0, 0, 0, 0, 0, 0,
249, 4, 0, 0, 130, 0, 0, 0,
41, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
89, 0, 0, 0, 0, 0, 0, 0,
245, 4, 0, 0, 114, 0, 0, 0,
77, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
90, 0, 0, 0, 0, 0, 0, 0,
241, 4, 0, 0, 138, 0, 0, 0,
78, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
91, 0, 0, 0, 0, 0, 0, 0,
241, 4, 0, 0, 114, 0, 0, 0,
117, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 18, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
14, 0, 0, 0, 0, 0, 0, 0,
237, 4, 0, 0, 114, 0, 0, 0,
79, 0, 0, 0, 0, 0, 0, 0,
41, 5, 0, 0, 170, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
80, 0, 0, 0, 0, 0, 0, 0,
41, 5, 0, 0, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
81, 0, 0, 0, 0, 0, 0, 0,
37, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
82, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
83, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 162, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
92, 0, 0, 0, 0, 0, 0, 0,
233, 4, 0, 0, 122, 0, 0, 0,
33, 5, 0, 0, 194, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
93, 0, 0, 0, 0, 0, 0, 0,
229, 4, 0, 0, 178, 0, 0, 0,
65, 0, 0, 0, 0, 0, 0, 0,
33, 5, 0, 0, 98, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
84, 0, 0, 0, 0, 0, 0, 0,
29, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
85, 0, 0, 0, 0, 0, 0, 0,
25, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
86, 0, 0, 0, 0, 0, 0, 0,
21, 5, 0, 0, 106, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
13, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
45, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
75, 0, 0, 0, 0, 0, 0, 0,
17, 5, 0, 0, 130, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
87, 0, 0, 0, 0, 0, 0, 0,
13, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
88, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 138, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
89, 0, 0, 0, 0, 0, 0, 0,
9, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
14, 0, 0, 0, 0, 0, 0, 0,
5, 5, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
90, 0, 0, 0, 0, 0, 0, 0,
1, 5, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
91, 0, 0, 0, 0, 0, 0, 0,
253, 4, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
21, 0, 0, 0, 0, 0, 0, 0,
229, 4, 0, 0, 202, 0, 0, 0,
253, 4, 0, 0, 202, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
93, 0, 0, 0, 0, 0, 0, 0,
1, 5, 0, 0, 194, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
95, 0, 0, 0, 0, 0, 0, 0,
1, 5, 0, 0, 178, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 97, 110, 69, 114, 114, 111, 114,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -721,9 +727,9 @@ static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
105, 114, 97, 102, 102, 101, 72, 111,
110, 100, 97, 68, 69, 80, 82, 69,
67, 65, 84, 69, 68, 0, 0, 0,
118, 101, 104, 105, 99, 108, 101, 77,
111, 100, 101, 108, 73, 110, 118, 97,
108, 105, 100, 0, 0, 0, 0, 0,
112, 97, 114, 97, 109, 115, 100, 84,
101, 109, 112, 111, 114, 97, 114, 121,
69, 114, 114, 111, 114, 0, 0, 0,
97, 99, 99, 70, 97, 117, 108, 116,
101, 100, 0, 0, 0, 0, 0, 0,
115, 101, 110, 115, 111, 114, 68, 97,
@@ -866,9 +872,9 @@ static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
119, 105, 100, 101, 82, 111, 97, 100,
67, 97, 109, 101, 114, 97, 69, 114,
114, 111, 114, 0, 0, 0, 0, 0,
108, 111, 99, 97, 108, 105, 122, 101,
114, 77, 97, 108, 102, 117, 110, 99,
116, 105, 111, 110, 0, 0, 0, 0,
108, 111, 99, 97, 116, 105, 111, 110,
100, 84, 101, 109, 112, 111, 114, 97,
114, 121, 69, 114, 114, 111, 114, 0,
115, 116, 97, 114, 116, 117, 112, 78,
111, 70, 119, 0, 0, 0, 0, 0,
104, 105, 103, 104, 67, 112, 117, 85,
@@ -902,14 +908,20 @@ static const ::capnp::_::AlignedData<688> b_baa8c5d505f727de = {
99, 97, 108, 105, 98, 114, 97, 116,
105, 111, 110, 82, 101, 99, 97, 108,
105, 98, 114, 97, 116, 105, 110, 103,
0, 0, 0, 0, 0, 0, 0, 0, }
0, 0, 0, 0, 0, 0, 0, 0,
108, 111, 99, 97, 116, 105, 111, 110,
100, 80, 101, 114, 109, 97, 110, 101,
110, 116, 69, 114, 114, 111, 114, 0,
112, 97, 114, 97, 109, 115, 100, 80,
101, 114, 109, 97, 110, 101, 110, 116,
69, 114, 114, 111, 114, 0, 0, 0, }
};
::capnp::word const* const bp_baa8c5d505f727de = b_baa8c5d505f727de.words;
#if !CAPNP_LITE
static const uint16_t m_baa8c5d505f727de[] = {51, 84, 46, 28, 2, 11, 12, 20, 21, 47, 117, 110, 92, 111, 0, 66, 53, 109, 83, 62, 98, 22, 112, 14, 106, 96, 16, 90, 5, 101, 39, 68, 42, 41, 45, 7, 91, 79, 86, 108, 3, 40, 94, 105, 61, 49, 60, 69, 33, 34, 59, 71, 65, 107, 103, 48, 63, 31, 30, 27, 93, 89, 88, 85, 25, 18, 19, 29, 24, 23, 13, 32, 55, 37, 43, 73, 57, 58, 95, 38, 44, 15, 67, 26, 72, 113, 36, 10, 100, 6, 52, 56, 70, 17, 75, 97, 78, 76, 77, 104, 82, 114, 80, 9, 35, 115, 1, 64, 74, 54, 99, 50, 116, 81, 102, 8, 87, 4};
static const uint16_t m_baa8c5d505f727de[] = {51, 84, 46, 28, 2, 11, 12, 20, 21, 47, 117, 110, 92, 111, 0, 66, 53, 109, 83, 62, 98, 22, 112, 14, 106, 96, 16, 90, 5, 101, 39, 68, 42, 41, 45, 7, 91, 79, 86, 108, 3, 40, 94, 105, 61, 49, 60, 69, 33, 34, 59, 71, 65, 107, 118, 103, 48, 63, 31, 30, 27, 93, 89, 88, 85, 25, 18, 19, 119, 50, 29, 24, 23, 13, 32, 55, 37, 43, 73, 57, 58, 95, 38, 44, 15, 67, 26, 72, 113, 36, 10, 100, 6, 52, 56, 70, 17, 75, 97, 78, 76, 77, 104, 82, 114, 80, 9, 35, 115, 1, 64, 74, 54, 99, 116, 81, 102, 8, 87, 4};
const ::capnp::_::RawSchema s_baa8c5d505f727de = {
0xbaa8c5d505f727de, b_baa8c5d505f727de.words, 688, nullptr, m_baa8c5d505f727de,
0, 118, nullptr, nullptr, nullptr, { &s_baa8c5d505f727de, nullptr, nullptr, 0, 0, nullptr }
0xbaa8c5d505f727de, b_baa8c5d505f727de.words, 700, nullptr, m_baa8c5d505f727de,
0, 120, nullptr, nullptr, nullptr, { &s_baa8c5d505f727de, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
CAPNP_DEFINE_ENUM(EventName_baa8c5d505f727de, baa8c5d505f727de);
@@ -6497,7 +6509,7 @@ const ::capnp::_::RawSchema s_ff99e3682a833c51 = {
};
#endif // !CAPNP_LITE
CAPNP_DEFINE_ENUM(NetworkLocation_ff99e3682a833c51, ff99e3682a833c51);
static const ::capnp::_::AlignedData<78> b_93fc580a35339568 = {
static const ::capnp::_::AlignedData<80> b_93fc580a35339568 = {
{ 0, 0, 0, 0, 5, 0, 6, 0,
104, 149, 51, 53, 10, 88, 252, 147,
20, 0, 0, 0, 1, 0, 17, 0,
@@ -6526,24 +6538,24 @@ static const ::capnp::_::AlignedData<78> b_93fc580a35339568 = {
1, 0, 254, 255, 9, 0, 0, 0,
0, 0, 1, 0, 27, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
101, 0, 0, 0, 42, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
96, 0, 0, 0, 3, 0, 1, 0,
108, 0, 0, 0, 2, 0, 1, 0,
2, 0, 253, 255, 9, 0, 0, 0,
0, 0, 1, 0, 40, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
105, 0, 0, 0, 34, 0, 0, 0,
101, 0, 0, 0, 122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
100, 0, 0, 0, 3, 0, 1, 0,
112, 0, 0, 0, 2, 0, 1, 0,
2, 0, 253, 255, 9, 0, 0, 0,
0, 0, 1, 0, 40, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
109, 0, 0, 0, 114, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
108, 0, 0, 0, 3, 0, 1, 0,
120, 0, 0, 0, 2, 0, 1, 0,
3, 0, 252, 255, 9, 0, 0, 0,
0, 0, 1, 0, 67, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
109, 0, 0, 0, 58, 0, 0, 0,
117, 0, 0, 0, 58, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
104, 0, 0, 0, 3, 0, 1, 0,
116, 0, 0, 0, 2, 0, 1, 0,
112, 0, 0, 0, 3, 0, 1, 0,
124, 0, 0, 0, 2, 0, 1, 0,
112, 105, 100, 0, 0, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0,
46, 76, 209, 203, 63, 114, 34, 150,
@@ -6552,7 +6564,8 @@ static const ::capnp::_::AlignedData<78> b_93fc580a35339568 = {
16, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
105, 110, 100, 105, 0, 0, 0, 0,
105, 110, 100, 105, 68, 69, 80, 82,
69, 67, 65, 84, 69, 68, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0,
179, 51, 85, 4, 46, 71, 52, 163,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6560,7 +6573,8 @@ static const ::capnp::_::AlignedData<78> b_93fc580a35339568 = {
16, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
108, 113, 114, 0, 0, 0, 0, 0,
108, 113, 114, 68, 69, 80, 82, 69,
67, 65, 84, 69, 68, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0,
18, 106, 97, 40, 63, 30, 21, 157,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6589,7 +6603,7 @@ static const ::capnp::_::RawSchema* const d_93fc580a35339568[] = {
static const uint16_t m_93fc580a35339568[] = {1, 2, 0, 3};
static const uint16_t i_93fc580a35339568[] = {0, 1, 2, 3};
const ::capnp::_::RawSchema s_93fc580a35339568 = {
0x93fc580a35339568, b_93fc580a35339568.words, 78, d_93fc580a35339568, m_93fc580a35339568,
0x93fc580a35339568, b_93fc580a35339568.words, 80, d_93fc580a35339568, m_93fc580a35339568,
5, 4, i_93fc580a35339568, nullptr, nullptr, { &s_93fc580a35339568, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
+66 -64
View File
@@ -67,7 +67,7 @@ enum class EventName_baa8c5d505f727de: uint16_t {
CALIBRATION_PROGRESS_D_E_P_R_E_C_A_T_E_D,
LOW_BATTERY,
INVALID_GIRAFFE_HONDA_D_E_P_R_E_C_A_T_E_D,
VEHICLE_MODEL_INVALID,
PARAMSD_TEMPORARY_ERROR,
ACC_FAULTED,
SENSOR_DATA_INVALID,
COMM_ISSUE,
@@ -120,7 +120,7 @@ enum class EventName_baa8c5d505f727de: uint16_t {
ROAD_CAMERA_ERROR,
DRIVER_CAMERA_ERROR,
WIDE_ROAD_CAMERA_ERROR,
LOCALIZER_MALFUNCTION,
LOCATIOND_TEMPORARY_ERROR,
STARTUP_NO_FW,
HIGH_CPU_USAGE,
CRUISE_MISMATCH,
@@ -135,6 +135,8 @@ enum class EventName_baa8c5d505f727de: uint16_t {
STEER_TIME_LIMIT,
VEHICLE_SENSORS_INVALID,
CALIBRATION_RECALIBRATING,
LOCATIOND_PERMANENT_ERROR,
PARAMSD_PERMANENT_ERROR,
};
CAPNP_DECLARE_ENUM(EventName, baa8c5d505f727de);
CAPNP_DECLARE_SCHEMA(9da4fa09e052903c);
@@ -675,8 +677,8 @@ struct CarParams::LateralTuning {
class Pipeline;
enum Which: uint16_t {
PID,
INDI,
LQR,
INDI_D_E_P_R_E_C_A_T_E_D,
LQR_D_E_P_R_E_C_A_T_E_D,
TORQUE,
};
@@ -3704,13 +3706,13 @@ public:
inline bool hasPid() const;
inline ::cereal::CarParams::LateralPIDTuning::Reader getPid() const;
inline bool isIndi() const;
inline bool hasIndi() const;
inline ::cereal::CarParams::LateralINDITuning::Reader getIndi() const;
inline bool isIndiDEPRECATED() const;
inline bool hasIndiDEPRECATED() const;
inline ::cereal::CarParams::LateralINDITuning::Reader getIndiDEPRECATED() const;
inline bool isLqr() const;
inline bool hasLqr() const;
inline ::cereal::CarParams::LateralLQRTuning::Reader getLqr() const;
inline bool isLqrDEPRECATED() const;
inline bool hasLqrDEPRECATED() const;
inline ::cereal::CarParams::LateralLQRTuning::Reader getLqrDEPRECATED() const;
inline bool isTorque() const;
inline bool hasTorque() const;
@@ -3753,21 +3755,21 @@ public:
inline void adoptPid(::capnp::Orphan< ::cereal::CarParams::LateralPIDTuning>&& value);
inline ::capnp::Orphan< ::cereal::CarParams::LateralPIDTuning> disownPid();
inline bool isIndi();
inline bool hasIndi();
inline ::cereal::CarParams::LateralINDITuning::Builder getIndi();
inline void setIndi( ::cereal::CarParams::LateralINDITuning::Reader value);
inline ::cereal::CarParams::LateralINDITuning::Builder initIndi();
inline void adoptIndi(::capnp::Orphan< ::cereal::CarParams::LateralINDITuning>&& value);
inline ::capnp::Orphan< ::cereal::CarParams::LateralINDITuning> disownIndi();
inline bool isIndiDEPRECATED();
inline bool hasIndiDEPRECATED();
inline ::cereal::CarParams::LateralINDITuning::Builder getIndiDEPRECATED();
inline void setIndiDEPRECATED( ::cereal::CarParams::LateralINDITuning::Reader value);
inline ::cereal::CarParams::LateralINDITuning::Builder initIndiDEPRECATED();
inline void adoptIndiDEPRECATED(::capnp::Orphan< ::cereal::CarParams::LateralINDITuning>&& value);
inline ::capnp::Orphan< ::cereal::CarParams::LateralINDITuning> disownIndiDEPRECATED();
inline bool isLqr();
inline bool hasLqr();
inline ::cereal::CarParams::LateralLQRTuning::Builder getLqr();
inline void setLqr( ::cereal::CarParams::LateralLQRTuning::Reader value);
inline ::cereal::CarParams::LateralLQRTuning::Builder initLqr();
inline void adoptLqr(::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning>&& value);
inline ::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning> disownLqr();
inline bool isLqrDEPRECATED();
inline bool hasLqrDEPRECATED();
inline ::cereal::CarParams::LateralLQRTuning::Builder getLqrDEPRECATED();
inline void setLqrDEPRECATED( ::cereal::CarParams::LateralLQRTuning::Reader value);
inline ::cereal::CarParams::LateralLQRTuning::Builder initLqrDEPRECATED();
inline void adoptLqrDEPRECATED(::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning>&& value);
inline ::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning> disownLqrDEPRECATED();
inline bool isTorque();
inline bool hasTorque();
@@ -8668,109 +8670,109 @@ inline ::capnp::Orphan< ::cereal::CarParams::LateralPIDTuning> CarParams::Latera
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline bool CarParams::LateralTuning::Reader::isIndi() const {
return which() == CarParams::LateralTuning::INDI;
inline bool CarParams::LateralTuning::Reader::isIndiDEPRECATED() const {
return which() == CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D;
}
inline bool CarParams::LateralTuning::Builder::isIndi() {
return which() == CarParams::LateralTuning::INDI;
inline bool CarParams::LateralTuning::Builder::isIndiDEPRECATED() {
return which() == CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D;
}
inline bool CarParams::LateralTuning::Reader::hasIndi() const {
if (which() != CarParams::LateralTuning::INDI) return false;
inline bool CarParams::LateralTuning::Reader::hasIndiDEPRECATED() const {
if (which() != CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D) return false;
return !_reader.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS).isNull();
}
inline bool CarParams::LateralTuning::Builder::hasIndi() {
if (which() != CarParams::LateralTuning::INDI) return false;
inline bool CarParams::LateralTuning::Builder::hasIndiDEPRECATED() {
if (which() != CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D) return false;
return !_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS).isNull();
}
inline ::cereal::CarParams::LateralINDITuning::Reader CarParams::LateralTuning::Reader::getIndi() const {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI),
inline ::cereal::CarParams::LateralINDITuning::Reader CarParams::LateralTuning::Reader::getIndiDEPRECATED() const {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::get(_reader.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline ::cereal::CarParams::LateralINDITuning::Builder CarParams::LateralTuning::Builder::getIndi() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI),
inline ::cereal::CarParams::LateralINDITuning::Builder CarParams::LateralTuning::Builder::getIndiDEPRECATED() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::get(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline void CarParams::LateralTuning::Builder::setIndi( ::cereal::CarParams::LateralINDITuning::Reader value) {
inline void CarParams::LateralTuning::Builder::setIndiDEPRECATED( ::cereal::CarParams::LateralINDITuning::Reader value) {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D);
::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::set(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS), value);
}
inline ::cereal::CarParams::LateralINDITuning::Builder CarParams::LateralTuning::Builder::initIndi() {
inline ::cereal::CarParams::LateralINDITuning::Builder CarParams::LateralTuning::Builder::initIndiDEPRECATED() {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D);
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::init(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline void CarParams::LateralTuning::Builder::adoptIndi(
inline void CarParams::LateralTuning::Builder::adoptIndiDEPRECATED(
::capnp::Orphan< ::cereal::CarParams::LateralINDITuning>&& value) {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D);
::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::adopt(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::cereal::CarParams::LateralINDITuning> CarParams::LateralTuning::Builder::disownIndi() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI),
inline ::capnp::Orphan< ::cereal::CarParams::LateralINDITuning> CarParams::LateralTuning::Builder::disownIndiDEPRECATED() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::INDI_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralINDITuning>::disown(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline bool CarParams::LateralTuning::Reader::isLqr() const {
return which() == CarParams::LateralTuning::LQR;
inline bool CarParams::LateralTuning::Reader::isLqrDEPRECATED() const {
return which() == CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D;
}
inline bool CarParams::LateralTuning::Builder::isLqr() {
return which() == CarParams::LateralTuning::LQR;
inline bool CarParams::LateralTuning::Builder::isLqrDEPRECATED() {
return which() == CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D;
}
inline bool CarParams::LateralTuning::Reader::hasLqr() const {
if (which() != CarParams::LateralTuning::LQR) return false;
inline bool CarParams::LateralTuning::Reader::hasLqrDEPRECATED() const {
if (which() != CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D) return false;
return !_reader.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS).isNull();
}
inline bool CarParams::LateralTuning::Builder::hasLqr() {
if (which() != CarParams::LateralTuning::LQR) return false;
inline bool CarParams::LateralTuning::Builder::hasLqrDEPRECATED() {
if (which() != CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D) return false;
return !_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS).isNull();
}
inline ::cereal::CarParams::LateralLQRTuning::Reader CarParams::LateralTuning::Reader::getLqr() const {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR),
inline ::cereal::CarParams::LateralLQRTuning::Reader CarParams::LateralTuning::Reader::getLqrDEPRECATED() const {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::get(_reader.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline ::cereal::CarParams::LateralLQRTuning::Builder CarParams::LateralTuning::Builder::getLqr() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR),
inline ::cereal::CarParams::LateralLQRTuning::Builder CarParams::LateralTuning::Builder::getLqrDEPRECATED() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::get(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline void CarParams::LateralTuning::Builder::setLqr( ::cereal::CarParams::LateralLQRTuning::Reader value) {
inline void CarParams::LateralTuning::Builder::setLqrDEPRECATED( ::cereal::CarParams::LateralLQRTuning::Reader value) {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D);
::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::set(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS), value);
}
inline ::cereal::CarParams::LateralLQRTuning::Builder CarParams::LateralTuning::Builder::initLqr() {
inline ::cereal::CarParams::LateralLQRTuning::Builder CarParams::LateralTuning::Builder::initLqrDEPRECATED() {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D);
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::init(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
}
inline void CarParams::LateralTuning::Builder::adoptLqr(
inline void CarParams::LateralTuning::Builder::adoptLqrDEPRECATED(
::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning>&& value) {
_builder.setDataField<CarParams::LateralTuning::Which>(
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR);
::capnp::bounded<7>() * ::capnp::ELEMENTS, CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D);
::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::adopt(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning> CarParams::LateralTuning::Builder::disownLqr() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR),
inline ::capnp::Orphan< ::cereal::CarParams::LateralLQRTuning> CarParams::LateralTuning::Builder::disownLqrDEPRECATED() {
KJ_IREQUIRE((which() == CarParams::LateralTuning::LQR_D_E_P_R_E_C_A_T_E_D),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralLQRTuning>::disown(_builder.getPointerField(
::capnp::bounded<9>() * ::capnp::POINTERS));
File diff suppressed because it is too large Load Diff
+270
View File
@@ -471,6 +471,8 @@ enum class Direction_eea5b9d8c9e5c192: uint16_t {
LEFT,
RIGHT,
STRAIGHT,
SLIGHT_LEFT,
SLIGHT_RIGHT,
};
CAPNP_DECLARE_ENUM(Direction, eea5b9d8c9e5c192);
CAPNP_DECLARE_SCHEMA(b66e0aa568d09c66);
@@ -2438,6 +2440,10 @@ struct Event {
LIVESTREAM_ROAD_ENCODE_DATA,
LIVESTREAM_WIDE_ROAD_ENCODE_DATA,
LIVESTREAM_DRIVER_ENCODE_DATA,
TEMPERATURE_SENSOR2,
CUSTOM_RESERVED_RAW_DATA0,
CUSTOM_RESERVED_RAW_DATA1,
CUSTOM_RESERVED_RAW_DATA2,
};
struct _capnpPrivate {
@@ -18866,6 +18872,22 @@ public:
inline bool hasLivestreamDriverEncodeData() const;
inline ::cereal::EncodeData::Reader getLivestreamDriverEncodeData() const;
inline bool isTemperatureSensor2() const;
inline bool hasTemperatureSensor2() const;
inline ::cereal::SensorEventData::Reader getTemperatureSensor2() const;
inline bool isCustomReservedRawData0() const;
inline bool hasCustomReservedRawData0() const;
inline ::capnp::Data::Reader getCustomReservedRawData0() const;
inline bool isCustomReservedRawData1() const;
inline bool hasCustomReservedRawData1() const;
inline ::capnp::Data::Reader getCustomReservedRawData1() const;
inline bool isCustomReservedRawData2() const;
inline bool hasCustomReservedRawData2() const;
inline ::capnp::Data::Reader getCustomReservedRawData2() const;
private:
::capnp::_::StructReader _reader;
template <typename, ::capnp::Kind>
@@ -19869,6 +19891,38 @@ public:
inline void adoptLivestreamDriverEncodeData(::capnp::Orphan< ::cereal::EncodeData>&& value);
inline ::capnp::Orphan< ::cereal::EncodeData> disownLivestreamDriverEncodeData();
inline bool isTemperatureSensor2();
inline bool hasTemperatureSensor2();
inline ::cereal::SensorEventData::Builder getTemperatureSensor2();
inline void setTemperatureSensor2( ::cereal::SensorEventData::Reader value);
inline ::cereal::SensorEventData::Builder initTemperatureSensor2();
inline void adoptTemperatureSensor2(::capnp::Orphan< ::cereal::SensorEventData>&& value);
inline ::capnp::Orphan< ::cereal::SensorEventData> disownTemperatureSensor2();
inline bool isCustomReservedRawData0();
inline bool hasCustomReservedRawData0();
inline ::capnp::Data::Builder getCustomReservedRawData0();
inline void setCustomReservedRawData0( ::capnp::Data::Reader value);
inline ::capnp::Data::Builder initCustomReservedRawData0(unsigned int size);
inline void adoptCustomReservedRawData0(::capnp::Orphan< ::capnp::Data>&& value);
inline ::capnp::Orphan< ::capnp::Data> disownCustomReservedRawData0();
inline bool isCustomReservedRawData1();
inline bool hasCustomReservedRawData1();
inline ::capnp::Data::Builder getCustomReservedRawData1();
inline void setCustomReservedRawData1( ::capnp::Data::Reader value);
inline ::capnp::Data::Builder initCustomReservedRawData1(unsigned int size);
inline void adoptCustomReservedRawData1(::capnp::Orphan< ::capnp::Data>&& value);
inline ::capnp::Orphan< ::capnp::Data> disownCustomReservedRawData1();
inline bool isCustomReservedRawData2();
inline bool hasCustomReservedRawData2();
inline ::capnp::Data::Builder getCustomReservedRawData2();
inline void setCustomReservedRawData2( ::capnp::Data::Reader value);
inline ::capnp::Data::Builder initCustomReservedRawData2(unsigned int size);
inline void adoptCustomReservedRawData2(::capnp::Orphan< ::capnp::Data>&& value);
inline ::capnp::Orphan< ::capnp::Data> disownCustomReservedRawData2();
private:
::capnp::_::StructBuilder _builder;
template <typename, ::capnp::Kind>
@@ -51990,5 +52044,221 @@ inline ::capnp::Orphan< ::cereal::EncodeData> Event::Builder::disownLivestreamDr
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline bool Event::Reader::isTemperatureSensor2() const {
return which() == Event::TEMPERATURE_SENSOR2;
}
inline bool Event::Builder::isTemperatureSensor2() {
return which() == Event::TEMPERATURE_SENSOR2;
}
inline bool Event::Reader::hasTemperatureSensor2() const {
if (which() != Event::TEMPERATURE_SENSOR2) return false;
return !_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline bool Event::Builder::hasTemperatureSensor2() {
if (which() != Event::TEMPERATURE_SENSOR2) return false;
return !_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline ::cereal::SensorEventData::Reader Event::Reader::getTemperatureSensor2() const {
KJ_IREQUIRE((which() == Event::TEMPERATURE_SENSOR2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::SensorEventData>::get(_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline ::cereal::SensorEventData::Builder Event::Builder::getTemperatureSensor2() {
KJ_IREQUIRE((which() == Event::TEMPERATURE_SENSOR2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::SensorEventData>::get(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline void Event::Builder::setTemperatureSensor2( ::cereal::SensorEventData::Reader value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::TEMPERATURE_SENSOR2);
::capnp::_::PointerHelpers< ::cereal::SensorEventData>::set(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), value);
}
inline ::cereal::SensorEventData::Builder Event::Builder::initTemperatureSensor2() {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::TEMPERATURE_SENSOR2);
return ::capnp::_::PointerHelpers< ::cereal::SensorEventData>::init(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline void Event::Builder::adoptTemperatureSensor2(
::capnp::Orphan< ::cereal::SensorEventData>&& value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::TEMPERATURE_SENSOR2);
::capnp::_::PointerHelpers< ::cereal::SensorEventData>::adopt(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::cereal::SensorEventData> Event::Builder::disownTemperatureSensor2() {
KJ_IREQUIRE((which() == Event::TEMPERATURE_SENSOR2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::cereal::SensorEventData>::disown(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline bool Event::Reader::isCustomReservedRawData0() const {
return which() == Event::CUSTOM_RESERVED_RAW_DATA0;
}
inline bool Event::Builder::isCustomReservedRawData0() {
return which() == Event::CUSTOM_RESERVED_RAW_DATA0;
}
inline bool Event::Reader::hasCustomReservedRawData0() const {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA0) return false;
return !_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline bool Event::Builder::hasCustomReservedRawData0() {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA0) return false;
return !_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline ::capnp::Data::Reader Event::Reader::getCustomReservedRawData0() const {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA0),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline ::capnp::Data::Builder Event::Builder::getCustomReservedRawData0() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA0),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline void Event::Builder::setCustomReservedRawData0( ::capnp::Data::Reader value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA0);
::capnp::_::PointerHelpers< ::capnp::Data>::set(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), value);
}
inline ::capnp::Data::Builder Event::Builder::initCustomReservedRawData0(unsigned int size) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA0);
return ::capnp::_::PointerHelpers< ::capnp::Data>::init(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), size);
}
inline void Event::Builder::adoptCustomReservedRawData0(
::capnp::Orphan< ::capnp::Data>&& value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA0);
::capnp::_::PointerHelpers< ::capnp::Data>::adopt(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::capnp::Data> Event::Builder::disownCustomReservedRawData0() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA0),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::disown(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline bool Event::Reader::isCustomReservedRawData1() const {
return which() == Event::CUSTOM_RESERVED_RAW_DATA1;
}
inline bool Event::Builder::isCustomReservedRawData1() {
return which() == Event::CUSTOM_RESERVED_RAW_DATA1;
}
inline bool Event::Reader::hasCustomReservedRawData1() const {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA1) return false;
return !_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline bool Event::Builder::hasCustomReservedRawData1() {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA1) return false;
return !_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline ::capnp::Data::Reader Event::Reader::getCustomReservedRawData1() const {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA1),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline ::capnp::Data::Builder Event::Builder::getCustomReservedRawData1() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA1),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline void Event::Builder::setCustomReservedRawData1( ::capnp::Data::Reader value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA1);
::capnp::_::PointerHelpers< ::capnp::Data>::set(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), value);
}
inline ::capnp::Data::Builder Event::Builder::initCustomReservedRawData1(unsigned int size) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA1);
return ::capnp::_::PointerHelpers< ::capnp::Data>::init(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), size);
}
inline void Event::Builder::adoptCustomReservedRawData1(
::capnp::Orphan< ::capnp::Data>&& value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA1);
::capnp::_::PointerHelpers< ::capnp::Data>::adopt(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::capnp::Data> Event::Builder::disownCustomReservedRawData1() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA1),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::disown(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline bool Event::Reader::isCustomReservedRawData2() const {
return which() == Event::CUSTOM_RESERVED_RAW_DATA2;
}
inline bool Event::Builder::isCustomReservedRawData2() {
return which() == Event::CUSTOM_RESERVED_RAW_DATA2;
}
inline bool Event::Reader::hasCustomReservedRawData2() const {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA2) return false;
return !_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline bool Event::Builder::hasCustomReservedRawData2() {
if (which() != Event::CUSTOM_RESERVED_RAW_DATA2) return false;
return !_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
}
inline ::capnp::Data::Reader Event::Reader::getCustomReservedRawData2() const {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline ::capnp::Data::Builder Event::Builder::getCustomReservedRawData2() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
inline void Event::Builder::setCustomReservedRawData2( ::capnp::Data::Reader value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA2);
::capnp::_::PointerHelpers< ::capnp::Data>::set(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), value);
}
inline ::capnp::Data::Builder Event::Builder::initCustomReservedRawData2(unsigned int size) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA2);
return ::capnp::_::PointerHelpers< ::capnp::Data>::init(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), size);
}
inline void Event::Builder::adoptCustomReservedRawData2(
::capnp::Orphan< ::capnp::Data>&& value) {
_builder.setDataField<Event::Which>(
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED_RAW_DATA2);
::capnp::_::PointerHelpers< ::capnp::Data>::adopt(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
}
inline ::capnp::Orphan< ::capnp::Data> Event::Builder::disownCustomReservedRawData2() {
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED_RAW_DATA2),
"Must check which() before get()ing a union member.");
return ::capnp::_::PointerHelpers< ::capnp::Data>::disown(_builder.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS));
}
} // namespace
Binary file not shown.
+7
View File
@@ -2096,6 +2096,8 @@ struct NavInstruction {
left @1;
right @2;
straight @3;
slightLeft @4;
slightRight @5;
}
enum SpeedLimitSign {
@@ -2186,6 +2188,7 @@ struct Event {
magnetometer @95 :SensorEventData;
lightSensor @96 :SensorEventData;
temperatureSensor @97 :SensorEventData;
temperatureSensor2 @123 :SensorEventData;
pandaStates @81 :List(PandaState);
peripheralState @80 :PeripheralState;
radarState @13 :RadarState;
@@ -2262,6 +2265,10 @@ struct Event {
livestreamWideRoadEncodeData @121 :EncodeData;
livestreamDriverEncodeData @122 :EncodeData;
customReservedRawData0 @124 :Data;
customReservedRawData1 @125 :Data;
customReservedRawData2 @126 :Data;
# *********** Custom: reserved for forks ***********
liveMapData @107 :Custom.LiveMapData;
longitudinalPlanExt @108 :Custom.LongitudinalPlanExt;
+5 -13
View File
@@ -11,7 +11,7 @@ from typing import Optional, List, Union, Dict, Deque
from collections import deque
from cereal import log
from cereal.services import service_list
from cereal.services import SERVICE_LIST
assert MultiplePublishersError
assert MessagingError
@@ -24,13 +24,6 @@ assert wait_for_one_event
NO_TRAVERSAL_LIMIT = 2**64-1
AVG_FREQ_HISTORY = 100
# sec_since_boot is faster, but allow to run standalone too
try:
from common.realtime import sec_since_boot
except ImportError:
sec_since_boot = time.time
print("Warning, using python time.time() instead of faster sec_since_boot")
context = Context()
@@ -50,7 +43,7 @@ def log_from_bytes(dat: bytes) -> capnp.lib.capnp._DynamicStructReader:
def new_message(service: Optional[str] = None, size: Optional[int] = None) -> capnp.lib.capnp._DynamicStructBuilder:
dat = log.Event.new_message()
dat.logMonoTime = int(sec_since_boot() * 1e9)
dat.logMonoTime = int(time.monotonic() * 1e9)
dat.valid = True
if service is not None:
if size is None:
@@ -187,7 +180,7 @@ class SubMaster:
if addr is not None:
p = self.poller if s not in self.non_polled_services else None
self.sock[s] = sub_sock(s, poller=p, addr=addr, conflate=True)
self.freq[s] = service_list[s].frequency
self.freq[s] = SERVICE_LIST[s].frequency
try:
data = new_message(s)
@@ -213,7 +206,7 @@ class SubMaster:
# non-blocking receive for non-polled sockets
for s in self.non_polled_services:
msgs.append(recv_one_or_none(self.sock[s]))
self.update_msgs(sec_since_boot(), msgs)
self.update_msgs(time.monotonic(), msgs)
def update_msgs(self, cur_time: float, msgs: List[capnp.lib.capnp._DynamicStructReader]) -> None:
self.frame += 1
@@ -294,8 +287,7 @@ class PubMaster:
dat = dat.to_bytes()
self.sock[s].send(dat)
def wait_for_readers_to_update(self, s: str, timeout: int) -> bool:
dt = 0.05
def wait_for_readers_to_update(self, s: str, timeout: int, dt: float = 0.05) -> bool:
for _ in range(int(timeout*(1./dt))):
if self.sock[s].all_readers_updated():
return True
Binary file not shown.
+1 -1
View File
@@ -63,5 +63,5 @@ private:
public:
void registerSocket(SubSocket *socket) override;
std::vector<SubSocket*> poll(int timeout) override;
~FakePoller() {};
~FakePoller() {}
};
+1 -1
View File
@@ -63,5 +63,5 @@ private:
public:
void registerSocket(SubSocket *socket);
std::vector<SubSocket*> poll(int timeout);
~MSGQPoller(){};
~MSGQPoller(){}
};
+1 -1
View File
@@ -63,5 +63,5 @@ private:
public:
void registerSocket(SubSocket *socket);
std::vector<SubSocket*> poll(int timeout);
~ZMQPoller(){};
~ZMQPoller(){}
};
+4 -4
View File
@@ -33,7 +33,7 @@ public:
virtual void close() = 0;
virtual size_t getSize() = 0;
virtual char * getData() = 0;
virtual ~Message(){};
virtual ~Message(){}
};
@@ -45,7 +45,7 @@ public:
virtual void * getRawSocket() = 0;
static SubSocket * create();
static SubSocket * create(Context * context, std::string endpoint, std::string address="127.0.0.1", bool conflate=false, bool check_endpoint=true);
virtual ~SubSocket(){};
virtual ~SubSocket(){}
};
class PubSocket {
@@ -57,7 +57,7 @@ public:
static PubSocket * create();
static PubSocket * create(Context * context, std::string endpoint, bool check_endpoint=true);
static PubSocket * create(Context * context, std::string endpoint, int port, bool check_endpoint=true);
virtual ~PubSocket(){};
virtual ~PubSocket(){}
};
class Poller {
@@ -66,7 +66,7 @@ public:
virtual std::vector<SubSocket*> poll(int timeout) = 0;
static Poller * create();
static Poller * create(std::vector<SubSocket*> sockets);
virtual ~Poller(){};
virtual ~Poller(){}
};
class SubMaster {
+1 -1
View File
@@ -10,7 +10,7 @@
"language": "c++",
"name": "cereal.messaging.messaging_pyx",
"sources": [
"/data/openpilot/cereal/messaging/messaging_pyx.pyx"
"/data/dp-private/cereal/messaging/messaging_pyx.pyx"
]
},
"module_name": "cereal.messaging.messaging_pyx"
Binary file not shown.
+83 -77
View File
@@ -1,83 +1,89 @@
/* THIS IS AN AUTOGENERATED FILE, PLEASE EDIT services.py */
#ifndef __SERVICES_H
#define __SERVICES_H
struct service { char name[0x100]; int port; bool should_log; int frequency; int decimation; };
static struct service services[] = {
{ "gyroscope", 8001, true, 104, 104 },
{ "gyroscope2", 8002, true, 100, 100 },
{ "accelerometer", 8003, true, 104, 104 },
{ "accelerometer2", 8004, true, 100, 100 },
{ "magnetometer", 8005, true, 100, 100 },
{ "lightSensor", 8006, true, 100, 100 },
{ "temperatureSensor", 8007, true, 100, 100 },
{ "gpsNMEA", 8008, true, 9, -1 },
{ "deviceState", 8009, true, 2, 1 },
{ "can", 8010, true, 100, 1223 },
{ "controlsState", 8011, true, 100, 10 },
{ "pandaStates", 8012, true, 2, 1 },
{ "peripheralState", 8013, true, 2, 1 },
{ "radarState", 8014, true, 20, 5 },
{ "roadEncodeIdx", 8015, false, 20, 1 },
{ "liveTracks", 8016, true, 20, -1 },
{ "sendcan", 8017, true, 100, 139 },
{ "logMessage", 8018, true, 0, -1 },
{ "errorLogMessage", 8019, true, 0, 1 },
{ "liveCalibration", 8020, true, 4, 4 },
{ "liveTorqueParameters", 8021, true, 4, 1 },
{ "androidLog", 8023, true, 0, -1 },
{ "carState", 8024, true, 100, 10 },
{ "carControl", 8025, true, 100, 10 },
{ "longitudinalPlan", 8026, true, 20, 5 },
{ "procLog", 8027, true, 0, 15 },
{ "gpsLocationExternal", 8028, true, 10, 10 },
{ "gpsLocation", 8029, true, 1, 1 },
{ "ubloxGnss", 8030, true, 10, -1 },
{ "qcomGnss", 8031, true, 2, -1 },
{ "gnssMeasurements", 8032, true, 10, 10 },
{ "clocks", 8033, true, 1, 1 },
{ "ubloxRaw", 8034, true, 20, -1 },
{ "liveLocationKalman", 8035, true, 20, 5 },
{ "liveParameters", 8036, true, 20, 5 },
{ "cameraOdometry", 8037, true, 20, 5 },
{ "lateralPlan", 8038, true, 20, 5 },
{ "thumbnail", 8039, true, 0, 1 },
{ "carEvents", 8040, true, 1, 1 },
{ "carParams", 8041, true, 0, 1 },
{ "roadCameraState", 8042, true, 20, 20 },
{ "driverCameraState", 8043, true, 20, 20 },
{ "driverEncodeIdx", 8044, false, 20, 1 },
{ "driverStateV2", 8045, true, 20, 10 },
{ "driverMonitoringState", 8046, true, 20, 10 },
{ "wideRoadEncodeIdx", 8047, false, 20, 1 },
{ "wideRoadCameraState", 8048, true, 20, 20 },
{ "modelV2", 8049, true, 20, 40 },
{ "managerState", 8050, true, 2, 1 },
{ "uploaderState", 8051, true, 0, 1 },
{ "navInstruction", 8052, true, 1, 10 },
{ "navRoute", 8053, true, 0, -1 },
{ "navThumbnail", 8054, true, 0, -1 },
{ "navModel", 8055, true, 2, 4 },
{ "mapRenderState", 8056, true, 2, 1 },
{ "uiPlan", 8057, true, 20, 40 },
{ "qRoadEncodeIdx", 8058, false, 20, -1 },
{ "userFlag", 8059, true, 0, 1 },
{ "microphone", 8060, true, 10, 10 },
{ "uiDebug", 8061, true, 0, 1 },
{ "testJoystick", 8062, true, 0, -1 },
{ "roadEncodeData", 8063, false, 20, -1 },
{ "driverEncodeData", 8064, false, 20, -1 },
{ "wideRoadEncodeData", 8065, false, 20, -1 },
{ "qRoadEncodeData", 8066, false, 20, -1 },
{ "livestreamWideRoadEncodeIdx", 8067, false, 20, -1 },
{ "livestreamRoadEncodeIdx", 8068, false, 20, -1 },
{ "livestreamDriverEncodeIdx", 8069, false, 20, -1 },
{ "livestreamWideRoadEncodeData", 8070, false, 20, -1 },
{ "livestreamRoadEncodeData", 8071, false, 20, -1 },
{ "livestreamDriverEncodeData", 8072, false, 20, -1 },
{ "liveMapData", 8073, false, 0, -1 },
{ "longitudinalPlanExt", 8074, false, 20, 5 },
{ "lateralPlanExt", 8075, false, 20, 5 },
{ "controlsStateExt", 8076, false, 100, 10 },
#include <map>
#include <string>
struct service { std::string name; int port; bool should_log; int frequency; int decimation; };
static std::map<std::string, service> services = {
{ "gyroscope", {"gyroscope", 8001, true, 104, 104}},
{ "gyroscope2", {"gyroscope2", 8002, true, 100, 100}},
{ "accelerometer", {"accelerometer", 8003, true, 104, 104}},
{ "accelerometer2", {"accelerometer2", 8004, true, 100, 100}},
{ "magnetometer", {"magnetometer", 8005, true, 25, 25}},
{ "lightSensor", {"lightSensor", 8006, true, 100, 100}},
{ "temperatureSensor", {"temperatureSensor", 8007, true, 2, 200}},
{ "temperatureSensor2", {"temperatureSensor2", 8008, true, 2, 200}},
{ "gpsNMEA", {"gpsNMEA", 8009, true, 9, -1}},
{ "deviceState", {"deviceState", 8010, true, 2, 1}},
{ "can", {"can", 8011, true, 100, 1223}},
{ "controlsState", {"controlsState", 8012, true, 100, 10}},
{ "pandaStates", {"pandaStates", 8013, true, 10, 1}},
{ "peripheralState", {"peripheralState", 8014, true, 2, 1}},
{ "radarState", {"radarState", 8015, true, 20, 5}},
{ "roadEncodeIdx", {"roadEncodeIdx", 8016, false, 20, 1}},
{ "liveTracks", {"liveTracks", 8017, true, 20, -1}},
{ "sendcan", {"sendcan", 8018, true, 100, 139}},
{ "logMessage", {"logMessage", 8019, true, 0, -1}},
{ "errorLogMessage", {"errorLogMessage", 8020, true, 0, 1}},
{ "liveCalibration", {"liveCalibration", 8021, true, 4, 4}},
{ "liveTorqueParameters", {"liveTorqueParameters", 8023, true, 4, 1}},
{ "androidLog", {"androidLog", 8024, true, 0, -1}},
{ "carState", {"carState", 8025, true, 100, 10}},
{ "carControl", {"carControl", 8026, true, 100, 10}},
{ "longitudinalPlan", {"longitudinalPlan", 8027, true, 20, 5}},
{ "procLog", {"procLog", 8028, true, 0, 15}},
{ "gpsLocationExternal", {"gpsLocationExternal", 8029, true, 10, 10}},
{ "gpsLocation", {"gpsLocation", 8030, true, 1, 1}},
{ "ubloxGnss", {"ubloxGnss", 8031, true, 10, -1}},
{ "qcomGnss", {"qcomGnss", 8032, true, 2, -1}},
{ "gnssMeasurements", {"gnssMeasurements", 8033, true, 10, 10}},
{ "clocks", {"clocks", 8034, true, 1, 1}},
{ "ubloxRaw", {"ubloxRaw", 8035, true, 20, -1}},
{ "liveLocationKalman", {"liveLocationKalman", 8036, true, 20, 5}},
{ "liveParameters", {"liveParameters", 8037, true, 20, 5}},
{ "cameraOdometry", {"cameraOdometry", 8038, true, 20, 5}},
{ "lateralPlan", {"lateralPlan", 8039, true, 20, 5}},
{ "thumbnail", {"thumbnail", 8040, true, 0, 1}},
{ "carEvents", {"carEvents", 8041, true, 1, 1}},
{ "carParams", {"carParams", 8042, true, 0, 1}},
{ "roadCameraState", {"roadCameraState", 8043, true, 20, 20}},
{ "driverCameraState", {"driverCameraState", 8044, true, 20, 20}},
{ "driverEncodeIdx", {"driverEncodeIdx", 8045, false, 20, 1}},
{ "driverStateV2", {"driverStateV2", 8046, true, 20, 10}},
{ "driverMonitoringState", {"driverMonitoringState", 8047, true, 20, 10}},
{ "wideRoadEncodeIdx", {"wideRoadEncodeIdx", 8048, false, 20, 1}},
{ "wideRoadCameraState", {"wideRoadCameraState", 8049, true, 20, 20}},
{ "modelV2", {"modelV2", 8050, true, 20, 40}},
{ "managerState", {"managerState", 8051, true, 2, 1}},
{ "uploaderState", {"uploaderState", 8052, true, 0, 1}},
{ "navInstruction", {"navInstruction", 8053, true, 1, 10}},
{ "navRoute", {"navRoute", 8054, true, 0, -1}},
{ "navThumbnail", {"navThumbnail", 8055, true, 0, -1}},
{ "navModel", {"navModel", 8056, true, 2, 4}},
{ "mapRenderState", {"mapRenderState", 8057, true, 2, 1}},
{ "uiPlan", {"uiPlan", 8058, true, 20, 40}},
{ "qRoadEncodeIdx", {"qRoadEncodeIdx", 8059, false, 20, -1}},
{ "userFlag", {"userFlag", 8060, true, 0, 1}},
{ "microphone", {"microphone", 8061, true, 10, 10}},
{ "uiDebug", {"uiDebug", 8062, true, 0, 1}},
{ "testJoystick", {"testJoystick", 8063, true, 0, -1}},
{ "roadEncodeData", {"roadEncodeData", 8064, false, 20, -1}},
{ "driverEncodeData", {"driverEncodeData", 8065, false, 20, -1}},
{ "wideRoadEncodeData", {"wideRoadEncodeData", 8066, false, 20, -1}},
{ "qRoadEncodeData", {"qRoadEncodeData", 8067, false, 20, -1}},
{ "livestreamWideRoadEncodeIdx", {"livestreamWideRoadEncodeIdx", 8068, false, 20, -1}},
{ "livestreamRoadEncodeIdx", {"livestreamRoadEncodeIdx", 8069, false, 20, -1}},
{ "livestreamDriverEncodeIdx", {"livestreamDriverEncodeIdx", 8070, false, 20, -1}},
{ "livestreamWideRoadEncodeData", {"livestreamWideRoadEncodeData", 8071, false, 20, -1}},
{ "livestreamRoadEncodeData", {"livestreamRoadEncodeData", 8072, false, 20, -1}},
{ "livestreamDriverEncodeData", {"livestreamDriverEncodeData", 8073, false, 20, -1}},
{ "customReservedRawData0", {"customReservedRawData0", 8074, true, 0, -1}},
{ "customReservedRawData1", {"customReservedRawData1", 8075, true, 0, -1}},
{ "customReservedRawData2", {"customReservedRawData2", 8076, true, 0, -1}},
{ "liveMapData", {"liveMapData", 8077, false, 0, -1}},
{ "longitudinalPlanExt", {"longitudinalPlanExt", 8078, false, 20, 5}},
{ "lateralPlanExt", {"lateralPlanExt", 8079, false, 20, 5}},
{ "controlsStateExt", {"controlsStateExt", 8080, false, 100, 10}},
};
#endif
+19 -10
View File
@@ -18,21 +18,22 @@ class Service:
self.decimation = decimation
services = {
services: dict[str, tuple] = {
# service: (should_log, frequency, qlog decimation (optional))
# note: the "EncodeIdx" packets will still be in the log
"gyroscope": (True, 104., 104),
"gyroscope2": (True, 100., 100),
"accelerometer": (True, 104., 104),
"accelerometer2": (True, 100., 100),
"magnetometer": (True, 100., 100),
"magnetometer": (True, 25., 25),
"lightSensor": (True, 100., 100),
"temperatureSensor": (True, 100., 100),
"temperatureSensor": (True, 2., 200),
"temperatureSensor2": (True, 2., 200),
"gpsNMEA": (True, 9.),
"deviceState": (True, 2., 1),
"can": (True, 100., 1223), # decimation gives ~5 msgs in a full segment
"controlsState": (True, 100., 10),
"pandaStates": (True, 2., 1),
"pandaStates": (True, 10., 1),
"peripheralState": (True, 2., 1),
"radarState": (True, 20., 5),
"roadEncodeIdx": (False, 20., 1),
@@ -94,6 +95,9 @@ services = {
"livestreamWideRoadEncodeData": (False, 20.),
"livestreamRoadEncodeData": (False, 20.),
"livestreamDriverEncodeData": (False, 20.),
"customReservedRawData0": (True, 0.),
"customReservedRawData1": (True, 0.),
"customReservedRawData2": (True, 0.),
# mapd
"liveMapData": (False, 0.),
@@ -101,7 +105,7 @@ services = {
"lateralPlanExt": (False, 20., 5),
"controlsStateExt": (False, 100., 10),
}
service_list = {name: Service(new_port(idx), *vals) for # type: ignore
SERVICE_LIST = {name: Service(new_port(idx), *vals) for
idx, (name, vals) in enumerate(services.items())}
@@ -110,14 +114,19 @@ def build_header():
h += "/* THIS IS AN AUTOGENERATED FILE, PLEASE EDIT services.py */\n"
h += "#ifndef __SERVICES_H\n"
h += "#define __SERVICES_H\n"
h += "struct service { char name[0x100]; int port; bool should_log; int frequency; int decimation; };\n"
h += "static struct service services[] = {\n"
for k, v in service_list.items():
h += "#include <map>\n"
h += "#include <string>\n"
h += "struct service { std::string name; int port; bool should_log; int frequency; int decimation; };\n"
h += "static std::map<std::string, service> services = {\n"
for k, v in SERVICE_LIST.items():
should_log = "true" if v.should_log else "false"
decimation = -1 if v.decimation is None else v.decimation
h += ' { "%s", %d, %s, %d, %d },\n' % \
(k, v.port, should_log, v.frequency, decimation)
h += ' { "%s", {"%s", %d, %s, %d, %d}},\n' % \
(k, k, v.port, should_log, v.frequency, decimation)
h += "};\n"
h += "#endif\n"
return h
+1 -1
View File
@@ -12,7 +12,7 @@
"language": "c++",
"name": "cereal.visionipc.visionipc_pyx",
"sources": [
"/data/openpilot/cereal/visionipc/visionipc_pyx.pyx"
"/data/dp-private/cereal/visionipc/visionipc_pyx.pyx"
]
},
"module_name": "cereal.visionipc.visionipc_pyx"
Binary file not shown.