|
|
|
@ -1,3 +1,5 @@ |
|
|
|
|
from common.numpy_fast import interp |
|
|
|
|
|
|
|
|
|
def create_steer_command(packer, steer, steer_req, raw_cnt): |
|
|
|
|
"""Creates a CAN message for the Toyota Steer Command.""" |
|
|
|
|
|
|
|
|
@ -10,14 +12,15 @@ def create_steer_command(packer, steer, steer_req, raw_cnt): |
|
|
|
|
return packer.make_can_msg("STEERING_LKA", 0, values) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def create_lta_steer_command(packer, steer, steer_req, raw_cnt): |
|
|
|
|
def create_lta_steer_command(packer, steer, driver_torque, steer_req, raw_cnt): |
|
|
|
|
"""Creates a CAN message for the Toyota LTA Steer Command.""" |
|
|
|
|
|
|
|
|
|
percentage = interp(abs(driver_torque), [40, 100], [100, 0]) |
|
|
|
|
values = { |
|
|
|
|
"COUNTER": raw_cnt + 128, |
|
|
|
|
"SETME_X1": 1, |
|
|
|
|
"SETME_X3": 3, |
|
|
|
|
"PERCENTAGE": 100, |
|
|
|
|
"PERCENTAGE": percentage, |
|
|
|
|
"SETME_X64": 0x64, |
|
|
|
|
"ANGLE": steer, # Rate limit? Lower values seeem to work better, but needs more testing |
|
|
|
|
"STEER_ANGLE_CMD": steer, |
|
|
|
|