From c61d504516158d1e9926cf09625bbfc87aba9664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20R=C4=85czy?= Date: Wed, 14 Aug 2024 15:52:47 -0700 Subject: [PATCH] ui: remove GPS status from the sidebar (#33304) * Remove usage of llk in ui * Remove GPS from sidebar * Remove it from test --- selfdrive/controls/controlsd.py | 1 + selfdrive/ui/qt/sidebar.cc | 2 -- selfdrive/ui/tests/test_ui/run.py | 2 +- selfdrive/ui/translations/main_ar.ts | 8 -------- selfdrive/ui/translations/main_de.ts | 8 -------- selfdrive/ui/translations/main_es.ts | 8 -------- selfdrive/ui/translations/main_fr.ts | 8 -------- selfdrive/ui/translations/main_ja.ts | 8 -------- selfdrive/ui/translations/main_ko.ts | 8 -------- selfdrive/ui/translations/main_pt-BR.ts | 8 -------- selfdrive/ui/translations/main_th.ts | 8 -------- selfdrive/ui/translations/main_tr.ts | 8 -------- selfdrive/ui/translations/main_zh-CHS.ts | 8 -------- selfdrive/ui/translations/main_zh-CHT.ts | 8 -------- selfdrive/ui/ui.cc | 2 +- 15 files changed, 3 insertions(+), 92 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 6916161307..08aaff2f7e 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -382,6 +382,7 @@ class Controls: # TODO: fix simulator if not SIMULATION or REPLAY: + # Not show in first 1.5 km to allow for driving out of garage. This event shows after 5 minutes gps_ok = self.sm.recv_frame[self.gps_location_service] > 0 and (self.sm.frame - self.sm.recv_frame[self.gps_location_service]) * DT_CTRL < 2.0 if not gps_ok and self.sm['livePose'].inputsOK and (self.distance_traveled > 1500): self.events.add(EventName.noGps) diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index 75b966c9aa..52d618ab48 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -102,8 +102,6 @@ void Sidebar::updateState(const UIState &s) { ItemStatus pandaStatus = {{tr("VEHICLE"), tr("ONLINE")}, good_color}; if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) { pandaStatus = {{tr("NO"), tr("PANDA")}, danger_color}; - } else if (s.scene.started && !sm["liveLocationKalman"].getLiveLocationKalman().getGpsOK()) { - pandaStatus = {{tr("GPS"), tr("SEARCH")}, warning_color}; } setProperty("pandaStatus", QVariant::fromValue(pandaStatus)); } diff --git a/selfdrive/ui/tests/test_ui/run.py b/selfdrive/ui/tests/test_ui/run.py index 15b97511bc..6286517ee6 100644 --- a/selfdrive/ui/tests/test_ui/run.py +++ b/selfdrive/ui/tests/test_ui/run.py @@ -116,7 +116,7 @@ class TestUI: def setup(self): self.sm = SubMaster(["uiDebug"]) - self.pm = PubMaster(["deviceState", "pandaStates", "controlsState", 'roadCameraState', 'wideRoadCameraState', 'liveLocationKalman']) + self.pm = PubMaster(["deviceState", "pandaStates", "controlsState", 'roadCameraState', 'wideRoadCameraState']) while not self.sm.valid["uiDebug"]: self.sm.update(1) time.sleep(UI_DELAY) # wait a bit more for the UI to start rendering diff --git a/selfdrive/ui/translations/main_ar.ts b/selfdrive/ui/translations/main_ar.ts index a8a1f29d23..645a63a493 100644 --- a/selfdrive/ui/translations/main_ar.ts +++ b/selfdrive/ui/translations/main_ar.ts @@ -779,14 +779,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - بحث - -- -- diff --git a/selfdrive/ui/translations/main_de.ts b/selfdrive/ui/translations/main_de.ts index 0b2b794ac4..48180eef92 100644 --- a/selfdrive/ui/translations/main_de.ts +++ b/selfdrive/ui/translations/main_de.ts @@ -762,14 +762,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - SUCHEN - -- -- diff --git a/selfdrive/ui/translations/main_es.ts b/selfdrive/ui/translations/main_es.ts index c8093e3029..150c00d117 100644 --- a/selfdrive/ui/translations/main_es.ts +++ b/selfdrive/ui/translations/main_es.ts @@ -763,14 +763,6 @@ Esto puede tardar un minuto. PANDA PANDA - - GPS - GPS - - - SEARCH - BÚSQUEDA - -- -- diff --git a/selfdrive/ui/translations/main_fr.ts b/selfdrive/ui/translations/main_fr.ts index 480d70c481..a678742f74 100644 --- a/selfdrive/ui/translations/main_fr.ts +++ b/selfdrive/ui/translations/main_fr.ts @@ -763,14 +763,6 @@ Cela peut prendre jusqu'à une minute. PANDA PANDA - - GPS - GPS - - - SEARCH - RECHERCHE - -- -- diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index c448186823..096fa95091 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -757,14 +757,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - 検索 - -- -- diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 40d07d9b1c..df012d3e85 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -759,14 +759,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - 검색중 - -- -- diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index c0c7fcb3e8..1500f07e63 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -763,14 +763,6 @@ Isso pode levar até um minuto. PANDA PANDA - - GPS - GPS - - - SEARCH - PROCURA - -- -- diff --git a/selfdrive/ui/translations/main_th.ts b/selfdrive/ui/translations/main_th.ts index 1d7aa3df00..bae326d532 100644 --- a/selfdrive/ui/translations/main_th.ts +++ b/selfdrive/ui/translations/main_th.ts @@ -759,14 +759,6 @@ This may take up to a minute. PANDA PANDA - - GPS - จีพีเอส - - - SEARCH - ค้นหา - -- -- diff --git a/selfdrive/ui/translations/main_tr.ts b/selfdrive/ui/translations/main_tr.ts index 3fabd5a384..72148807d4 100644 --- a/selfdrive/ui/translations/main_tr.ts +++ b/selfdrive/ui/translations/main_tr.ts @@ -757,14 +757,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - ARA - -- -- diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 255886a15e..976b58b31d 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -759,14 +759,6 @@ This may take up to a minute. PANDA PANDA - - GPS - GPS - - - SEARCH - 搜索中 - -- -- diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 9cea6a1bbc..de8d3ff701 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -759,14 +759,6 @@ This may take up to a minute. PANDA 車輛通訊 - - GPS - GPS - - - SEARCH - 車輛通訊 - -- -- diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index bd26741193..6de0babc7b 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -242,7 +242,7 @@ void UIState::updateStatus() { UIState::UIState(QObject *parent) : QObject(parent) { sm = std::make_unique>({ "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", - "pandaStates", "carParams", "driverMonitoringState", "carState", "liveLocationKalman", "driverStateV2", + "pandaStates", "carParams", "driverMonitoringState", "carState", "driverStateV2", "wideRoadCameraState", "managerState", "clocks", });