mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-29 08:33:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-priv' into dynamic_personality

Browse Source
This commit is contained in:
Jason Wen
2024-07-01 15:35:31 -04:00
parent 4de6fac0d4 86446a8e42
commit faddc5a93b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/onroad/buttons.cc
+1 -1
View File
@@ -99,7 +99,7 @@ void OnroadSettingsButton::paintEvent(QPaintEvent *event) {
void OnroadSettingsButton::updateState(const UIState &s) {
const auto cp = (*s.sm)["carParams"].getCarParams();
auto dlp_enabled = true;
auto dlp_enabled = s.scene.driving_model_gen == 1;
bool allow_btn = s.scene.onroad_settings_toggle && (dlp_enabled || hasLongitudinalControl(cp) || !cp.getPcmCruiseSpeed());
setVisible(allow_btn);
selfdrive/ui/qt/onroad_settings.cc
+1 -1
View File
@@ -111,7 +111,7 @@ OnroadSettings::OnroadSettings(bool closeable, QWidget *parent) : QFrame(parent)
void OnroadSettings::changeDynamicLaneProfile() {
UIScene &scene = uiState()->scene;
bool can_change = true;
bool can_change = scene.driving_model_gen == 1;
if (can_change) {
scene.dynamic_lane_profile++;
scene.dynamic_lane_profile = scene.dynamic_lane_profile > 2 ? 0 : scene.dynamic_lane_profile;