From 8f2682022e86634869f4ec0f007769cd38cd9e2b Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 6 Nov 2023 21:40:03 +0000 Subject: [PATCH] ui: Speed limit cleanup --- selfdrive/ui/qt/onroad.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index d3e177770d..33ca352b40 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -702,8 +702,8 @@ void AnnotatedCameraWidget::updateState(const UIState &s) { slcSubTextSize = sl_inactive || sl_temp_inactive || sl_distance > 0 ? 25.0 : 27.0; mapSourcedSpeedLimit = lp_sp.getIsMapSpeedLimit(); slcActive = !sl_inactive && !sl_temp_inactive; - overSpeedLimit = (((speed_limit_slc + speed_limit_offset) < speed) && !sl_inactive && !sl_temp_inactive) || - ((speed_limit_slc < speed) && (speed_limit_slc > 0.0) && (sl_inactive || sl_temp_inactive)); + overSpeedLimit = (std::nearbyint(speed_limit_slc + speed_limit_offset) < std::nearbyint(speed)) && + (std::nearbyint(speed_limit_slc + speed_limit_offset) > 0); const float tsc_speed = lp_sp.getTurnSpeed() * (s.scene.is_metric ? MS_TO_KPH : MS_TO_MPH); const auto tscState = lp_sp.getTurnSpeedControlState();