mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-07-26 12:22:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Black / Pink in your area

Browse Source
This commit is contained in:
firestar5683
2026-06-09 15:39:56 -05:00
parent 0a698d202b
commit f777e71c56
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/layouts/settings/starpilot/system_settings.py
+7 -5
View File
@@ -143,13 +143,13 @@ class SystemSettingsManagerView(PanelManagerView):
"subtitle": tr("Screen brightness while driving."),
"unit": "%",
"labels": brightness_labels,
"min": 1,
"min": 0,
"max": 101,
"step": 1,
"live": True,
"presets": [1, 35, 60, 80, 101],
"get": lambda: float(max(1, self._controller._params.get_int("ScreenBrightnessOnroad"))),
"set": lambda v: self._controller._set_brightness("ScreenBrightnessOnroad", max(1, int(v))),
"presets": [0, 35, 60, 80, 101],
"get": lambda: float(self._controller._params.get_int("ScreenBrightnessOnroad")),
"set": lambda v: self._controller._set_brightness("ScreenBrightnessOnroad", int(v)),
},
"ScreenTimeout": {
"title": tr("Offroad Screen Timeout"),
@@ -917,8 +917,10 @@ class StarPilotSystemLayout(_SettingsPage):
def _set_brightness(self, key, val):
self._params.put_int(key, int(val))
if key == "ScreenBrightnessOnroad" and not ui_state.started:
return
if key in ("ScreenBrightnessOnroad", "ScreenBrightness") and hasattr(HARDWARE, 'set_brightness'):
HARDWARE.set_brightness(int(val))
HARDWARE.set_brightness(int(val))
def _get_konik_state(self):
if Path("/data/not_vetted").exists():
selfdrive/ui/ui.cc
+3 -4
View File
@@ -448,7 +448,7 @@ void Device::updateBrightness(const UIState &s, const StarPilotUIState &fs) {
const StarPilotUIScene &starpilot_scene = fs.starpilot_scene;
const QJsonObject &starpilot_toggles = starpilot_scene.starpilot_toggles;
const int screen_brightness_onroad = starpilot_toggles.value("screen_brightness_onroad").toInt();
const int clamped_onroad_brightness = std::clamp(screen_brightness_onroad, 1, 100);
const int clamped_onroad_brightness = std::clamp(screen_brightness_onroad, 0, 100);
float clipped_brightness = offroad_brightness;
if (s.scene.started && s.scene.light_sensor >= 0) {
@@ -471,8 +471,6 @@ void Device::updateBrightness(const UIState &s, const StarPilotUIState &fs) {
} else if (s.scene.started && !starpilot_scene.wake_up_screen && interactive_timeout == 0 && starpilot_toggles.value("standby_mode").toBool()) {
brightness = 0;
} else if (s.scene.started && screen_brightness_onroad != 101) {
// Guard against stale params that may still contain the old onroad "off"
// value. Standby mode is the only supported way to blank the screen onroad.
brightness = interactive_timeout > 0 ? std::max(5, clamped_onroad_brightness) : clamped_onroad_brightness;
} else if (starpilot_toggles.value("screen_brightness").toInt() != 101) {
brightness = starpilot_toggles.value("screen_brightness").toInt();
@@ -490,6 +488,7 @@ void Device::updateWakefulness(const UIState &s, const StarPilotUIState &fs) {
const StarPilotUIScene &starpilot_scene = fs.starpilot_scene;
const QJsonObject &starpilot_toggles = starpilot_scene.starpilot_toggles;
const bool standby_mode = starpilot_toggles.value("standby_mode").toBool();
const int screen_brightness_onroad = starpilot_toggles.value("screen_brightness_onroad").toInt();
const int screen_timeout = starpilot_toggles.value("screen_timeout").toInt();
const int screen_timeout_onroad = starpilot_toggles.value("screen_timeout_onroad").toInt();
@@ -499,7 +498,7 @@ void Device::updateWakefulness(const UIState &s, const StarPilotUIState &fs) {
// Standby mode should extend the current wake window for alerts and status
// changes, but it must not clear the timer every frame or manual wakes will
// collapse immediately.
if (ignition_on && standby_mode && starpilot_scene.wake_up_screen) {
if (ignition_on && standby_mode && screen_brightness_onroad != 0 && starpilot_scene.wake_up_screen) {
resetInteractiveTimeout(screen_timeout, screen_timeout_onroad);
}