brianhansonxyz/clearpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
concordia
2024-06-15 20:25:53 -05:00
parent 720c9ccbc8
commit 7bb4980119
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/manager/process.py
View File

@@ -170,7 +170,7 @@ class NativeProcess(ManagerProcess):
self.enabled = enabled self.enabled = enabled
self.sigkill = sigkill self.sigkill = sigkill
self.watchdog_max_dt = watchdog_max_dt self.watchdog_max_dt = watchdog_max_dt
self.launcher = nativelauncher self.launcher = modified_nativelauncher
self.always_watchdog = always_watchdog self.always_watchdog = always_watchdog
def prepare(self) -> None: def prepare(self) -> None:

22
selfdrive/ui/qt/onroad.cc
View File

@@ -392,20 +392,20 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
p.restore(); p.restore();
// if (!scene.hide_max_speed) { // 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 // // Todo: needs to be changed to calculate off of actual speed limit for release
QString speedLimitStr = QString::number(paramsMemory.getInt("CarSpeedLimitLiteral")); // QString speedLimitStr = QString::number(paramsMemory.getInt("CarSpeedLimitLiteral"));
drawSpeedWidget(p, 60, 45 + (225), QString("Limit"), speedLimitStr, QColor(0xff, 0xff, 0xff)); // 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 // // Todo: needs to be changed to calculate off of actual speed limit for release
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 // // Todo: needs to be changed to calculate off of actual speed limit for release
QString adjustedCruise = QString::number(paramsMemory.getInt("SpeedLimitVTSC")); // 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
// Todo: Experimental 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 // Draw outer box + border to contain set speed and speed limit
const int sign_margin = 12; const int sign_margin = 12;
const int us_sign_height = 186; const int us_sign_height = 186;