新增 `DistractionDetectionLevel` 参数以控制驾驶员分心检测的灵敏度等级,并在 `dmonitoringd.py` 和 `helpers.py` 中实现不同等级对应的时间阈值配置。同时更新了相关逻辑以支持动态调整该参数。 fix(toyota): 支持 Toyota Wildlander PHEV 车型接入与控制 增加对 Toyota Wildlander PHEV 的指纹识别、车辆规格定义及接口适配,确保其在 TSS2 平台下的正常运行,并修正部分雷达ACC判断条件。 feat(ui): 优化 Dragonpilot 设置界面选项显示语言一致性 将 Dragonpilot 设置页面中的多个下拉选项文本进行国际化处理,统一使用翻译函数包裹,提升多语言兼容性。 chore(config): 更新 launch 脚本 API 地址并切换 shell 解释器 修改 `launch_openpilot.sh` 使用 `/usr/bin/bash` 作为解释器,并设置自定义 API 与 Athena 服务地址。 refactor(key): 实现 ECU 秘钥提取脚本并写入参数存储 创建 `key.py` 脚本用于通过 UDS 协议从 ECU 提取 SecOC 密钥,并将其保存至系统参数中供后续使用。 docs(vscode): 移除不再使用的终端配置项 清理 `.vscode/settings.json` 文件中过时的 terminal 配置内容。 feat(fonts): 新增中文字体资源文件 添加 `china.ttf` 字体文件以增强 UI 在中文环境下的渲染效果。 build(payload): 添加二进制负载文件 引入新的二进制 payload 文件用于辅助密钥提取流程。
195 lines
8.1 KiB
Python
195 lines
8.1 KiB
Python
import os
|
|
import time
|
|
import datetime
|
|
from openpilot.common.time_helpers import system_time_valid
|
|
from openpilot.selfdrive.ui.ui_state import ui_state
|
|
from openpilot.system.ui.lib.application import gui_app
|
|
from openpilot.system.ui.lib.multilang import tr, trn
|
|
from openpilot.system.ui.widgets import Widget, DialogResult
|
|
from openpilot.system.ui.widgets.confirm_dialog import ConfirmDialog
|
|
from openpilot.system.ui.widgets.list_view import button_item, text_item, ListItem
|
|
from openpilot.system.ui.widgets.option_dialog import MultiOptionDialog
|
|
from openpilot.system.ui.widgets.scroller import Scroller
|
|
|
|
# TODO: remove this. updater fails to respond on startup if time is not correct
|
|
UPDATED_TIMEOUT = 10 # seconds to wait for updated to respond
|
|
|
|
|
|
def time_ago(date: datetime.datetime | None) -> str:
|
|
if not date:
|
|
return tr("never")
|
|
|
|
if not system_time_valid():
|
|
return date.strftime("%a %b %d %Y")
|
|
|
|
now = datetime.datetime.now(datetime.UTC)
|
|
if date.tzinfo is None:
|
|
date = date.replace(tzinfo=datetime.UTC)
|
|
|
|
diff_seconds = int((now - date).total_seconds())
|
|
if diff_seconds < 60:
|
|
return tr("now")
|
|
if diff_seconds < 3600:
|
|
m = diff_seconds // 60
|
|
return trn("{} minute ago", "{} minutes ago", m).format(m)
|
|
if diff_seconds < 86400:
|
|
h = diff_seconds // 3600
|
|
return trn("{} hour ago", "{} hours ago", h).format(h)
|
|
if diff_seconds < 604800:
|
|
d = diff_seconds // 86400
|
|
return trn("{} day ago", "{} days ago", d).format(d)
|
|
return date.strftime("%a %b %d %Y")
|
|
|
|
|
|
class SoftwareLayout(Widget):
|
|
def __init__(self):
|
|
super().__init__()
|
|
|
|
self._onroad_label = ListItem(lambda: tr("Updates are only downloaded while the car is off."))
|
|
self._version_item = text_item(lambda: tr("Current Version"), ui_state.params.get("UpdaterCurrentDescription") or "")
|
|
self._download_btn = button_item(lambda: tr("Download"), lambda: tr("CHECK"), callback=self._on_download_update)
|
|
|
|
# Install button is initially hidden
|
|
self._install_btn = button_item(lambda: tr("Install Update"), lambda: tr("INSTALL"), callback=self._on_install_update)
|
|
self._install_btn.set_visible(False)
|
|
|
|
# Track waiting-for-updater transition to avoid brief re-enable while still idle
|
|
self._waiting_for_updater = False
|
|
self._waiting_start_ts: float = 0.0
|
|
|
|
# Branch switcher
|
|
self._branch_btn = button_item(lambda: tr("Target Branch"), lambda: tr("SELECT"), callback=self._on_select_branch)
|
|
self._branch_btn.set_visible(not ui_state.params.get_bool("IsTestedBranch"))
|
|
self._branch_btn.action_item.set_value(ui_state.params.get("UpdaterTargetBranch") or "")
|
|
self._branch_dialog: MultiOptionDialog | None = None
|
|
|
|
self._scroller = Scroller([
|
|
self._onroad_label,
|
|
self._version_item,
|
|
self._download_btn,
|
|
self._install_btn,
|
|
self._branch_btn,
|
|
button_item(lambda: tr("Uninstall"), lambda: tr("UNINSTALL"), callback=self._on_uninstall),
|
|
], line_separator=True, spacing=0)
|
|
|
|
def show_event(self):
|
|
self._scroller.show_event()
|
|
|
|
def _render(self, rect):
|
|
self._scroller.render(rect)
|
|
|
|
def _update_state(self):
|
|
# Show/hide onroad warning
|
|
self._onroad_label.set_visible(ui_state.is_onroad())
|
|
|
|
# Update current version and release notes
|
|
current_desc = ui_state.params.get("UpdaterCurrentDescription") or ""
|
|
current_release_notes = (ui_state.params.get("UpdaterCurrentReleaseNotes") or b"").decode("utf-8", "replace")
|
|
self._version_item.action_item.set_text(current_desc)
|
|
self._version_item.set_description(current_release_notes)
|
|
|
|
# Update download button visibility and state
|
|
self._download_btn.set_visible(ui_state.is_offroad())
|
|
|
|
updater_state = ui_state.params.get("UpdaterState") or "idle"
|
|
failed_count = ui_state.params.get("UpdateFailedCount") or 0
|
|
fetch_available = ui_state.params.get_bool("UpdaterFetchAvailable")
|
|
update_available = ui_state.params.get_bool("UpdateAvailable")
|
|
|
|
if updater_state != "idle":
|
|
# Updater responded
|
|
self._waiting_for_updater = False
|
|
self._download_btn.action_item.set_enabled(False)
|
|
self._download_btn.action_item.set_value(updater_state)
|
|
else:
|
|
if failed_count > 0:
|
|
self._download_btn.action_item.set_value(tr("failed to check for update"))
|
|
self._download_btn.action_item.set_text(tr("CHECK"))
|
|
elif fetch_available:
|
|
self._download_btn.action_item.set_value(tr("update available"))
|
|
self._download_btn.action_item.set_text(tr("DOWNLOAD"))
|
|
else:
|
|
last_update = ui_state.params.get("LastUpdateTime")
|
|
if last_update:
|
|
formatted = time_ago(last_update)
|
|
self._download_btn.action_item.set_value(tr("up to date, last checked {}").format(formatted))
|
|
else:
|
|
self._download_btn.action_item.set_value(tr("up to date, last checked never"))
|
|
self._download_btn.action_item.set_text(tr("CHECK"))
|
|
|
|
# If we've been waiting too long without a state change, reset state
|
|
if self._waiting_for_updater and (time.monotonic() - self._waiting_start_ts > UPDATED_TIMEOUT):
|
|
self._waiting_for_updater = False
|
|
|
|
# Only enable if we're not waiting for updater to flip out of idle
|
|
self._download_btn.action_item.set_enabled(not self._waiting_for_updater)
|
|
|
|
# Update target branch button value
|
|
current_branch = ui_state.params.get("UpdaterTargetBranch") or ""
|
|
self._branch_btn.action_item.set_value(current_branch)
|
|
|
|
# Update install button
|
|
self._install_btn.set_visible(ui_state.is_offroad() and update_available)
|
|
if update_available:
|
|
new_desc = ui_state.params.get("UpdaterNewDescription") or ""
|
|
new_release_notes = (ui_state.params.get("UpdaterNewReleaseNotes") or b"").decode("utf-8", "replace")
|
|
self._install_btn.action_item.set_text(tr("INSTALL"))
|
|
self._install_btn.action_item.set_value(new_desc)
|
|
self._install_btn.set_description(new_release_notes)
|
|
# Enable install button for testing (like Qt showEvent)
|
|
self._install_btn.action_item.set_enabled(True)
|
|
else:
|
|
self._install_btn.set_visible(False)
|
|
|
|
def _on_download_update(self):
|
|
# Check if we should start checking or start downloading
|
|
self._download_btn.action_item.set_enabled(False)
|
|
if self._download_btn.action_item.text == tr("CHECK"):
|
|
# Start checking for updates
|
|
self._waiting_for_updater = True
|
|
self._waiting_start_ts = time.monotonic()
|
|
os.system("pkill -SIGUSR1 -f system.updated.updated")
|
|
else:
|
|
# Start downloading
|
|
self._waiting_for_updater = True
|
|
self._waiting_start_ts = time.monotonic()
|
|
os.system("pkill -SIGHUP -f system.updated.updated")
|
|
|
|
def _on_uninstall(self):
|
|
def handle_uninstall_confirmation(result):
|
|
if result == DialogResult.CONFIRM:
|
|
ui_state.params.put_bool("DoUninstall", True)
|
|
|
|
dialog = ConfirmDialog(tr("Are you sure you want to uninstall?"), tr("Uninstall"))
|
|
gui_app.set_modal_overlay(dialog, callback=handle_uninstall_confirmation)
|
|
|
|
def _on_install_update(self):
|
|
# Trigger reboot to install update
|
|
self._install_btn.action_item.set_enabled(False)
|
|
ui_state.params.put_bool("DoReboot", True)
|
|
|
|
def _on_select_branch(self):
|
|
# Get available branches and order
|
|
current_git_branch = ui_state.params.get("GitBranch") or ""
|
|
branches_str = ui_state.params.get("UpdaterAvailableBranches") or ""
|
|
branches = [b for b in branches_str.split(",") if b]
|
|
|
|
for b in [current_git_branch, "devel-staging", "devel", "nightly", "nightly-dev", "master"]:
|
|
if b in branches:
|
|
branches.remove(b)
|
|
branches.insert(0, b)
|
|
|
|
current_target = ui_state.params.get("UpdaterTargetBranch") or ""
|
|
self._branch_dialog = MultiOptionDialog(tr("Select a branch"), branches, current_target)
|
|
|
|
def handle_selection(result):
|
|
# Confirmed selection
|
|
if result == DialogResult.CONFIRM and self._branch_dialog is not None and self._branch_dialog.selection:
|
|
selection = self._branch_dialog.selection
|
|
ui_state.params.put("UpdaterTargetBranch", selection)
|
|
self._branch_btn.action_item.set_value(selection)
|
|
os.system("pkill -SIGUSR1 -f system.updated.updated")
|
|
self._branch_dialog = None
|
|
|
|
gui_app.set_modal_overlay(self._branch_dialog, callback=handle_selection)
|