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

Merge branch 'ui-icbm-universal' into hkg-angle-steering-2025

Browse Source
This commit is contained in:
Jason Wen
2025-10-17 12:21:47 -04:00
parent bce86637ae 1be0c20cf5
commit e2bc0996ef
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc
View File

@@ -7,8 +7,6 @@
#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h"
#include "selfdrive/ui/sunnypilot/qt/util.h"
SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent) {
subPanelFrame = new QFrame();
QVBoxLayout *subPanelLayout = new QVBoxLayout(subPanelFrame);
@@ -123,7 +121,7 @@ void SpeedLimitSettings::refresh() {
cereal::CarParamsSP::Reader CP_SP = cmsg_sp.getRoot<cereal::CarParamsSP>();
has_longitudinal_control = hasLongitudinalControl(CP);
has_icbm = hasIntelligentCruiseButtonManagement(CP_SP);
has_icbm = CP_SP.getIntelligentCruiseButtonManagementAvailable();
if (!has_longitudinal_control && CP_SP.getPcmCruiseSpeed()) {
if (speed_limit_mode_param == SpeedLimitMode::ASSIST) {

2
selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc
View File

@@ -120,7 +120,7 @@ void LongitudinalPanel::refresh(bool _offroad) {
params.remove("IntelligentCruiseButtonManagement");
}
if (!has_longitudinal_control && !has_icbm) {
if (!has_longitudinal_control && !CP_SP.getIntelligentCruiseButtonManagementAvailable()) {
params.remove("CustomAccIncrementsEnabled");
params.remove("DynamicExperimentalControl");
params.remove("SmartCruiseControlVision");