diff --git a/launch_openpilot.sh b/launch_openpilot.sh index 0d00561..809e5cf 100755 --- a/launch_openpilot.sh +++ b/launch_openpilot.sh @@ -19,11 +19,46 @@ done if [ "$timeout" -gt 0 ]; then echo "Internet connection established, proceeding with update." - # Fetch the latest changes from the remote repository - git fetch origin + # Set branch to your target branch + branch="oscrpilot" - # Reset the local changes and set the local branch to match the remote repository, overwriting local changes - git reset --hard origin/oscrpilot + # Fetch the latest changes from the remote repository for the target branch + git fetch origin "$branch" + + # Checkout the target branch forcefully, ignoring submodules as in the Python example + git checkout --force --no-recurse-submodules -B "$branch" FETCH_HEAD + + # Reset the local changes hard, clean the directory including untracked files and directories, + # and ensure submodules are in sync, updated, and also reset hard + git reset --hard + git clean -xdff + git submodule sync + git submodule update --init --recursive + git submodule foreach --recursive git reset --hard + + echo "Repository and submodules have been updated and cleaned." + + # Assuming AGNOS and finalize_update steps are specific and detailed, + # the shell equivalent might require custom scripts or commands. + # For AGNOS update, you'd handle it based on your specific needs. + + # Finalizing update - replicating the Python finalize_update function + FINALIZED="/path/to/finalized" # Define your finalized update path + OVERLAY_MERGED="/path/to/overlay_merged" # Define your overlay merged view path + + # Clean up any previous finalized update and copy the new one + [ -d "$FINALIZED" ] && rm -rf "$FINALIZED" + cp -rT "$OVERLAY_MERGED" "$FINALIZED" --preserve=links + + # Reset and clean the finalized update directory + git -C "$FINALIZED" reset --hard + git -C "$FINALIZED" submodule foreach --recursive git reset --hard + + # Run git cleanup in the finalized update directory + git -C "$FINALIZED" gc + git -C "$FINALIZED" lfs prune + + echo "Finalized update directory has been prepared." fi # Blank the UI (assuming framebuffer device is /dev/fb0) diff --git a/notes b/notes index 06e8eb1..bf28733 100644 --- a/notes +++ b/notes @@ -16,7 +16,12 @@ Pie in the sky: OPKR features: - Auto Resume at Stop - Button Spam CC +- auto select speedometer on boot - Accelerated Departure by Cruise Gap: Cruise gap automatically changed to step 1 for faster departure, sets back to orignal gap selection after few second. +- Weather radar screen (accessible by wheel) +- weather forecast screen (also by wheel) +- auto consent to carplay on car start +- auto hvac to comfortable on drve mode ret.cruiseState.standstill cp_scc.vl["SCC11"]["SCCInfoDisplay"] == 4. @@ -32,4 +37,4 @@ Interesting can messages - test: set cluster speed directly - test: simulate down button on wheel - we should put a splash screen of the pacman ghost over the main startup display, and only reveal the interface when we tap on it -- Fix: read speed limit from car computer, flicker LKAS button when it is out of range \ No newline at end of file +- Fix: read speed limit from car computer, flicker LKAS button when it is out of range diff --git a/selfdrive/ui/qt/util.cc b/selfdrive/ui/qt/util.cc index d3981ae..e18f92a 100644 --- a/selfdrive/ui/qt/util.cc +++ b/selfdrive/ui/qt/util.cc @@ -25,7 +25,7 @@ QString getVersion() { } QString getBrand() { - return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("FrogPilot"); + return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("OscarPilot"); } QString getUserAgent() {