Volkswagen Longitudinal: Display personality in instrument cluster (#31800)

pull/31837/head
Jason Wen 1 year ago committed by GitHub
parent 82fa0d762c
commit 7ca07f8be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      selfdrive/car/volkswagen/carcontroller.py
  2. 4
      selfdrive/car/volkswagen/mqbcan.py
  3. 2
      selfdrive/car/volkswagen/pqcan.py

@ -102,7 +102,7 @@ class CarController(CarControllerBase):
# FIXME: follow the recent displayed-speed updates, also use mph_kmh toggle to fix display rounding problem? # FIXME: follow the recent displayed-speed updates, also use mph_kmh toggle to fix display rounding problem?
set_speed = hud_control.setSpeed * CV.MS_TO_KPH set_speed = hud_control.setSpeed * CV.MS_TO_KPH
can_sends.append(self.CCS.create_acc_hud_control(self.packer_pt, CANBUS.pt, acc_hud_status, set_speed, can_sends.append(self.CCS.create_acc_hud_control(self.packer_pt, CANBUS.pt, acc_hud_status, set_speed,
lead_distance)) lead_distance, hud_control.leadDistanceBars))
# **** Stock ACC Button Controls **************************************** # # **** Stock ACC Button Controls **************************************** #

@ -125,11 +125,11 @@ def create_acc_accel_control(packer, bus, acc_type, acc_enabled, accel, acc_cont
return commands return commands
def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_distance): def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_distance, distance):
values = { values = {
"ACC_Status_Anzeige": acc_hud_status, "ACC_Status_Anzeige": acc_hud_status,
"ACC_Wunschgeschw_02": set_speed if set_speed < 250 else 327.36, "ACC_Wunschgeschw_02": set_speed if set_speed < 250 else 327.36,
"ACC_Gesetzte_Zeitluecke": 3, "ACC_Gesetzte_Zeitluecke": distance + 2,
"ACC_Display_Prio": 3, "ACC_Display_Prio": 3,
"ACC_Abstandsindex": lead_distance, "ACC_Abstandsindex": lead_distance,
} }

@ -91,7 +91,7 @@ def create_acc_accel_control(packer, bus, acc_type, acc_enabled, accel, acc_cont
return commands return commands
def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_distance): def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_distance, distance):
values = { values = {
"ACA_StaACC": acc_hud_status, "ACA_StaACC": acc_hud_status,
"ACA_Zeitluecke": 2, "ACA_Zeitluecke": 2,

Loading…
Cancel
Save