mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-05 05:22:07 +08:00
ee03d13529
* format card * standalone process * no class member CS, there's no point also can be confusing; what else could be using this? * rename CoS * Update selfdrive/controls/controlsd.py * never works first time :D * canRcvTimeout is bool * hack * add cpu * see what testing closet comes up with * first * some clean up * support passable CI, fix test models * fix startup alert * process replay changes * test_fuzzy * gate carOutput valid on carControl valid * we should publish after we update carOutput * controlsd was using actuatorsOutput from 2 frames ago for torque, not the most up to date * check all checks for carControl in case controlsd dies * log more timestamps * more generic latency logger; needs some clean up latency_logger.py was difficult to understand and modify * card polls on can and carControl to get latest carControl possible * temp try to send earlier * add log * remove latencylogger * no mpld3! * old loop * detect first event * normal send * revert "card polls on can and carControl to get latest carControl possible" how it was is best * sheesh! update should be first * first timestamp * temp comment ( timestamp is slow :( ) * more final ordering, and make polling on/off test repeatable * Received can * new plot timestamps * clean up * no poll * add controllers (draft) * Revert "add controllers (draft)" This reverts commit e2c3f01b2fadcff74347bac90c8a5cc1ef4e27b3. * fix that * conventions * just use CS * consider controlsd state machine in card: not fully done * hmm it's just becoming controlsd * rm debugging * Revert "hmm it's just becoming controlsd" This reverts commit 534a357ee95bec4ed070667186af55d59421bbc7. * Revert "just use CS" This reverts commit 9fa7406f30c86200f20457f7b9ff95e731201bf9. * add vCruise * migrate car state * Revert "migrate car state" This reverts commit 4ae86ca163c6920070f410f608f7644ab632850b. * Revert "add vCruise" This reverts commit af247a8da41c3626ada4231b98042da1a1ae4633. * simple state machine in card (doesn't work as is) * Revert "simple state machine in card (doesn't work as is)" This reverts commit b4af8a9b0a2e17fdfc89d344c64678ef51305c24. * poll carState without conflate * bump * remove state transition * fix * update refs * ignore cumLagMs and don't ignore valid * fix controls mismatch; controlsd used to set alt exp * controlsd_config_callback not needed for card * revert ref temp * update refs * no poll * not builder! * test fix * need to migrate initialized * CC will be a reader * more as_reader! * fix None * init after publish like before - no real difference * controlsd clean up * remove redundant check and check passive for init * stash * flip * migrate missing carOutput for controlsd * Update ref_commit * bump cereal * comment * no class params * no class * Revert "no class" This reverts commit 5499b83c2dcb5462070626f8523e3aec6f4c209d. * add todo * regen and update refs * fix * update refs * and fix that * should be controlsstate * remove controlsState migration CoS.initialized isn't needed yet * fix * flip! * bump * fix that * update refs * fix * if canValid goes false, controlsd would still send * bump * rm diff * need to be very careful with initializing * update refs old-commit-hash: 71f5c441fe32184d94a9f26565a36c661e2ccf28
121 lines
5.9 KiB
Python
121 lines
5.9 KiB
Python
from cereal import car
|
|
from opendbc.can.packer import CANPacker
|
|
from openpilot.common.numpy_fast import clip
|
|
from openpilot.selfdrive.car import apply_std_steer_angle_limits
|
|
from openpilot.selfdrive.car.ford import fordcan
|
|
from openpilot.selfdrive.car.ford.values import CarControllerParams, FordFlags
|
|
from openpilot.selfdrive.car.interfaces import CarControllerBase
|
|
from openpilot.selfdrive.controls.lib.drive_helpers import V_CRUISE_MAX
|
|
|
|
LongCtrlState = car.CarControl.Actuators.LongControlState
|
|
VisualAlert = car.CarControl.HUDControl.VisualAlert
|
|
|
|
|
|
def apply_ford_curvature_limits(apply_curvature, apply_curvature_last, current_curvature, v_ego_raw):
|
|
# No blending at low speed due to lack of torque wind-up and inaccurate current curvature
|
|
if v_ego_raw > 9:
|
|
apply_curvature = clip(apply_curvature, current_curvature - CarControllerParams.CURVATURE_ERROR,
|
|
current_curvature + CarControllerParams.CURVATURE_ERROR)
|
|
|
|
# Curvature rate limit after driver torque limit
|
|
apply_curvature = apply_std_steer_angle_limits(apply_curvature, apply_curvature_last, v_ego_raw, CarControllerParams)
|
|
|
|
return clip(apply_curvature, -CarControllerParams.CURVATURE_MAX, CarControllerParams.CURVATURE_MAX)
|
|
|
|
|
|
class CarController(CarControllerBase):
|
|
def __init__(self, dbc_name, CP, VM):
|
|
self.CP = CP
|
|
self.VM = VM
|
|
self.packer = CANPacker(dbc_name)
|
|
self.CAN = fordcan.CanBus(CP)
|
|
self.frame = 0
|
|
|
|
self.apply_curvature_last = 0
|
|
self.main_on_last = False
|
|
self.lkas_enabled_last = False
|
|
self.steer_alert_last = False
|
|
self.lead_distance_bars_last = None
|
|
|
|
def update(self, CC, CS, now_nanos):
|
|
can_sends = []
|
|
|
|
actuators = CC.actuators
|
|
hud_control = CC.hudControl
|
|
|
|
main_on = CS.out.cruiseState.available
|
|
steer_alert = hud_control.visualAlert in (VisualAlert.steerRequired, VisualAlert.ldw)
|
|
fcw_alert = hud_control.visualAlert == VisualAlert.fcw
|
|
|
|
### acc buttons ###
|
|
if CC.cruiseControl.cancel:
|
|
can_sends.append(fordcan.create_button_msg(self.packer, self.CAN.camera, CS.buttons_stock_values, cancel=True))
|
|
can_sends.append(fordcan.create_button_msg(self.packer, self.CAN.main, CS.buttons_stock_values, cancel=True))
|
|
elif CC.cruiseControl.resume and (self.frame % CarControllerParams.BUTTONS_STEP) == 0:
|
|
can_sends.append(fordcan.create_button_msg(self.packer, self.CAN.camera, CS.buttons_stock_values, resume=True))
|
|
can_sends.append(fordcan.create_button_msg(self.packer, self.CAN.main, CS.buttons_stock_values, resume=True))
|
|
# if stock lane centering isn't off, send a button press to toggle it off
|
|
# the stock system checks for steering pressed, and eventually disengages cruise control
|
|
elif CS.acc_tja_status_stock_values["Tja_D_Stat"] != 0 and (self.frame % CarControllerParams.ACC_UI_STEP) == 0:
|
|
can_sends.append(fordcan.create_button_msg(self.packer, self.CAN.camera, CS.buttons_stock_values, tja_toggle=True))
|
|
|
|
### lateral control ###
|
|
# send steer msg at 20Hz
|
|
if (self.frame % CarControllerParams.STEER_STEP) == 0:
|
|
if CC.latActive:
|
|
# apply rate limits, curvature error limit, and clip to signal range
|
|
current_curvature = -CS.out.yawRate / max(CS.out.vEgoRaw, 0.1)
|
|
apply_curvature = apply_ford_curvature_limits(actuators.curvature, self.apply_curvature_last, current_curvature, CS.out.vEgoRaw)
|
|
else:
|
|
apply_curvature = 0.
|
|
|
|
self.apply_curvature_last = apply_curvature
|
|
|
|
if self.CP.flags & FordFlags.CANFD:
|
|
# TODO: extended mode
|
|
mode = 1 if CC.latActive else 0
|
|
counter = (self.frame // CarControllerParams.STEER_STEP) % 0x10
|
|
can_sends.append(fordcan.create_lat_ctl2_msg(self.packer, self.CAN, mode, 0., 0., -apply_curvature, 0., counter))
|
|
else:
|
|
can_sends.append(fordcan.create_lat_ctl_msg(self.packer, self.CAN, CC.latActive, 0., 0., -apply_curvature, 0.))
|
|
|
|
# send lka msg at 33Hz
|
|
if (self.frame % CarControllerParams.LKA_STEP) == 0:
|
|
can_sends.append(fordcan.create_lka_msg(self.packer, self.CAN))
|
|
|
|
### longitudinal control ###
|
|
# send acc msg at 50Hz
|
|
if self.CP.openpilotLongitudinalControl and (self.frame % CarControllerParams.ACC_CONTROL_STEP) == 0:
|
|
# Both gas and accel are in m/s^2, accel is used solely for braking
|
|
accel = clip(actuators.accel, CarControllerParams.ACCEL_MIN, CarControllerParams.ACCEL_MAX)
|
|
gas = accel
|
|
if not CC.longActive or gas < CarControllerParams.MIN_GAS:
|
|
gas = CarControllerParams.INACTIVE_GAS
|
|
stopping = CC.actuators.longControlState == LongCtrlState.stopping
|
|
can_sends.append(fordcan.create_acc_msg(self.packer, self.CAN, CC.longActive, gas, accel, stopping, v_ego_kph=V_CRUISE_MAX))
|
|
|
|
### ui ###
|
|
send_ui = (self.main_on_last != main_on) or (self.lkas_enabled_last != CC.latActive) or (self.steer_alert_last != steer_alert)
|
|
# send lkas ui msg at 1Hz or if ui state changes
|
|
if (self.frame % CarControllerParams.LKAS_UI_STEP) == 0 or send_ui:
|
|
can_sends.append(fordcan.create_lkas_ui_msg(self.packer, self.CAN, main_on, CC.latActive, steer_alert, hud_control, CS.lkas_status_stock_values))
|
|
|
|
# send acc ui msg at 5Hz or if ui state changes
|
|
if hud_control.leadDistanceBars != self.lead_distance_bars_last:
|
|
send_ui = True
|
|
if (self.frame % CarControllerParams.ACC_UI_STEP) == 0 or send_ui:
|
|
can_sends.append(fordcan.create_acc_ui_msg(self.packer, self.CAN, self.CP, main_on, CC.latActive,
|
|
fcw_alert, CS.out.cruiseState.standstill, hud_control,
|
|
CS.acc_tja_status_stock_values))
|
|
|
|
self.main_on_last = main_on
|
|
self.lkas_enabled_last = CC.latActive
|
|
self.steer_alert_last = steer_alert
|
|
self.lead_distance_bars_last = hud_control.leadDistanceBars
|
|
|
|
new_actuators = actuators.as_builder()
|
|
new_actuators.curvature = self.apply_curvature_last
|
|
|
|
self.frame += 1
|
|
return new_actuators, can_sends
|