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
pull/34795/head
Shane Smiskol 2 months ago committed by GitHub
parent 59bb5c54b3
commit f3bfdf6969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      opendbc_repo
  2. 3
      selfdrive/car/cruise.py
  3. 2
      selfdrive/test/process_replay/ref_commit
  4. 5
      selfdrive/ui/qt/onroad/hud.cc
  5. 1
      selfdrive/ui/qt/onroad/hud.h

@ -1 +1 @@
Subproject commit b426c1c837295565e706ec03e27c91aa5f0b6146
Subproject commit de65067d800ed1744ee111ee202da54bcf987b43

@ -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

@ -1 +1 @@
e3f35c6ced7dcf38635060944fa7017af5fe68cd
87088a3540ddfc26356d9b71a3a4f40efcbc9b3b

@ -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();

@ -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;

Loading…
Cancel
Save