From 7bb4980119d65585268dced7d721369cd81de285 Mon Sep 17 00:00:00 2001 From: concordia Date: Sat, 15 Jun 2024 20:25:53 -0500 Subject: [PATCH] wip --- selfdrive/manager/process.py | 2 +- selfdrive/ui/qt/onroad.cc | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/selfdrive/manager/process.py b/selfdrive/manager/process.py index cda3922..3472a2f 100755 --- a/selfdrive/manager/process.py +++ b/selfdrive/manager/process.py @@ -170,7 +170,7 @@ class NativeProcess(ManagerProcess): self.enabled = enabled self.sigkill = sigkill self.watchdog_max_dt = watchdog_max_dt - self.launcher = nativelauncher + self.launcher = modified_nativelauncher self.always_watchdog = always_watchdog def prepare(self) -> None: diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 16c77cc..2499db8 100755 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -392,20 +392,20 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { p.restore(); // if (!scene.hide_max_speed) { - drawSpeedWidget(p, 60, 45, QString("MAX"), setSpeedStr, QColor(0xff, 0xff, 0xff)); + // drawSpeedWidget(p, 60, 45, QString("MAX"), setSpeedStr, QColor(0xff, 0xff, 0xff)); // } - // Todo: needs to be changed to calculate off of actual speed limit for release - QString speedLimitStr = QString::number(paramsMemory.getInt("CarSpeedLimitLiteral")); - drawSpeedWidget(p, 60, 45 + (225), QString("Limit"), speedLimitStr, QColor(0xff, 0xff, 0xff)); + // // Todo: needs to be changed to calculate off of actual speed limit for release + // QString speedLimitStr = QString::number(paramsMemory.getInt("CarSpeedLimitLiteral")); + // drawSpeedWidget(p, 60, 45 + (225), QString("Limit"), speedLimitStr, QColor(0xff, 0xff, 0xff)); - // Todo: needs to be changed to calculate off of actual speed limit for release - QString SpeedLimitLatDesired = QString::number(paramsMemory.getInt("SpeedLimitLatDesired")); - 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 SpeedLimitLatDesired = QString::number(paramsMemory.getInt("SpeedLimitLatDesired")); + // 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("SpeedLimitVTSC")); - drawSpeedWidget(p, 60, 45 + (225 * 3), QString("VTSC"), adjustedCruise, QColor(0xff, 0xff, 0xff)); + // // Todo: needs to be changed to calculate off of actual speed limit for release + // QString adjustedCruise = QString::number(paramsMemory.getInt("SpeedLimitVTSC")); + // drawSpeedWidget(p, 60, 45 + (225 * 3), QString("VTSC"), adjustedCruise, QColor(0xff, 0xff, 0xff)); // Todo: lead speed // Todo: Experimental speed @@ -481,7 +481,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { // } // } -void AnnotatedCameraWidget::drawSpeedWidget(QPainter &p, int x, int y, const QString &title, const QString &speedLimitStr, QColor colorSpeed, int width) { +void AnnotatedCameraWidget::drawSpeedWidget(QPainter &p, int x, int y, const QString &title, const QString &speedLimitStr, QColor colorSpeed, int width = 176) { // Draw outer box + border to contain set speed and speed limit const int sign_margin = 12; const int us_sign_height = 186;