diff --git a/selfdrive/car/mazda/carcontroller.py b/selfdrive/car/mazda/carcontroller.py index cd53737291..61ad78ca3b 100644 --- a/selfdrive/car/mazda/carcontroller.py +++ b/selfdrive/car/mazda/carcontroller.py @@ -1,5 +1,5 @@ from selfdrive.car.mazda import mazdacan -from selfdrive.car.mazda.values import DBC, SteerLimitParams +from selfdrive.car.mazda.values import SteerLimitParams from opendbc.can.packer import CANPacker from selfdrive.car import apply_std_steer_torque_limits diff --git a/selfdrive/car/mazda/carstate.py b/selfdrive/car/mazda/carstate.py index b8277ad50e..2cdbae50ac 100644 --- a/selfdrive/car/mazda/carstate.py +++ b/selfdrive/car/mazda/carstate.py @@ -58,7 +58,7 @@ class CarState(CarStateBase): ret.gasPressed = ret.gas > 1e-3 # No steer if block signal is on - block = cp.vl["STEER_RATE"]['LKAS_BLOCK'] == 1 + # block = cp.vl["STEER_RATE"]['LKAS_BLOCK'] == 1 # On if no driver torque the last 5 seconds handsoff = cp.vl["STEER_RATE"]['HANDS_OFF_5_SECONDS'] == 1 @@ -67,7 +67,7 @@ class CarState(CarStateBase): if speed_kph > LKAS_LIMITS.ENABLE_SPEED: self.lkas_on = True - elif speed_kph < LKAS_LIMITS.DISABLE_SPEED and block: + elif speed_kph < LKAS_LIMITS.DISABLE_SPEED: self.lkas_on = False # if any of the cruize buttons is pressed force state update diff --git a/selfdrive/car/mazda/interface.py b/selfdrive/car/mazda/interface.py index 8cc890a283..c41a9988a0 100755 --- a/selfdrive/car/mazda/interface.py +++ b/selfdrive/car/mazda/interface.py @@ -3,7 +3,6 @@ from cereal import car from selfdrive.config import Conversions as CV from selfdrive.controls.lib.drive_helpers import create_event, EventTypes as ET from selfdrive.car.mazda.values import CAR, FINGERPRINTS, ECU_FINGERPRINT, Ecu -from selfdrive.car.mazda.carstate import CarState from selfdrive.car import STD_CARGO_KG, scale_rot_inertia, scale_tire_stiffness, gen_empty_fingerprint, is_ecu_disconnected from selfdrive.car.interfaces import CarInterfaceBase