diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 5e739573bb63b0..e3406899d71c5a 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -24,9 +24,7 @@ def get_can_parser(CP): # sig_name, sig_address, default ("STEER_ANGLE", "STEER_ANGLE_SENSOR", 0), ("GEAR", "GEAR_PACKET", 0), - ("SPORT_ON", "GEAR_PACKET", 0), ("BRAKE_PRESSED", "BRAKE_MODULE", 0), - ("BRAKE_PRESSURE", "BRAKE_MODULE", 0), ("GAS_PEDAL", "GAS_PEDAL", 0), ("WHEEL_SPEED_FL", "WHEEL_SPEEDS", 0), ("WHEEL_SPEED_FR", "WHEEL_SPEEDS", 0), @@ -169,7 +167,7 @@ def update(self, cp): self.angle_steers = cp.vl["STEER_ANGLE_SENSOR"]['STEER_ANGLE'] + cp.vl["STEER_ANGLE_SENSOR"]['STEER_FRACTION'] self.angle_steers_rate = cp.vl["STEER_ANGLE_SENSOR"]['STEER_RATE'] can_gear = int(cp.vl["GEAR_PACKET"]['GEAR']) - self.sport_on = bool(int(cp.vl["GEAR_PACKET"]['SPORT_ON'])) + self.sport_on = 0#bool(int(cp.vl["GEAR_PACKET"]['SPORT_ON'])) self.gear_shifter = parse_gear_shifter(can_gear, self.shifter_values) if self.CP.carFingerprint == CAR.LEXUS_IS: self.main_on = cp.vl["DSU_CRUISE"]['MAIN_ON'] @@ -188,7 +186,7 @@ def update(self, cp): # we could use the override bit from dbc, but it's triggered at too high torque values self.steer_override = abs(self.steer_torque_driver) > STEER_THRESHOLD - self.user_brake = cp.vl["BRAKE_MODULE"]['BRAKE_PRESSURE'] + self.user_brake = 0 # cp.vl["BRAKE_MODULE"]['BRAKE_PRESSURE'] if self.CP.carFingerprint == CAR.LEXUS_IS: self.v_cruise_pcm = cp.vl["DSU_CRUISE"]['SET_SPEED'] self.low_speed_lockout = False