mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-23 18:22:13 +08:00
91b7752268
* pressed state for larger sliders
* wifibutton
* fix
* clean up
* some work
* don't nee this now
* stash
* more
* new pressed bigcircle
* black
* interp
* just check position
* clean up and fix slider reset
* fix custom
* no speed
* stash
* even chatter couldn't figure this one out
* makes sense to combine together, less split mentality
* clean that up
* fix lag
* match ui.py prio to eliminate lag on wifiui show event. separately, why is this slow?
* night mode
* delay scroll over
* fix auto scrolling
* stash
* waiting looks disabled
* clean up and don't reset sliders until user goes back
* rm
* fix
* add termsheader back
* fix callbacks
* ctrl alt l
* fix text spacing
* clean up
* stash
* fix style
* i want to go back
* guard on exit
* kinda useless stuff
* Revert "kinda useless stuff"
This reverts commit a4acbac31523408f358c5f68262cb630aa13ad8e.
* Revert "guard on exit"
This reverts commit 63ccfbf64edfbe1a144a441681f5ec78d8021ff7.
* wide
* setup pressed!
* grow animation
* 10s after initial
* slow fast
* start onboarding (terms)
* rm duplicate page
* add qr code
* final grey
* fix visual lag on first start
* clean up dead code
* dont exit from cancel
* revert grey
* clean up, REVIEW ME
* Revert "clean up, REVIEW ME"
This reverts commit c66fa60947c5f922520e7cf58c630b4bbe2d0177.
* reboot slider
* kb fix
* Revert "kb fix"
This reverts commit 883039448e6c37ae1d25d4f75ada6e96b6736358.
* ./ goes to letters
* Revert "./ goes to letters"
This reverts commit 0d97442427edb1a000638863a3f2181204ddc160.
* clean up
* some more clean up
* more
* clean up
* rename block
* reset pending scroll so it can't use stale data in rare sequence
* remove unused assets
* clean up imports
* fix updater
* clean up
* fix double reboot
* demo time - reset to setup on reboot
* let manager restart
* Revert "demo time - reset to setup on reboot"
This reverts commit 9468657e8438a1ce8fcb5266403b7bb3539f131f.
* url... and no grow animation on start button
* one next button
* grow instead of shake wifi button
* 36 pt font size in setup
* touch up onboarding a lil
* Revert "rm cpp bz2 (#37332)"
This reverts commit f4a36f7f74.
* more onboarding and clean up
* clean up
* wow what an amazing future clean up
* back to software select
* fix
* copy
* fix dm confirmation dialog not disabling widget underneath, all fixed with real nav stack in here
* uploading
* lint
* add review terms to device w/ close button
* todo
* remove old Terms vertical scrolling classes
* use new Scroller!
* installer
* tweak to match figma exactly
* revert
* fixup updater
* demo day
* demo day v2
* ... for percent while finishing setup
* demo day v3
* demo day v4
* remove ...
* demo day v6 -- "why does it do that!!"
* demo day v7 -- no flash
* hmm
* demo day v7
* prebuilt
* revert demo day
* scroll after pop animation
* back -> retry
* stash fixes
* damn, need back_callback
* scroll over immediately if already in network setup
* tweaks
* going down is confusing
* more
* Revert "more"
This reverts commit 29ce75b1f81eb40e7527a71d27842d9a66802206.
* Revert "going down is confusing"
This reverts commit 0cd2ae30d4135db1ccba6478429b45e886714e9c.
* dupl
* nl
* sort functions
* more clean up from merge
* move
* more
* dismiss to download (hack)
* Revert "dismiss to download (hack)"
This reverts commit 53c45ed1f63db1f0cebbce0dfab1777c8658f505.
* onboarding work
* set brightness and timeout in root onboarding only
* clean up
* type
* keep 5m for settings preview
* switch back to letters on . or /
* reset first step scroller
* custom software warning goes down network comes up and back cb fix
* clean up
* smaller qr
* ReviewTermsPage just for device as NavWidget
* clean up
* installer: stay on 100%
* reset has internet while in wifiui
* try this
* try this
* see what error we get exactly
see what error we get exactly
* not final solution but see how good
* rm
* copy changes
* reset on disconnect
* for separate pr
* Revert "reset on disconnect"
This reverts commit 552372fa4d497ba7d9de7f2edb730ee63798ffa4.
* revert this, too buggy
* fix for updater
* sort
* fix test
* minor cleanup
* more leaks than this rn
* onboarding clean up
* clean up application
* click delay to small button
* clean up
* reset more state
* fix training guide not cleaning up driverview
* Revert "fix training guide not cleaning up driverview"
This reverts commit cac7c5f436056cc9e747f80905d390790fb83c22.
* simpler fix :(
* nice catch, if you go back to terms it will reset 300s timeout and brightness
* duplicate show
* unused
124 lines
4.7 KiB
Python
124 lines
4.7 KiB
Python
import pyray as rl
|
|
import cereal.messaging as messaging
|
|
from openpilot.selfdrive.ui.mici.layouts.home import MiciHomeLayout
|
|
from openpilot.selfdrive.ui.mici.layouts.settings.settings import SettingsLayout
|
|
from openpilot.selfdrive.ui.mici.layouts.offroad_alerts import MiciOffroadAlerts
|
|
from openpilot.selfdrive.ui.mici.onroad.augmented_road_view import AugmentedRoadView
|
|
from openpilot.selfdrive.ui.ui_state import device, ui_state
|
|
from openpilot.selfdrive.ui.mici.layouts.onboarding import OnboardingWindow
|
|
from openpilot.system.ui.widgets import Widget
|
|
from openpilot.system.ui.widgets.scroller import Scroller
|
|
from openpilot.system.ui.lib.application import gui_app
|
|
|
|
|
|
ONROAD_DELAY = 2.5 # seconds
|
|
|
|
|
|
class MiciMainLayout(Scroller):
|
|
def __init__(self):
|
|
super().__init__(snap_items=True, spacing=0, pad=0, scroll_indicator=False, edge_shadows=False)
|
|
|
|
self._pm = messaging.PubMaster(['bookmarkButton'])
|
|
|
|
self._prev_onroad = False
|
|
self._prev_standstill = False
|
|
self._onroad_time_delay: float | None = None
|
|
self._setup = False
|
|
|
|
# Initialize widgets
|
|
self._home_layout = MiciHomeLayout()
|
|
self._alerts_layout = MiciOffroadAlerts()
|
|
self._settings_layout = SettingsLayout()
|
|
self._onroad_layout = AugmentedRoadView(bookmark_callback=self._on_bookmark_clicked)
|
|
|
|
# Initialize widget rects
|
|
for widget in (self._home_layout, self._settings_layout, self._alerts_layout, self._onroad_layout):
|
|
# TODO: set parent rect and use it if never passed rect from render (like in Scroller)
|
|
widget.set_rect(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
|
|
|
|
self._scroller.add_widgets([
|
|
self._alerts_layout,
|
|
self._home_layout,
|
|
self._onroad_layout,
|
|
])
|
|
self._scroller.set_reset_scroll_at_show(False)
|
|
|
|
# Disable scrolling when onroad is interacting with bookmark
|
|
self._scroller.set_scrolling_enabled(lambda: not self._onroad_layout.is_swiping_left())
|
|
|
|
# Set callbacks
|
|
self._setup_callbacks()
|
|
|
|
gui_app.add_nav_stack_tick(self._handle_transitions)
|
|
gui_app.push_widget(self)
|
|
|
|
# Start onboarding if terms or training not completed, make sure to push after self
|
|
self._onboarding_window = OnboardingWindow(lambda: gui_app.pop_widgets_to(self))
|
|
if not self._onboarding_window.completed:
|
|
gui_app.push_widget(self._onboarding_window)
|
|
|
|
def _setup_callbacks(self):
|
|
self._home_layout.set_callbacks(on_settings=lambda: gui_app.push_widget(self._settings_layout))
|
|
self._onroad_layout.set_click_callback(lambda: self._scroll_to(self._home_layout))
|
|
device.add_interactive_timeout_callback(self._on_interactive_timeout)
|
|
|
|
def _scroll_to(self, layout: Widget):
|
|
layout_x = int(layout.rect.x)
|
|
self._scroller.scroll_to(layout_x, smooth=True)
|
|
|
|
def _render(self, _):
|
|
if not self._setup:
|
|
if self._alerts_layout.active_alerts() > 0:
|
|
self._scroller.scroll_to(self._alerts_layout.rect.x)
|
|
else:
|
|
self._scroller.scroll_to(self._rect.width)
|
|
self._setup = True
|
|
|
|
# Render
|
|
super()._render(self._rect)
|
|
|
|
def _handle_transitions(self):
|
|
# Don't pop if onboarding
|
|
if gui_app.widget_in_stack(self._onboarding_window):
|
|
return
|
|
|
|
if ui_state.started != self._prev_onroad:
|
|
self._prev_onroad = ui_state.started
|
|
|
|
# onroad: after delay, pop nav stack and scroll to onroad
|
|
# offroad: immediately scroll to home, but don't pop nav stack (can stay in settings)
|
|
if ui_state.started:
|
|
self._onroad_time_delay = rl.get_time()
|
|
else:
|
|
self._scroll_to(self._home_layout)
|
|
|
|
# FIXME: these two pops can interrupt user interacting in the settings
|
|
if self._onroad_time_delay is not None and rl.get_time() - self._onroad_time_delay >= ONROAD_DELAY:
|
|
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
|
self._onroad_time_delay = None
|
|
|
|
# When car leaves standstill, pop nav stack and scroll to onroad
|
|
CS = ui_state.sm["carState"]
|
|
if not CS.standstill and self._prev_standstill:
|
|
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
|
self._prev_standstill = CS.standstill
|
|
|
|
def _on_interactive_timeout(self):
|
|
# Don't pop if onboarding
|
|
if gui_app.widget_in_stack(self._onboarding_window):
|
|
return
|
|
|
|
if ui_state.started:
|
|
# Don't pop if at standstill
|
|
if not ui_state.sm["carState"].standstill:
|
|
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
|
else:
|
|
# Screen turns off on timeout offroad, so pop immediately without animation
|
|
gui_app.pop_widgets_to(self, instant=True)
|
|
self._scroll_to(self._home_layout)
|
|
|
|
def _on_bookmark_clicked(self):
|
|
user_bookmark = messaging.new_message('bookmarkButton')
|
|
user_bookmark.valid = True
|
|
self._pm.send('bookmarkButton', user_bookmark)
|