From 93b1cf7d69f5c9dd03b7271628ff8fc7aa76a8e9 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sat, 2 Dec 2023 01:16:07 -0800
Subject: [PATCH] bump cereal (#30582)

* bump cereal

* fix dmonitoringd

* update refs

* update refs
old-commit-hash: c028688a652a8354ac641e185eee80a04633543b
---
 cereal                                   |  2 +-
 selfdrive/monitoring/dmonitoringd.py     | 11 +++--------
 selfdrive/test/process_replay/ref_commit |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/cereal b/cereal
index 65b34b4d15..60d1ee0490 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit 65b34b4d152bcea6d49b821bf1da7189f6086b0f
+Subproject commit 60d1ee0490a33830168b30a1e92f8d4e43cfbb15
diff --git a/selfdrive/monitoring/dmonitoringd.py b/selfdrive/monitoring/dmonitoringd.py
index ff2ee71e74..6ea35a6c63 100755
--- a/selfdrive/monitoring/dmonitoringd.py
+++ b/selfdrive/monitoring/dmonitoringd.py
@@ -3,7 +3,6 @@ import gc
 
 import cereal.messaging as messaging
 from cereal import car
-from cereal import log
 from openpilot.common.params import Params, put_bool_nonblocking
 from openpilot.common.realtime import set_realtime_priority
 from openpilot.selfdrive.controls.lib.events import Events
@@ -19,18 +18,12 @@ def dmonitoringd_thread():
 
   driver_status = DriverStatus(rhd_saved=Params().get_bool("IsRhdDetected"))
 
-  sm['liveCalibration'].calStatus = log.LiveCalibrationData.Status.invalid
-  sm['liveCalibration'].rpyCalib = [0, 0, 0]
-  sm['carState'].buttonEvents = []
-  sm['carState'].standstill = True
-
   v_cruise_last = 0
   driver_engaged = False
 
   # 10Hz <- dmonitoringmodeld
   while True:
     sm.update()
-
     if not sm.updated['driverStateV2']:
       continue
 
@@ -48,7 +41,9 @@ def dmonitoringd_thread():
 
     # Get data from dmonitoringmodeld
     events = Events()
-    driver_status.update_states(sm['driverStateV2'], sm['liveCalibration'].rpyCalib, sm['carState'].vEgo, sm['controlsState'].enabled)
+
+    if sm.all_checks():
+      driver_status.update_states(sm['driverStateV2'], sm['liveCalibration'].rpyCalib, sm['carState'].vEgo, sm['controlsState'].enabled)
 
     # Block engaging after max number of distrations
     if driver_status.terminal_alert_cnt >= driver_status.settings._MAX_TERMINAL_ALERTS or \
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index 40ac91ee70..2ab22ca9ef 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-dbea36698ba48429b201b138846165eb4c329b92
\ No newline at end of file
+a42195085f2b92df02d13d60a8cee80354a84c7a
\ No newline at end of file