Merge branch 'commaai:master' into PA-dev2

Edison-CBS · Oct 11, 2024 · aeaf3db · aeaf3db
2 parents 2128c3a + 21a8f9e
commit aeaf3db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/selfdrive/ui/qt/onroad/model.cc b/selfdrive/ui/qt/onroad/model.cc
@@ -25,7 +25,7 @@ void ModelRenderer::draw(QPainter &painter, const QRect &surface_rect) {
   }
 
   clip_region = surface_rect.adjusted(-CLIP_MARGIN, -CLIP_MARGIN, CLIP_MARGIN, CLIP_MARGIN);
-  experimental_model = sm["selfdriveState"].getSelfdriveState().getExperimentalMode();
+  experimental_mode = sm["selfdriveState"].getSelfdriveState().getExperimentalMode();
 
   painter.save();
 
@@ -107,7 +107,7 @@ void ModelRenderer::drawLaneLines(QPainter &painter) {
 
 void ModelRenderer::drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height) {
   QLinearGradient bg(0, height, 0, 0);
-  if (experimental_model) {
+  if (experimental_mode) {
     // The first half of track_vertices are the points for the right side of the path
     const auto &acceleration = model.getAcceleration().getX();
     const int max_len = std::min<int>(track_vertices.length() / 2, acceleration.size());

diff --git a/selfdrive/ui/qt/onroad/model.h b/selfdrive/ui/qt/onroad/model.h
@@ -22,7 +22,7 @@ class ModelRenderer {
   void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height);
 
   bool longitudinal_control = false;
-  bool experimental_model = false;
+  bool experimental_mode = false;
   float lane_line_probs[4] = {};
   float road_edge_stds[2] = {};
   QPolygonF track_vertices;