|
|
@ -64,9 +64,10 @@ def create_acc_accel_control(packer, bus, acc_type, acc_enabled, accel, acc_cont |
|
|
|
|
|
|
|
|
|
|
|
values = { |
|
|
|
values = { |
|
|
|
"ACS_Sta_ADR": acc_control, |
|
|
|
"ACS_Sta_ADR": acc_control, |
|
|
|
"ACS_StSt_Info": acc_control != 1, |
|
|
|
"ACS_StSt_Info": acc_enabled, |
|
|
|
"ACS_Typ_ACC": acc_type, |
|
|
|
"ACS_Typ_ACC": acc_type, |
|
|
|
"ACS_Anhaltewunsch": acc_type == 1 and stopping, |
|
|
|
"ACS_Anhaltewunsch": acc_type == 1 and stopping, |
|
|
|
|
|
|
|
"ACS_FreigSollB": acc_enabled, |
|
|
|
"ACS_Sollbeschl": accel if acc_enabled else 3.01, |
|
|
|
"ACS_Sollbeschl": accel if acc_enabled else 3.01, |
|
|
|
"ACS_zul_Regelabw": 0.2 if acc_enabled else 1.27, |
|
|
|
"ACS_zul_Regelabw": 0.2 if acc_enabled else 1.27, |
|
|
|
"ACS_max_AendGrad": 3.0 if acc_enabled else 5.08, |
|
|
|
"ACS_max_AendGrad": 3.0 if acc_enabled else 5.08, |
|
|
@ -83,9 +84,9 @@ def create_acc_hud_control(packer, bus, acc_hud_status, set_speed, lead_distance |
|
|
|
"ACA_Zeitluecke": 2, |
|
|
|
"ACA_Zeitluecke": 2, |
|
|
|
"ACA_V_Wunsch": set_speed, |
|
|
|
"ACA_V_Wunsch": set_speed, |
|
|
|
"ACA_gemZeitl": lead_distance, |
|
|
|
"ACA_gemZeitl": lead_distance, |
|
|
|
# TODO: ACA_ID_StaACC, ACA_AnzDisplay, ACA_kmh_mph, ACA_PrioDisp, ACA_Aend_Zeitluecke |
|
|
|
"ACA_PrioDisp": 3, |
|
|
|
# display/display-prio handling probably needed to stop confusing the instrument cluster |
|
|
|
# TODO: restore dynamic pop-to-foreground/highlight behavior with ACA_PrioDisp and ACA_AnzDisplay |
|
|
|
# kmh_mph handling probably needed to resolve rounding errors in displayed setpoint |
|
|
|
# TODO: ACA_kmh_mph handling probably needed to resolve rounding errors in displayed setpoint |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return packer.make_can_msg("ACC_GRA_Anzeige", bus, values) |
|
|
|
return packer.make_can_msg("ACC_GRA_Anzeige", bus, values) |
|
|
|