better put

JMPZ11 · Jan 28, 2020 · 5794030 · 5794030
1 parent 06f8d15
commit 5794030
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/car.capnp b/car.capnp
@@ -473,26 +473,3 @@ struct CarParams {
     apgs @7;
   }
 }
-
-struct MonitorState {
-  events @0 :List(CarEvent);
-  driverState @1 :DriverState;
-
-  # TODO: deprecate old fields in controlsState
-  struct DriverState {
-    faceDetected @0 :Bool;
-    isDistracted @1 :Bool;
-    awarenessStatus @2 :Float32;
-    isRHD @3 :Bool;
-    rhdChecked @4 :Bool;
-    posePitchOffset @5 :Float32;
-    posePitchValidCount @6 :UInt32;
-    poseYawOffset @7 :Float32;
-    poseYawValidCount @8 :UInt32;
-    stepChange @9 :Float32;
-    awarenessActive @10 :Float32;
-    awarenessPassive @11 :Float32;
-    isLowStd @12 :Bool;
-    hiStdCount @13 :UInt32;
-  }
-}
diff --git a/log.capnp b/log.capnp
@@ -1770,6 +1770,29 @@ struct DriverMonitoring {
   facePositionStd @12 :List(Float32);
 }
 
+struct MonitorState {
+  events @0 :List(Car.CarEvent);
+  driverState @1 :DriverState;
+
+  # TODO: deprecate old fields in controlsState
+  struct DriverState {
+    faceDetected @0 :Bool;
+    isDistracted @1 :Bool;
+    awarenessStatus @2 :Float32;
+    isRHD @3 :Bool;
+    rhdChecked @4 :Bool;
+    posePitchOffset @5 :Float32;
+    posePitchValidCount @6 :UInt32;
+    poseYawOffset @7 :Float32;
+    poseYawValidCount @8 :UInt32;
+    stepChange @9 :Float32;
+    awarenessActive @10 :Float32;
+    awarenessPassive @11 :Float32;
+    isLowStd @12 :Bool;
+    hiStdCount @13 :UInt32;
+  }
+}
+
 struct Boot {
   wallTimeNanos @0 :UInt64;
   lastKmsg @1 :Data;
@@ -1900,5 +1923,6 @@ struct Event {
     carEvents @68: List(Car.CarEvent);
     carParams @69: Car.CarParams;
     frontFrame @70: FrameData;
+    monitorState @71: MonitorState;
   }
 }