mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-06 00:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "raylib: 20 FPS onroad (#36208)"

Browse Source 
This reverts commit 8de8c3eb00.
This commit is contained in:
Shane Smiskol
2025-09-26 21:41:12 -07:00
parent 8de8c3eb00
commit 5cbfc7705b
6 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/ui/lib/application.py
+5 -12
View File
@@ -14,7 +14,7 @@ from openpilot.common.swaglog import cloudlog
from openpilot.system.hardware import HARDWARE, PC
from openpilot.common.realtime import Ratekeeper
_DEFAULT_FPS = int(os.getenv("FPS", "60"))
DEFAULT_FPS = int(os.getenv("FPS", "60"))
FPS_LOG_INTERVAL = 5 # Seconds between logging FPS drops
FPS_DROP_THRESHOLD = 0.9 # FPS drop threshold for triggering a warning
FPS_CRITICAL_THRESHOLD = 0.5 # Critical threshold for triggering strict actions
@@ -130,7 +130,7 @@ class GuiApplication:
self._scaled_height = int(self._height * self._scale)
self._render_texture: rl.RenderTexture | None = None
self._textures: dict[str, rl.Texture] = {}
self._target_fps: int = _DEFAULT_FPS
self._target_fps: int = DEFAULT_FPS
self._last_fps_log_time: float = time.monotonic()
self._window_close_requested = False
self._trace_log_callback = None
@@ -145,7 +145,7 @@ class GuiApplication:
def request_close(self):
self._window_close_requested = True
def init_window(self, title: str, fps: int = _DEFAULT_FPS):
def init_window(self, title: str, fps: int = DEFAULT_FPS):
atexit.register(self.close) # Automatically call close() on exit
HARDWARE.set_display_power(True)
@@ -164,22 +164,15 @@ class GuiApplication:
rl.set_mouse_scale(1 / self._scale, 1 / self._scale)
self._render_texture = rl.load_render_texture(self._width, self._height)
rl.set_texture_filter(self._render_texture.texture, rl.TextureFilter.TEXTURE_FILTER_BILINEAR)
rl.set_target_fps(fps)
self.set_target_fps(fps)
self._target_fps = fps
self._set_styles()
self._load_fonts()
if not PC:
self._mouse.start()
@property
def target_fps(self):
return self._target_fps
def set_target_fps(self, fps: int):
self._target_fps = fps
rl.set_target_fps(fps)
def set_modal_overlay(self, overlay, callback: Callable | None = None):
self._modal_overlay = ModalOverlay(overlay=overlay, callback=callback)
system/ui/widgets/network.py
+3 -5
View File
@@ -5,7 +5,7 @@ from typing import cast
import pyray as rl
from openpilot.common.filter_simple import FirstOrderFilter
from openpilot.common.params import Params
from openpilot.system.ui.lib.application import gui_app
from openpilot.system.ui.lib.application import gui_app, DEFAULT_FPS
from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
from openpilot.system.ui.lib.wifi_manager import WifiManager, SecurityType, Network, MeteredType
from openpilot.system.ui.widgets import Widget
@@ -50,12 +50,10 @@ class NavButton(Widget):
super().__init__()
self.text = text
self.set_rect(rl.Rectangle(0, 0, 400, 100))
self._x_pos_filter = FirstOrderFilter(0.0, 0.05, 1 / gui_app.target_fps, initialized=False)
self._y_pos_filter = FirstOrderFilter(0.0, 0.05, 1 / gui_app.target_fps, initialized=False)
self._x_pos_filter = FirstOrderFilter(0.0, 0.05, 1 / DEFAULT_FPS, initialized=False)
self._y_pos_filter = FirstOrderFilter(0.0, 0.05, 1 / DEFAULT_FPS, initialized=False)
def set_position(self, x: float, y: float) -> None:
self._x_pos_filter.update_dt(1 / gui_app.target_fps)
self._y_pos_filter.update_dt(1 / gui_app.target_fps)
x = self._x_pos_filter.update(x)
y = self._y_pos_filter.update(y)
changed = (self._rect.x != x or self._rect.y != y)