diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 6949d0c47..73aa98fe9 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -348,7 +348,8 @@ class CarInterfaceBase(ABC): # FrogPilot variables fp_ret.alwaysOnLateralAllowed = self.always_on_lateral_allowed - fp_ret.distancePressed = bool(self.CS.distance_button) + # Preserve any car-interface override (e.g. remapped buttons) and include native distance state. + fp_ret.distancePressed = bool(fp_ret.distancePressed or self.CS.distance_button) fp_ret.ecoGear |= ret.gearShifter == GearShifter.eco fp_ret.sportGear |= ret.gearShifter == GearShifter.sport