setpoint visibility in instrument cluster

pull/23257/head
Jason Young 4 years ago
parent 2db099a179
commit b74fbba7f2
  1. 4
      selfdrive/car/volkswagen/carcontroller.py
  2. 3
      selfdrive/car/volkswagen/interface.py
  3. 4
      selfdrive/car/volkswagen/volkswagencan.py

@ -27,7 +27,7 @@ class CarController():
self.acc_stopping = False
def update(self, enabled, CS, frame, ext_bus, actuators, visual_alert, left_lane_visible, right_lane_visible, left_lane_depart,
right_lane_depart, lead_visible, set_speed):
right_lane_depart, lead_visible, set_speed, speed_visible):
""" Controls thread """
can_sends = []
@ -80,7 +80,7 @@ class CarController():
if frame % P.ACC_HUD_STEP == 0:
idx = (frame / P.ACC_HUD_STEP) % 16
can_sends.append(volkswagencan.create_mqb_acc_hud_control(self.packer_pt, CANBUS.pt, CS.tsk_status,
set_speed * CV.MS_TO_KPH, idx))
set_speed * CV.MS_TO_KPH, speed_visible, idx))
# **** Steering Controls ************************************************ #

@ -248,6 +248,7 @@ class CarInterface(CarInterfaceBase):
c.hudControl.leftLaneDepart,
c.hudControl.rightLaneDepart,
c.hudControl.leadVisible,
c.hudControl.setSpeed)
c.hudControl.setSpeed,
c.hudControl.speedVisible)
self.frame += 1
return can_sends

@ -83,10 +83,10 @@ def create_mqb_acc_07_control(packer, bus, enabled, accel, acc_stopping, acc_sta
return packer.make_can_msg("ACC_07", bus, values, idx)
def create_mqb_acc_hud_control(packer, bus, acc_status, set_speed, idx):
def create_mqb_acc_hud_control(packer, bus, acc_status, set_speed, speed_visible, idx):
values = {
"ACC_Status_Anzeige": acc_status,
"ACC_Wunschgeschw": 327.36 if set_speed == 255 else set_speed,
"ACC_Wunschgeschw": 327.36 if not speed_visible else set_speed,
"ACC_Gesetzte_Zeitluecke": 3,
"ACC_Display_Prio": 3
}

Loading…
Cancel
Save