|
|
@ -63,11 +63,11 @@ def create_gas_command(packer, gas_amount, idx): |
|
|
|
return packer.make_can_msg("GAS_COMMAND", 0, values, idx) |
|
|
|
return packer.make_can_msg("GAS_COMMAND", 0, values, idx) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def create_steering_control(packer, apply_steer, enabled, car_fingerprint, idx): |
|
|
|
def create_steering_control(packer, apply_steer, lkas_active, car_fingerprint, idx): |
|
|
|
"""Creates a CAN message for the Honda DBC STEERING_CONTROL.""" |
|
|
|
"""Creates a CAN message for the Honda DBC STEERING_CONTROL.""" |
|
|
|
values = { |
|
|
|
values = { |
|
|
|
"STEER_TORQUE": apply_steer, |
|
|
|
"STEER_TORQUE": apply_steer if lkas_active else 0, |
|
|
|
"STEER_TORQUE_REQUEST": enabled, |
|
|
|
"STEER_TORQUE_REQUEST": lkas_active, |
|
|
|
} |
|
|
|
} |
|
|
|
# Set bus 2 for accord and new crv. |
|
|
|
# Set bus 2 for accord and new crv. |
|
|
|
bus = 2 if car_fingerprint in (CAR.CRV_5G, CAR.ACCORD, CAR.CIVIC_HATCH) else 0 |
|
|
|
bus = 2 if car_fingerprint in (CAR.CRV_5G, CAR.ACCORD, CAR.CIVIC_HATCH) else 0 |
|
|
|