Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,13 @@ class WifiUIMici(BigMultiOptionDialog):
# Wait this long after user interacts with widget to update network list
INACTIVITY_TIMEOUT = 1

def __init__(self, wifi_manager: WifiManager, back_callback: Callable):
def __init__(self, wifi_manager: WifiManager, back_callback: Callable, back_on_activate: bool = False):
super().__init__([], None, None, right_btn_callback=None)

# Set up back navigation
self.set_back_callback(back_callback)
self.back_callback = back_callback
self.back_on_activate = back_on_activate

self._network_info_page = NetworkInfoPage(wifi_manager, self._connect_to_network, self._forget_network, self._open_network_manage_page)
self._network_info_page.set_connecting(lambda: self._connecting)
Expand Down Expand Up @@ -429,6 +431,10 @@ def _on_need_auth(self, ssid, incorrect_password=True):

def _on_activated(self):
self._connecting = None
if self.back_on_activate:
# Close the overlay and go back
gui_app.set_modal_overlay(None)
self.back_callback()

def _on_forgotten(self):
self._connecting = None
Expand Down
2 changes: 1 addition & 1 deletion system/ui/mici_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ class NetworkSetupState(IntEnum):
class NetworkSetupPage(Widget):
def __init__(self, wifi_manager, continue_callback: Callable, back_callback: Callable):
super().__init__()
self._wifi_ui = WifiUIMici(wifi_manager, back_callback=lambda: self.set_state(NetworkSetupState.MAIN))
self._wifi_ui = WifiUIMici(wifi_manager, back_callback=lambda: self.set_state(NetworkSetupState.MAIN), back_on_activate=True)

self._no_wifi_txt = gui_app.texture("icons_mici/settings/network/wifi_strength_slash.png", 58, 50)
self._wifi_full_txt = gui_app.texture("icons_mici/settings/network/wifi_strength_full.png", 58, 50)
Expand Down
Loading