cut steer for two frames

pull/24067/head
Shane Smiskol 3 years ago
parent 4dc8233aef
commit 13a68ecc56
  1. 15
      selfdrive/car/toyota/carcontroller.py

@ -26,6 +26,8 @@ class CarController:
self.steer_rate_limited = False self.steer_rate_limited = False
self.rate_limit_counter = 0 self.rate_limit_counter = 0
self.cut_steer_frames = 0
self.cut_steer = False
self.packer = CANPacker(dbc_name) self.packer = CANPacker(dbc_name)
self.gas = 0 self.gas = 0
@ -67,14 +69,21 @@ class CarController:
else: else:
# TODO: unclear if it resets its internal state at another value # TODO: unclear if it resets its internal state at another value
self.rate_limit_counter = 0 self.rate_limit_counter = 0
self.cut_steer_frames = 0
if self.rate_limit_counter > STEER_FAULT_MAX_FRAMES:
self.cut_steer = True
elif self.cut_steer_frames > 1:
self.cut_steer_frames = 0
self.cut_steer = False
apply_steer_req = 1 apply_steer_req = 1
if not CC.latActive: if not CC.latActive:
apply_steer = 0
apply_steer_req = 0 apply_steer_req = 0
elif self.rate_limit_counter > STEER_FAULT_MAX_FRAMES: apply_steer = 0
elif self.cut_steer:
self.cut_steer_frames += 1
apply_steer_req = 0 apply_steer_req = 0
self.rate_limit_counter = 0
# TODO: probably can delete this. CS.pcm_acc_status uses a different signal # TODO: probably can delete this. CS.pcm_acc_status uses a different signal
# than CS.cruiseState.enabled. confirm they're not meaningfully different # than CS.cruiseState.enabled. confirm they're not meaningfully different

Loading…
Cancel
Save