diff --git a/opendbc_repo/opendbc/car/ford/interface.py b/opendbc_repo/opendbc/car/ford/interface.py index 5f38e99bd..57a404cba 100644 --- a/opendbc_repo/opendbc/car/ford/interface.py +++ b/opendbc_repo/opendbc/car/ford/interface.py @@ -56,8 +56,8 @@ class CarInterface(CarInterfaceBase): ret.safetyConfigs[-1].safetyParam |= FordSafetyFlags.LONG_CONTROL.value ret.openpilotLongitudinalControl = True - if ret.flags & FordFlags.ALT_STEER_ANGLE: - # Edge MK2 has RCM Yaw_Data_FD1 counter increments of 5 instead of 1 + if ret.flags & FordFlags.ALT_STEER_ANGLE and not ret.flags & FordFlags.YAW_COUNTER_STEP_1: + # Edge MK2 normally has RCM Yaw_Data_FD1 counter increments of 5 instead of 1 ret.safetyConfigs[-1].safetyParam |= FordSafetyFlags.YAW_COUNTER_STEP_5.value if ret.flags & FordFlags.CANFD: diff --git a/opendbc_repo/opendbc/car/ford/values.py b/opendbc_repo/opendbc/car/ford/values.py index 3b03fb65f..f5e032140 100644 --- a/opendbc_repo/opendbc/car/ford/values.py +++ b/opendbc_repo/opendbc/car/ford/values.py @@ -49,6 +49,7 @@ class FordFlags(IntFlag): # Static flags CANFD = 1 ALT_STEER_ANGLE = 2 + YAW_COUNTER_STEP_1 = 4 class RADAR: @@ -128,6 +129,11 @@ class CAR(Platforms): CarSpecs(mass=1933, wheelbase=2.824, steerRatio=15.3), flags=FordFlags.ALT_STEER_ANGLE, ) + FORD_EDGE_MK2_YAW1 = FordPlatformConfig( + [FordCarDocs("Ford Edge 2022 (Yaw Counter Step 1)")], + CarSpecs(mass=1933, wheelbase=2.824, steerRatio=15.3), + flags=FordFlags.ALT_STEER_ANGLE | FordFlags.YAW_COUNTER_STEP_1, + ) FORD_ESCAPE_MK4 = FordPlatformConfig( [ FordCarDocs("Ford Escape 2020-22", hybrid=True, plug_in_hybrid=True),