diff --git a/notes b/notes index 0ddc08e..b8b6852 100644 --- a/notes +++ b/notes @@ -1,5 +1,11 @@ hyundai/interface ENABLE_BUTTONS = (Buttons.RES_ACCEL, Buttons.SET_DECEL, Buttons.CANCEL) +- The speedometer icons are at: +- void AnnotatedCameraWidget::updateState(const UIState &s) { + +- Test: no more wheel or record icons + +- test: 5 minute timeout settings screen - SSH reverse proxy if it is my personal dongle ID - Read all car variables: - Dash speed @@ -24,6 +30,11 @@ hyundai/interface ENABLE_BUTTONS = (Buttons.RES_ACCEL, Buttons.SET_DECEL, Button - Info button interception - Set speedometer as main display on car start - Set hvac to standard when car started w/ key (openpilot on) +- Store settings on device and on server when possible by dongle id. restore settings on boot. +- Bring up wifi before compile. If automatic updates are enabled and a update is available, fetch it and compile. +- disable lat turn signal below hwy speeds +- setting: disable lane change assist alltogether +- setting: auto passive dash cam recorder / uploader Weather: Ideally we intercept the info buttons on the wheel to control this. diff --git a/selfdrive/frogpilot/ui/control_settings.cc b/selfdrive/frogpilot/ui/control_settings.cc index 686c040..da081a6 100644 --- a/selfdrive/frogpilot/ui/control_settings.cc +++ b/selfdrive/frogpilot/ui/control_settings.cc @@ -10,7 +10,7 @@ FrogPilotControlsPanel::FrogPilotControlsPanel(SettingsWindow *parent) : FrogPil {"CECurves", "Curve Detected Ahead", "Switch to 'Experimental Mode' when a curve is detected.", ""}, {"CENavigation", "Navigation Based", "Switch to 'Experimental Mode' based on navigation data. (i.e. Intersections, stop signs, etc.)", ""}, {"CESlowerLead", "Slower Lead Detected Ahead", "Switch to 'Experimental Mode' when a slower lead vehicle is detected ahead.", ""}, - {"CEStopLights", "Stop Lights and Stop Signs", "Switch to 'Experimental Mode' when a stop light or stop sign is detected.", ""}, + // {"CEStopLights", "Stop Lights and Stop Signs", "Switch to 'Experimental Mode' when a stop light or stop sign is detected.", ""}, {"CESignal", "Turn Signal When Below Highway Speeds", "Switch to 'Experimental Mode' when using turn signals below highway speeds to help assit with turns.", ""}, {"CSLCEnabled", "Custom Stock Longitudinal Control", "Use cruise control button spamming to adjust cruise set speed based on MTSC, VTSC, and SLC", "../frogpilot/assets/toggle_icons/icon_custom.png"}, {"CustomPersonalities", "Custom Driving Personalities", "Customize the driving personality profiles to your driving style.", "../frogpilot/assets/toggle_icons/icon_custom.png"}, diff --git a/selfdrive/frogpilot/ui/frogpilot_functions.cc b/selfdrive/frogpilot/ui/frogpilot_functions.cc index 35a16af..135bd4d 100644 --- a/selfdrive/frogpilot/ui/frogpilot_functions.cc +++ b/selfdrive/frogpilot/ui/frogpilot_functions.cc @@ -67,8 +67,8 @@ void setDefaultParams() { {"CESlowerLead", "0"}, {"CESpeed", "0"}, {"CESpeedLead", "0"}, - {"CEStopLights", "1"}, - {"CEStopLightsLead", FrogsGoMoo ? "0" : "1"}, + {"CEStopLights", "0"}, + {"CEStopLightsLead", FrogsGoMoo ? "0" : "0"}, {"Compass", FrogsGoMoo ? "1" : "0"}, {"ConditionalExperimental", "1"}, {"CurveSensitivity", FrogsGoMoo ? "125" : "100"}, @@ -80,6 +80,7 @@ void setDefaultParams() { {"CustomTheme", "1"}, {"CustomUI", "0"}, {"DeviceShutdown", "1"}, + {"DisableOnroadUploads", "1"}, {"DriverCamera", "0"}, {"DriveStats", "1"}, {"EVTable", FrogsGoMoo ? "0" : "1"}, @@ -114,14 +115,14 @@ void setDefaultParams() { {"NoLogging", "1"}, {"NudgelessLaneChange", "0"}, {"NumericalTemp", FrogsGoMoo ? "1" : "0"}, - {"Offset1", "5"}, + {"Offset1", "3"}, {"Offset2", FrogsGoMoo ? "7" : "5"}, - {"Offset3", "5"}, - {"Offset4", FrogsGoMoo ? "20" : "10"}, + {"Offset3", "7"}, + {"Offset4", FrogsGoMoo ? "20" : "7"}, {"OneLaneChange", "1"}, {"PathEdgeWidth", "20"}, {"PathWidth", "61"}, - {"PauseLateralOnSignal", "0"}, + {"PauseLateralOnSignal", "20"}, {"PreferredSchedule", "0"}, {"QOLControls", "1"}, {"QOLVisuals", "1"}, @@ -150,7 +151,7 @@ void setDefaultParams() { {"StandardJerk", "10"}, {"StoppingDistance", FrogsGoMoo ? "6" : "0"}, {"TSS2Tune", "1"}, - {"TurnAggressiveness", FrogsGoMoo ? "150" : "100"}, + {"TurnAggressiveness", FrogsGoMoo ? "150" : "100"}, // Test 90? {"TurnDesires", "0"}, {"UnlimitedLength", "1"}, {"UseSI", FrogsGoMoo ? "1" : "0"}, diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index e342996..e125e74 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -427,24 +427,26 @@ void ExperimentalButton::updateState(const UIState &s, bool leadInfo) { void ExperimentalButton::paintEvent(QPaintEvent *event) { QPainter p(this); - // Custom steering wheel icon - engage_img = wheelImages[wheelIcon]; - QPixmap img = wheelIcon ? engage_img : (experimental_mode ? experimental_img : engage_img); + // Steering wheel icon disabled - QColor background_color = wheelIcon && !isDown() && engageable ? - (scene.always_on_lateral_active ? QColor(10, 186, 181, 255) : - (scene.conditional_status == 1 ? QColor(255, 246, 0, 255) : - (experimental_mode ? QColor(218, 111, 37, 241) : - (scene.navigate_on_openpilot ? QColor(49, 161, 238, 255) : QColor(0, 0, 0, 166))))) : - QColor(0, 0, 0, 166); + // // Custom steering wheel icon + // engage_img = wheelImages[wheelIcon]; + // QPixmap img = wheelIcon ? engage_img : (experimental_mode ? experimental_img : engage_img); - if (!scene.show_driver_camera) { - if (rotatingWheel || firefoxRandomEventTriggered) { - drawIconRotate(p, QPoint(btn_size / 2, btn_size / 2 + y_offset), img, background_color, (isDown() || (!engageable && !scene.always_on_lateral_active)) ? 0.6 : 1.0, steeringAngleDeg); - } else { - drawIcon(p, QPoint(btn_size / 2, btn_size / 2 + y_offset), img, background_color, (isDown() || (!engageable && !scene.always_on_lateral_active)) ? 0.6 : 1.0); - } - } + // QColor background_color = wheelIcon && !isDown() && engageable ? + // (scene.always_on_lateral_active ? QColor(10, 186, 181, 255) : + // (scene.conditional_status == 1 ? QColor(255, 246, 0, 255) : + // (experimental_mode ? QColor(218, 111, 37, 241) : + // (scene.navigate_on_openpilot ? QColor(49, 161, 238, 255) : QColor(0, 0, 0, 166))))) : + // QColor(0, 0, 0, 166); + + // if (!scene.show_driver_camera) { + // if (rotatingWheel || firefoxRandomEventTriggered) { + // drawIconRotate(p, QPoint(btn_size / 2, btn_size / 2 + y_offset), img, background_color, (isDown() || (!engageable && !scene.always_on_lateral_active)) ? 0.6 : 1.0, steeringAngleDeg); + // } else { + // drawIcon(p, QPoint(btn_size / 2, btn_size / 2 + y_offset), img, background_color, (isDown() || (!engageable && !scene.always_on_lateral_active)) ? 0.6 : 1.0); + // } + // } } @@ -475,11 +477,12 @@ AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* par // Neokii screen recorder QHBoxLayout *top_right_layout = new QHBoxLayout(); top_right_layout->setSpacing(0); - recorder_btn = new ScreenRecorder(this); - top_right_layout->addWidget(recorder_btn); - experimental_btn = new ExperimentalButton(this); - top_right_layout->addWidget(experimental_btn); + // recorder_btn = new ScreenRecorder(this); + // top_right_layout->addWidget(recorder_btn); + + // experimental_btn = new ExperimentalButton(this); + // top_right_layout->addWidget(experimental_btn); main_layout->addLayout(top_right_layout, 0); main_layout->setAlignment(top_right_layout, Qt::AlignTop | Qt::AlignRight); diff --git a/selfdrive/updated.py b/selfdrive/updated.py index 0bba9eb..47620c0 100644 --- a/selfdrive/updated.py +++ b/selfdrive/updated.py @@ -338,7 +338,7 @@ class Updater: def check_for_update(self) -> None: cloudlog.info("checking for updates") - excluded_branches = ('release2', 'release2-staging', 'dashcam', 'dashcam-staging') + excluded_branches = ('release2', 'release2-staging', 'dashcam', 'dashcam-staging', 'FrogPilot') try: run(["git", "ls-remote", "origin", "HEAD"], OVERLAY_MERGED)