Retain hotspot/tether: Initialize after modem is configured (commaai#295

)
opgm · Sep 25, 2023 · 7445c42 · 7445c42
1 parent 8d75ca9
commit 7445c42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py
@@ -267,9 +267,6 @@ def main() -> None:
   # SystemExit on sigterm
   signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1))
 
-  if Params().get_bool("HotspotOnBoot") and Params().get_bool("HotspotOnBootConfirmed"):
-    os.system('nmcli con up Hotspot')
-
   try:
     manager_thread()
   except Exception:

diff --git a/selfdrive/thermald/thermald.py b/selfdrive/thermald/thermald.py
@@ -156,6 +156,8 @@ def hw_state_thread(end_event, hw_queue):
           cloudlog.warning("configuring modem")
           HARDWARE.configure_modem()
           modem_configured = True
+          if Params().get_bool("HotspotOnBoot") and Params().get_bool("HotspotOnBootConfirmed"):
+            os.system('nmcli con up Hotspot')
 
         prev_hw_state = hw_state
       except Exception:

diff --git a/selfdrive/ui/qt/network/networking.cc b/selfdrive/ui/qt/network/networking.cc
@@ -125,7 +125,8 @@ AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWid
 
   ListWidget *list = new ListWidget(this);
   // Enable tethering layout
-  tetheringToggle = new ToggleControl(tr("Enable Tethering"), "", "", wifi->isTetheringEnabled());
+  const bool set_hotspot_on_boot = params.getBool("HotspotOnBootConfirmed");
+  tetheringToggle = new ToggleControl(tr("Enable Tethering"), "", "", wifi->isTetheringEnabled() || set_hotspot_on_boot);
   list->addItem(tetheringToggle);
   QObject::connect(tetheringToggle, &ToggleControl::toggleFlipped, this, &AdvancedNetworking::toggleTethering);