From 249e7c2fa2e9f9851ff3696680dd3cbf3fb83b3f Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 11 Nov 2024 20:46:56 -0500 Subject: [PATCH] fixes --- sunnypilot/mads/mads.py | 6 ++---- sunnypilot/mads/state.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py index b26647d6da..73f9bb3d9d 100644 --- a/sunnypilot/mads/mads.py +++ b/sunnypilot/mads/mads.py @@ -1,12 +1,10 @@ -from cereal import car, custom - -from panda import ALTERNATIVE_EXPERIENCE +from cereal import car, log, custom from openpilot.sunnypilot.mads.state import StateMachine State = custom.SelfdriveStateSP.ModifiedAssistDrivingSystem.ModifiedAssistDrivingSystemState ButtonType = car.CarState.ButtonEvent.Type -EventName = car.OnroadEvent.EventName +EventName = log.OnroadEvent.EventName class ModifiedAssistDrivingSystem: diff --git a/sunnypilot/mads/state.py b/sunnypilot/mads/state.py index 1c10c8729f..d747bc4e78 100644 --- a/sunnypilot/mads/state.py +++ b/sunnypilot/mads/state.py @@ -1,10 +1,10 @@ -from cereal import car, custom +from cereal import log, custom from openpilot.selfdrive.selfdrived.events import ET, Events from openpilot.selfdrive.selfdrived.state import SOFT_DISABLE_TIME from openpilot.common.realtime import DT_CTRL State = custom.SelfdriveStateSP.ModifiedAssistDrivingSystem.ModifiedAssistDrivingSystemState -EventName = car.OnroadEvent.EventName +EventName = log.OnroadEvent.EventName ENABLED_STATES = (State.enabled, State.softDisabling, State.overriding) ACTIVE_STATES = (State.paused, *ENABLED_STATES)