diff --git a/selfdrive/selfdrived/selfdrived.py b/selfdrive/selfdrived/selfdrived.py index 06cad2d33..ae9f98f2a 100644 --- a/selfdrive/selfdrived/selfdrived.py +++ b/selfdrive/selfdrived/selfdrived.py @@ -10,6 +10,7 @@ from msgq.visionipc import VisionIpcClient, VisionStreamType from opendbc.car.gm.values import GMFlags +from opendbc.safety import ALTERNATIVE_EXPERIENCE from openpilot.common.params import Params from openpilot.common.realtime import config_realtime_process, Priority, Ratekeeper, DT_CTRL @@ -165,7 +166,8 @@ class SelfdriveD: self.starpilot_events_prev = [] - self.has_menu = self.CP.brand == "gm" and not (self.CP.flags & GMFlags.NO_CAMERA.value) + remap_cancel_to_distance = bool(self.CP.alternativeExperience & ALTERNATIVE_EXPERIENCE.GM_REMAP_CANCEL_TO_DISTANCE) + self.has_menu = self.CP.brand == "gm" and not (self.CP.flags & GMFlags.NO_CAMERA.value) and not remap_cancel_to_distance self.FPCP = messaging.log_from_bytes(self.params.get("StarPilotCarParams", block=True), custom.StarPilotCarParams) diff --git a/starpilot/controls/starpilot_card.py b/starpilot/controls/starpilot_card.py index a8d14815e..afa269fa9 100644 --- a/starpilot/controls/starpilot_card.py +++ b/starpilot/controls/starpilot_card.py @@ -34,7 +34,7 @@ class StarPilotCard: self.always_on_lateral_set = bool(FPCP.alternativeExperience & ALTERNATIVE_EXPERIENCE.ALWAYS_ON_LATERAL) self.frogs_go_moo = is_FrogsGoMoo() - self.long_press_threshold = CRUISE_LONG_PRESS * (1.5 if self.CP.brand == "gm" else 1) + self.long_press_threshold = CRUISE_LONG_PRESS self.very_long_press_threshold = CRUISE_LONG_PRESS * 5 self.error_log = ERROR_LOGS_PATH / "error.txt"