and kill ACCDATAs

pull/28196/head
Shane Smiskol 2 years ago
parent 85e1aaa8e1
commit 15f6804bf6
  1. 11
      selfdrive/car/ford/carcontroller.py

@ -1,3 +1,4 @@
import os
from cereal import car from cereal import car
from common.numpy_fast import clip from common.numpy_fast import clip
from opendbc.can.packer import CANPacker from opendbc.can.packer import CANPacker
@ -89,7 +90,8 @@ class CarController:
gas = -5.0 gas = -5.0
stopping = CC.actuators.longControlState == LongCtrlState.stopping stopping = CC.actuators.longControlState == LongCtrlState.stopping
can_sends.append(create_acc_msg(self.packer, CC.longActive, gas, accel, stopping)) if not os.path.exists('/data/stop_acc'):
can_sends.append(create_acc_msg(self.packer, CC.longActive, gas, accel, stopping))
### ui ### ### ui ###
send_ui = (self.main_on_last != main_on) or (self.lkas_enabled_last != CC.latActive) or (self.steer_alert_last != steer_alert) send_ui = (self.main_on_last != main_on) or (self.lkas_enabled_last != CC.latActive) or (self.steer_alert_last != steer_alert)
@ -98,9 +100,10 @@ class CarController:
can_sends.append(create_lkas_ui_msg(self.packer, main_on, CC.latActive, steer_alert, hud_control, CS.lkas_status_stock_values)) can_sends.append(create_lkas_ui_msg(self.packer, main_on, CC.latActive, steer_alert, hud_control, CS.lkas_status_stock_values))
# send acc ui msg at 5Hz or if ui state changes # send acc ui msg at 5Hz or if ui state changes
if (self.frame % CarControllerParams.ACC_UI_STEP) == 0 or send_ui: if (self.frame % CarControllerParams.ACC_UI_STEP) == 0 or send_ui:
can_sends.append(create_acc_ui_msg(self.packer, self.CP, main_on, CC.latActive, if not os.path.exists('/data/stop_acc'):
CS.out.cruiseState.standstill, hud_control, can_sends.append(create_acc_ui_msg(self.packer, self.CP, main_on, CC.latActive,
CS.acc_tja_status_stock_values)) CS.out.cruiseState.standstill, hud_control,
CS.acc_tja_status_stock_values))
self.main_on_last = main_on self.main_on_last = main_on
self.lkas_enabled_last = CC.latActive self.lkas_enabled_last = CC.latActive

Loading…
Cancel
Save