From f3bfdf6969854a554d60c0d14f693ede5173fa7d Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Thu, 6 Mar 2025 01:49:00 -0600
Subject: [PATCH] Rivian: don't show set speed in UI (#34705)

* Rivian: don't show set speed in UI

* stash

* bump

* use speed

* bump

* bump to master

* update refs

* default true
---
 opendbc_repo                             | 2 +-
 selfdrive/car/cruise.py                  | 3 +++
 selfdrive/test/process_replay/ref_commit | 2 +-
 selfdrive/ui/qt/onroad/hud.cc            | 5 ++++-
 selfdrive/ui/qt/onroad/hud.h             | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/opendbc_repo b/opendbc_repo
index b426c1c837..de65067d80 160000
--- a/opendbc_repo
+++ b/opendbc_repo
@@ -1 +1 @@
-Subproject commit b426c1c837295565e706ec03e27c91aa5f0b6146
+Subproject commit de65067d800ed1744ee111ee202da54bcf987b43
diff --git a/selfdrive/car/cruise.py b/selfdrive/car/cruise.py
index 697d0273a5..b825808acb 100644
--- a/selfdrive/car/cruise.py
+++ b/selfdrive/car/cruise.py
@@ -56,6 +56,9 @@ class VCruiseHelper:
         if CS.cruiseState.speed == 0:
           self.v_cruise_kph = V_CRUISE_UNSET
           self.v_cruise_cluster_kph = V_CRUISE_UNSET
+        elif CS.cruiseState.speed == -1:
+          self.v_cruise_kph = -1
+          self.v_cruise_cluster_kph = -1
     else:
       self.v_cruise_kph = V_CRUISE_UNSET
       self.v_cruise_cluster_kph = V_CRUISE_UNSET
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index d42f143de3..10c773c2c0 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-e3f35c6ced7dcf38635060944fa7017af5fe68cd
\ No newline at end of file
+87088a3540ddfc26356d9b71a3a4f40efcbc9b3b
\ No newline at end of file
diff --git a/selfdrive/ui/qt/onroad/hud.cc b/selfdrive/ui/qt/onroad/hud.cc
index c63962caf6..4cfa3d0e3c 100644
--- a/selfdrive/ui/qt/onroad/hud.cc
+++ b/selfdrive/ui/qt/onroad/hud.cc
@@ -26,6 +26,7 @@ void HudRenderer::updateState(const UIState &s) {
   // Handle older routes where vCruiseCluster is not set
   set_speed = car_state.getVCruiseCluster() == 0.0 ? controls_state.getVCruiseDEPRECATED() : car_state.getVCruiseCluster();
   is_cruise_set = set_speed > 0 && set_speed != SET_SPEED_NA;
+  is_cruise_available = set_speed != -1;
 
   if (is_cruise_set && !is_metric) {
     set_speed *= KM_TO_MILE;
@@ -47,7 +48,9 @@ void HudRenderer::draw(QPainter &p, const QRect &surface_rect) {
   p.fillRect(0, 0, surface_rect.width(), UI_HEADER_HEIGHT, bg);
 
 
-  drawSetSpeed(p, surface_rect);
+  if (is_cruise_available) {
+    drawSetSpeed(p, surface_rect);
+  }
   drawCurrentSpeed(p, surface_rect);
 
   p.restore();
diff --git a/selfdrive/ui/qt/onroad/hud.h b/selfdrive/ui/qt/onroad/hud.h
index 0b1220a27a..b2ac379dbe 100644
--- a/selfdrive/ui/qt/onroad/hud.h
+++ b/selfdrive/ui/qt/onroad/hud.h
@@ -19,6 +19,7 @@ private:
   float speed = 0;
   float set_speed = 0;
   bool is_cruise_set = false;
+  bool is_cruise_available = true;
   bool is_metric = false;
   bool v_ego_cluster_seen = false;
   int status = STATUS_DISENGAGED;