* bump cereal

* fix dmonitoringd

* update refs

* update refs
old-commit-hash: c028688a65
chrysler-long2
Adeeb Shihadeh 1 year ago committed by GitHub
parent 4394116e5b
commit 93b1cf7d69
  1. 2
      cereal
  2. 9
      selfdrive/monitoring/dmonitoringd.py
  3. 2
      selfdrive/test/process_replay/ref_commit

@ -1 +1 @@
Subproject commit 65b34b4d152bcea6d49b821bf1da7189f6086b0f
Subproject commit 60d1ee0490a33830168b30a1e92f8d4e43cfbb15

@ -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,6 +41,8 @@ def dmonitoringd_thread():
# Get data from dmonitoringmodeld
events = Events()
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

@ -1 +1 @@
dbea36698ba48429b201b138846165eb4c329b92
a42195085f2b92df02d13d60a8cee80354a84c7a
Loading…
Cancel
Save