diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index ded513a..a5c0f64 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -279,11 +279,11 @@ class CarState(CarStateBase): self.main_buttons.extend(cp.vl_all[self.cruise_btns_msg_canfd]["ADAPTIVE_CRUISE_MAIN_BTN"]) if self.prev_main_buttons == 0 and self.main_buttons[-1] != 0: self.main_enabled = not self.main_enabled - if self.fix_main_enabled_check: - self.fix_main_enabled_check = False - if ret.cruiseState.speed > 1 and self.main_enabled == False: - self.fix_main_enabled_cancel_main = True - self.fix_main_enabled_executed = True + # if self.fix_main_enabled_check: + # self.fix_main_enabled_check = False + # if ret.cruiseState.speed > 1 and self.main_enabled == False: + # self.fix_main_enabled_cancel_main = True + # self.fix_main_enabled_executed = True self.buttons_counter = cp.vl[self.cruise_btns_msg_canfd]["COUNTER"] ret.accFaulted = cp.vl["TCS"]["ACCEnable"] != 0 # 0 ACC CONTROL ENABLED, 1-3 ACC CONTROL DISABLED diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index ba0e525..017d877 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -905,7 +905,8 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { // Use current background color QLinearGradient edge_gradient; // QColor test_color = QColor(201, 41, 204, 0xd1); - QColor test_color = bg; + QColor test_color; + test_color = bg; // edge_gradient.setColorAt(0.0, QColor(test_color.red(), test_color.green(), test_color.blue(), static_cast(OTHER_LANE_ALPHA * 255))); // edge_gradient.setColorAt(0.5, QColor(test_color.red(), test_color.green(), test_color.blue(), static_cast(OTHER_LANE_ALPHA * 255 * 0.5))); // edge_gradient.setColorAt(1.0, QColor(test_color.red(), test_color.green(), test_color.blue(), static_cast(OTHER_LANE_ALPHA * 255 * 0.1)));