wip
This commit is contained in:
@@ -234,7 +234,7 @@ std::unordered_map<std::string, uint32_t> keys = {
|
|||||||
{"CarSpeedLimit", PERSISTENT},
|
{"CarSpeedLimit", PERSISTENT},
|
||||||
{"CarSpeedLimitLiteral", PERSISTENT},
|
{"CarSpeedLimitLiteral", PERSISTENT},
|
||||||
{"SpeedLimitLatDesired", PERSISTENT},
|
{"SpeedLimitLatDesired", PERSISTENT},
|
||||||
("AdjustedCruise", PERSISTENT),
|
("SpeedLimitVTSC", PERSISTENT),
|
||||||
{"CECurves", PERSISTENT},
|
{"CECurves", PERSISTENT},
|
||||||
{"CECurvesLead", PERSISTENT},
|
{"CECurvesLead", PERSISTENT},
|
||||||
{"CENavigation", PERSISTENT},
|
{"CENavigation", PERSISTENT},
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ class FrogPilotPlanner:
|
|||||||
|
|
||||||
frogpilotPlan.vtscControllingCurve = bool(self.mtsc_target > self.vtsc_target)
|
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)
|
pm.send('frogpilotPlan', frogpilot_plan_send)
|
||||||
|
|
||||||
|
|||||||
@@ -453,7 +453,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
|
|||||||
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
|
// 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));
|
drawSpeedWidget(p, 60, 45 + (225 * 3), QString("VTSC"), adjustedCruise, QColor(0xff, 0xff, 0xff));
|
||||||
|
|
||||||
// Todo: lead speed
|
// Todo: lead speed
|
||||||
|
|||||||
Reference in New Issue
Block a user