brianhansonxyz
ab9158bfb7
Discard the modelrevert tree adoption (8b4b7e0) and the in-process park short-circuits / cached-output / dashcam-idle work that came with it (0dc8002,37e095e). Restore the clearpilot tree as it stood atd639e28— the parked-controlsd manager-process split, the GPS-disable in locationd, the controlsd UI hooks, the boardd ignition-edge safety_setter_thread fix. After a full /data/params/d wipe and re-calibration drive, the modelrevert-tree variant overcorrected on turns; reverting to the parked-controlsd architecture (which Brian had previously vetted and documented in887b9c9+27cad05) and starting fresh. Single new commit, no merge — file state matchesd639e28byte-for-byte. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
91 lines
3.5 KiB
Python
Executable File
91 lines
3.5 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
import gc
|
|
|
|
import cereal.messaging as messaging
|
|
from cereal import car
|
|
from openpilot.common.params import Params
|
|
from openpilot.common.realtime import set_realtime_priority
|
|
from openpilot.selfdrive.controls.lib.events import Events
|
|
from openpilot.selfdrive.monitoring.driver_monitor import DriverStatus
|
|
|
|
|
|
def dmonitoringd_thread():
|
|
gc.disable()
|
|
set_realtime_priority(2)
|
|
|
|
params = Params()
|
|
pm = messaging.PubMaster(['driverMonitoringState'])
|
|
sm = messaging.SubMaster(['driverStateV2', 'liveCalibration', 'carState', 'controlsState', 'modelV2'], poll='driverStateV2')
|
|
|
|
driver_status = DriverStatus(rhd_saved=params.get_bool("IsRhdDetected"))
|
|
|
|
v_cruise_last = 0
|
|
driver_engaged = False
|
|
|
|
# 10Hz <- dmonitoringmodeld
|
|
while True:
|
|
sm.update()
|
|
if not sm.updated['driverStateV2']:
|
|
continue
|
|
|
|
# Get interaction
|
|
if sm.updated['carState']:
|
|
v_cruise = sm['carState'].cruiseState.speed
|
|
driver_engaged = len(sm['carState'].buttonEvents) > 0 or \
|
|
v_cruise != v_cruise_last or \
|
|
sm['carState'].steeringPressed or \
|
|
sm['carState'].gasPressed
|
|
v_cruise_last = v_cruise
|
|
|
|
if sm.updated['modelV2']:
|
|
driver_status.set_policy(sm['modelV2'], sm['carState'].vEgo)
|
|
|
|
# Get data from dmonitoringmodeld
|
|
events = Events()
|
|
|
|
if sm.all_checks() and len(sm['liveCalibration'].rpyCalib):
|
|
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 \
|
|
driver_status.terminal_time >= driver_status.settings._MAX_TERMINAL_DURATION:
|
|
events.add(car.CarEvent.EventName.tooDistracted)
|
|
|
|
# Update events from driver state
|
|
driver_status.update_events(events, driver_engaged, sm['controlsState'].enabled, sm['carState'].standstill)
|
|
|
|
# build driverMonitoringState packet
|
|
dat = messaging.new_message('driverMonitoringState', valid=sm.all_checks())
|
|
dat.driverMonitoringState = {
|
|
"events": events.to_msg(),
|
|
"faceDetected": driver_status.face_detected,
|
|
"isDistracted": driver_status.driver_distracted,
|
|
"distractedType": sum(driver_status.distracted_types),
|
|
"awarenessStatus": driver_status.awareness,
|
|
"posePitchOffset": driver_status.pose.pitch_offseter.filtered_stat.mean(),
|
|
"posePitchValidCount": driver_status.pose.pitch_offseter.filtered_stat.n,
|
|
"poseYawOffset": driver_status.pose.yaw_offseter.filtered_stat.mean(),
|
|
"poseYawValidCount": driver_status.pose.yaw_offseter.filtered_stat.n,
|
|
"stepChange": driver_status.step_change,
|
|
"awarenessActive": driver_status.awareness_active,
|
|
"awarenessPassive": driver_status.awareness_passive,
|
|
"isLowStd": driver_status.pose.low_std,
|
|
"hiStdCount": driver_status.hi_stds,
|
|
"isActiveMode": driver_status.active_monitoring_mode,
|
|
"isRHD": driver_status.wheel_on_right,
|
|
}
|
|
pm.send('driverMonitoringState', dat)
|
|
|
|
# save rhd virtual toggle every 5 mins
|
|
if (sm['driverStateV2'].frameId % 6000 == 0 and
|
|
driver_status.wheelpos_learner.filtered_stat.n > driver_status.settings._WHEELPOS_FILTER_MIN_COUNT and
|
|
driver_status.wheel_on_right == (driver_status.wheelpos_learner.filtered_stat.M > driver_status.settings._WHEELPOS_THRESHOLD)):
|
|
params.put_bool_nonblocking("IsRhdDetected", driver_status.wheel_on_right)
|
|
|
|
def main():
|
|
dmonitoringd_thread()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|