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-03 22:42:45 -05:00
parent 7813a5aeff
commit 3cf8f095a8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
selfdrive/car/hyundai/carstate.py
View File

@@ -187,9 +187,6 @@ class CarState(CarStateBase):
self.lkas_previously_enabled = self.lkas_enabled self.lkas_previously_enabled = self.lkas_enabled
self.lkas_enabled = cp.vl["BCM_PO_11"]["LFA_Pressed"] self.lkas_enabled = cp.vl["BCM_PO_11"]["LFA_Pressed"]
print('Hello World', file=sys.stderr)
print(self, file=sys.stderr)
self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_conv) self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_conv)
return ret return ret
@@ -285,10 +282,13 @@ class CarState(CarStateBase):
# CLEARPILOT fix # CLEARPILOT fix
lkas_enabled = False lkas_enabled = False
try: try:
lkas_enabled = cp.vl[self.cruise_btns_msg_canfd]["LKAS_BTN"] lkas_enabled = cp.vl[self.cruise_btns_msg_canfd]["LFA_BTN"]
except: except:
nothing = 0 nothing = 0
print('Hello World', file=sys.stderr)
print(self, file=sys.stderr)
self.lkas_enabled = lkas_enabled self.lkas_enabled = lkas_enabled
self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_factor) self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_factor)

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

@@ -46,7 +46,7 @@ static void drawIconGif(QPainter &p, const QPoint &center, const QMovie &img, co
} }
OnroadWindow::OnroadWindow(QWidget *parent) : QWidget(parent), scene(uiState()->scene) { OnroadWindow::OnroadWindow(QWidget *parent) : QWidget(parent), scene(uiState()->scene) {
bg = QColor(0x17, 0x33, 0x49, 0xc8); // init to a default color bg = QColor(255, 0x33, 0x49, 0xc8); // init to a default color
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
main_layout->setMargin(UI_BORDER_SIZE); main_layout->setMargin(UI_BORDER_SIZE);
QStackedLayout *stacked_layout = new QStackedLayout; QStackedLayout *stacked_layout = new QStackedLayout;

3
selfdrive/ui/ui.cc
View File

@@ -360,7 +360,8 @@ void ui_update_frogpilot_params(UIState *s) {
scene.hide_lead_marker = scene.model_ui && params.getBool("HideLeadMarker"); scene.hide_lead_marker = scene.model_ui && params.getBool("HideLeadMarker");
scene.lane_line_width = params.getInt("LaneLinesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f; scene.lane_line_width = params.getInt("LaneLinesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f;
// CLEARPILOT - either disable these options, or set them as defaults and restore them // CLEARPILOT - either disable these options, or set them as defaults and restore them
scene.path_edge_width = /* params.getInt("PathEdgeWidth"); */ OTHER_LANE_WIDTH; scene.path_edge_width = params.getInt("PathEdgeWidth");
// scene.path_edge_width = /* params.getInt("PathEdgeWidth"); */ OTHER_LANE_WIDTH;
scene.path_width = /* params.getInt("PathWidth") */ CENTER_LANE_WIDTH / 10.0f * (scene.is_metric ? 1.0f : FOOT_TO_METER) / 2.0f; scene.path_width = /* params.getInt("PathWidth") */ CENTER_LANE_WIDTH / 10.0f * (scene.is_metric ? 1.0f : FOOT_TO_METER) / 2.0f;
scene.road_edge_width = params.getInt("RoadEdgesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f; scene.road_edge_width = params.getInt("RoadEdgesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f;
scene.unlimited_road_ui_length = scene.model_ui && params.getBool("UnlimitedLength"); scene.unlimited_road_ui_length = scene.model_ui && params.getBool("UnlimitedLength");