From a1ec1c089e807ad5929dde54804d3325991fd1d2 Mon Sep 17 00:00:00 2001
From: Vehicle Researcher <user@comma.ai>
Date: Tue, 13 Aug 2019 01:34:22 +0000
Subject: [PATCH] Squashed 'cereal/' changes from 748002c1..bb94ed98

bb94ed98 add eps torque to carstate
291319a6 add soundsUnavailable event
9b0b0ee4 add blink msg
072b2e21 use enum for alert sounds

git-subtree-dir: cereal
git-subtree-split: bb94ed98ac9cb5c3448117e28b4fea000e8225ee
---
 car.capnp | 2 ++
 log.capnp | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/car.capnp b/car.capnp
index e6c9df5dd0..68d2176508 100644
--- a/car.capnp
+++ b/car.capnp
@@ -78,6 +78,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
     commIssue @53;
     tooDistracted @54;
     posenetInvalid @55;
+    soundsUnavailable @56;
   }
 }
 
@@ -109,6 +110,7 @@ struct CarState {
   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
 
   # cruise state
diff --git a/log.capnp b/log.capnp
index 5f76cbd742..479e5ec642 100644
--- a/log.capnp
+++ b/log.capnp
@@ -439,7 +439,8 @@ struct ControlsState @0x97ff69c53601abf1 {
   alertSize @39 :AlertSize;
   alertBlinkingRate @42 :Float32;
   alertType @44 :Text;
-  alertSound @45 :Text;
+  alertSoundDEPRECATED @45 :Text;
+  alertSound @56 :Car.CarControl.HUDControl.AudibleAlert;
   awarenessStatus @26 :Float32;
   angleModelBias @27 :Float32;
   gpsPlannerActive @40 :Bool;
@@ -1681,6 +1682,8 @@ struct DriverMonitoring {
   faceProb @5 :Float32;
   leftEyeProb @6 :Float32;
   rightEyeProb @7 :Float32;
+  leftBlinkProb @8 :Float32;
+  rightBlinkProb @9 :Float32;
 }
 
 struct Boot {