counters now directly supported in opendbc

pull/24768/head
Jason Young 3 years ago
parent caf932f9c5
commit 1528c87158
  1. 6
      selfdrive/car/volkswagen/pqcan.py

@ -1,13 +1,12 @@
def create_pq_steering_control(packer, bus, apply_steer, idx, lkas_enabled): def create_pq_steering_control(packer, bus, apply_steer, idx, lkas_enabled):
values = { values = {
"COUNTER": idx,
"LM_Offset": abs(apply_steer), "LM_Offset": abs(apply_steer),
"LM_OffSign": 1 if apply_steer < 0 else 0, "LM_OffSign": 1 if apply_steer < 0 else 0,
"HCA_Status": 5 if (lkas_enabled and apply_steer != 0) else 3, "HCA_Status": 5 if (lkas_enabled and apply_steer != 0) else 3,
"Vib_Freq": 16, "Vib_Freq": 16,
} }
return packer.make_can_msg("HCA_1", bus, values) return packer.make_can_msg("HCA_1", bus, values, idx)
def create_pq_hud_control(packer, bus, hca_enabled, steering_pressed, hud_alert, left_lane_visible, right_lane_visible, def create_pq_hud_control(packer, bus, hca_enabled, steering_pressed, hud_alert, left_lane_visible, right_lane_visible,
ldw_stock_values, left_lane_depart, right_lane_depart): ldw_stock_values, left_lane_depart, right_lane_depart):
@ -30,10 +29,9 @@ def create_pq_hud_control(packer, bus, hca_enabled, steering_pressed, hud_alert,
def create_pq_acc_buttons_control(packer, bus, buttonStatesToSend, CS, idx): def create_pq_acc_buttons_control(packer, bus, buttonStatesToSend, CS, idx):
values = { values = {
"COUNTER": idx,
"GRA_Sender": CS.graSenderCoding, "GRA_Sender": CS.graSenderCoding,
"GRA_Abbrechen": 1 if (buttonStatesToSend["cancel"] or CS.buttonStates["cancel"]) else 0, "GRA_Abbrechen": 1 if (buttonStatesToSend["cancel"] or CS.buttonStates["cancel"]) else 0,
"GRA_Hauptschalt": CS.graHauptschalter, "GRA_Hauptschalt": CS.graHauptschalter,
} }
return packer.make_can_msg("GRA_Neu", bus, values) return packer.make_can_msg("GRA_Neu", bus, values, idx)

Loading…
Cancel
Save