From 51d269427978b4797aabe60fe9791e187b75cd42 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 19 May 2025 23:32:10 -0700 Subject: [PATCH] fixes --- selfdrive/ui/qt/network/networking.cc | 11 ++--------- selfdrive/ui/qt/network/wifi_manager.cc | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/selfdrive/ui/qt/network/networking.cc b/selfdrive/ui/qt/network/networking.cc index 73e9897358..04a3051549 100644 --- a/selfdrive/ui/qt/network/networking.cc +++ b/selfdrive/ui/qt/network/networking.cc @@ -207,21 +207,14 @@ AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWid // Wi-Fi metered toggle std::vector longi_button_texts{tr("Unmetered"), tr("Default"), tr("Metered")}; - wifiMeteredToggle = new ToggleControl(tr("Meter Wi-Fi Network"), tr("Prevent large data uploads when on a metered connection"), "", false); - wifiMeteredToggle->setTitle(tr("Meter Wi-Fi Network")); + wifiMeteredToggle = new ToggleControl(tr("Metered Wi-Fi Network"), tr("Prevent large data uploads when on a metered connection"), "", false); wifiMeteredToggle->setValue("Disconnected"); wifiMeteredToggle->setEnabled(false); QObject::connect(wifiMeteredToggle, &ToggleControl::toggleFlipped, [=](bool state) { wifi->setCurrentNetworkMetered(state); - refresh(); std::cout << "Set Wi-Fi metered to " << state << std::endl; + refresh(); }); -// wifiMeteredToggle = new ToggleControl("LongitudinalPersonality", tr("Meter Wi-Fi Network"), -// tr("Standard is recommended. In aggressive mode, openpilot will follow lead cars closer and be more aggressive with the gas and brake. " -// "In relaxed mode openpilot will stay further away from lead cars. On supported cars, you can cycle through these personalities with " -// "your steering wheel distance button."), -// "../assets/icons/speed_limit.png", -// longi_button_texts); list->addItem(wifiMeteredToggle); main_layout->addWidget(new ScrollView(list, this)); diff --git a/selfdrive/ui/qt/network/wifi_manager.cc b/selfdrive/ui/qt/network/wifi_manager.cc index 324fc0a64e..cf1804cc11 100644 --- a/selfdrive/ui/qt/network/wifi_manager.cc +++ b/selfdrive/ui/qt/network/wifi_manager.cc @@ -404,10 +404,10 @@ bool WifiManager::setCurrentNetworkMetered(bool metered) { NetworkType type = currentNetworkType(); if (type == NetworkType::WIFI && !isTetheringEnabled()) { // note: already checks tethering Connection settings = getConnectionSettings(settingsConnPath); - int meteredInt = metered ? NM_METERED_UNKNOWN : NM_METERED_NO; + int meteredInt = metered ? NM_METERED_YES : NM_METERED_NO; settings["connection"]["metered"] = meteredInt; - call(settingsConnPath.path(), NM_DBUS_INTERFACE_SETTINGS_CONNECTION, "UpdateUnsaved", QVariant::fromValue(settings)); + call(settingsConnPath.path(), NM_DBUS_INTERFACE_SETTINGS_CONNECTION, "Update", QVariant::fromValue(settings)); return true; } return false;