pull/35011/head
Shane Smiskol 2 months ago
parent 2bfb564206
commit f1f6c339d0
  1. 4
      selfdrive/ui/qt/offroad/developer_panel.cc
  2. 2
      selfdrive/ui/qt/offroad/settings.cc
  3. 2
      selfdrive/ui/qt/util.cc

@ -68,7 +68,7 @@ void DeveloperPanel::updateToggles(bool _offroad) {
capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size())); capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>(); cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
if (!CP.getExperimentalLongitudinalAvailable() || is_release) { if (!CP.getAlphaLongitudinalAvailable() || is_release) {
params.remove("ExperimentalLongitudinalEnabled"); params.remove("ExperimentalLongitudinalEnabled");
experimentalLongitudinalToggle->setEnabled(false); experimentalLongitudinalToggle->setEnabled(false);
} }
@ -78,7 +78,7 @@ void DeveloperPanel::updateToggles(bool _offroad) {
* - is not a release branch, and * - is not a release branch, and
* - the car supports experimental longitudinal control (alpha) * - the car supports experimental longitudinal control (alpha)
*/ */
experimentalLongitudinalToggle->setVisible(CP.getExperimentalLongitudinalAvailable() && !is_release); experimentalLongitudinalToggle->setVisible(CP.getAlphaLongitudinalAvailable() && !is_release);
longManeuverToggle->setEnabled(hasLongitudinalControl(CP) && _offroad); longManeuverToggle->setEnabled(hasLongitudinalControl(CP) && _offroad);
} else { } else {

@ -152,7 +152,7 @@ void TogglesPanel::updateToggles() {
QString long_desc = unavailable + " " + \ QString long_desc = unavailable + " " + \
tr("openpilot longitudinal control may come in a future update."); tr("openpilot longitudinal control may come in a future update.");
if (CP.getExperimentalLongitudinalAvailable()) { if (CP.getAlphaLongitudinalAvailable()) {
if (is_release) { if (is_release) {
long_desc = unavailable + " " + tr("An alpha version of openpilot longitudinal control can be tested, along with Experimental mode, on non-release branches."); long_desc = unavailable + " " + tr("An alpha version of openpilot longitudinal control can be tested, along with Experimental mode, on non-release branches.");
} else { } else {

@ -193,7 +193,7 @@ QPixmap bootstrapPixmap(const QString &id) {
bool hasLongitudinalControl(const cereal::CarParams::Reader &car_params) { bool hasLongitudinalControl(const cereal::CarParams::Reader &car_params) {
// Using the experimental longitudinal toggle, returns whether longitudinal control // Using the experimental longitudinal toggle, returns whether longitudinal control
// will be active without needing a restart of openpilot // will be active without needing a restart of openpilot
return car_params.getExperimentalLongitudinalAvailable() return car_params.getAlphaLongitudinalAvailable()
? Params().getBool("ExperimentalLongitudinalEnabled") ? Params().getBool("ExperimentalLongitudinalEnabled")
: car_params.getOpenpilotLongitudinalControl(); : car_params.getOpenpilotLongitudinalControl();
} }

Loading…
Cancel
Save