Skip to content

Commit

Permalink
Squashed 'cereal/' changes from 6511990..65af436
Browse files Browse the repository at this point in the history
65af436 Add relayMalfunction alert
442e914 add preview driver flag
c8e5db8 Add comment to faulttype
975a633 Add all panda fault types to health
93ccbcb UiLayoutState: add mockEngaged for onboarding
9dbbb54 UiLayoutState: add 'none' app
c820f83 Add offroadLayout service
e370f79 Add the laneChangeBlocked Event (commaai#40)
35040fe Update service documentation (commaai#39)
8f13dfc Additional car params auto-detection in support of VW (commaai#38)
22986de add speedTooHigh alert
f515e4d Add invalid lkas setting alert
5908762 gnustl_shared is only for android
b0c746b solve by renaming event name instead of service
df82a53 the service is called androidLogEntry

git-subtree-dir: cereal
git-subtree-split: 65af436
  • Loading branch information
Vehicle Researcher authored and Thaixican committed May 15, 2020
1 parent fa95b66 commit 1666250
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions cereal/car.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ struct CarEvent @0x9b1657f34caf3ad3 {
speedTooHigh @70;
laneChangeBlocked @71;
relayMalfunction @72;
gasPressed @73;
stockFcw @74;
}
}

Expand Down Expand Up @@ -125,14 +123,12 @@ struct CarState {
brakeLights @19 :Bool;

# steering wheel
steeringAngle @7 :Float32; # deg
steeringRate @15 :Float32; # deg/s
steeringTorque @8 :Float32; # TODO: standardize units
steeringAngle @7 :Float32; # deg
steeringRate @15 :Float32; # deg/s
steeringTorque @8 :Float32; # TODO: standardize units
steeringTorqueEps @27 :Float32; # TODO: standardize units
steeringPressed @9 :Bool; # if the user is using the steering wheel
steeringRateLimited @29 :Bool; # if the torque is limited by the rate limiter
steerWarning @35 :Bool; # temporary steer unavailble
steerError @36 :Bool; # permanent steer error
steeringPressed @9 :Bool; # if the user is using the steering wheel
steeringRateLimited @29 :Bool; # if the torque is limited by the rate limiter
stockAeb @30 :Bool;
stockFcw @31 :Bool;
espDisabled @32 :Bool;
Expand Down Expand Up @@ -317,7 +313,6 @@ struct CarControl {
chimeWarning2 @5;
chimeWarningRepeat @6;
chimePrompt @7;
chimeWarning2Repeat @8;
}
}
}
Expand Down

0 comments on commit 1666250

Please sign in to comment.