|
|
@ -45,7 +45,7 @@ class CarSpecificEvents: |
|
|
|
if self.CP.carName in ('body', 'mock'): |
|
|
|
if self.CP.carName in ('body', 'mock'): |
|
|
|
events = Events() |
|
|
|
events = Events() |
|
|
|
|
|
|
|
|
|
|
|
elif self.CP.carName == 'subaru': |
|
|
|
elif self.CP.carName in ('subaru', 'mazda'): |
|
|
|
events = self.create_common_events(CS.out, CS_prev) |
|
|
|
events = self.create_common_events(CS.out, CS_prev) |
|
|
|
|
|
|
|
|
|
|
|
elif self.CP.carName == 'ford': |
|
|
|
elif self.CP.carName == 'ford': |
|
|
@ -54,12 +54,6 @@ class CarSpecificEvents: |
|
|
|
elif self.CP.carName == 'nissan': |
|
|
|
elif self.CP.carName == 'nissan': |
|
|
|
events = self.create_common_events(CS.out, CS_prev, extra_gears=[GearShifter.brake]) |
|
|
|
events = self.create_common_events(CS.out, CS_prev, extra_gears=[GearShifter.brake]) |
|
|
|
|
|
|
|
|
|
|
|
elif self.CP.carName == 'mazda': |
|
|
|
|
|
|
|
events = self.create_common_events(CS.out, CS_prev) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if CS.low_speed_alert: # type: ignore[attr-defined] |
|
|
|
|
|
|
|
events.add(EventName.belowSteerSpeed) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
elif self.CP.carName == 'chrysler': |
|
|
|
elif self.CP.carName == 'chrysler': |
|
|
|
events = self.create_common_events(CS.out, CS_prev, extra_gears=[GearShifter.low]) |
|
|
|
events = self.create_common_events(CS.out, CS_prev, extra_gears=[GearShifter.low]) |
|
|
|
|
|
|
|
|
|
|
@ -212,6 +206,8 @@ class CarSpecificEvents: |
|
|
|
events.add(EventName.vehicleSensorsInvalid) |
|
|
|
events.add(EventName.vehicleSensorsInvalid) |
|
|
|
if CS.invalidLkasSetting: |
|
|
|
if CS.invalidLkasSetting: |
|
|
|
events.add(EventName.invalidLkasSetting) |
|
|
|
events.add(EventName.invalidLkasSetting) |
|
|
|
|
|
|
|
if CS.lowSpeedAlert: |
|
|
|
|
|
|
|
events.add(EventName.belowSteerSpeed) |
|
|
|
|
|
|
|
|
|
|
|
# Handle button presses |
|
|
|
# Handle button presses |
|
|
|
for b in CS.buttonEvents: |
|
|
|
for b in CS.buttonEvents: |
|
|
|