mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-05 11:15:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-new' into feature/external-storage

Browse Source
This commit is contained in:
royjr
2025-06-03 00:37:25 -04:00
committed by GitHub
parent 85f6252d92 9c28583171
commit 397f613201
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/sunnypilot/ui.h
+5
View File
@@ -20,6 +20,11 @@ class UIStateSP : public UIState {
public:
UIStateSP(QObject *parent = 0);
void updateStatus() override;
inline bool engaged() const override {
return scene.started && (
(*sm)["selfdriveState"].getSelfdriveState().getEnabled() || (*sm)["selfdriveStateSP"].getSelfdriveStateSP().getMads().getEnabled()
);
}
void setSunnylinkRoles(const std::vector<RoleModel> &roles);
void setSunnylinkDeviceUsers(const std::vector<UserModel> &users);
selfdrive/ui/ui.h
+1 -1
View File
@@ -72,7 +72,7 @@ class UIState : public QObject {
public:
UIState(QObject* parent = 0);
virtual void updateStatus();
inline bool engaged() const {
virtual inline bool engaged() const {
return scene.started && (*sm)["selfdriveState"].getSelfdriveState().getEnabled();
}