diff --git a/board/safety/safety_ford.h b/board/safety/safety_ford.h index 93c1e3a18..b25262ca2 100644 --- a/board/safety/safety_ford.h +++ b/board/safety/safety_ford.h @@ -126,7 +126,7 @@ static bool ford_get_quality_flag_valid(CANPacket_t *to_push) { } else if (addr == MSG_EngVehicleSpThrottle2) { valid = ((GET_BYTE(to_push, 4) >> 5) & 0x3U) == 0x3U; // VehVActlEng_D_Qf } else if (addr == MSG_Yaw_Data_FD1) { - valid = (GET_BYTE(to_push, 6) >> 4) == 0xFU; // VehRolWActl_D_Qf & VehYawWActl_D_Qf + valid = ((GET_BYTE(to_push, 6) >> 4) & 0x3U) == 0x3U; // VehYawWActl_D_Qf } else { } return valid; diff --git a/tests/safety/test_ford.py b/tests/safety/test_ford.py index e7e874029..dfc317fa1 100755 --- a/tests/safety/test_ford.py +++ b/tests/safety/test_ford.py @@ -131,7 +131,7 @@ class TestFordSafetyBase(common.PandaSafetyTest): # Current curvature def _yaw_rate_msg(self, curvature: float, speed: float, quality_flag=True): values = {"VehYaw_W_Actl": curvature * speed, "VehYawWActl_D_Qf": 3 if quality_flag else 0, - "VehRolWActl_D_Qf": 3 if quality_flag else 0, "VehRollYaw_No_Cnt": self.cnt_yaw_rate % 256} + "VehRollYaw_No_Cnt": self.cnt_yaw_rate % 256} self.__class__.cnt_yaw_rate += 1 return self.packer.make_can_msg_panda("Yaw_Data_FD1", 0, values, fix_checksum=checksum)