diff --git a/selfdrive/selfdrived/events.py b/selfdrive/selfdrived/events.py index 973b331eda..4c0870ec1f 100755 --- a/selfdrive/selfdrived/events.py +++ b/selfdrive/selfdrived/events.py @@ -11,7 +11,7 @@ from openpilot.selfdrive.locationd.calibrationd import MIN_SPEED_FILTER from openpilot.sunnypilot.selfdrive.selfdrived.events_base import EventsBase, Priority, ET, Alert, \ NoEntryAlert, SoftDisableAlert, UserSoftDisableAlert, ImmediateDisableAlert, EngagementAlert, NormalPermanentAlert, \ - StartupAlert, AlertCallbackType, wrong_car_mode_alert + StartupAlert, AlertCallbackType, AlertCallbackTypeSP, wrong_car_mode_alert AlertSize = log.SelfdriveState.AlertSize @@ -30,7 +30,7 @@ class Events(EventsBase): super().__init__() self.event_counters = dict.fromkeys(EVENTS.keys(), 0) - def get_events_mapping(self) -> dict[int, dict[str, Alert | AlertCallbackType]]: + def get_events_mapping(self) -> dict[int, dict[str, Alert | AlertCallbackType | AlertCallbackTypeSP]]: return EVENTS def get_event_name(self, event: int): @@ -193,7 +193,7 @@ def personality_changed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging -EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { +EVENTS: dict[int, dict[str, Alert | AlertCallbackType | AlertCallbackTypeSP]] = { # ********** events with no alerts ********** EventName.stockFcw: {}, diff --git a/sunnypilot/selfdrive/selfdrived/events.py b/sunnypilot/selfdrive/selfdrived/events.py index 353f26512b..5c894e203e 100644 --- a/sunnypilot/selfdrive/selfdrived/events.py +++ b/sunnypilot/selfdrive/selfdrived/events.py @@ -1,7 +1,7 @@ from cereal import log, car, custom import cereal.messaging as messaging from openpilot.sunnypilot.selfdrive.selfdrived.events_base import EventsBase, Priority, ET, Alert, \ - NoEntryAlert, ImmediateDisableAlert, EngagementAlert, NormalPermanentAlert, AlertCallbackTypeSP, wrong_car_mode_alert + NoEntryAlert, ImmediateDisableAlert, EngagementAlert, NormalPermanentAlert, AlertCallbackType, AlertCallbackTypeSP, wrong_car_mode_alert AlertSize = log.SelfdriveState.AlertSize @@ -20,7 +20,7 @@ class EventsSP(EventsBase): super().__init__() self.event_counters = dict.fromkeys(EVENTS_SP.keys(), 0) - def get_events_mapping(self) -> dict[int, dict[str, Alert | AlertCallbackTypeSP]]: + def get_events_mapping(self) -> dict[int, dict[str, Alert | AlertCallbackType | AlertCallbackTypeSP]]: return EVENTS_SP def get_event_name(self, event: int): @@ -37,7 +37,7 @@ def experimental_mode_changed_alert(CP: car.CarParams, CS: car.CarState, sm: mes return NormalPermanentAlert(f"Experimental Mode: {exp_mode_str}\nDynamic Experimental Control: {dec_str}", duration=1.5) -EVENTS_SP: dict[int, dict[str, Alert | AlertCallbackTypeSP]] = { +EVENTS_SP: dict[int, dict[str, Alert | AlertCallbackType | AlertCallbackTypeSP]] = { # sunnypilot EventNameSP.lkasEnable: { ET.ENABLE: EngagementAlert(AudibleAlert.engage),