distance bars: bars always cycle 1, 2, 3 (#32251)

1, 2, 3 instead of 2, 3, 4
old-commit-hash: 5d28b929c3
pull/32199/head
Shane Smiskol 1 year ago committed by GitHub
parent 896f58c28b
commit 7b7aa6c08e
  1. 2
      selfdrive/car/ford/fordcan.py
  2. 2
      selfdrive/car/hyundai/hyundaican.py
  3. 2
      selfdrive/car/hyundai/hyundaicanfd.py

@ -212,7 +212,7 @@ def create_acc_ui_msg(packer, CAN: CanBus, CP, main_on: bool, enabled: bool, fcw
"AccFllwMde_B_Dsply": 1 if hud_control.leadVisible else 0, # Lead indicator "AccFllwMde_B_Dsply": 1 if hud_control.leadVisible else 0, # Lead indicator
"AccStopMde_B_Dsply": 1 if standstill else 0, "AccStopMde_B_Dsply": 1 if standstill else 0,
"AccWarn_D_Dsply": 0, # ACC warning "AccWarn_D_Dsply": 0, # ACC warning
"AccTGap_D_Dsply": hud_control.leadDistanceBars + 1, # Time gap "AccTGap_D_Dsply": hud_control.leadDistanceBars, # Time gap
}) })
# Forwards FCW alert from IPMA # Forwards FCW alert from IPMA

@ -131,7 +131,7 @@ def create_acc_commands(packer, enabled, accel, upper_jerk, idx, hud_control, se
scc11_values = { scc11_values = {
"MainMode_ACC": 1, "MainMode_ACC": 1,
"TauGapSet": hud_control.leadDistanceBars + 1, "TauGapSet": hud_control.leadDistanceBars,
"VSetDis": set_speed if enabled else 0, "VSetDis": set_speed if enabled else 0,
"AliveCounterACC": idx % 0x10, "AliveCounterACC": idx % 0x10,
"ObjValid": 1, # close lead makes controls tighter "ObjValid": 1, # close lead makes controls tighter

@ -146,7 +146,7 @@ def create_acc_control(packer, CAN, enabled, accel_last, accel, stopping, gas_ov
"SET_ME_2": 0x4, "SET_ME_2": 0x4,
"SET_ME_3": 0x3, "SET_ME_3": 0x3,
"SET_ME_TMP_64": 0x64, "SET_ME_TMP_64": 0x64,
"DISTANCE_SETTING": hud_control.leadDistanceBars + 1, "DISTANCE_SETTING": hud_control.leadDistanceBars,
} }
return packer.make_can_msg("SCC_CONTROL", CAN.ECAN, values) return packer.make_can_msg("SCC_CONTROL", CAN.ECAN, values)

Loading…
Cancel
Save