Skip to content

Commit

Permalink
Squashed 'cereal/' changes from ea14abe..3d90c78
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Vehicle Researcher committed Oct 9, 2019
1 parent df46400 commit f66527d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 3 deletions.
26 changes: 24 additions & 2 deletions car.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ struct CarEvent @0x9b1657f34caf3ad3 {
preLaneChangeLeft @57;
preLaneChangeRight @58;
laneChange @59;
invalidGiraffeToyota @60;
internetConnectivityNeeded @61;
}
}

Expand Down Expand Up @@ -133,6 +135,9 @@ struct CarState {
seatbeltUnlatched @25 :Bool;
canValid @26 :Bool;

# clutch (manual transmission only)
clutchPressed @28 :Bool;

# which packets this state came from
canMonoTimes @12: List(UInt64);

Expand Down Expand Up @@ -161,6 +166,8 @@ struct CarState {
sport @5;
low @6;
brake @7;
eco @8;
manumatic @9;
}


Expand All @@ -179,6 +186,9 @@ struct CarState {
altButton1 @6;
altButton2 @7;
altButton3 @8;
setCruise @9;
resumeCruise @10;
gapAdjustCruise @11;
}
}
}
Expand Down Expand Up @@ -271,6 +281,7 @@ struct CarControl {
wrongGear @4;
seatbeltUnbuckled @5;
speedTooHigh @6;
ldw @7;
}

enum AudibleAlert {
Expand Down Expand Up @@ -348,6 +359,7 @@ struct CarParams {
carVin @38 :Text; # VIN number queried during fingerprinting
isPandaBlack @39: Bool;
dashcamOnly @41: Bool;
transmissionType @43 :TransmissionType;

struct LateralPIDTuning {
kpBP @0 :List(Float32);
Expand Down Expand Up @@ -388,9 +400,7 @@ struct CarParams {
l @7 :List(Float32); # Kalman gain
}


enum SafetyModel {
# does NOT match board setting
noOutput @0;
honda @1;
toyota @2;
Expand All @@ -404,10 +414,22 @@ struct CarParams {
tesla @10;
subaru @11;
gmPassive @12;
mazda @13;
nissan @14;
volkswagen @15;
toyotaIpas @16;
allOutput @17;
gmAscm @18;
}

enum SteerControlType {
torque @0;
angle @1;
}

enum TransmissionType {
unknown @0;
automatic @1;
manual @2;
}
}
12 changes: 11 additions & 1 deletion log.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,24 @@ struct HealthData {
canSendErrs @7 :UInt32;
canFwdErrs @8 :UInt32;
gmlanSendErrs @9 :UInt32;
hwType @10: HwType;
hwType @10 :HwType;
fanSpeedRpm @11 :UInt16;
usbPowerMode @12 :UsbPowerMode;

enum HwType {
unknown @0;
whitePanda @1;
greyPanda @2;
blackPanda @3;
pedal @4;
uno @5;
}

enum UsbPowerMode {
none @0;
client @1;
cdp @2;
dcp @3;
}
}

Expand Down

0 comments on commit f66527d

Please sign in to comment.