Skip to content

Commit f66527d

Browse files
author
Vehicle Researcher
committed
Squashed 'cereal/' changes from ea14abe..3d90c78
3d90c78 Fix wrong event enum f4c92cf add none/invalid usb power mode 12bc189 Add fields and states required for robust Volkswagen safety compliance (#8) 16b5850 let's spell wolkswagen 6243622 Safety cereal (#9) 5cf3c2c change order of UsbPowerMode to preserve panda lib behavior 18a2917 usbPowerMode is more useful to log and it comes from panda 1526784 add ldw to visual hud alerts (#5) 24f6fa7 merge commaai/msgq#3 after fixing conflicts 4d5862c added event about internet connection ca070f9 Added usbPowerOn to health e2eaa76 add HW type for UNO e528a20 Read RPM from fan connected to Panda 8472175 Added invalidGiraffeToyota event 71be970 placeholders for mazda, nissan and vw safety models git-subtree-dir: cereal git-subtree-split: 3d90c78
1 parent df46400 commit f66527d

File tree

2 files changed

+35
-3
lines changed

2 files changed

+35
-3
lines changed

car.capnp

+24-2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ struct CarEvent @0x9b1657f34caf3ad3 {
8282
preLaneChangeLeft @57;
8383
preLaneChangeRight @58;
8484
laneChange @59;
85+
invalidGiraffeToyota @60;
86+
internetConnectivityNeeded @61;
8587
}
8688
}
8789

@@ -133,6 +135,9 @@ struct CarState {
133135
seatbeltUnlatched @25 :Bool;
134136
canValid @26 :Bool;
135137

138+
# clutch (manual transmission only)
139+
clutchPressed @28 :Bool;
140+
136141
# which packets this state came from
137142
canMonoTimes @12: List(UInt64);
138143

@@ -161,6 +166,8 @@ struct CarState {
161166
sport @5;
162167
low @6;
163168
brake @7;
169+
eco @8;
170+
manumatic @9;
164171
}
165172

166173

@@ -179,6 +186,9 @@ struct CarState {
179186
altButton1 @6;
180187
altButton2 @7;
181188
altButton3 @8;
189+
setCruise @9;
190+
resumeCruise @10;
191+
gapAdjustCruise @11;
182192
}
183193
}
184194
}
@@ -271,6 +281,7 @@ struct CarControl {
271281
wrongGear @4;
272282
seatbeltUnbuckled @5;
273283
speedTooHigh @6;
284+
ldw @7;
274285
}
275286

276287
enum AudibleAlert {
@@ -348,6 +359,7 @@ struct CarParams {
348359
carVin @38 :Text; # VIN number queried during fingerprinting
349360
isPandaBlack @39: Bool;
350361
dashcamOnly @41: Bool;
362+
transmissionType @43 :TransmissionType;
351363

352364
struct LateralPIDTuning {
353365
kpBP @0 :List(Float32);
@@ -388,9 +400,7 @@ struct CarParams {
388400
l @7 :List(Float32); # Kalman gain
389401
}
390402

391-
392403
enum SafetyModel {
393-
# does NOT match board setting
394404
noOutput @0;
395405
honda @1;
396406
toyota @2;
@@ -404,10 +414,22 @@ struct CarParams {
404414
tesla @10;
405415
subaru @11;
406416
gmPassive @12;
417+
mazda @13;
418+
nissan @14;
419+
volkswagen @15;
420+
toyotaIpas @16;
421+
allOutput @17;
422+
gmAscm @18;
407423
}
408424

409425
enum SteerControlType {
410426
torque @0;
411427
angle @1;
412428
}
429+
430+
enum TransmissionType {
431+
unknown @0;
432+
automatic @1;
433+
manual @2;
434+
}
413435
}

log.capnp

+11-1
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,24 @@ struct HealthData {
305305
canSendErrs @7 :UInt32;
306306
canFwdErrs @8 :UInt32;
307307
gmlanSendErrs @9 :UInt32;
308-
hwType @10: HwType;
308+
hwType @10 :HwType;
309+
fanSpeedRpm @11 :UInt16;
310+
usbPowerMode @12 :UsbPowerMode;
309311

310312
enum HwType {
311313
unknown @0;
312314
whitePanda @1;
313315
greyPanda @2;
314316
blackPanda @3;
315317
pedal @4;
318+
uno @5;
319+
}
320+
321+
enum UsbPowerMode {
322+
none @0;
323+
client @1;
324+
cdp @2;
325+
dcp @3;
316326
}
317327
}
318328

0 commit comments

Comments
 (0)