From ff5347949f6d5ff6994d4a225ff297e9dfdb79f2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 18 May 2024 02:25:33 -0500 Subject: [PATCH] wip --- common/params.cc | 2 +- selfdrive/frogpilot/controls/frogpilot_planner.py | 2 +- selfdrive/ui/qt/onroad.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/params.cc b/common/params.cc index e4e5286..ce206b8 100755 --- a/common/params.cc +++ b/common/params.cc @@ -234,7 +234,7 @@ std::unordered_map keys = { {"CarSpeedLimit", PERSISTENT}, {"CarSpeedLimitLiteral", PERSISTENT}, {"SpeedLimitLatDesired", PERSISTENT}, - ("AdjustedCruise", PERSISTENT), + ("SpeedLimitVTSC", PERSISTENT), {"CECurves", PERSISTENT}, {"CECurvesLead", PERSISTENT}, {"CENavigation", PERSISTENT}, diff --git a/selfdrive/frogpilot/controls/frogpilot_planner.py b/selfdrive/frogpilot/controls/frogpilot_planner.py index 4cb41a6..8bae6c6 100755 --- a/selfdrive/frogpilot/controls/frogpilot_planner.py +++ b/selfdrive/frogpilot/controls/frogpilot_planner.py @@ -274,7 +274,7 @@ class FrogPilotPlanner: frogpilotPlan.vtscControllingCurve = bool(self.mtsc_target > self.vtsc_target) - self.params_memory.set_int("AdjustedCruise", frogpilotPlan.adjustedCruise) + self.params_memory.set_int("SpeedLimitVTSC", frogpilotPlan.adjustedCruise) pm.send('frogpilotPlan', frogpilot_plan_send) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index eb7aedd..6b43691 100755 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -453,7 +453,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { drawSpeedWidget(p, 60, 45 + (225 * 2), QString("Exp"), SpeedLimitLatDesired, QColor(0xff, 0xff, 0xff)); // Todo: needs to be changed to calculate off of actual speed limit for release - QString adjustedCruise = QString::number(paramsMemory.getInt("AdjustedCruise")); + QString adjustedCruise = QString::number(paramsMemory.getInt("SpeedLimitVTSC")); drawSpeedWidget(p, 60, 45 + (225 * 3), QString("VTSC"), adjustedCruise, QColor(0xff, 0xff, 0xff)); // Todo: lead speed