From 0627cbd01f605ff9cbcb27f8566261cde93affc3 Mon Sep 17 00:00:00 2001 From: Jason Young Date: Wed, 7 Sep 2022 17:37:01 -0400 Subject: [PATCH] fill in ACC hud status --- selfdrive/car/volkswagen/mqbcan.py | 17 +++++++++++++++-- selfdrive/car/volkswagen/pqcan.py | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/selfdrive/car/volkswagen/mqbcan.py b/selfdrive/car/volkswagen/mqbcan.py index ddb940569..071e24dba 100644 --- a/selfdrive/car/volkswagen/mqbcan.py +++ b/selfdrive/car/volkswagen/mqbcan.py @@ -51,6 +51,19 @@ def acc_control_status_value(main_switch_on, acc_faulted, long_active): 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): commands = [] @@ -82,11 +95,11 @@ def create_acc_accel_control(packer, bus, enabled, acc_status, accel): 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 = [] 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_Gesetzte_Zeitluecke": 3, "ACC_Display_Prio": 3, diff --git a/selfdrive/car/volkswagen/pqcan.py b/selfdrive/car/volkswagen/pqcan.py index 8077ffe3a..d4b262cfe 100644 --- a/selfdrive/car/volkswagen/pqcan.py +++ b/selfdrive/car/volkswagen/pqcan.py @@ -72,9 +72,9 @@ def create_acc_accel_control(packer, bus, enabled, acc_status, accel): 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 = { - "ACA_StaACC": acc_status, + "ACA_StaACC": acc_hud_status, "ACA_Zeitluecke": 2, "ACA_V_Wunsch": set_speed, "ACA_gemZeitl": 8 if lead_visible else 0,