diff --git a/clearpiliot_devqueue.txt b/clearpiliot_devqueue.txt index 359d03e..6c358db 100644 --- a/clearpiliot_devqueue.txt +++ b/clearpiliot_devqueue.txt @@ -1,13 +1,28 @@ -- fix drive mode -- on ready, just logo with 'ready' (auto gen) -- on ready, screen timeout 3 minutes -- on settings, screen timeout 3 minutes + +- disable changing lanes notices (tiny indicator is fine) +- speed limit display / over speed display +- hack the buttons so we can press them +- auto set speed limit +- conditional experimenal mode +- auto set hvac +- fix gps data +- disable cc on start if already enabled +- chirp on stoplight +- resume when lead moving away +- hold down button to turn off screen, remember setting + +- package up lateral pause lane change feature for merge into frogpilot + +- bluetooth dummy device +- dash cam + +- put dev logo in repo +- better detection of if logo is installed even without it generated (md5 in persistant dirs?) + - define forced settings - define default settings - update dash symbols logic -- update on road gui to take out dumb widgets -- write forced disable lane change mode feature -- write automations node script, have it read data from stdin / write to stdout + - fix webview - write hello world new settings menu diff --git a/selfdrive/car/hyundai/hyundaicanfd.py b/selfdrive/car/hyundai/hyundaicanfd.py index ba1d352..a87539e 100644 --- a/selfdrive/car/hyundai/hyundaicanfd.py +++ b/selfdrive/car/hyundai/hyundaicanfd.py @@ -41,7 +41,7 @@ def create_steering_messages(packer, CP, CAN, enabled, lat_active, apply_steer): ret = [] values = { - "LKA_MODE": 2, # CP: Whats this? + "LKA_MODE": 2, "LKA_ICON": 2 if enabled else 1 if lat_active else 0, # right mode icon "TORQUE_REQUEST": apply_steer, "LKA_ASSIST": 0, @@ -137,7 +137,8 @@ def create_lfahda_cluster(packer, CAN, enabled, lat_active): # 0 off, 1 gray, 2 green, 3 blinking (wheel icon) # CP: Is this actually the wheel? Might this be the HDA2 thing? "HDA_ICON": 0, # Intention is to have this represent stock HDA mode - "LFA_ICON": 0 if no_lat_lane_change else 2 if enabled else 1 if lat_active else 0, + "LFA_ICON": 0, + # "LFA_ICON": 0 if no_lat_lane_change else 2 if enabled else 1 if lat_active else 0, } return packer.make_can_msg("LFAHDA_CLUSTER", CAN.ECAN, values) diff --git a/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png b/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png index 434f331..1ebae3f 100644 Binary files a/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png and b/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png~ b/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png~ new file mode 100644 index 0000000..e704533 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot/images/boot_logo.png~ differ diff --git a/selfdrive/clearpilot/theme/clearpilot/images/button_flag.png b/selfdrive/clearpilot/theme/clearpilot/images/button_flag.png index 2398328..cac4db6 100644 Binary files a/selfdrive/clearpilot/theme/clearpilot/images/button_flag.png and b/selfdrive/clearpilot/theme/clearpilot/images/button_flag.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot/images/button_home.png b/selfdrive/clearpilot/theme/clearpilot/images/button_home.png index 2398328..9f52faf 100644 Binary files a/selfdrive/clearpilot/theme/clearpilot/images/button_home.png and b/selfdrive/clearpilot/theme/clearpilot/images/button_home.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot/images/ready.png b/selfdrive/clearpilot/theme/clearpilot/images/ready.png index 247ec81..0da094c 100644 Binary files a/selfdrive/clearpilot/theme/clearpilot/images/ready.png and b/selfdrive/clearpilot/theme/clearpilot/images/ready.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/boot_logo.png b/selfdrive/clearpilot/theme/clearpilot_release/images/boot_logo.png new file mode 100644 index 0000000..434f331 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/boot_logo.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png b/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png new file mode 100644 index 0000000..2398328 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png~ b/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png~ new file mode 100644 index 0000000..24af958 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/button_flag.png~ differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png b/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png new file mode 100644 index 0000000..2398328 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png~ b/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png~ new file mode 100644 index 0000000..24af958 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/button_home.png~ differ diff --git a/selfdrive/clearpilot/theme/pac/images/button_settings.png b/selfdrive/clearpilot/theme/clearpilot_release/images/button_settings.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/button_settings.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/button_settings.png diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png b/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png new file mode 100644 index 0000000..247ec81 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png differ diff --git a/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png~ b/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png~ new file mode 100644 index 0000000..83eadc4 Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/images/ready.png~ differ diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_1.png b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_1.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1.png diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_1.png~ b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1.png~ similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_1.png~ rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1.png~ diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_1_red.png b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1_red.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_1_red.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_1_red.png diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_2.png b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_2.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_2.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_2.png diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_3.png b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_3.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_3.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_3.png diff --git a/selfdrive/clearpilot/theme/pac/images/turn_signal_4.png b/selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_4.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/turn_signal_4.png rename to selfdrive/clearpilot/theme/clearpilot_release/images/turn_signal_4.png diff --git a/selfdrive/clearpilot/theme/pac/sounds/disengage.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/disengage.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/disengage.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/disengage.wav diff --git a/selfdrive/clearpilot/theme/pac/sounds/engage.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/engage.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/engage.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/engage.wav diff --git a/selfdrive/clearpilot/theme/pac/sounds/firefox.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/firefox.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/firefox.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/firefox.wav diff --git a/selfdrive/clearpilot/theme/pac/sounds/prompt.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/prompt.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/prompt.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/prompt.wav diff --git a/selfdrive/clearpilot/theme/clearpilot_release/sounds/prompt_distracted.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/prompt_distracted.wav new file mode 100644 index 0000000..5d6308b Binary files /dev/null and b/selfdrive/clearpilot/theme/clearpilot_release/sounds/prompt_distracted.wav differ diff --git a/selfdrive/clearpilot/theme/pac/sounds/refuse.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/refuse.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/refuse.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/refuse.wav diff --git a/selfdrive/clearpilot/theme/pac/sounds/warning_immediate.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/warning_immediate.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/warning_immediate.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/warning_immediate.wav diff --git a/selfdrive/clearpilot/theme/pac/sounds/warning_soft.wav b/selfdrive/clearpilot/theme/clearpilot_release/sounds/warning_soft.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/warning_soft.wav rename to selfdrive/clearpilot/theme/clearpilot_release/sounds/warning_soft.wav diff --git a/selfdrive/clearpilot/theme/pac/images/bg.jpg b/selfdrive/clearpilot/theme/pacman_dev/images/bg.jpg~ similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/bg.jpg rename to selfdrive/clearpilot/theme/pacman_dev/images/bg.jpg~ diff --git a/selfdrive/clearpilot/theme/pac/images/button_flag.png b/selfdrive/clearpilot/theme/pacman_dev/images/button_flag.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/button_flag.png rename to selfdrive/clearpilot/theme/pacman_dev/images/button_flag.png diff --git a/selfdrive/clearpilot/theme/pac/images/button_home.png b/selfdrive/clearpilot/theme/pacman_dev/images/button_home.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/button_home.png rename to selfdrive/clearpilot/theme/pacman_dev/images/button_home.png diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/button_settings.png b/selfdrive/clearpilot/theme/pacman_dev/images/button_settings.png new file mode 100644 index 0000000..549e2be Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/button_settings.png differ diff --git a/selfdrive/clearpilot/theme/pac/images/ready.png b/selfdrive/clearpilot/theme/pacman_dev/images/ready.png similarity index 100% rename from selfdrive/clearpilot/theme/pac/images/ready.png rename to selfdrive/clearpilot/theme/pacman_dev/images/ready.png diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png new file mode 100644 index 0000000..ff7893e Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png~ b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png~ new file mode 100644 index 0000000..ff7893e Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1.png~ differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1_red.png b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1_red.png new file mode 100644 index 0000000..58f63c8 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_1_red.png differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_2.png b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_2.png new file mode 100644 index 0000000..58f63c8 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_2.png differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_3.png b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_3.png new file mode 100644 index 0000000..58f63c8 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_3.png differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_4.png b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_4.png new file mode 100644 index 0000000..58f63c8 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/images/turn_signal_4.png differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/disengage.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/disengage.wav new file mode 100644 index 0000000..2ec5f45 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/disengage.wav differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/engage.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/engage.wav new file mode 100644 index 0000000..2ec5f45 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/engage.wav differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/firefox.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/firefox.wav new file mode 100644 index 0000000..2ec5f45 Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/firefox.wav differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/prompt.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/prompt.wav new file mode 100644 index 0000000..420e9fa Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/prompt.wav differ diff --git a/selfdrive/clearpilot/theme/pac/sounds/prompt_distracted.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/prompt_distracted.wav similarity index 100% rename from selfdrive/clearpilot/theme/pac/sounds/prompt_distracted.wav rename to selfdrive/clearpilot/theme/pacman_dev/sounds/prompt_distracted.wav diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/refuse.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/refuse.wav new file mode 100644 index 0000000..0e80f7d Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/refuse.wav differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_immediate.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_immediate.wav new file mode 100644 index 0000000..a8c778f Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_immediate.wav differ diff --git a/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_soft.wav b/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_soft.wav new file mode 100644 index 0000000..a8c778f Binary files /dev/null and b/selfdrive/clearpilot/theme/pacman_dev/sounds/warning_soft.wav differ diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index f508de0..2aa5ef3 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -568,19 +568,23 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { ET.WARNING: below_steer_speed_alert, }, + # Clearpilot - move this to status bar only on lane_change_suspend_lat + # restore small size on other modes EventName.preLaneChangeLeft: { ET.WARNING: Alert( "Steer Left to Start Lane Change Once Safe", "", - AlertStatus.normal, AlertSize.small, + AlertStatus.normal, AlertSize.none, Priority.LOW, VisualAlert.none, AudibleAlert.none, .1, alert_rate=0.75), }, + # Clearpilot - move this to status bar only on lane_change_suspend_lat + # restore small size on other modes EventName.preLaneChangeRight: { ET.WARNING: Alert( "Steer Right to Start Lane Change Once Safe", "", - AlertStatus.normal, AlertSize.small, + AlertStatus.normal, AlertSize.none, Priority.LOW, VisualAlert.none, AudibleAlert.none, .1, alert_rate=0.75), }, @@ -592,11 +596,12 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { Priority.LOW, VisualAlert.none, AudibleAlert.prompt, .1), }, + # Clearpilot - move this to status bar only on lane_change_suspend_lat EventName.laneChange: { ET.WARNING: Alert( "Changing Lanes", "", - AlertStatus.normal, AlertSize.small, + AlertStatus.normal, AlertSize.none, Priority.LOW, VisualAlert.none, AudibleAlert.none, .1), }, diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index d9b3811..ae467dc 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -98,6 +98,11 @@ void OnroadWindow::updateState(const UIState &s) { } QColor bgColor = bg_colors[s.status]; + // Clearpilot + if (paramsMemory.getInt("no_lat_lane_change") == 1) { + bg = bg_colors[STATUS_DISENGAGED]; + } + Alert alert = Alert::get(*(s.sm), s.scene.started_frame); alerts->updateAlert(alert); @@ -109,11 +114,6 @@ void OnroadWindow::updateState(const UIState &s) { nvg->updateState(s); - // Clearpilot - if (paramsMemory.getInt("no_lat_lane_change") == 1) { - bg = bg_colors[STATUS_DISENGAGED]; - } - if (bg != bgColor) { // repaint border bg = bgColor; @@ -899,29 +899,25 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { painter.setBrush(path_gradient); painter.drawPolygon(scene.track_vertices); - // Paint path edges - // don't paint if not engaged color - // if (bg != bg_colors[STATUS_DISENGAGED]) { - // Use current background color + // Paint path edges ,Use current background color + QColor bgColor = bg_colors[uiState().status]; + // Clearpilot + if (paramsMemory.getInt("no_lat_lane_change") == 1) { + bgColor = bg_colors[STATUS_DISENGAGED]; + } + if (bgColor != bg_colors[STATUS_DISENGAGED]) { QLinearGradient edge_gradient; - // QColor test_color = QColor(201, 41, 204, 0xd1); - 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))); - edge_gradient.setColorAt(0.0, QColor(bg.red(), bg.green(), bg.blue(), static_cast(255))); - edge_gradient.setColorAt(0.5, QColor(bg.red(), bg.green(), bg.blue(), static_cast(255 * 0.7) )); - edge_gradient.setColorAt(1.0, QColor(bg.red(), bg.green(), bg.blue(), static_cast(255 * 0.5))); + edge_gradient.setColorAt(0.0, QColor(bgColor.red(), bgColor.green(), bgColor.blue(), static_cast(255))); + edge_gradient.setColorAt(0.5, QColor(bgColor.red(), bgColor.green(), bgColor.blue(), static_cast(255 * 0.7) )); + edge_gradient.setColorAt(1.0, QColor(bgColor.red(), bgColor.green(), bg.blue(), static_cast(255 * 0.5))); QPainterPath path; path.addPolygon(scene.track_vertices); path.addPolygon(scene.track_edge_vertices); - // painter.setBrush(path_gradient); painter.setBrush(edge_gradient); painter.drawPath(path); - // } + } // Paint blindspot path if (scene.blind_spot_path) { diff --git a/system/clearpilot/loading_messages.txt b/system/clearpilot/loading_messages.txt new file mode 100644 index 0000000..0b5f1c9 --- /dev/null +++ b/system/clearpilot/loading_messages.txt @@ -0,0 +1,24 @@ +Ignoring back seat drivers +Exagerating ETAs +Excessivising spoken directions +Coping with rush hour +Aplifying engine noise +Embellishing odometer milestones +Battle hardening high beams +Supercharging racing stripes +Entwining software threading +Exagerating window tint levels +Thinning traffic densities +Chiseling GPS precision +Garnishing dashboard displays +Unfolding map details +Sprinkling road salt forecasts +Skimming speed limit tolerances +Fudging commute predictions +Contemplating the meaning of life +Compiling cospiracy theories +Scanning road trip snacks +Cataloguing snacks +Elevating tire rotation into ballet +Preparing for best behavior +Pep talking driving models \ No newline at end of file diff --git a/system/clearpilot/notes/oscarpilot_boot.png b/system/clearpilot/notes/oscarpilot_boot.png new file mode 100644 index 0000000..f942d76 Binary files /dev/null and b/system/clearpilot/notes/oscarpilot_boot.png differ diff --git a/system/clearpilot/notes/oscarpilot_ready.png b/system/clearpilot/notes/oscarpilot_ready.png new file mode 100644 index 0000000..0da094c Binary files /dev/null and b/system/clearpilot/notes/oscarpilot_ready.png differ diff --git a/system/clearpilot/startup_logo/bg.jpg b/system/clearpilot/startup_logo/bg.jpg deleted file mode 100644 index 256c1af..0000000 Binary files a/system/clearpilot/startup_logo/bg.jpg and /dev/null differ diff --git a/system/clearpilot/startup_logo/set_logo.sh b/system/clearpilot/startup_logo/set_logo.sh index 28de09d..4b1533a 100644 --- a/system/clearpilot/startup_logo/set_logo.sh +++ b/system/clearpilot/startup_logo/set_logo.sh @@ -2,20 +2,18 @@ set -x -# Todo: Put stock image in the repo, so we can reset the stock with it if some other -# fork changed it and failed to restore it on uninstall # Check if md5sum of /usr/comma/bg.jpg is not equal to md5sum of /data/openpilot/system/clearpilot/startup_logo/bg.jpg if [ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" != "$(md5sum /data/openpilot/system/clearpilot/startup_logo/bg.jpg | awk '{print $1}')" ]; then - bash /data/openpilot/system/clearpilot/startup_logo/generate_logo.sh +fi + +if [ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" != "$(md5sum /data/openpilot/system/clearpilot/startup_logo/bg.jpg | awk '{print $1}')" ]; then # If /usr/comma/bg.org does not exist if [ ! -f /usr/comma/bg.org ]; then - # if [[ "$(md5sum /usr/comma/bg.jpg | awk '{print $1}')" == "642380ba4c0f00b16e9cf6e613f43eec" ]]; then - sudo mount -o remount,rw / - sudo cp /data/openpilot/system/clearpilot/startup_logo/bg.org /usr/comma/bg.org - # fi + sudo mount -o remount,rw / + sudo cp /data/openpilot/system/clearpilot/startup_logo/bg.org /usr/comma/bg.org fi if [[ "$(md5sum /usr/comma/bg.org | awk '{print $1}')" != "642380ba4c0f00b16e9cf6e613f43eec" ]]; then