pull/31792/head
Shane Smiskol 1 year ago
parent 8368cb69cb
commit 62eb33be72
  1. 2
      selfdrive/car/gm/carcontroller.py
  2. 6
      selfdrive/car/gm/gmcan.py

@ -118,7 +118,7 @@ class CarController(CarControllerBase):
# Send dashboard UI commands (ACC status) # Send dashboard UI commands (ACC status)
send_fcw = hud_alert == VisualAlert.fcw send_fcw = hud_alert == VisualAlert.fcw
can_sends.append(gmcan.create_acc_dashboard_command(self.packer_pt, CanBus.POWERTRAIN, CC.enabled, can_sends.append(gmcan.create_acc_dashboard_command(self.packer_pt, CanBus.POWERTRAIN, CC.enabled,
hud_v_cruise * CV.MS_TO_KPH, hud_control.leadVisible, send_fcw)) hud_v_cruise * CV.MS_TO_KPH, hud_control, send_fcw))
# Radar needs to know current speed and yaw rate (50hz), # Radar needs to know current speed and yaw rate (50hz),
# and that ADAS is alive (10hz) # and that ADAS is alive (10hz)

@ -102,17 +102,17 @@ def create_friction_brake_command(packer, bus, apply_brake, idx, enabled, near_s
return packer.make_can_msg("EBCMFrictionBrakeCmd", bus, values) return packer.make_can_msg("EBCMFrictionBrakeCmd", bus, values)
def create_acc_dashboard_command(packer, bus, enabled, target_speed_kph, lead_car_in_sight, fcw): def create_acc_dashboard_command(packer, bus, enabled, target_speed_kph, hud_control, fcw):
target_speed = min(target_speed_kph, 255) target_speed = min(target_speed_kph, 255)
values = { values = {
"ACCAlwaysOne": 1, "ACCAlwaysOne": 1,
"ACCResumeButton": 0, "ACCResumeButton": 0,
"ACCSpeedSetpoint": target_speed, "ACCSpeedSetpoint": target_speed,
"ACCGapLevel": 3 * enabled, # 3 "far", 0 "inactive" "ACCGapLevel": hud_control.leadDistanceBars * enabled, # 3 "far", 0 "inactive"
"ACCCmdActive": enabled, "ACCCmdActive": enabled,
"ACCAlwaysOne2": 1, "ACCAlwaysOne2": 1,
"ACCLeadCar": lead_car_in_sight, "ACCLeadCar": hud_control.leadVisible,
"FCWAlert": 0x3 if fcw else 0 "FCWAlert": 0x3 if fcw else 0
} }

Loading…
Cancel
Save