From 56d196162528b053d8da3441edc83608931dc66a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 9 Mar 2026 14:09:13 -0700 Subject: [PATCH] Revert "setup & reset tuneups" (#37619) Revert "setup & reset tuneups (#37611)" This reverts commit 9510e05dc0012757f6156f012fc37f87f6340d06. --- system/ui/mici_reset.py | 2 +- system/ui/mici_setup.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/ui/mici_reset.py b/system/ui/mici_reset.py index c547d9185..2f89b6d62 100755 --- a/system/ui/mici_reset.py +++ b/system/ui/mici_reset.py @@ -77,7 +77,7 @@ class Reset(Scroller): self._reset_failed_page = ResetFailedPage() self._reset_button = BigConfirmationCircleButton("reset &\nerase", gui_app.texture("icons_mici/settings/device/uninstall.png", 70, 70), - self._start_reset, exit_on_confirm=False, red=True) + self._start_reset, red=True) self._cancel_button = BigConfirmationCircleButton("cancel", gui_app.texture("icons_mici/setup/cancel.png", 64, 64), gui_app.request_close, exit_on_confirm=False) self._reboot_button = BigConfirmationCircleButton("reboot\ndevice", gui_app.texture("icons_mici/settings/device/reboot.png", 64, 70), diff --git a/system/ui/mici_setup.py b/system/ui/mici_setup.py index 4e340335b..33dfe98f3 100755 --- a/system/ui/mici_setup.py +++ b/system/ui/mici_setup.py @@ -144,7 +144,7 @@ class SoftwareSelectionPage(NavWidget): self._openpilot_slider = LargerSlider("slide to install\nopenpilot", use_openpilot_callback) self._openpilot_slider.set_enabled(lambda: self.enabled and not self.is_dismissing) - self._custom_software_slider = LargerSlider("slide to install\ncustom software", use_custom_software_callback, green=False) + self._custom_software_slider = LargerSlider("slide to install\nother software", use_custom_software_callback, green=False) self._custom_software_slider.set_enabled(lambda: self.enabled and not self.is_dismissing) def show_event(self): @@ -190,11 +190,11 @@ class CustomSoftwareWarningPage(NavScroller): self._continue_button.set_click_callback(continue_callback) self._scroller.add_widgets([ - GreyBigButton("caution: installing\n3rd party software", "swipe down to go back", + GreyBigButton("use caution", "when installing\n3rd party software", gui_app.texture("icons_mici/setup/warning.png", 64, 58)), - GreyBigButton("", "• It has not been tested by comma."), - GreyBigButton("", "• It may not comply with safety standards."), - GreyBigButton("", "• It may damage your device and/or vehicle."), + GreyBigButton("", "• It has not been tested by comma"), + GreyBigButton("", "• It may not comply with relevant safety standards."), + GreyBigButton("", "• It may cause damage to your device and/or vehicle."), GreyBigButton("how to restore to a\nfactory state later", "https://flash.comma.ai", gui_app.texture("icons_mici/setup/restore.png", 64, 64)), self._continue_button, @@ -546,7 +546,7 @@ class Setup(Widget): def _push_network_setup(self, custom_software: bool = False): # to fire the correct continue callback later self._network_setup_page.set_custom_software(custom_software) - gui_app.push_widget(self._network_setup_page) + gui_app.pop_widgets_to(self._software_selection_page, lambda: gui_app.push_widget(self._network_setup_page)) def _network_setup_continue_callback(self, custom_software: bool): if not custom_software: