From a34bae5613d90a07cbd3f0dab30b81d51043f111 Mon Sep 17 00:00:00 2001
From: Vehicle Researcher <user@comma.ai>
Date: Thu, 31 Oct 2019 17:02:27 -0700
Subject: [PATCH] Squashed 'cereal/' changes from 3d90c7877..90e48c549

90e48c549 add ir pwr field
101facee1 added safety model to health packet
fe09e4c07 distinguish between ignition_line and ignition_can

git-subtree-dir: cereal
git-subtree-split: 90e48c549c505383a7242cfddd32984cd5c268b8

old-commit-hash: 047924cb35eca0c76cecb631eff00f8c9072620b
---
 log.capnp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/log.capnp b/log.capnp
index 30e346668d..0fd5155bf6 100644
--- a/log.capnp
+++ b/log.capnp
@@ -297,7 +297,7 @@ struct HealthData {
   # from can health
   voltage @0 :UInt32;
   current @1 :UInt32;
-  started @2 :Bool;
+  ignitionLine @2 :Bool;
   controlsAllowed @3 :Bool;
   gasInterceptorDetected @4 :Bool;
   startedSignalDetectedDeprecated @5 :Bool;
@@ -308,6 +308,8 @@ struct HealthData {
   hwType @10 :HwType;
   fanSpeedRpm @11 :UInt16;
   usbPowerMode @12 :UsbPowerMode;
+  ignitionCan @13 :Bool;
+  safetyModel @14 :Car.CarParams.SafetyModel;
 
   enum HwType {
     unknown @0;
@@ -1723,6 +1725,7 @@ struct DriverMonitoring {
   rightEyeProb @7 :Float32;
   leftBlinkProb @8 :Float32;
   rightBlinkProb @9 :Float32;
+  irPwr @10 :Float32;
 }
 
 struct Boot {