diff --git a/selfdrive/ui/qt/network/networking.cc b/selfdrive/ui/qt/network/networking.cc index 090b9b578c4a9d..c42ba70b71fcaf 100644 --- a/selfdrive/ui/qt/network/networking.cc +++ b/selfdrive/ui/qt/network/networking.cc @@ -153,6 +153,7 @@ AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWid roamingToggle = new ToggleControl(tr("Enable Roaming"), "", "", roamingEnabled); QObject::connect(roamingToggle, &ToggleControl::toggleFlipped, [=](bool state) { params.putBool("GsmRoaming", state); + qWarning() << "roamingToggle"; wifi->updateGsmSettings(state, QString::fromStdString(params.get("GsmApn")), params.getBool("GsmMetered")); }); list->addItem(roamingToggle); @@ -168,6 +169,7 @@ AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWid } else { params.put("GsmApn", apn.toStdString()); } + qWarning() << "apnToggle"; wifi->updateGsmSettings(params.getBool("GsmRoaming"), apn, params.getBool("GsmMetered")); }); list->addItem(editApnButton); @@ -177,11 +179,13 @@ AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWid meteredToggle = new ToggleControl(tr("Cellular Metered"), tr("Prevent large data uploads when on a metered connection"), "", metered); QObject::connect(meteredToggle, &SshToggle::toggleFlipped, [=](bool state) { params.putBool("GsmMetered", state); + qWarning() << "meteredToggle"; wifi->updateGsmSettings(params.getBool("GsmRoaming"), QString::fromStdString(params.get("GsmApn")), state); }); list->addItem(meteredToggle); // Set initial config + qWarning() << "updateGsmSettings initial config apn" << QString::fromStdString(params.get("GsmApn")); wifi->updateGsmSettings(roamingEnabled, QString::fromStdString(params.get("GsmApn")), metered); connect(uiState(), &UIState::primeTypeChanged, this, [=](PrimeType prime_type) { diff --git a/selfdrive/ui/qt/network/wifi_manager.cc b/selfdrive/ui/qt/network/wifi_manager.cc index 304c5422dddf1f..2909695beff00b 100644 --- a/selfdrive/ui/qt/network/wifi_manager.cc +++ b/selfdrive/ui/qt/network/wifi_manager.cc @@ -53,8 +53,10 @@ WifiManager::WifiManager(QObject *parent) : QObject(parent) { adapter = getAdapter(); if (!adapter.isEmpty()) { + qWarning() << "WifiManager setup"; setup(); } else { + qWarning() << "WifiManager DeviceAdded"; QDBusConnection::systemBus().connect(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "DeviceAdded", this, SLOT(deviceAdded(QDBusObjectPath))); } @@ -71,7 +73,7 @@ void WifiManager::setup() { raw_adapter_state = call(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE, "State"); activeAp = call(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE_WIRELESS, "ActiveAccessPoint").path(); - + qWarning() << "WifiManager::setup"; initConnections(); requestScan(); } @@ -204,6 +206,7 @@ void WifiManager::deactivateConnectionBySsid(const QString &ssid) { } std::optional WifiManager::deactivateConnection(const QDBusObjectPath &path) { + qWarning() << "WifiManager::deactivateConnection"; return asyncCall(NM_DBUS_PATH, NM_DBUS_INTERFACE, "DeactivateConnection", QVariant::fromValue(path)); } @@ -284,6 +287,7 @@ void WifiManager::propertyChange(const QString &interface, const QVariantMap &pr } void WifiManager::deviceAdded(const QDBusObjectPath &path) { + qWarning() << "WifiManager::deviceAdded"; if (getAdapterType(path) == NM_DEVICE_TYPE_WIFI && emptyPath(adapter)) { adapter = path.path(); setup(); @@ -313,6 +317,7 @@ Connection WifiManager::getConnectionSettings(const QDBusObjectPath &path) { } void WifiManager::initConnections() { + qWarning() << "WifiManager::initConnections"; const QDBusReply> response = call(NM_DBUS_PATH_SETTINGS, NM_DBUS_INTERFACE_SETTINGS, "ListConnections"); for (const QDBusObjectPath &path : response.value()) { const Connection settings = getConnectionSettings(path); @@ -334,8 +339,10 @@ std::optional WifiManager::activateWifiConnection(const QStrin } void WifiManager::activateModemConnection(const QDBusObjectPath &path) { + qWarning() << "WifiManager::activateModemConnection"; QString modem = getAdapter(NM_DEVICE_TYPE_MODEM); if (!path.path().isEmpty() && !modem.isEmpty()) { + qWarning() << "WifiManager::activateModemConnection - ActivateConnection"; asyncCall(NM_DBUS_PATH, NM_DBUS_INTERFACE, "ActivateConnection", QVariant::fromValue(path), QVariant::fromValue(QDBusObjectPath(modem)), QVariant::fromValue(QDBusObjectPath("/"))); } } @@ -361,7 +368,9 @@ NetworkType WifiManager::currentNetworkType() { } void WifiManager::updateGsmSettings(bool roaming, QString apn, bool metered) { + qWarning() << "WifiManager::updateGsmSettings 1" << roaming << apn << metered; if (!lteConnectionPath.path().isEmpty()) { + qWarning() << "WifiManager::updateGsmSettings 2" << roaming << apn << metered; bool changes = false; bool auto_config = apn.isEmpty(); Connection settings = getConnectionSettings(lteConnectionPath); @@ -391,6 +400,7 @@ void WifiManager::updateGsmSettings(bool roaming, QString apn, bool metered) { } if (changes) { + qWarning() << "WifiManager::updateGsmSettings UpdateUnsaved" << settings; call(lteConnectionPath.path(), NM_DBUS_INTERFACE_SETTINGS_CONNECTION, "UpdateUnsaved", QVariant::fromValue(settings)); // update is temporary auto pending_call = deactivateConnection(lteConnectionPath); diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 669de5eae93e94..b73ef537cad7ba 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -378,6 +378,8 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QFrame(parent) { TogglesPanel *toggles = new TogglesPanel(this); QObject::connect(this, &SettingsWindow::expandToggleDescription, toggles, &TogglesPanel::expandToggleDescription); + qWarning() << "before Networking(this) in settings.cc"; + QList> panels = { {tr("Device"), device}, {tr("Network"), new Networking(this)}, diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc index 3b3666b19a132e..cf6de161676b31 100644 --- a/selfdrive/ui/qt/setup/setup.cc +++ b/selfdrive/ui/qt/setup/setup.cc @@ -177,6 +177,7 @@ QWidget * Setup::network_setup() { main_layout->addSpacing(25); // wifi widget + qWarning() << "before Networking(this) in setup.cc"; Networking *networking = new Networking(this, false); networking->setStyleSheet("Networking {background-color: #292929; border-radius: 13px;}"); main_layout->addWidget(networking, 1); diff --git a/selfdrive/ui/qt/setup/updater.cc b/selfdrive/ui/qt/setup/updater.cc index ed47590aa32501..4013b99b1d87bf 100644 --- a/selfdrive/ui/qt/setup/updater.cc +++ b/selfdrive/ui/qt/setup/updater.cc @@ -64,6 +64,7 @@ Updater::Updater(const QString &updater_path, const QString &manifest_path, QWid QVBoxLayout *layout = new QVBoxLayout(wifi); layout->setContentsMargins(100, 100, 100, 100); + qWarning() << "before Networking(this) in updater.cc"; Networking *networking = new Networking(this, false); networking->setStyleSheet("Networking { background-color: #292929; border-radius: 13px; }"); layout->addWidget(networking, 1);