From 9195b93843d49ca213e30d17b1276b08e6e48ac1 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 28 Jul 2021 14:55:42 -0700 Subject: [PATCH] setup: continue without wifi (#21766) old-commit-hash: c7d75ffb5dac712344d5444a240b079c4c3b4782 --- selfdrive/ui/qt/offroad/networking.h | 2 +- selfdrive/ui/qt/setup/setup.cc | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/selfdrive/ui/qt/offroad/networking.h b/selfdrive/ui/qt/offroad/networking.h index 02fd2d372f..574af10f99 100644 --- a/selfdrive/ui/qt/offroad/networking.h +++ b/selfdrive/ui/qt/offroad/networking.h @@ -52,6 +52,7 @@ class Networking : public QFrame { public: explicit Networking(QWidget* parent = 0, bool show_advanced = true); + WifiManager* wifi = nullptr; private: QStackedLayout* main_layout = nullptr; @@ -59,7 +60,6 @@ private: AdvancedNetworking* an = nullptr; WifiUI* wifiWidget; - WifiManager* wifi = nullptr; protected: void showEvent(QShowEvent* event) override; diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc index 8e63496d14..0d235e882c 100644 --- a/selfdrive/ui/qt/setup/setup.cc +++ b/selfdrive/ui/qt/setup/setup.cc @@ -94,9 +94,9 @@ QWidget * Setup::network_setup() { main_layout->addSpacing(25); // wifi widget - Networking *wifi = new Networking(this, false); - wifi->setStyleSheet("Networking {background-color: #292929; border-radius: 13px;}"); - main_layout->addWidget(wifi, 1); + Networking *networking = new Networking(this, false); + networking->setStyleSheet("Networking {background-color: #292929; border-radius: 13px;}"); + main_layout->addWidget(networking, 1); main_layout->addSpacing(35); @@ -120,7 +120,12 @@ QWidget * Setup::network_setup() { HttpRequest *request = new HttpRequest(this, false, 2500); QObject::connect(request, &HttpRequest::requestDone, [=](bool success) { cont->setEnabled(success); - cont->setText(success ? "Continue" : "Waiting for internet"); + if (success) { + const bool cell = networking->wifi->currentNetworkType() == NetworkType::CELL; + cont->setText(cell ? "Continue without WiFi" : "Continue"); + } else { + cont->setText("Waiting for internet"); + } repaint(); }); request->sendRequest(DASHCAM_URL);