Merge cereal subtree

pull/758/head
Vehicle Researcher 6 years ago
commit 53413fa019
  1. 2
      cereal/car.capnp
  2. 25
      cereal/log.capnp

@ -76,6 +76,8 @@ struct CarEvent @0x9b1657f34caf3ad3 {
controlsFailed @51; controlsFailed @51;
sensorDataInvalid @52; sensorDataInvalid @52;
commIssue @53; commIssue @53;
tooDistracted @54;
posenetInvalid @55;
} }
} }

@ -300,8 +300,20 @@ struct HealthData {
started @2 :Bool; started @2 :Bool;
controlsAllowed @3 :Bool; controlsAllowed @3 :Bool;
gasInterceptorDetected @4 :Bool; gasInterceptorDetected @4 :Bool;
startedSignalDetected @5 :Bool; startedSignalDetectedDeprecated @5 :Bool;
isGreyPanda @6 :Bool; isGreyPanda @6 :Bool;
canSendErrs @7 :UInt32;
canFwdErrs @8 :UInt32;
gmlanSendErrs @9 :UInt32;
hwType @10: HwType;
enum HwType {
unknown @0;
whitePanda @1;
greyPanda @2;
blackPanda @3;
pedal @4;
}
} }
struct LiveUI { struct LiveUI {
@ -343,6 +355,8 @@ struct RadarState @0x9a185389d6fdd05f {
fcw @10 :Bool; fcw @10 :Bool;
status @11 :Bool; status @11 :Bool;
aLeadTau @12 :Float32; aLeadTau @12 :Float32;
modelProb @13 :Float32;
radar @14 :Bool;
} }
} }
@ -508,6 +522,8 @@ struct ModelData {
freePath @6 :List(Float32); freePath @6 :List(Float32);
settings @5 :ModelSettings; settings @5 :ModelSettings;
leadFuture @7 :LeadData;
speed @8 :List(Float32);
struct PathData { struct PathData {
points @0 :List(Float32); points @0 :List(Float32);
@ -523,6 +539,10 @@ struct ModelData {
std @2 :Float32; std @2 :Float32;
relVel @3 :Float32; relVel @3 :Float32;
relVelStd @4 :Float32; relVelStd @4 :Float32;
relY @5 :Float32;
relYStd @6 :Float32;
relA @7 :Float32;
relAStd @8 :Float32;
} }
struct ModelSettings { struct ModelSettings {
@ -662,6 +682,7 @@ struct PathPlan {
angleOffset @11 :Float32; angleOffset @11 :Float32;
sensorValid @14 :Bool; sensorValid @14 :Bool;
commIssue @15 :Bool; commIssue @15 :Bool;
posenetValid @16 :Bool;
} }
struct LiveLocationData { struct LiveLocationData {
@ -1659,6 +1680,8 @@ struct LiveParametersData {
steerRatio @5 :Float32; steerRatio @5 :Float32;
sensorValid @6 :Bool; sensorValid @6 :Bool;
yawRate @7 :Float32; yawRate @7 :Float32;
posenetSpeed @8 :Float32;
posenetValid @9 :Bool;
} }
struct LiveMapData { struct LiveMapData {

Loading…
Cancel
Save