diff --git a/foo b/foo deleted file mode 100644 index e69de29..0000000 diff --git a/notes b/notes index 80c6fcf..0ddc08e 100644 --- a/notes +++ b/notes @@ -1,5 +1,36 @@ hyundai/interface ENABLE_BUTTONS = (Buttons.RES_ACCEL, Buttons.SET_DECEL, Buttons.CANCEL) +- SSH reverse proxy if it is my personal dongle ID +- Read all car variables: + - Dash speed + - Experimental desired speed + - engagement +- UI updates: + - Turn HDA2 icon off if in experimental mode + - Show "AUTO" in green if in auto speed mode via wheel icon +- Simulated button presses + - Down / Up / Resume +- CAN data: + - Windows down + - Lead car distance while in stocklong + - Lead car is getting away +- Disable all telemetry to comma +- Conditional telemetry to me +- More than one wifi network - specify set wifi network for dashcam / route uploads and one for basic coms +- Implement stocklong on GM cars +- settings screen updates +- store / restore OP settings on my server +- cleanup code / reorganize fork +- Info button interception +- Set speedometer as main display on car start +- Set hvac to standard when car started w/ key (openpilot on) + +Weather: +Ideally we intercept the info buttons on the wheel to control this. +UI: https://github.com/jclarke0000/MMM-OpenWeatherForecast/blob/master/README.md +Radar: https://github.com/jojoduquartier/MMM-RAIN-RADAR +Embed possibility: https://cefview.github.io/QCefView/docs/intros/buiding + Goals: 1 - get current dash speed via calculate_speed_limit_canfd 2 - issue set decel button via LFA button (proof of concept) diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 68d0970..574f055 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -89,12 +89,11 @@ void HomeWindow::showDriverView(bool show) { } void HomeWindow::mousePressEvent(QMouseEvent* e) { - // Handle sidebar collapsing if (body->isVisible()) { showSidebar(true); slayout->setCurrentWidget(home); } else { - // ?? + // Handle sidebar collapsing if ((onroad->isVisible() || body->isVisible()) && (!sidebar->isVisible() || e->x() > sidebar->width())) { sidebar->setVisible(!sidebar->isVisible() && !onroad->isMapVisible()); } diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index bde9942..42b4c9e 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -29,6 +29,9 @@ #include "selfdrive/frogpilot/ui/vehicle_settings.h" #include "selfdrive/frogpilot/ui/visual_settings.h" +// Bbot notes: +// This is the main settings page. All other settings pages attach themselves to this page. + TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { // param, title, desc, icon std::vector> toggle_defs{ diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 985021a..900e23a 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -93,7 +93,11 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { case QEvent::MouseMove: { // ignore events when device is awakened by resetInteractiveTimeout ignore = !device()->isAwake(); - device()->resetInteractiveTimeout(); + if (main_layout->currentWidget() == settingsWindow) { + device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window + } else { + device()->resetInteractiveTimeout(); // Default 30 seconds otherwise + } break; } default: diff --git a/shell/revert_logo.sh b/shell/revert_logo.sh index bed8654..a50b2ed 100644 --- a/shell/revert_logo.sh +++ b/shell/revert_logo.sh @@ -9,9 +9,15 @@ if [ ! -f /data/openpilot/shell/bg.jpg ]; then sudo mv -f /usr/comma/bg.org /usr/comma/bg.jpg # Remove /usr/comma/bg.org # sudo rm /usr/comma/bg.org + if [ -f /usr/comma/comma.org ]; then + sudo mv -f /usr/comma/comma.org /usr/comma/comma.sh + fi echo Reverted custom logo for comma boot sequence sudo sync sleep 2 - sudo mount -o remount,ro / + sudo reboot + while true; do + sleep 1 + done fi fi \ No newline at end of file diff --git a/shell/set_logo.sh b/shell/set_logo.sh index 26f1cc3..e0cc12e 100644 --- a/shell/set_logo.sh +++ b/shell/set_logo.sh @@ -9,7 +9,6 @@ if [ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" != "$(md5sum /data/openpil # If /usr/comma/bg.org does not exist if [ ! -f /usr/comma/bg.org ]; then - # Check if md5sum of /usr/comma/bg.jpg contains "642380ba4c0f00b16e9cf6e613f43eec" if [[ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" == "642380ba4c0f00b16e9cf6e613f43eec" ]]; then sudo mount -o remount,rw / sudo cp /usr/comma/bg.jpg /usr/comma/bg.org @@ -35,8 +34,15 @@ if [ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" != "$(md5sum /data/openpil fi if [ "$(md5sum md5sum /usr/comma/comma.sh | awk '{print $1}')" != "$(md5sum /data/openpilot/shell/usr_comma_comma.sh | awk '{print $1}')" ]; then - echo updated comma.sh - sudo cp /data/openpilot/shell/usr_comma_comma.sh /usr/comma/comma.sh + if [[ "$(md5sum /usr/comma/comma.sh | awk '{print $1}')" == "ddbac0b46dd02efd672a0ef31ca426cf" ]]; then + if [ ! -f /usr/comma/comma.org ]; then + sudo cp /usr/comma/comma.sh /usr/comma/comma.org + fi + fi + if [-f /usr/comma/comma.org ]; then + sudo cp /data/openpilot/shell/usr_comma_comma.sh /usr/comma/comma.sh + echo updated comma.sh + fi fi echo Applied custom logo for comma boot sequence @@ -44,4 +50,5 @@ if [ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" != "$(md5sum /data/openpil sleep 2 sudo mount -o remount,ro / sudo sync + sleep 2 fi