This commit is contained in:
Your Name
2024-02-13 00:22:00 -06:00
parent e10db32b69
commit af0fc9daec
3 changed files with 46 additions and 6 deletions

View File

@@ -19,11 +19,46 @@ done
if [ "$timeout" -gt 0 ]; then if [ "$timeout" -gt 0 ]; then
echo "Internet connection established, proceeding with update." echo "Internet connection established, proceeding with update."
# Fetch the latest changes from the remote repository # Set branch to your target branch
git fetch origin branch="oscrpilot"
# Reset the local changes and set the local branch to match the remote repository, overwriting local changes # Fetch the latest changes from the remote repository for the target branch
git reset --hard origin/oscrpilot 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 fi
# Blank the UI (assuming framebuffer device is /dev/fb0) # Blank the UI (assuming framebuffer device is /dev/fb0)

7
notes
View File

@@ -16,7 +16,12 @@ Pie in the sky:
OPKR features: OPKR features:
- Auto Resume at Stop - Auto Resume at Stop
- Button Spam CC - 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. - 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. ret.cruiseState.standstill cp_scc.vl["SCC11"]["SCCInfoDisplay"] == 4.
@@ -32,4 +37,4 @@ Interesting can messages
- test: set cluster speed directly - test: set cluster speed directly
- test: simulate down button on wheel - 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 - 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 - Fix: read speed limit from car computer, flicker LKAS button when it is out of range

View File

@@ -25,7 +25,7 @@ QString getVersion() {
} }
QString getBrand() { QString getBrand() {
return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("FrogPilot"); return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("OscarPilot");
} }
QString getUserAgent() { QString getUserAgent() {