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

wip

Browse Source
This commit is contained in:
Your Name
2024-05-18 02:11:26 -05:00
parent b8327c3dcd
commit a3de2347ad
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/controls/controlsd.py
View File

@@ -1239,7 +1239,7 @@ class Controls:
if any(be.pressed and be.type == FrogPilotButtonType.lkas for be in CS.buttonEvents): if any(be.pressed and be.type == FrogPilotButtonType.lkas for be in CS.buttonEvents):
# CC.cruiseControl.resume = True # CC.cruiseControl.resume = True
CC.cruiseControl.cancel = True CC.cruiseControl.cancel = True
self.params_memory.put_int("SpeedLimitLatDesired", CC.actuators.speed) self.params_memory.put_int("SpeedLimitLatDesired", CC.actuators.speed * CV.MS_TO_MPH )
# CC.actuators.speed # CC.actuators.speed
# print ("Alive") # print ("Alive")
return CC return CC

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

@@ -622,15 +622,15 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
QColor center_lane_color; QColor center_lane_color;
if (is_no_lat_lane_change) { // if (is_no_lat_lane_change) {
center_lane_color = bg_colors[CHANGE_LANE_PATH_COLOR]; // center_lane_color = bg_colors[CHANGE_LANE_PATH_COLOR];
} else { // } else {
center_lane_color = bg_colors[CENTER_LANE_COLOR]; center_lane_color = bg_colors[CENTER_LANE_COLOR];
} // }
QLinearGradient path_gradient(0, height(), 0, 0); QLinearGradient path_gradient(0, height(), 0, 0);
if (edgeColor != bg_colors[STATUS_DISENGAGED] || is_no_lat_lane_change) { // if (edgeColor != bg_colors[STATUS_DISENGAGED] || is_no_lat_lane_change) {
if (scene.acceleration_path) { if (scene.acceleration_path) {
// The first half of track_vertices are the points for the right side of the path // The first half of track_vertices are the points for the right side of the path
// and the indices match the positions of accel from uiPlan // and the indices match the positions of accel from uiPlan
@@ -680,7 +680,7 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
painter.setBrush(path_gradient); painter.setBrush(path_gradient);
painter.drawPolygon(scene.track_vertices); painter.drawPolygon(scene.track_vertices);
} // }
// Paint path edges ,Use current background color // Paint path edges ,Use current background color
if (edgeColor != bg_colors[STATUS_DISENGAGED]) { if (edgeColor != bg_colors[STATUS_DISENGAGED]) {