From d637568056a511e186daf539572bd6a9d480a18c Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Thu, 20 Mar 2025 16:48:52 -0400 Subject: [PATCH] merge --- selfdrive/ui/qt/offroad/developer_panel.h | 2 +- selfdrive/ui/sunnypilot/SConscript | 2 +- .../offroad/settings/lateral/neural_network_lateral_control.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/qt/offroad/developer_panel.h b/selfdrive/ui/qt/offroad/developer_panel.h index f1752b6703..c0799894a4 100644 --- a/selfdrive/ui/qt/offroad/developer_panel.h +++ b/selfdrive/ui/qt/offroad/developer_panel.h @@ -2,7 +2,7 @@ #ifdef SUNNYPILOT #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h" -#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/neural_network_lateral_control.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.h" #else #include "selfdrive/ui/qt/offroad/settings.h" #endif diff --git a/selfdrive/ui/sunnypilot/SConscript b/selfdrive/ui/sunnypilot/SConscript index e66a2e5cb2..24c98c9868 100644 --- a/selfdrive/ui/sunnypilot/SConscript +++ b/selfdrive/ui/sunnypilot/SConscript @@ -36,7 +36,7 @@ qt_src = [ lateral_panel_qt_src = [ "sunnypilot/qt/offroad/settings/lateral/mads_settings.cc", - "sunnypilot/qt/offroad/settings/sunnypilot/neural_network_lateral_control.cc", + "sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc", ] network_src = [ diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc index 8b11e95076..439781f65e 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc @@ -5,7 +5,7 @@ * See the LICENSE.md file in the root directory for more details. */ -#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/neural_network_lateral_control.h" +#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.h" NeuralNetworkLateralcontrol::NeuralNetworkLateralcontrol(QWidget *parent) { toggle = new ParamControl(