|
|
@ -102,17 +102,17 @@ def create_friction_brake_command(packer, bus, apply_brake, idx, enabled, near_s |
|
|
|
return packer.make_can_msg("EBCMFrictionBrakeCmd", bus, values) |
|
|
|
return packer.make_can_msg("EBCMFrictionBrakeCmd", bus, values) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def create_acc_dashboard_command(packer, bus, enabled, target_speed_kph, lead_car_in_sight, fcw): |
|
|
|
def create_acc_dashboard_command(packer, bus, enabled, target_speed_kph, hud_control, fcw): |
|
|
|
target_speed = min(target_speed_kph, 255) |
|
|
|
target_speed = min(target_speed_kph, 255) |
|
|
|
|
|
|
|
|
|
|
|
values = { |
|
|
|
values = { |
|
|
|
"ACCAlwaysOne": 1, |
|
|
|
"ACCAlwaysOne": 1, |
|
|
|
"ACCResumeButton": 0, |
|
|
|
"ACCResumeButton": 0, |
|
|
|
"ACCSpeedSetpoint": target_speed, |
|
|
|
"ACCSpeedSetpoint": target_speed, |
|
|
|
"ACCGapLevel": 3 * enabled, # 3 "far", 0 "inactive" |
|
|
|
"ACCGapLevel": hud_control.leadDistanceBars * enabled, # 3 "far", 0 "inactive" |
|
|
|
"ACCCmdActive": enabled, |
|
|
|
"ACCCmdActive": enabled, |
|
|
|
"ACCAlwaysOne2": 1, |
|
|
|
"ACCAlwaysOne2": 1, |
|
|
|
"ACCLeadCar": lead_car_in_sight, |
|
|
|
"ACCLeadCar": hud_control.leadVisible, |
|
|
|
"FCWAlert": 0x3 if fcw else 0 |
|
|
|
"FCWAlert": 0x3 if fcw else 0 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|