mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-06-28 01:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: fix power buttons disable logic (#23774)

Browse Source 
old-commit-hash: 00d469dbc9d5ab8237247f7036892fe74c5e3c8a
This commit is contained in:
Adeeb Shihadeh
2022-02-15 16:18:09 -08:00
committed by GitHub
parent 66473b54b2
commit b695ffbfdb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/settings.cc
+2 -2
View File
@@ -196,7 +196,7 @@ void DevicePanel::updateCalibDescription() {
}
void DevicePanel::reboot() {
if (uiState()->status == UIStatus::STATUS_DISENGAGED) {
if (!uiState()->engaged()) {
if (ConfirmationDialog::confirm("Are you sure you want to reboot?", this)) {
// Check engaged again in case it changed while the dialog was open
if (uiState()->status == UIStatus::STATUS_DISENGAGED) {
@@ -209,7 +209,7 @@ void DevicePanel::reboot() {
}
void DevicePanel::poweroff() {
if (uiState()->status == UIStatus::STATUS_DISENGAGED) {
if (!uiState()->engaged()) {
if (ConfirmationDialog::confirm("Are you sure you want to power off?", this)) {
// Check engaged again in case it changed while the dialog was open
if (uiState()->status == UIStatus::STATUS_DISENGAGED) {
selfdrive/ui/ui.h
+3
View File
@@ -118,6 +118,9 @@ public:
inline bool worldObjectsVisible() const {
return sm->rcv_frame("liveCalibration") > scene.started_frame;
};
inline bool engaged() const {
return scene.started && (*sm)["controlsState"].getControlsState().getEnabled();
};
int fb_w = 0, fb_h = 0;