fill in ACC hud status

mqb-long
Jason Young 3 years ago
parent fa7fa605bf
commit 0627cbd01f
  1. 17
      selfdrive/car/volkswagen/mqbcan.py
  2. 4
      selfdrive/car/volkswagen/pqcan.py

@ -51,6 +51,19 @@ def acc_control_status_value(main_switch_on, acc_faulted, long_active):
return tsk_status return tsk_status
def acc_hud_status_value(main_switch_on, acc_faulted, long_active):
if acc_faulted:
hud_status = 6
elif long_active:
hud_status = 3
elif main_switch_on:
hud_status = 2
else:
hud_status = 0
return hud_status
def create_acc_accel_control(packer, bus, enabled, acc_status, accel): def create_acc_accel_control(packer, bus, enabled, acc_status, accel):
commands = [] commands = []
@ -82,11 +95,11 @@ def create_acc_accel_control(packer, bus, enabled, acc_status, accel):
return commands return commands
def create_acc_hud_control(packer, bus, acc_status, set_speed, lead_visible, pass_through_data): def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_visible, pass_through_data):
commands = [] commands = []
acc_02_values = { acc_02_values = {
"ACC_Status_Anzeige": 3 if acc_status == 5 else acc_status, "ACC_Status_Anzeige": acc_hud_status,
"ACC_Wunschgeschw": set_speed if set_speed < 250 else 327.36, "ACC_Wunschgeschw": set_speed if set_speed < 250 else 327.36,
"ACC_Gesetzte_Zeitluecke": 3, "ACC_Gesetzte_Zeitluecke": 3,
"ACC_Display_Prio": 3, "ACC_Display_Prio": 3,

@ -72,9 +72,9 @@ def create_acc_accel_control(packer, bus, enabled, acc_status, accel):
packer.make_can_msg("ACC_System", bus, values) packer.make_can_msg("ACC_System", bus, values)
def create_acc_hud_control(packer, bus, acc_status, set_speed, lead_visible, pass_through_data=None): def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_visible, pass_through_data=None):
values = { values = {
"ACA_StaACC": acc_status, "ACA_StaACC": acc_hud_status,
"ACA_Zeitluecke": 2, "ACA_Zeitluecke": 2,
"ACA_V_Wunsch": set_speed, "ACA_V_Wunsch": set_speed,
"ACA_gemZeitl": 8 if lead_visible else 0, "ACA_gemZeitl": 8 if lead_visible else 0,

Loading…
Cancel
Save