This commit is contained in:
Your Name
2024-05-18 02:21:06 -05:00
parent a19a1c1e6b
commit e9be420232
3 changed files with 7 additions and 0 deletions

View File

@@ -234,6 +234,7 @@ std::unordered_map<std::string, uint32_t> keys = {
{"CarSpeedLimit", PERSISTENT}, {"CarSpeedLimit", PERSISTENT},
{"CarSpeedLimitLiteral", PERSISTENT}, {"CarSpeedLimitLiteral", PERSISTENT},
{"SpeedLimitLatDesired", PERSISTENT}, {"SpeedLimitLatDesired", PERSISTENT},
("adjustedCruise", PERSISTENT),
{"CECurves", PERSISTENT}, {"CECurves", PERSISTENT},
{"CECurvesLead", PERSISTENT}, {"CECurvesLead", PERSISTENT},
{"CENavigation", PERSISTENT}, {"CENavigation", PERSISTENT},

View File

@@ -274,6 +274,8 @@ class FrogPilotPlanner:
frogpilotPlan.vtscControllingCurve = bool(self.mtsc_target > self.vtsc_target) frogpilotPlan.vtscControllingCurve = bool(self.mtsc_target > self.vtsc_target)
self.params.set_int("adjustedCruise", frogpilotPlan.adjustedCruise)
pm.send('frogpilotPlan', frogpilot_plan_send) pm.send('frogpilotPlan', frogpilot_plan_send)
def update_frogpilot_params(self): def update_frogpilot_params(self):

View File

@@ -452,6 +452,10 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
QString SpeedLimitLatDesired = QString::number(paramsMemory.getInt("SpeedLimitLatDesired")); QString SpeedLimitLatDesired = QString::number(paramsMemory.getInt("SpeedLimitLatDesired"));
drawSpeedWidget(p, 60, 45 + (225 * 2), QString("Exp"), SpeedLimitLatDesired, QColor(0xff, 0xff, 0xff)); 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"));
drawSpeedWidget(p, 60, 45 + (225 * 2), QString("VTSC"), adjustedCruise, QColor(0xff, 0xff, 0xff));
// Todo: lead speed // Todo: lead speed
// Todo: Experimental speed // Todo: Experimental speed