change rect width instead

.codespellignore

@@ -3,4 +3,3 @@ REGIST
 PullRequest
 cancelled
 FOF
-NoO

.github/workflows/build-all-tinygrad-models.yaml

@@ -74,7 +74,7 @@ jobs:
         env:
           GIT_SSH_COMMAND: 'ssh -o UserKnownHostsFile=~/.ssh/known_hosts'
         run: |
-          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/${{ vars.MODELS_GITLAB }} gitlab_docs
+          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/docs.sunnypilot.ai2.git gitlab_docs
           cd gitlab_docs
           git checkout main
           git sparse-checkout set --no-cone models/
@@ -191,7 +191,7 @@ jobs:
           GIT_SSH_COMMAND: 'ssh -o UserKnownHostsFile=~/.ssh/known_hosts'
         run: |
           echo "Cloning GitLab"
-          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/${{ vars.MODELS_GITLAB }} gitlab_docs
+          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/docs.sunnypilot.ai2.git gitlab_docs
           cd gitlab_docs
           echo "checkout models/${RECOMPILED_DIR}"
           git sparse-checkout set --no-cone models/${RECOMPILED_DIR}

.github/workflows/build-single-tinygrad-model.yaml

@@ -109,7 +109,7 @@ jobs:
           GIT_SSH_COMMAND: 'ssh -o UserKnownHostsFile=~/.ssh/known_hosts'
         run: |
           echo "Cloning GitLab"
-          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/${{ vars.MODELS_GITLAB }} gitlab_docs
+          git clone --depth 1 --filter=tree:0 --sparse git@gitlab.com:sunnypilot/public/docs.sunnypilot.ai2.git gitlab_docs
           cd gitlab_docs
           echo "checkout models/${RECOMPILED_DIR}"
           git sparse-checkout set --no-cone models/${RECOMPILED_DIR}

.github/workflows/post-to-discourse/action.yml

@@ -1,105 +0,0 @@
-name: 'Post to Discourse'
-description: 'Posts a message to a Discourse topic (existing or new)'
-
-inputs:
-  discourse-url:
-    description: 'Discourse instance URL (e.g., https://discourse.example.com)'
-    required: true
-  api-key:
-    description: 'Discourse API key'
-    required: true
-  api-username:
-    description: 'Discourse API username'
-    required: true
-  topic-id:
-    description: 'Discourse topic ID to post to (use this OR category-id + title)'
-    required: false
-  category-id:
-    description: 'Category ID for new topic (required if topic-id not provided)'
-    required: false
-  title:
-    description: 'Title for new topic (required if topic-id not provided)'
-    required: false
-  message:
-    description: 'Message content (markdown supported)'
-    required: true
-
-outputs:
-  post-number:
-    description: 'The post number in the topic'
-    value: ${{ steps.post.outputs.post_number }}
-  post-url:
-    description: 'Direct URL to the post'
-    value: ${{ steps.post.outputs.post_url }}
-  topic-id:
-    description: 'The topic ID (useful when creating a new topic)'
-    value: ${{ steps.post.outputs.topic_id }}
-
-runs:
-  using: "composite"
-  steps:
-    - name: Post to Discourse
-      id: post
-      shell: bash
-      run: |
-        # Validate inputs
-        if [ -z "${{ inputs.topic-id }}" ] && ([ -z "${{ inputs.category-id }}" ] || [ -z "${{ inputs.title }}" ]); then
-          echo "❌ Error: Must provide either topic-id OR both category-id and title"
-          exit 1
-        fi
-        
-        if [ -n "${{ inputs.topic-id }}" ] && ([ -n "${{ inputs.category-id }}" ] || [ -n "${{ inputs.title }}" ]); then
-          echo "⚠️  Warning: Both topic-id and category-id/title provided. Will post to existing topic."
-        fi
-        
-        # Determine if creating new topic or posting to existing
-        if [ -n "${{ inputs.topic-id }}" ]; then
-          echo "📝 Posting to existing topic ID: ${{ inputs.topic-id }}"
-        
-          # Create JSON payload for posting to existing topic
-          PAYLOAD=$(jq -n \
-            --arg content '${{ inputs.message }}' \
-            --arg topic_id "${{ inputs.topic-id }}" \
-            '{topic_id: $topic_id, raw: $content}')
-        else
-          echo "✨ Creating new topic: ${{ inputs.title }}"
-        
-          # Create JSON payload for new topic
-          PAYLOAD=$(jq -n \
-            --arg content '${{ inputs.message }}' \
-            --arg title "${{ inputs.title }}" \
-            --arg category "${{ inputs.category-id }}" \
-            '{title: $title, category: ($category | tonumber), raw: $content}')
-        fi
-        
-        # Post to Discourse
-        RESPONSE=$(curl -s -w "\n%{http_code}" \
-          -X POST "${{ inputs.discourse-url }}/posts.json" \
-          -H "Content-Type: application/json" \
-          -H "Api-Key: ${{ inputs.api-key }}" \
-          -H "Api-Username: ${{ inputs.api-username }}" \
-          -d "$PAYLOAD")
-        
-        HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
-        BODY=$(echo "$RESPONSE" | sed '$d')
-        
-        if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
-          echo "✅ Successfully posted to Discourse!"
-        
-          POST_NUMBER=$(echo "$BODY" | jq -r '.post_number // "unknown"')
-          TOPIC_ID=$(echo "$BODY" | jq -r '.topic_id // "${{ inputs.topic-id }}"')
-          POST_URL="${{ inputs.discourse-url }}/t/${TOPIC_ID}/${POST_NUMBER}"
-        
-          echo "post_number=${POST_NUMBER}" >> $GITHUB_OUTPUT
-          echo "post_url=${POST_URL}" >> $GITHUB_OUTPUT
-          echo "topic_id=${TOPIC_ID}" >> $GITHUB_OUTPUT
-        
-          echo "Topic ID: ${TOPIC_ID}"
-          echo "Post number: ${POST_NUMBER}"
-          echo "URL: ${POST_URL}"
-        else
-          echo "❌ Failed to post to Discourse"
-          echo "HTTP Code: ${HTTP_CODE}"
-          echo "Response: ${BODY}"
-          exit 1
-        fi

.github/workflows/selfdrive_tests.yaml

@@ -21,12 +21,11 @@ env:
   PYTHONWARNINGS: error
   BASE_IMAGE: sunnypilot-base
   AZURE_TOKEN: ${{ secrets.AZURE_COMMADATACI_OPENPILOTCI_TOKEN }}
-  MAPBOX_TOKEN_CI: ${{ secrets.MAPBOX_TOKEN_CI }}
 
   DOCKER_LOGIN: docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
   BUILD: release/ci/docker_build_sp.sh base
 
-  RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=error -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -e MAPBOX_TOKEN_CI=$MAPBOX_TOKEN_CI -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c
+  RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=error -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c
 
   PYTEST: pytest --continue-on-collection-errors --durations=0 -n logical
 

.github/workflows/sunnypilot-build-model.yaml

@@ -156,8 +156,6 @@ jobs:
         with:
           name: models-${{ env.REF }}${{ inputs.artifact_suffix }}
           path: ${{ github.workspace }}/selfdrive/modeld/models
-      - run: |
-          rm -f ${{ github.workspace }}/selfdrive/modeld/models/{dmonitoring_model,big_driving_policy,big_driving_vision}.onnx
 
       - name: Build Model
         run: |

.github/workflows/sunnypilot-build-prebuilt.yaml

@@ -79,7 +79,7 @@ jobs:
             is_stable_branch="$(echo "$CONFIG" | jq -r '.stable_branch // false')";
             echo "is_stable_branch=$is_stable_branch" >> $GITHUB_OUTPUT
 
-            stable_version=$(cat sunnypilot/common/version.h | grep SUNNYPILOT_VERSION | sed -e 's/[^0-9|.]//g');
+            stable_version=$(cat common/version.h | grep COMMA_VERSION | sed -e 's/[^0-9|.]//g');
             echo "version=$([ "$is_stable_branch" = "true" ] && echo "$stable_version" || echo "$BUILD")" >> $GITHUB_OUTPUT
             echo "extra_version_identifier=${environment}" >> $GITHUB_OUTPUT
           fi
@@ -302,51 +302,36 @@ jobs:
             git push -f origin ${TAG}
 
   notify:
-    needs: 
-    - prepare_strategy
-    - build
-    - publish
+    needs: [ build, publish ]
     runs-on: ubuntu-24.04
-    if: ${{ (always() && !cancelled() && !failure())
-      && needs.publish.result == 'success'
-      && (!contains(github.event_name, 'pull_request') || (github.event.action == 'labeled' && github.event.label.name == 'prebuilt'))
-      && (fromJSON(vars.DEV_FEEDBACK_NOTIFICATION_BRANCHES_V2)[github.head_ref || github.ref_name] != null) }}
+    if: ${{ (always() && !cancelled() && !failure()) && needs.publish.result == 'success' && !failure() && (!contains(github.event_name, 'pull_request') || (github.event.action == 'labeled' && github.event.label.name == 'prebuilt')) }}
     steps:
       - uses: actions/checkout@v4
-
-      - name: Prepare notification message
-        id: message
-        run: |
-          TEMPLATE='${{ vars.DISCOURSE_GENERAL_UPDATE_NOTICE }}'
-          export VERSION="${{ needs.prepare_strategy.outputs.version }}"
-          export branch_name="${{ env.SOURCE_BRANCH }}"
-          export new_branch="${{ needs.prepare_strategy.outputs.new_branch }}"
-          export commit_sha="${{ github.sha }}"
-          export commit_short_sha="${{ github.sha }}"
-          export commit_short_sha="${commit_short_sha:0:7}"
-          export extra_version_identifier="${{ needs.prepare_strategy.outputs.extra_version_identifier || github.run_number }}"
-          export PUBLIC_REPO_URL="${{ env.PUBLIC_REPO_URL }}"
-
-          MESSAGE=$(cat << 'EOF' | envsubst
-          ${{ vars.DISCOURSE_GENERAL_UPDATE_NOTICE }}
-          EOF
-          )
-          
-          {
-            echo 'content<<EOFMARKER'
-            echo "$MESSAGE"
-            echo 'EOFMARKER'
-          } >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Post to Discourse
-        uses: ./.github/workflows/post-to-discourse
+      - name: Setup Alpine Linux environment
+        uses: jirutka/setup-alpine@v1.2.0
         with:
-          discourse-url: ${{ vars.DISCOURSE_URL }}
-          api-key: ${{ secrets.DISCOURSE_API_KEY }}
-          api-username: "system"
-          topic-id: ${{ fromJSON(vars.DEV_FEEDBACK_NOTIFICATION_BRANCHES_V2)[github.head_ref || github.ref_name].topic_id }}
-          message: ${{ steps.message.outputs.content }}
+          packages: 'jq gettext curl'
+
+      - name: Send Discord Notification
+        env:
+          DISCORD_WEBHOOK: ${{ contains(fromJSON(vars.DEV_FEEDBACK_NOTIFICATION_BRANCHES), env.SOURCE_BRANCH) && secrets.DISCORD_DEV_FEEDBACK_CHANNEL_WEBHOOK || secrets.DISCORD_DEV_PRIVATE_CHANNEL_WEBHOOK }}
+        run: |
+          TEMPLATE='${{ vars.DISCORD_GENERAL_UPDATE_NOTICE }}'
+          export EXTRA_VERSION_IDENTIFIER="${{ needs.build.outputs.extra_version_identifier }}"
+          export VERSION="${{ needs.build.outputs.version }}"
+          export branch_name=${{ env.SOURCE_BRANCH }}
+          export new_branch=${{ needs.build.outputs.new_branch }}
+          export extra_version_identifier=${{ needs.build.outputs.extra_version_identifier || github.run_number}}
+          echo ${TEMPLATE} | envsubst | jq -c '.' | tee payload.json
+          curl -X POST -H "Content-Type: application/json" -d @payload.json $DISCORD_WEBHOOK
+
+          echo ""
+          echo "----   ℹ️ To update the list of branches that notify to dev-feedback  -----"
+          echo ""
+          echo "1. Go to: ${{ github.server_url }}/${{ github.repository }}/settings/variables/actions/DEV_FEEDBACK_NOTIFICATION_BRANCHES"
+          echo "2. Current value: ${{ vars.DEV_FEEDBACK_NOTIFICATION_BRANCHES }}"
+          echo "3. Update as needed (JSON array with no spaces)"
+        shell: alpine.sh {0}
 
   manage-pr-labels:
     name: Remove prebuilt label

.github/workflows/sunnypilot-master-dev-prep.yaml

@@ -3,6 +3,7 @@ name: Build dev
 env:
   DEFAULT_SOURCE_BRANCH: "master"
   DEFAULT_TARGET_BRANCH: "master-dev"
+  PR_LABEL: "dev"
   LFS_URL: 'https://gitlab.com/sunnypilot/public/sunnypilot-new-lfs.git/info/lfs'
   LFS_PUSH_URL: 'ssh://git@gitlab.com/sunnypilot/public/sunnypilot-new-lfs.git'
 
@@ -42,7 +43,7 @@ jobs:
     if: (
       (github.event_name == 'workflow_dispatch')
       || (github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch))
-      || (contains(github.event_name, 'pull_request') && ((github.event.action == 'labeled' && (github.event.label.name == vars.PREBUILT_PR_LABEL || github.event.label.name == 'trust-fork-pr') && contains(github.event.pull_request.labels.*.name, vars.PREBUILT_PR_LABEL))))
+      || (contains(github.event_name, 'pull_request') && ((github.event.action == 'labeled' && (github.event.label.name == 'dev' || github.event.label.name == 'trust-fork-pr') && contains(github.event.pull_request.labels.*.name, 'dev'))))
       )
     steps:
       - uses: actions/checkout@v4
@@ -54,7 +55,7 @@ jobs:
         uses: ./.github/workflows/wait-for-action # Path to where you place the action
         if: (
           (github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch))
-          || (contains(github.event_name, 'pull_request') && ((github.event.action == 'labeled' && (github.event.label.name == vars.PREBUILT_PR_LABEL || github.event.label.name == 'trust-fork-pr') && contains(github.event.pull_request.labels.*.name, vars.PREBUILT_PR_LABEL))))
+          || (contains(github.event_name, 'pull_request') && ((github.event.action == 'labeled' && (github.event.label.name == 'dev' || github.event.label.name == 'trust-fork-pr') && contains(github.event.pull_request.labels.*.name, 'dev'))))
           )
         with:
           workflow: selfdrive_tests.yaml # The workflow file to monitor
@@ -118,7 +119,7 @@ jobs:
           # Use GitHub API to get PRs with specific label, ordered by creation date
           PR_LIST=$(gh api graphql -f query='
             query($search_query:String!) {
-              search(query: $search_query, type:ISSUE, first:40) {
+              search(query: $search_query, type:ISSUE, first:100) {
                 nodes {
                   ... on PullRequest {
                     number
@@ -148,7 +149,7 @@ jobs:
                   }
                 }
               }
-            }' -F search_query="repo:${{ github.repository }} is:pr is:open label:${{ vars.PREBUILT_PR_LABEL }},${{ vars.PREBUILT_PR_LABEL }}-c3 draft:false sort:created-asc")
+            }' -F search_query="repo:${{ github.repository }} is:pr is:open label:${PR_LABEL},${PR_LABEL}-c3 draft:false sort:created-asc")
 
           PR_LIST=${PR_LIST//\'/}
           echo "PR_LIST=${PR_LIST}" >> $GITHUB_OUTPUT

.github/workflows/test-discourse.yaml.yml

@@ -1,78 +0,0 @@
-name: Debug Discourse Posting
-
-on:
-  push:
-
-jobs:
-  test-discourse-post:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Post test message to Discourse
-        uses: ./.github/workflows/post-to-discourse
-        with:
-          discourse-url: ${{ vars.DISCOURSE_URL }}
-          api-key: ${{ secrets.DISCOURSE_API_KEY }}
-          api-username: ${{ secrets.DISCOURSE_API_USERNAME }}
-          topic-id: ${{ vars.DISCOURSE_UPDATES_TOPIC_ID }}
-          message: |
-            ## 🧪 Test Post from GitHub Actions
-            
-            **This is a test post to verify Discourse integration**
-            
-            - **Workflow**: ${{ github.workflow }}
-            - **Run Number**: #${{ github.run_number }}
-            - **Branch**: `${{ github.ref_name }}`
-            - **Commit**: ${{ github.sha }}
-            - **Actor**: @${{ github.actor }}
-            - **Timestamp**: ${{ github.event.head_commit.timestamp }}
-            
-            ---
-            
-            ### Fake Build Info (for testing)
-            - **Version**: 0.9.8-test
-            - **Build**: #42
-            - **Branch**: release-test
-            
-            [View workflow run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
-            
-            *This is an automated test message. Drive safe! 🚗💨*
-      
-      
-      - name: Create topic on Discourse
-        uses: ./.github/workflows/post-to-discourse
-        with:
-          discourse-url: ${{ vars.DISCOURSE_URL }}
-          api-key: ${{ secrets.DISCOURSE_API_KEY }}
-          api-username: ${{ secrets.DISCOURSE_API_USERNAME }}
-          #topic-id: ${{ vars.DISCOURSE_UPDATES_TOPIC_ID }}
-          category-id: 4
-          title: "This is a test of a new topic instead of a reply"
-          message: |
-            ## 🧪 Test Post from GitHub Actions
-            
-            **This is a test post to verify Discourse integration**
-            
-            - **Workflow**: ${{ github.workflow }}
-            - **Run Number**: #${{ github.run_number }}
-            - **Branch**: `${{ github.ref_name }}`
-            - **Commit**: ${{ github.sha }}
-            - **Actor**: @${{ github.actor }}
-            - **Timestamp**: ${{ github.event.head_commit.timestamp }}
-            
-            ---
-            
-            ### Fake Build Info (for testing)
-            - **Version**: 0.9.8-test
-            - **Build**: #42
-            - **Branch**: release-test
-            
-            [View workflow run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
-            
-            *This is an automated test message. Drive safe! 🚗💨*
-      - name: Display results
-        if: always()
-        run: |
-          echo "::notice::Discourse post test completed"
-          echo "Check your Discourse topic to verify the post appeared correctly"

.gitmodules

@@ -4,7 +4,6 @@
 [submodule "opendbc"]
   path = opendbc_repo
   url = https://github.com/sunnypilot/opendbc.git
-  branch = tn
 [submodule "msgq"]
   path = msgq_repo
   url = https://github.com/sunnypilot/msgq.git

README.md

@@ -3,9 +3,11 @@
 ## 🌞 What is sunnypilot?
 [sunnypilot](https://github.com/sunnyhaibin/sunnypilot) is a fork of comma.ai's openpilot, an open source driver assistance system. sunnypilot offers the user a unique driving experience for over 300+ supported car makes and models with modified behaviors of driving assist engagements. sunnypilot complies with comma.ai's safety rules as accurately as possible.
 
-## 💭 Join our Community Forum
-Join the official sunnypilot community forum to stay up to date with all the latest features and be a part of shaping the future of sunnypilot!
-* https://community.sunnypilot.ai/
+## 💭 Join our Discord
+Join the official sunnypilot Discord server to stay up to date with all the latest features and be a part of shaping the future of sunnypilot!
+* https://discord.gg/sunnypilot
+
+  ![](https://dcbadge.vercel.app/api/server/wRW3meAgtx?style=flat) ![Discord Shield](https://discordapp.com/api/guilds/880416502577266699/widget.png?style=shield)
 
 ## Documentation
 https://docs.sunnypilot.ai/ is your one stop shop for everything from features to installation to FAQ about the sunnypilot
@@ -14,13 +16,13 @@ https://docs.sunnypilot.ai/ is your one stop shop for everything from features t
 * A supported device to run this software
     * a [comma three](https://comma.ai/shop/products/three) or a [C3X](https://comma.ai/shop/comma-3x)
 * This software
-* One of [the 325+ supported cars](https://github.com/sunnypilot/sunnypilot/blob/master/docs/CARS.md). We support Honda, Toyota, Hyundai, Nissan, Kia, Chrysler, Lexus, Acura, Audi, VW, Ford, and more. If your car is not supported but has adaptive cruise control and lane-keeping assist, it's likely able to run sunnypilot.
+* One of [the 300+ supported cars](https://github.com/commaai/openpilot/blob/master/docs/CARS.md). We support Honda, Toyota, Hyundai, Nissan, Kia, Chrysler, Lexus, Acura, Audi, VW, Ford and more. If your car is not supported but has adaptive cruise control and lane-keeping assist, it's likely able to run sunnypilot.
 * A [car harness](https://comma.ai/shop/products/car-harness) to connect to your car
 
 Detailed instructions for [how to mount the device in a car](https://comma.ai/setup).
 
 ## Installation
-Please refer to [Recommended Branches](#recommended-branches) to find your preferred/supported branch. This guide will assume you want to install the latest `staging` branch.
+Please refer to [Recommended Branches](#-recommended-branches) to find your preferred/supported branch. This guide will assume you want to install the latest `staging-c3-new` branch.
 
 ### If you want to use our newest branches (our rewrite)
 > [!TIP]
@@ -29,28 +31,28 @@ Please refer to [Recommended Branches](#recommended-branches) to find your prefe
 * sunnypilot not installed or you installed a version before 0.8.17?
   1. [Factory reset/uninstall](https://github.com/commaai/openpilot/wiki/FAQ#how-can-i-reset-the-device) the previous software if you have another software/fork installed.
   2. After factory reset/uninstall and upon reboot, select `Custom Software` when given the option.
-  3. Input the installation URL per [Recommended Branches](#recommended-branches). Example: ```https://staging.sunnypilot.ai```.
+  3. Input the installation URL per [Recommended Branches](#-recommended-branches). Example: ```https://staging-c3-new.sunnypilot.ai```.
   4. Complete the rest of the installation following the onscreen instructions.
 
 * sunnypilot already installed and you installed a version after 0.8.17?
-  1. On the comma three/3X, go to `Settings` ▶️ `Software`.
+  1. On the comma three, go to `Settings` ▶️ `Software`.
   2. At the `Download` option, press `CHECK`. This will fetch the list of latest branches from sunnypilot.
   3. At the `Target Branch` option, press `SELECT` to open the Target Branch selector.
-  4. Scroll to select the desired branch per  Recommended Branches (see below). Example: `staging`
+  4. Scroll to select the desired branch per  Recommended Branches (see below). Example: `staging-c3-new`
 
-### Recommended Branches
-|      Branch     |                 Installation URL              |
-|:---------------:|:---------------------------------------------:|
-| `release`       | `https://release.sunnypilot.ai`               |
-| `staging`       | `https://staging.sunnypilot.ai`               |
-|   `dev`         | `https://dev.sunnypilot.ai`                   |
-| `custom-branch` | `https://install.sunnypilot.ai/{branch_name}` |
+
+|      Branch      |                 Installation URL              |
+|:----------------:|:---------------------------------------------:|
+| `staging-c3-new` | `https://staging-c3-new.sunnypilot.ai`        |
+|   `dev-c3-new`   | `https://dev-c3-new.sunnypilot.ai`            |
+| `custom-branch`  | `https://install.sunnypilot.ai/{branch_name}` |
+| `release-c3-new` |            **Not yet available**.             |
 
 > [!TIP]
-> You can use sunnypilot/targetbranch as an install URL. Example: 'sunnypilot/staging'.
+> You can use sunnypilot/targetbranch as an install URL. Example: 'sunnypilot/staging-c3-new'.
 
 > [!NOTE]
-> Do you require further assistance with software installation? Join the [sunnypilot community forum](https://community.sunnypilot.ai/new-topic?category=general/qa) and create a topic in the General/Q&A Category channel.
+> Do you require further assistance with software installation? Join the [sunnypilot Discord server](https://discord.sunnypilot.com) and message us in the `#installation-help` channel.
 
 
 <details>

cereal/custom.capnp

@@ -69,48 +69,6 @@ struct LeadData {
 struct SelfdriveStateSP @0x81c2f05a394cf4af {
   mads @0 :ModularAssistiveDrivingSystem;
   intelligentCruiseButtonManagement @1 :IntelligentCruiseButtonManagement;
-
-  enum AudibleAlert {
-    none @0;
-
-    engage @1;
-    disengage @2;
-    refuse @3;
-
-    warningSoft @4;
-    warningImmediate @5;
-
-    prompt @6;
-    promptRepeat @7;
-    promptDistracted @8;
-
-    # unused, these are reserved for upstream events so we don't collide
-    reserved9 @9;
-    reserved10 @10;
-    reserved11 @11;
-    reserved12 @12;
-    reserved13 @13;
-    reserved14 @14;
-    reserved15 @15;
-    reserved16 @16;
-    reserved17 @17;
-    reserved18 @18;
-    reserved19 @19;
-    reserved20 @20;
-    reserved21 @21;
-    reserved22 @22;
-    reserved23 @23;
-    reserved24 @24;
-    reserved25 @25;
-    reserved26 @26;
-    reserved27 @27;
-    reserved28 @28;
-    reserved29 @29;
-    reserved30 @30;
-
-    promptSingleLow @31;
-    promptSingleHigh @32;
-  }
 }
 
 struct ModelManagerSP @0xaedffd8f31e7b55d {
@@ -192,7 +150,6 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
   aTarget @5 :Float32;
   events @6 :List(OnroadEventSP.Event);
   e2eAlerts @7 :E2eAlerts;
-  accelPersonality @8 :AccelerationPersonality;
 
   struct DynamicExperimentalControl {
     state @0 :DynamicExperimentalControlState;
@@ -204,11 +161,7 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
       blended @1;
     }
   }
-  enum AccelerationPersonality {
-    sport @0;
-    normal @1;
-    eco @2;
-  }
+
   struct SmartCruiseControl {
     vision @0 :Vision;
     map @1 :Map;
@@ -345,7 +298,6 @@ struct OnroadEventSP @0xda96579883444c35 {
     speedLimitChanged @21;
     speedLimitPending @22;
     e2eChime @23;
-    laneChangeRoadEdge @24;
   }
 }
 
@@ -452,30 +404,15 @@ struct LiveMapDataSP @0xf416ec09499d9d19 {
 
 struct ModelDataV2SP @0xa1680744031fdb2d {
   laneTurnDirection @0 :TurnDirection;
-  leftLaneChangeEdgeBlock @1 :Bool;
-  rightLaneChangeEdgeBlock @2 :Bool;
-
-  enum TurnDirection {
-    none @0;
-    turnLeft @1;
-    turnRight @2;
-  }
 }
 
-struct Navigationd @0xcb9fd56c7057593a {
-  upcomingTurn @0 :Text;
-  currentSpeedLimit @1 :UInt64;
-  bannerInstructions @2 :Text;
-  distanceFromRoute @3 :Float64;
-  allManeuvers @4 :List(Maneuver);
-  valid @5 :Bool;
+enum TurnDirection {
+  none @0;
+  turnLeft @1;
+  turnRight @2;
+}
 
-  struct Maneuver {
-    distance @0 :Float64;
-    type @1 :Text;
-    modifier @2 :Text;
-    instruction @3 :Text;
-  }
+struct CustomReserved10 @0xcb9fd56c7057593a {
 }
 
 struct CustomReserved11 @0xc2243c65e0340384 {
@@ -496,84 +433,11 @@ struct CustomReserved15 @0xbd443b539493bc68 {
 struct CustomReserved16 @0xfc6241ed8877b611 {
 }
 
-enum MapdExtendedOutType {
-  paths @0;
-  settings @1;
+struct CustomReserved17 @0xa30662f84033036c {
 }
 
-struct MapdExtendedOut @0xa30662f84033036c {
-  type @0 :MapdExtendedOutType;
-  json @1 :Text;
+struct CustomReserved18 @0xc86a3d38d13eb3ef {
 }
 
-enum MapdInputType {
-  download @0;
-  setTargetLateralAccel @1;
-  setSpeedLimitOffset @2;
-  setSpeedLimitControl @3;
-  setCurveSpeedControl @4;
-  setVisionCurveSpeedControl @5;
-  setLogLevel @6;
-  setVisionCurveTargetLatA @7;
-  setVisionCurveMinTargetV @8;
-  reloadSettings @9;
-  saveSettings @10;
-  setEnableSpeed @11;
-  setVisionCurveUseEnableSpeed @12;
-  setCurveUseEnableSpeed @13;
-  setSpeedLimitUseEnableSpeed @14;
-  setHoldLastSeenSpeedLimit @15;
-  setCurveTargetJerk @16;
-  setCurveTargetAccel @17;
-  setCurveTargetOffset @18;
-  setDefaultLaneWidth @19;
-  setCurveTargetLatA @20;
-  loadDefaultSettings @21;
-  loadRecommendedSettings @22;
-  setSlowDownForNextSpeedLimit @23;
-  setSpeedUpForNextSpeedLimit @24;
-  setHoldSpeedLimitWhileChangingSetSpeed @25;
-}
-
-enum SpeedLimitOffsetType {
-  static @0;
-  percent @1;
-}
-
-struct MapdIn @0xc86a3d38d13eb3ef {
-  type @0 :MapdInputType;
-  float @1 :Float32;
-  str @2 :Text;
-  bool @3 :Bool;
-}
-
-enum RoadContext {
-  freeway @0;
-  city @1;
-  unknown @2;
-}
-
-struct MapdOut @0xa4f1eb3323f5f582 {
-  wayName @0 :Text;
-  wayRef @1 :Text;
-  roadName @2 :Text;
-  speedLimit @3 :Float32;
-  nextSpeedLimit @4 :Float32;
-  nextSpeedLimitDistance @5 :Float32;
-  hazard @6 :Text;
-  nextHazard @7 :Text;
-  nextHazardDistance @8 :Float32;
-  advisorySpeed @9 :Float32;
-  nextAdvisorySpeed @10 :Float32;
-  nextAdvisorySpeedDistance @11 :Float32;
-  oneWay @12 :Bool;
-  lanes @13 :UInt8;
-  tileLoaded @14 :Bool;
-  speedLimitOffset @15 :Float32;
-  suggestedSpeed @16 :Float32;
-  estimatedRoadWidth @17 :Float32;
-  roadContext @18 :RoadContext;
-  distanceFromWayCenter @19 :Float32;
-  visionCurveSpeed @20 :Float32;
-  curveSpeed @21 :Float32;
+struct CustomReserved19 @0xa4f1eb3323f5f582 {
 }

cereal/log.capnp

@@ -2632,16 +2632,16 @@ struct Event {
     carStateSP @114 :Custom.CarStateSP;
     liveMapDataSP @115 :Custom.LiveMapDataSP;
     modelDataV2SP @116 :Custom.ModelDataV2SP;
-    navigationd @136 :Custom.Navigationd;
+    customReserved10 @136 :Custom.CustomReserved10;
     customReserved11 @137 :Custom.CustomReserved11;
     customReserved12 @138 :Custom.CustomReserved12;
     customReserved13 @139 :Custom.CustomReserved13;
     customReserved14 @140 :Custom.CustomReserved14;
     customReserved15 @141 :Custom.CustomReserved15;
     customReserved16 @142 :Custom.CustomReserved16;
-    mapdExtendedOut @143 :Custom.MapdExtendedOut;
-    mapdIn @144 :Custom.MapdIn;
-    mapdOut @145 :Custom.MapdOut;
+    customReserved17 @143 :Custom.CustomReserved17;
+    customReserved18 @144 :Custom.CustomReserved18;
+    customReserved19 @145 :Custom.CustomReserved19;
 
     # *********** legacy + deprecated ***********
     model @9 :Legacy.ModelData; # TODO: rename modelV2 and mark this as deprecated

cereal/services.py

@@ -89,9 +89,7 @@ _services: dict[str, tuple] = {
   "carStateSP": (True, 100., 10),
   "liveMapDataSP": (True, 1., 1),
   "modelDataV2SP": (True, 20.),
-  "navigationd": (True, 3.),
   "liveLocationKalman": (True, 20.),
-  "mapdOut": (True, 20., 20),
 
   # debug
   "uiDebug": (True, 0., 1),

common/params_keys.h

@@ -130,8 +130,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"Version", {PERSISTENT, STRING}},
 
     // --- sunnypilot params --- //
-    {"AccelPersonality", {PERSISTENT | BACKUP, INT, std::to_string(static_cast<int>(cereal::LongitudinalPlanSP::AccelerationPersonality::NORMAL))}},
-    {"AccelPersonalityEnabled", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"ApiCache_DriveStats", {PERSISTENT, JSON}},
     {"AutoLaneChangeBsmDelay", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"AutoLaneChangeTimer", {PERSISTENT | BACKUP, INT, "0"}},
@@ -148,7 +146,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"CustomAccShortPressIncrement", {PERSISTENT | BACKUP, INT, "1"}},
     {"DeviceBootMode", {PERSISTENT | BACKUP, INT, "0"}},
     {"DevUIInfo", {PERSISTENT | BACKUP, INT, "0"}},
-    {"DynamicFollow", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"EnableCopyparty", {PERSISTENT | BACKUP, BOOL}},
     {"EnableGithubRunner", {PERSISTENT | BACKUP, BOOL}},
     {"GreenLightAlert", {PERSISTENT | BACKUP, BOOL, "0"}},
@@ -157,33 +154,24 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"IntelligentCruiseButtonManagement", {PERSISTENT | BACKUP , BOOL}},
     {"InteractivityTimeout", {PERSISTENT | BACKUP, INT, "0"}},
     {"IsDevelopmentBranch", {CLEAR_ON_MANAGER_START, BOOL}},
-    {"IsReleaseSpBranch", {CLEAR_ON_MANAGER_START, BOOL}},
     {"LastGPSPositionLLK", {PERSISTENT, STRING}},
     {"LeadDepartAlert", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"MaxTimeOffroad", {PERSISTENT | BACKUP, INT, "1800"}},
     {"ModelRunnerTypeCache", {CLEAR_ON_ONROAD_TRANSITION, INT}},
     {"OffroadMode", {CLEAR_ON_MANAGER_START, BOOL}},
     {"Offroad_TiciSupport", {CLEAR_ON_MANAGER_START, JSON}},
-    {"OnroadScreenOffBrightness", {PERSISTENT | BACKUP, INT, "0"}},
+    {"OnroadScreenOffBrightness", {PERSISTENT | BACKUP, INT, "100"}},
     {"OnroadScreenOffControl", {PERSISTENT | BACKUP, BOOL}},
-    {"OnroadScreenOffTimer", {PERSISTENT | BACKUP, INT, "15"}},
+    {"OnroadScreenOffTimer", {PERSISTENT | BACKUP, INT, "0"}},
     {"OnroadUploads", {PERSISTENT | BACKUP, BOOL, "1"}},
     {"QuickBootToggle", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"QuietMode", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"RainbowMode", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"RoadEdgeLaneChangeEnabled", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"ShowAdvancedControls", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"ShowTurnSignals", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"StandstillTimer", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"TrueVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
 
-    // toyota specific params
-    {"ToyotaAutoHold", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"ToyotaEnhancedBsm", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"ToyotaTSS2Long", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"ToyotaStockLongitudinal", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"ToyotaDriveMode", {PERSISTENT | BACKUP, BOOL, "0"}},
-
     // MADS params
     {"Mads", {PERSISTENT | BACKUP, BOOL, "1"}},
     {"MadsMainCruiseAllowed", {PERSISTENT | BACKUP, BOOL, "1"}},
@@ -198,14 +186,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"ModelManager_LastSyncTime", {CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION, INT, "0"}},
     {"ModelManager_ModelsCache", {PERSISTENT | BACKUP, JSON}},
 
-    // Navigation params
-    {"AllowNavigation", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"MapboxToken", {PERSISTENT | BACKUP, STRING}},
-    {"MapboxSettings", {CLEAR_ON_MANAGER_START, JSON}},
-    {"MapboxRoute", {PERSISTENT, STRING}},
-    {"MapboxRecompute", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"NavDesiresAllowed", {PERSISTENT | BACKUP, BOOL, "0"}},
-
     // Neural Network Lateral Control
     {"NeuralNetworkLateralControl", {PERSISTENT | BACKUP, BOOL, "0"}},
 
@@ -225,9 +205,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
 
     // sunnypilot car specific params
     {"HyundaiLongitudinalTuning", {PERSISTENT | BACKUP, INT, "0"}},
-    {"SubaruStopAndGo", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"SubaruStopAndGoManualParkingBrake", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"TeslaCoopSteering", {PERSISTENT | BACKUP, BOOL, "0"}},
 
     {"DynamicExperimentalControl", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"BlindSpot", {PERSISTENT | BACKUP, BOOL, "0"}},
@@ -239,9 +216,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"LaneTurnDesire", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"LaneTurnValue", {PERSISTENT | BACKUP, FLOAT, "19.0"}},
 
-
-	  // mapd v020
-	  {"MapdSettings", {PERSISTENT | BACKUP, JSON}},
     // mapd
     {"MapAdvisorySpeedLimit", {CLEAR_ON_ONROAD_TRANSITION, FLOAT}},
     {"MapdVersion", {PERSISTENT, STRING}},

common/swaglog.cc

@@ -15,8 +15,6 @@
 #include "common/version.h"
 #include "system/hardware/hw.h"
 
-#include "sunnypilot/common/version.h"
-
 class SwaglogState {
 public:
   SwaglogState() {
@@ -58,7 +56,7 @@ public:
     if (char* daemon_name = getenv("MANAGER_DAEMON")) {
       ctx_j["daemon"] = daemon_name;
     }
-    ctx_j["version"] = SUNNYPILOT_VERSION;
+    ctx_j["version"] = COMMA_VERSION;
     ctx_j["dirty"] = !getenv("CLEAN");
     ctx_j["device"] = Hardware::get_name();
   }

common/tests/test_markdown.py

@@ -6,7 +6,7 @@ from openpilot.common.markdown import parse_markdown
 
 class TestMarkdown:
   def test_all_release_notes(self):
-    with open(os.path.join(BASEDIR, "CHANGELOG.md")) as f:
+    with open(os.path.join(BASEDIR, "RELEASES.md")) as f:
       release_notes = f.read().split("\n\n")
       assert len(release_notes) > 10
 

common/tests/test_swaglog.cc

@@ -9,8 +9,6 @@
 #include "system/hardware/hw.h"
 #include "third_party/json11/json11.hpp"
 
-#include "sunnypilot/common/version.h"
-
 std::string daemon_name = "testy";
 std::string dongle_id = "test_dongle_id";
 int LINE_NO = 0;
@@ -55,7 +53,7 @@ void recv_log(int thread_cnt, int thread_msg_cnt) {
     REQUIRE(ctx["dongle_id"].string_value() == dongle_id);
     REQUIRE(ctx["dirty"].bool_value() == true);
 
-    REQUIRE(ctx["version"].string_value() == SUNNYPILOT_VERSION);
+    REQUIRE(ctx["version"].string_value() == COMMA_VERSION);
 
     std::string device = Hardware::get_name();
     REQUIRE(ctx["device"].string_value() == device);

docs/CARS.md

@@ -4,7 +4,7 @@
 
 A supported vehicle is one that just works when you install a comma device. All supported cars provide a better experience than any stock system. Supported vehicles reference the US market unless otherwise specified.
 
-# 339 Supported Cars
+# 337 Supported Cars
 
 |Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|<a href="##"><img width=2000></a>Hardware Needed<br>&nbsp;|Video|Setup Video|
 |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
@@ -21,10 +21,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Audi S3 2015-17">Buy Here</a></sub></details>|||
 |Chevrolet|Bolt EUV 2022-23|Premier or Premier Redline Trim without Super Cruise Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EUV 2022-23">Buy Here</a></sub></details>|<a href="https://youtu.be/xvwzGMUA210" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Chevrolet|Bolt EV 2022-23|2LT Trim with Adaptive Cruise Control Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EV 2022-23">Buy Here</a></sub></details>|||
-|Chevrolet|Bolt EV Non-ACC 2017|Adaptive Cruise Control (ACC)|Stock|24 mph|7 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EV Non-ACC 2017">Buy Here</a></sub></details>|||
-|Chevrolet|Bolt EV Non-ACC 2018-21|Adaptive Cruise Control (ACC)|Stock|24 mph|7 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EV Non-ACC 2018-21">Buy Here</a></sub></details>|||
 |Chevrolet|Equinox 2019-22|Adaptive Cruise Control (ACC)|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Equinox 2019-22">Buy Here</a></sub></details>|||
-|Chevrolet|Malibu Non-ACC 2016-23|Adaptive Cruise Control (ACC)|Stock|24 mph|7 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Malibu Non-ACC 2016-23">Buy Here</a></sub></details>|||
 |Chevrolet|Silverado 1500 2020-21|Safety Package II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Silverado 1500 2020-21">Buy Here</a></sub></details>|||
 |Chevrolet|Trailblazer 2021-22|Adaptive Cruise Control (ACC)|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Trailblazer 2021-22">Buy Here</a></sub></details>|||
 |Chrysler|Pacifica 2017-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Chrysler Pacifica 2017-18">Buy Here</a></sub></details>|||
@@ -239,20 +236,20 @@ A supported vehicle is one that just works when you install a comma device. All
 |Rivian|R1T 2022-24|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Rivian A connector<br>- 1 USB-C coupler<br>- 1 angled mount (8 degrees)<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1T 2022-24">Buy Here</a></sub></details>||<a href="https://youtu.be/uaISd1j7Z4U" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
 |SEAT|Ateca 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Ateca 2016-23">Buy Here</a></sub></details>|||
 |SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Leon 2014-20">Buy Here</a></sub></details>|||
-|Subaru|Ascent 2019-21|All[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Ascent 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Crosstrek 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
-|Subaru|Crosstrek 2020-23|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2020-23">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Forester 2017-18|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2017-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Forester 2019-21|All[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Impreza 2017-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2017-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Impreza 2020-22|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Legacy 2015-18|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2015-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Ascent 2019-21|All[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Ascent 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Crosstrek 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
+|Subaru|Crosstrek 2020-23|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2020-23">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Forester 2017-18|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2017-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Forester 2019-21|All[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Impreza 2017-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2017-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Impreza 2020-22|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Legacy 2015-18|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2015-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
 |Subaru|Legacy 2020-22|All[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru B connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Outback 2015-17|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2015-17">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|Outback 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Outback 2015-17|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2015-17">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|Outback 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
 |Subaru|Outback 2020-22|All[<sup>8</sup>](#footnotes)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru B connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
-|Subaru|XV 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
-|Subaru|XV 2020-21|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2020-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
+|Subaru|XV 2018-19|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
+|Subaru|XV 2020-21|EyeSight Driver Assistance[<sup>8</sup>](#footnotes)|openpilot available[<sup>1,9</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2020-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
 |Škoda|Fabia 2022-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Fabia 2022-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
 |Škoda|Kamiq 2021-23[<sup>13,15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Kamiq 2021-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
 |Škoda|Karoq 2019-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Karoq 2019-23">Buy Here</a></sub></details>|||
@@ -311,6 +308,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Toyota|RAV4 Hybrid 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2022">Buy Here</a></sub></details>|<a href="https://youtu.be/U0nH9cnrFB0" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Toyota|RAV4 Hybrid 2023-25|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2023-25">Buy Here</a></sub></details>|<a href="https://youtu.be/4eIsEq4L4Ng" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Toyota|Sienna 2018-20|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Sienna 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=q1UPOo4Sh68" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
+|Toyota|Wildlander PHEV 2021|All|openpilot|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Wildlander PHEV 2021">Buy Here</a></sub></details>|||
 |Volkswagen|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Volkswagen|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon eHybrid 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Volkswagen|Arteon R 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon R 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||

release/build_release.sh

@@ -39,7 +39,7 @@ cd $BUILD_DIR
 rm -f panda/board/obj/panda.bin.signed
 rm -f panda/board/obj/panda_h7.bin.signed
 
-VERSION=$(cat sunnypilot/common/version.h | awk -F[\"-]  '{print $2}')
+VERSION=$(cat common/version.h | awk -F[\"-]  '{print $2}')
 echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
 git commit -a -m "openpilot v$VERSION release"

release/build_stripped.sh

@@ -49,7 +49,7 @@ rm -f panda/board/obj/panda.bin.signed
 GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
 GIT_COMMIT_DATE=$(git --git-dir=$SOURCE_DIR/.git show --no-patch --format='%ct %ci' HEAD)
 DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
-VERSION=$(cat $SOURCE_DIR/sunnypilot/common/version.h | awk -F\" '{print $2}')
+VERSION=$(cat $SOURCE_DIR/common/version.h | awk -F\" '{print $2}')
 
 echo -n "$GIT_HASH" > git_src_commit
 echo -n "$GIT_COMMIT_DATE" > git_src_commit_date

release/ci/publish.sh

@@ -30,7 +30,7 @@ if [ -z "$GIT_ORIGIN" ]; then
 fi
 
 # "Tagging"
-echo "#define SUNNYPILOT_VERSION \"$VERSION\"" > ${OUTPUT_DIR}/sunnypilot/common/version.h
+echo "#define COMMA_VERSION \"$VERSION\"" > ${OUTPUT_DIR}/common/version.h
 
 ## set git identity
 #source $DIR/identity.sh
@@ -55,7 +55,7 @@ git add -f .
 # include source commit hash and build date in commit
 GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
 DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
-SP_VERSION=$(awk -F\" '{print $2}' $SOURCE_DIR/sunnypilot/common/version.h)
+SP_VERSION=$(awk -F\" '{print $2}' $SOURCE_DIR/common/version.h)
 
 # Commit with detailed message
 git commit -a -m "sunnypilot v$VERSION

selfdrive/assets/sounds/prompt_single_high.wav

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbfa5858c0a672411ffdc691efdecb06d01ae458cc1df409bcf3fdeaa4756f72
-size 34638

selfdrive/assets/sounds/prompt_single_low.wav

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9671bb03e01f119bba1eb6cc0507e0f039ac4e5b7f9f839a87071c52e86e56
-size 44416

selfdrive/car/card.py

@@ -10,7 +10,7 @@ from cereal import car, log, custom
 from openpilot.common.params import Params
 from openpilot.common.realtime import config_realtime_process, Priority, Ratekeeper
 from openpilot.common.swaglog import cloudlog, ForwardingHandler
-from opendbc.safety import ALTERNATIVE_EXPERIENCE
+
 from opendbc.car import DT_CTRL, structs
 from opendbc.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
 from opendbc.car.carlog import carlog
@@ -88,7 +88,6 @@ class Car:
     self.can_callbacks = can_comm_callbacks(self.can_sock, self.pm.sock['sendcan'])
 
     is_release = self.params.get_bool("IsReleaseBranch")
-    is_release_sp = self.params.get_bool("IsReleaseSpBranch")
 
     if CI is None:
       # wait for one pandaState and one CAN packet
@@ -111,7 +110,7 @@ class Car:
       init_params_list_sp = sunnypilot_interfaces.initialize_params(self.params)
 
       self.CI = get_car(*self.can_callbacks, obd_callback(self.params), alpha_long_allowed, is_release, num_pandas, cached_params,
-                        fixed_fingerprint, init_params_list_sp, is_release_sp)
+                        fixed_fingerprint, init_params_list_sp)
       sunnypilot_interfaces.setup_interfaces(self.CI, self.params)
       self.RI = interfaces[self.CI.CP.carFingerprint].RadarInterface(self.CI.CP, self.CI.CP_SP)
       self.CP = self.CI.CP
@@ -123,13 +122,7 @@ class Car:
       self.CI, self.CP, self.CP_SP = CI, CI.CP, CI.CP_SP
       self.RI = RI
 
-    # set alternative experiences from parameters
-    sp_toyota_auto_brake_hold = self.params.get_bool("ToyotaAutoHold")
     self.CP.alternativeExperience = 0
-    if sp_toyota_auto_brake_hold:
-      self.CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.ALLOW_AEB
-
-
     # mads
     set_alternative_experience(self.CP, self.CP_SP, self.params)
     set_car_specific_params(self.CP, self.CP_SP, self.params)

selfdrive/car/tests/test_models.py

@@ -151,7 +151,7 @@ class TestCarModelBase(unittest.TestCase):
 
     cls.CarInterface = interfaces[cls.platform]
     cls.CP = cls.CarInterface.get_params(cls.platform, cls.fingerprint, car_fw, alpha_long, False, docs=False)
-    cls.CP_SP = cls.CarInterface.get_params_sp(cls.CP, cls.platform,  cls.fingerprint, car_fw, alpha_long, False, docs=False)
+    cls.CP_SP = cls.CarInterface.get_params_sp(cls.CP, cls.platform,  cls.fingerprint, car_fw, alpha_long, docs=False)
     assert cls.CP
     assert cls.CP_SP
     assert cls.CP.carFingerprint == cls.platform

selfdrive/controls/controlsd.py

@@ -99,6 +99,7 @@ class Controls(ControlsExt, ModelStateBase):
 
       self.LaC.extension.update_model_v2(self.sm['modelV2'])
 
+      self.lat_delay = get_lat_delay(self.params, self.sm["liveDelay"].lateralDelay)
       self.LaC.extension.update_lateral_lag(self.lat_delay)
 
     long_plan = self.sm['longitudinalPlan']
@@ -132,7 +133,7 @@ class Controls(ControlsExt, ModelStateBase):
       self.LoC.reset()
 
     # accel PID loop
-    pid_accel_limits = self.CI.get_pid_accel_limits(self.CP, self.CP_SP, CS.vEgo, CS.vCruise * CV.KPH_TO_MS)
+    pid_accel_limits = self.CI.get_pid_accel_limits(self.CP, CS.vEgo, CS.vCruise * CV.KPH_TO_MS)
     actuators.accel = float(self.LoC.update(CC.longActive, CS, long_plan.aTarget, long_plan.shouldStop, pid_accel_limits))
 
     # Steering PID loop and lateral MPC
@@ -233,9 +234,6 @@ class Controls(ControlsExt, ModelStateBase):
     while not evt.is_set():
       self.get_params_sp()
 
-      if self.CP.lateralTuning.which() == 'torque':
-        self.lat_delay = get_lat_delay(self.params, self.sm["liveDelay"].lateralDelay)
-
       time.sleep(0.1)
 
   def run(self):

selfdrive/controls/lib/desire_helper.py

@@ -3,11 +3,9 @@ from openpilot.common.constants import CV
 from openpilot.common.realtime import DT_MDL
 from openpilot.sunnypilot.selfdrive.controls.lib.auto_lane_change import AutoLaneChangeController, AutoLaneChangeMode
 from openpilot.sunnypilot.selfdrive.controls.lib.lane_turn_desire import LaneTurnController
-from openpilot.sunnypilot.navd.navigation_desires.navigation_desires import NavigationDesires
 
 LaneChangeState = log.LaneChangeState
 LaneChangeDirection = log.LaneChangeDirection
-TurnDirection = custom.ModelDataV2SP.TurnDirection
 
 LANE_CHANGE_SPEED_MIN = 20 * CV.MPH_TO_MS
 LANE_CHANGE_TIME_MAX = 10.
@@ -34,9 +32,9 @@ DESIRES = {
 }
 
 TURN_DESIRES = {
-  TurnDirection.none: log.Desire.none,
-  TurnDirection.turnLeft: log.Desire.turnLeft,
-  TurnDirection.turnRight: log.Desire.turnRight,
+  custom.TurnDirection.none: log.Desire.none,
+  custom.TurnDirection.turnLeft: log.Desire.turnLeft,
+  custom.TurnDirection.turnRight: log.Desire.turnRight,
 }
 
 
@@ -51,14 +49,13 @@ class DesireHelper:
     self.desire = log.Desire.none
     self.alc = AutoLaneChangeController(self)
     self.lane_turn_controller = LaneTurnController(self)
-    self.lane_turn_direction = TurnDirection.none
-    self.navigation_desires = NavigationDesires()
+    self.lane_turn_direction = custom.TurnDirection.none
 
   @staticmethod
   def get_lane_change_direction(CS):
     return LaneChangeDirection.left if CS.leftBlinker else LaneChangeDirection.right
 
-  def update(self, carstate, lateral_active, lane_change_prob, left_edge_detected, right_edge_detected):
+  def update(self, carstate, lateral_active, lane_change_prob):
     self.alc.update_params()
     self.lane_turn_controller.update_params()
     v_ego = carstate.vEgo
@@ -90,8 +87,8 @@ class DesireHelper:
                          ((carstate.steeringTorque > 0 and self.lane_change_direction == LaneChangeDirection.left) or
                           (carstate.steeringTorque < 0 and self.lane_change_direction == LaneChangeDirection.right))
 
-        blindspot_detected = (((carstate.leftBlindspot or left_edge_detected) and self.lane_change_direction == LaneChangeDirection.left) or
-                              ((carstate.rightBlindspot or right_edge_detected) and self.lane_change_direction == LaneChangeDirection.right))
+        blindspot_detected = ((carstate.leftBlindspot and self.lane_change_direction == LaneChangeDirection.left) or
+                              (carstate.rightBlindspot and self.lane_change_direction == LaneChangeDirection.right))
 
         self.alc.update_lane_change(blindspot_detected, carstate.brakePressed)
 
@@ -129,7 +126,7 @@ class DesireHelper:
 
     self.prev_one_blinker = one_blinker
 
-    if self.lane_turn_direction != TurnDirection.none:
+    if self.lane_turn_direction != custom.TurnDirection.none:
       self.desire = TURN_DESIRES[self.lane_turn_direction]
     else:
       self.desire = DESIRES[self.lane_change_direction][self.lane_change_state]
@@ -145,7 +142,3 @@ class DesireHelper:
         self.desire = log.Desire.none
 
     self.alc.update_state()
-
-    nav_desire = self.navigation_desires.update(carstate, lateral_active)
-    if nav_desire != log.Desire.none and (self.desire == log.Desire.none or self.desire in (log.Desire.turnLeft, log.Desire.turnRight)):
-      self.desire = nav_desire

selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py

@@ -10,8 +10,6 @@ from openpilot.common.swaglog import cloudlog
 from openpilot.selfdrive.modeld.constants import index_function
 from openpilot.selfdrive.controls.radard import _LEAD_ACCEL_TAU
 
-from openpilot.sunnypilot.selfdrive.controls.lib.accel_personality.accel_controller import AccelPersonalityController
-from openpilot.sunnypilot.selfdrive.controls.lib.dynamic_personality.dynamic_follow import FollowDistanceController
 if __name__ == '__main__':  # generating code
   from openpilot.third_party.acados.acados_template import AcadosModel, AcadosOcp, AcadosOcpSolver
 else:
@@ -230,8 +228,6 @@ class LongitudinalMpc:
     self.solver = AcadosOcpSolverCython(MODEL_NAME, ACADOS_SOLVER_TYPE, N)
     self.reset()
     self.source = SOURCES[2]
-    self.accel_controller = AccelPersonalityController()
-    self.dynamic_follow = FollowDistanceController()
 
   def reset(self):
     # self.solver = AcadosOcpSolverCython(MODEL_NAME, ACADOS_SOLVER_TYPE, N)
@@ -332,27 +328,10 @@ class LongitudinalMpc:
     return lead_xv
 
   def update(self, radarstate, v_cruise, x, v, a, j, personality=log.LongitudinalPersonality.standard):
+    t_follow = get_T_FOLLOW(personality)
     v_ego = self.x0[1]
-
-    if self.dynamic_follow.is_enabled():
-      t_follow = self.dynamic_follow.get_follow_distance_multiplier(v_ego)
-      #print(f"DEBUG: dynamic_follow enabled, t_follow={t_follow:.3f}, v_ego={v_ego:.2f}, v_cruise={v_cruise:.2f}")
-    else:
-      t_follow = get_T_FOLLOW(personality)
-      #print(f"DEBUG: dynamic_follow disabled, using personality t_follow={t_follow:.3f}, personality={personality}")
-
     self.status = radarstate.leadOne.status or radarstate.leadTwo.status
 
-    # Get acceleration limits
-    if self.accel_controller.is_enabled():
-      min_accel = self.accel_controller.get_min_accel(v_ego)
-      #print(f"DEBUG: accel_enabled=True, min_accel={min_accel:.3f}")
-    else:
-      min_accel = CRUISE_MIN_ACCEL
-      #print(f"DEBUG: accel_enabled=False, using stock min_accel={min_accel}")
-
-    a_cruise_min = min_accel
-
     lead_xv_0 = self.process_lead(radarstate.leadOne)
     lead_xv_1 = self.process_lead(radarstate.leadTwo)
 
@@ -371,7 +350,7 @@ class LongitudinalMpc:
 
       # Fake an obstacle for cruise, this ensures smooth acceleration to set speed
       # when the leads are no factor.
-      v_lower = v_ego + (T_IDXS * a_cruise_min * 1.05)
+      v_lower = v_ego + (T_IDXS * CRUISE_MIN_ACCEL * 1.05)
       # TODO does this make sense when max_a is negative?
       v_upper = v_ego + (T_IDXS * CRUISE_MAX_ACCEL * 1.05)
       v_cruise_clipped = np.clip(v_cruise * np.ones(N+1),

selfdrive/controls/lib/longitudinal_planner.py

@@ -51,12 +51,12 @@ def limit_accel_in_turns(v_ego, angle_steers, a_target, CP):
 
 
 class LongitudinalPlanner(LongitudinalPlannerSP):
-  def __init__(self, CP, CP_SP, init_v=0.0, init_a=0.0, dt=DT_MDL):
+  def __init__(self, CP, init_v=0.0, init_a=0.0, dt=DT_MDL):
     self.CP = CP
     self.mpc = LongitudinalMpc(dt=dt)
     # TODO remove mpc modes when TR released
     self.mpc.mode = 'acc'
-    LongitudinalPlannerSP.__init__(self, self.CP, CP_SP, self.mpc)
+    LongitudinalPlannerSP.__init__(self, self.CP, self.mpc)
     self.fcw = False
     self.dt = dt
     self.allow_throttle = True
@@ -124,13 +124,7 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
     prev_accel_constraint = not (reset_state or sm['carState'].standstill)
 
     if mode == 'acc':
-      if self.accel_controller.is_enabled():
-        max_accel = self.accel_controller.get_max_accel(v_ego)
-        #print(f"Vibe personality active - max accel: {max_accel:.3f}")
-        accel_clip = [ACCEL_MIN, max_accel]
-      else:
-        accel_clip = [ACCEL_MIN, get_max_accel(v_ego)]
-
+      accel_clip = [ACCEL_MIN, get_max_accel(v_ego)]
       steer_angle_without_offset = sm['carState'].steeringAngleDeg - sm['liveParameters'].angleOffsetDeg
       accel_clip = limit_accel_in_turns(v_ego, steer_angle_without_offset, accel_clip, self.CP)
     else:
@@ -155,10 +149,6 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
     # Get new v_cruise and a_desired from Smart Cruise Control and Speed Limit Assist
     v_cruise, self.a_desired = LongitudinalPlannerSP.update_targets(self, sm, self.v_desired_filter.x, self.a_desired, v_cruise)
 
-    if sm.valid['mapdOut']:
-      if sm['mapdOut'].suggestedSpeed > 0 and v_cruise > sm['mapdOut'].suggestedSpeed:
-        v_cruise = sm['mapdOut'].suggestedSpeed
-
     if force_slow_decel:
       v_cruise = 0.0
 

selfdrive/controls/plannerd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from cereal import car, custom
+from cereal import car
 from openpilot.common.gps import get_gps_location_service
 from openpilot.common.params import Params
 from openpilot.common.realtime import Priority, config_realtime_process
@@ -17,22 +17,18 @@ def main():
   CP = messaging.log_from_bytes(params.get("CarParams", block=True), car.CarParams)
   cloudlog.info("plannerd got CarParams: %s", CP.brand)
 
-  cloudlog.info("plannerd is waiting for CarParamsSP")
-  CP_SP = messaging.log_from_bytes(params.get("CarParamsSP", block=True), custom.CarParamsSP)
-  cloudlog.info("plannerd got CarParamsSP")
-
   gps_location_service = get_gps_location_service(params)
 
   ldw = LaneDepartureWarning()
-  longitudinal_planner = LongitudinalPlanner(CP, CP_SP)
+  longitudinal_planner = LongitudinalPlanner(CP)
   pm = messaging.PubMaster(['longitudinalPlan', 'driverAssistance', 'longitudinalPlanSP'])
   sm = messaging.SubMaster(['carControl', 'carState', 'controlsState', 'liveParameters', 'radarState', 'modelV2', 'selfdriveState',
-                            'liveMapDataSP', 'carStateSP', 'mapdOut', gps_location_service],
+                            'liveMapDataSP', 'carStateSP', gps_location_service],
                            poll='carState')
 
   while True:
     sm.update()
-    #longitudinal_planner.sla.update_car_state(sm['carState'])
+    longitudinal_planner.sla.update_car_state(sm['carState'])
     if sm.updated['modelV2']:
       longitudinal_planner.update(sm)
       longitudinal_planner.publish(sm, pm)

selfdrive/modeld/SConscript

@@ -51,8 +51,8 @@ def tg_compile(flags, model_name):
 for model_name in ['driving_vision', 'driving_policy', 'dmonitoring_model']:
   flags = {
     'larch64': 'DEV=QCOM',
-    'Darwin': f'DEV=CPU HOME={os.path.expanduser("~")} IMAGE=0', # tinygrad calls brew which needs a $HOME in the env
-  }.get(arch, 'DEV=CPU CPU_LLVM=1 IMAGE=0')
+    'Darwin': 'DEV=CPU IMAGE=0',
+  }.get(arch, 'DEV=LLVM IMAGE=0')
   tg_compile(flags, model_name)
 
 # Compile BIG model if USB GPU is available

selfdrive/modeld/dmonitoringmodeld.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import os
 from openpilot.system.hardware import TICI
-os.environ['DEV'] = 'QCOM' if TICI else 'CPU'
+os.environ['DEV'] = 'QCOM' if TICI else 'LLVM'
 from tinygrad.tensor import Tensor
 from tinygrad.dtype import dtypes
 import math

selfdrive/modeld/modeld.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import os
 from openpilot.system.hardware import TICI
-os.environ['DEV'] = 'QCOM' if TICI else 'CPU'
+os.environ['DEV'] = 'QCOM' if TICI else 'LLVM'
 USBGPU = "USBGPU" in os.environ
 if USBGPU:
   os.environ['DEV'] = 'AMD'
@@ -33,7 +33,7 @@ from openpilot.selfdrive.modeld.runners.tinygrad_helpers import qcom_tensor_from
 
 from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
 from openpilot.sunnypilot.modeld.modeld_base import ModelStateBase
-from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
+
 
 PROCESS_NAME = "selfdrive.modeld.modeld"
 SEND_RAW_PRED = os.getenv('SEND_RAW_PRED')
@@ -298,7 +298,6 @@ def main(demo=False):
   prev_action = log.ModelDataV2.Action()
 
   DH = DesireHelper()
-  RELC = RoadEdgeLaneChangeController(params.get_bool("RoadEdgeLaneChangeEnabled"))
 
   while True:
     # Keep receiving frames until we are at least 1 frame ahead of previous extra frame
@@ -396,10 +395,7 @@ def main(demo=False):
       l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
       r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
       lane_change_prob = l_lane_change_prob + r_lane_change_prob
-      RELC.update(modelv2_send.modelV2.roadEdgeStds, modelv2_send.modelV2.laneLineProbs)
-      mdv2sp_send.modelDataV2SP.leftLaneChangeEdgeBlock = RELC.left_edge_detected
-      mdv2sp_send.modelDataV2SP.rightLaneChangeEdgeBlock = RELC.right_edge_detected
-      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob, RELC.left_edge_detected, RELC.right_edge_detected)
+      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob)
       modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
       modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
       mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction

selfdrive/selfdrived/selfdrived.py

@@ -24,7 +24,6 @@ from openpilot.selfdrive.selfdrived.alertmanager import AlertManager, set_offroa
 from openpilot.system.version import get_build_metadata
 
 from openpilot.sunnypilot.mads.mads import ModularAssistiveDrivingSystem
-from openpilot.sunnypilot import get_sanitize_int_param
 from openpilot.sunnypilot.selfdrive.car.car_specific import CarSpecificEventsSP
 from openpilot.sunnypilot.selfdrive.car.cruise_helpers import CruiseHelper
 from openpilot.sunnypilot.selfdrive.car.intelligent_cruise_button_management.controller import IntelligentCruiseButtonManagement
@@ -44,7 +43,6 @@ LaneChangeDirection = log.LaneChangeDirection
 EventName = log.OnroadEvent.EventName
 ButtonType = car.CarState.ButtonEvent.Type
 SafetyModel = car.CarParams.SafetyModel
-TurnDirection = custom.ModelDataV2SP.TurnDirection
 
 IGNORED_SAFETY_MODES = (SafetyModel.silent, SafetyModel.noOutput)
 
@@ -88,7 +86,7 @@ class SelfdriveD(CruiseHelper):
     # TODO: de-couple selfdrived with card/conflate on carState without introducing controls mismatches
     self.car_state_sock = messaging.sub_sock('carState', timeout=20)
 
-    ignore = self.sensor_packets + self.gps_packets + ['alertDebug'] + ['modelDataV2SP'] + ['navigationd']
+    ignore = self.sensor_packets + self.gps_packets + ['alertDebug'] + ['modelDataV2SP']
     if SIMULATION:
       ignore += ['driverCameraState', 'managerState']
     if REPLAY:
@@ -98,8 +96,8 @@ class SelfdriveD(CruiseHelper):
                                    'carOutput', 'driverMonitoringState', 'longitudinalPlan', 'livePose', 'liveDelay',
                                    'managerState', 'liveParameters', 'radarState', 'liveTorqueParameters',
                                    'controlsState', 'carControl', 'driverAssistance', 'alertDebug', 'userBookmark', 'audioFeedback',
-                                   'modelDataV2SP', 'longitudinalPlanSP', 'navigationd'] + \
-                                  self.camera_packets + self.sensor_packets + self.gps_packets,
+                                   'modelDataV2SP', 'longitudinalPlanSP'] + \
+                                   self.camera_packets + self.sensor_packets + self.gps_packets,
                                   ignore_alive=ignore, ignore_avg_freq=ignore,
                                   ignore_valid=ignore, frequency=int(1/DT_CTRL))
 
@@ -132,12 +130,7 @@ class SelfdriveD(CruiseHelper):
     self.logged_comm_issue = None
     self.not_running_prev = None
     self.experimental_mode = False
-    self.personality = get_sanitize_int_param(
-      "LongitudinalPersonality",
-      min(log.LongitudinalPersonality.schema.enumerants.values()),
-      max(log.LongitudinalPersonality.schema.enumerants.values()),
-      self.params
-    )
+    self.personality = self.params.get("LongitudinalPersonality", return_default=True)
     self.recalibrating_seen = False
     self.state_machine = StateMachine()
     self.rk = Ratekeeper(100, print_delay_threshold=None)
@@ -230,8 +223,8 @@ class SelfdriveD(CruiseHelper):
 
       # Disable on rising edge of accelerator or brake. Also disable on brake when speed > 0
       if (CS.gasPressed and not self.CS_prev.gasPressed and self.disengage_on_accelerator) or \
-            (CS.brakePressed and (not self.CS_prev.brakePressed or not CS.standstill)) or \
-            (CS.regenBraking and (not self.CS_prev.regenBraking or not CS.standstill)):
+        (CS.brakePressed and (not self.CS_prev.brakePressed or not CS.standstill)) or \
+        (CS.regenBraking and (not self.CS_prev.regenBraking or not CS.standstill)):
         self.events.add(EventName.pedalPressed)
 
     # Create events for temperature, disk space, and memory
@@ -292,29 +285,23 @@ class SelfdriveD(CruiseHelper):
     # Handle lane change
     if self.sm['modelV2'].meta.laneChangeState == LaneChangeState.preLaneChange:
       direction = self.sm['modelV2'].meta.laneChangeDirection
-      mdv2sp = self.sm['modelDataV2SP']
-
       if (CS.leftBlindspot and direction == LaneChangeDirection.left) or \
-        (CS.rightBlindspot and direction == LaneChangeDirection.right):
+         (CS.rightBlindspot and direction == LaneChangeDirection.right):
         self.events.add(EventName.laneChangeBlocked)
-
-      elif mdv2sp.leftLaneChangeEdgeBlock or mdv2sp.rightLaneChangeEdgeBlock:
-        self.events_sp.add(custom.OnroadEventSP.EventName.laneChangeRoadEdge)
-
       else:
         if direction == LaneChangeDirection.left:
           self.events.add(EventName.preLaneChangeLeft)
         else:
           self.events.add(EventName.preLaneChangeRight)
     elif self.sm['modelV2'].meta.laneChangeState in (LaneChangeState.laneChangeStarting,
-                                                     LaneChangeState.laneChangeFinishing):
+                                                    LaneChangeState.laneChangeFinishing):
       self.events.add(EventName.laneChange)
 
     # Handle lane turn
     lane_turn_direction = self.sm['modelDataV2SP'].laneTurnDirection
-    if lane_turn_direction == TurnDirection.turnLeft:
+    if lane_turn_direction == custom.TurnDirection.turnLeft:
       self.events_sp.add(custom.OnroadEventSP.EventName.laneTurnLeft)
-    elif lane_turn_direction == TurnDirection.turnRight:
+    elif lane_turn_direction == custom.TurnDirection.turnRight:
       self.events_sp.add(custom.OnroadEventSP.EventName.laneTurnRight)
 
     for i, pandaState in enumerate(self.sm['pandaStates']):
@@ -502,7 +489,7 @@ class SelfdriveD(CruiseHelper):
 
     # All pandas not in silent mode must have controlsAllowed when openpilot is enabled
     if self.enabled and any(not ps.controlsAllowed for ps in self.sm['pandaStates']
-                            if ps.safetyModel not in IGNORED_SAFETY_MODES):
+           if ps.safetyModel not in IGNORED_SAFETY_MODES):
       self.mismatch_counter += 1
 
     return CS

selfdrive/test/longitudinal_maneuvers/plant.py

@@ -51,9 +51,7 @@ class Plant:
     from opendbc.car.honda.values import CAR
     from opendbc.car.honda.interface import CarInterface
 
-    CP = CarInterface.get_non_essential_params(CAR.HONDA_CIVIC)
-    CP_SP = CarInterface.get_non_essential_params_sp(CP, CAR.HONDA_CIVIC)
-    self.planner = LongitudinalPlanner(CP, CP_SP, init_v=self.speed)
+    self.planner = LongitudinalPlanner(CarInterface.get_non_essential_params(CAR.HONDA_CIVIC), init_v=self.speed)
 
   @property
   def current_time(self):

selfdrive/ui/qt/offroad/developer_panel.cc

@@ -32,11 +32,11 @@ DeveloperPanel::DeveloperPanel(SettingsWindow *parent) : ListWidget(parent) {
 
   experimentalLongitudinalToggle = new ParamControl(
     "AlphaLongitudinalEnabled",
-    tr("sunnypilot Longitudinal Control (Alpha)"),
+    tr("openpilot Longitudinal Control (Alpha)"),
     QString("<b>%1</b><br><br>%2")
-      .arg(tr("WARNING: sunnypilot longitudinal control is in alpha for this car and will disable Automatic Emergency Braking (AEB)."))
-      .arg(tr("On this car, sunnypilot defaults to the car's built-in ACC instead of sunnypilot's longitudinal control. "
-              "Enable this to switch to sunnypilot longitudinal control. Enabling Experimental mode is recommended when enabling sunnypilot longitudinal control alpha.")),
+      .arg(tr("WARNING: openpilot longitudinal control is in alpha for this car and will disable Automatic Emergency Braking (AEB)."))
+      .arg(tr("On this car, sunnypilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. "
+              "Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when enabling openpilot longitudinal control alpha.")),
     ""
   );
   experimentalLongitudinalToggle->setConfirmation(true, false);

selfdrive/ui/qt/offroad/developer_panel.h

@@ -12,7 +12,7 @@ public:
   explicit DeveloperPanel(SettingsWindow *parent);
   void showEvent(QShowEvent *event) override;
 
-protected:
+private:
   Params params;
   ParamControl* adbToggle;
   ParamControl* joystickToggle;

selfdrive/ui/qt/offroad/settings.cc

@@ -34,38 +34,9 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
       false,
     },
     {
-      "ToyotaDriveMode",
-      tr("Enable drive mode btn link"),
-      tr("Links cars drive mode btn with accel personalities based on personality (i.e., relaxed, standard, sport)"),
-      "../assets/offroad/icon_blank.png",
-      false,
-    },
-    {
-      "ToyotaAutoHold",
-      tr("Toyota: Auto Brake Hold FOR TSS2 HYBRID CARS"),
-      tr("As you may auto brake hold currently supported by openpilot, this feature will allow sunnypilot to automatically hold the vehicle at a stop when the lead car is stopped. (TSS2 Hybird only)"),
-      "../assets/offroad/icon_blank.png",
-      false,
-    },
-    {
-      "ToyotaEnhancedBsm",
-      tr("Toyota: Prius TSS2 BSM and some tssp"),
-      tr("Add support for BSM."),
-      "../assets/offroad/icon_blank.png",
-      false,
-    },
-    {
-      "ToyotaTSS2Long",
-      tr("Toyota: custom tune"),
-      tr("idk something gas and brake"),
-      "../assets/offroad/icon_blank.png",
-      false,
-    },
-    {
-      "ToyotaStockLongitudinal",
-      tr("Toyota: Stock Toyota Longitudinal"),
-      tr("This feature will allow sunnypilot to use the stock Toyota longitudinal control instead of the sunnypilot longitudinal control. "
-         ""),
+      "DynamicExperimentalControl",
+      tr("Enable Dynamic Experimental Control"),
+      tr("Enable toggle to allow the model to determine when to use sunnypilot ACC or sunnypilot End to End Longitudinal."),
       "../assets/offroad/icon_blank.png",
       false,
     },
@@ -121,15 +92,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
                                              "your steering wheel distance button."),
                                           "../assets/icons/speed_limit.png",
                                           longi_button_texts);
-  // accel controller
-  std::vector<QString> accel_personality_texts{tr("Sport"), tr("Normal"), tr("Eco")};
-  accel_personality_setting = new ButtonParamControlSP("AccelPersonality", tr("Acceleration Personality"),
-                                          tr("Normal is recommended. In sport mode, sunnypilot will provide aggressive acceleration for a dynamic driving experience. "
-                                             "In eco mode, sunnypilot will apply smoother and more relaxed acceleration. On supported cars, you can cycle through these "
-                                             "acceleration personality within Onroad Settings on the driving screen."),
-                                          "",
-                                          accel_personality_texts);
-  accel_personality_setting->showDescription();
+
   // set up uiState update for personality setting
   QObject::connect(uiState(), &UIState::uiUpdate, this, &TogglesPanel::updateState);
 
@@ -157,7 +120,6 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
     // insert longitudinal personality after NDOG toggle
     if (param == "DisengageOnAccelerator") {
       addItem(long_personality_setting);
-      addItem(accel_personality_setting);
     }
   }
 
@@ -178,13 +140,6 @@ void TogglesPanel::updateState(const UIState &s) {
     }
     uiState()->scene.personality = personality;
   }
-  if (sm.updated("longitudinalPlanSP")) {
-    auto accel_personality = sm["longitudinalPlanSP"].getLongitudinalPlanSP().getAccelPersonality();
-    if (accel_personality != s.scene.accel_personality && s.scene.started && isVisible()) {
-      accel_personality_setting->setCheckedButton(static_cast<int>(accel_personality));
-    }
-    uiState()->scene.accel_personality = accel_personality;
-  }
 }
 
 void TogglesPanel::expandToggleDescription(const QString &param) {
@@ -231,18 +186,16 @@ void TogglesPanel::updateToggles() {
       experimental_mode_toggle->setEnabled(true);
       experimental_mode_toggle->setDescription(e2e_description);
       long_personality_setting->setEnabled(true);
-      accel_personality_setting->setEnabled(true);
     } else {
       // no long for now
       experimental_mode_toggle->setEnabled(false);
       long_personality_setting->setEnabled(false);
-      accel_personality_setting->setEnabled(true);
       params.remove("ExperimentalMode");
 
       const QString unavailable = tr("Experimental mode is currently unavailable on this car since the car's stock ACC is used for longitudinal control.");
 
       QString long_desc = unavailable + " " + \
-                          tr("sunnypilot longitudinal control may come in a future update.");
+                          tr("openpilot longitudinal control may come in a future update.");
       if (CP.getAlphaLongitudinalAvailable()) {
         if (is_release) {
           long_desc = unavailable + " " + tr("An alpha version of sunnypilot longitudinal control can be tested, along with Experimental mode, on non-release branches.");

selfdrive/ui/qt/offroad/settings.h

@@ -88,7 +88,6 @@ protected:
   Params params;
   std::map<std::string, ParamControl*> toggles;
   ButtonParamControl *long_personality_setting;
-  ButtonParamControl *accel_personality_setting;
 
   virtual void updateToggles();
 };

selfdrive/ui/qt/onroad/model.cc

@@ -22,7 +22,7 @@ void ModelRenderer::draw(QPainter &painter, const QRect &surface_rect) {
 
   update_model(model, lead_one);
   drawLaneLines(painter);
-  drawPath(painter, model, surface_rect.height(), surface_rect.width());
+  drawPath(painter, model, surface_rect);
 
   if (longitudinal_control && sm.alive("radarState")) {
     update_leads(radar_state, model.getPosition());
@@ -92,7 +92,7 @@ void ModelRenderer::drawLaneLines(QPainter &painter) {
   }
 }
 
-void ModelRenderer::drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height, int width) {
+void ModelRenderer::drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height) {
   QLinearGradient bg(0, height, 0, 0);
   if (experimental_mode) {
     // The first half of track_vertices are the points for the right side of the path
@@ -127,9 +127,6 @@ void ModelRenderer::drawPath(QPainter &painter, const cereal::ModelDataV2::Reade
 
   painter.setBrush(bg);
   painter.drawPolygon(track_vertices);
-
-  //LongFuel(painter,height, width);
-  //LateralFuel(painter, height, width);
 }
 
 void ModelRenderer::updatePathGradient(QLinearGradient &bg) {
@@ -176,195 +173,7 @@ QColor ModelRenderer::blendColors(const QColor &start, const QColor &end, float
       (1 - t) * start.alphaF() + t * end.alphaF());
 }
 
-void ModelRenderer::drawGaugeBackground(QPainter &painter, qreal centerX, qreal centerY) {
-    const qreal backgroundSize = GAUGE_SIZE * BACKGROUND_SIZE_MULTIPLIER;
 
-    // Draw circular background
-    painter.setPen(Qt::NoPen);
-    painter.setBrush(BACKGROUND_COLOR);
-    painter.drawEllipse(QPointF(centerX, centerY), backgroundSize / 2, backgroundSize / 2);
-
-    // Draw border
-    QPen borderPen(BORDER_COLOR);
-    borderPen.setWidth(BORDER_PEN_WIDTH);
-    painter.setPen(borderPen);
-    painter.drawEllipse(QPointF(centerX, centerY), backgroundSize / 2 + 1, backgroundSize / 2 + 1);
-
-    // Draw background semicircle
-    QPen semicirclePen(GAUGE_BACKGROUND_COLOR);
-    semicirclePen.setWidth(GAUGE_PEN_WIDTH);
-    semicirclePen.setCapStyle(Qt::RoundCap);
-    painter.setPen(semicirclePen);
-    painter.drawArc(QRectF(centerX - GAUGE_SIZE / 2, centerY - GAUGE_SIZE / 2,
-                          GAUGE_SIZE, GAUGE_SIZE), 0, SEMICIRCLE_SPAN);
-}
-
-QColor ModelRenderer::getIndicatorColor(float absoluteValue, float lowThreshold, float highThreshold) {
-    if (absoluteValue < lowThreshold) {
-        return LOW_INDICATOR_COLOR;
-    } else if (absoluteValue < highThreshold) {
-        return MODERATE_INDICATOR_COLOR;
-    } else {
-        return HIGH_INDICATOR_COLOR;
-    }
-}
-
-int ModelRenderer::calculateSpanAngle(float absoluteValue, float maxValue) {
-    const int spanAngle = static_cast<int>(QUARTER_CIRCLE_SPAN * (absoluteValue / maxValue));
-    return std::clamp(spanAngle, 0, QUARTER_CIRCLE_SPAN);
-}
-
-void ModelRenderer::drawGaugeArc(QPainter &painter, qreal centerX, qreal centerY,
-                                float value, bool isPositive, const QString &label) {
-    const float absoluteValue = std::abs(value);
-
-    if (absoluteValue <= MIN_THRESHOLD) {
-        return; // Skip drawing if value is too small
-    }
-
-    // Set up the arc rectangle
-    const QRectF arcRect(centerX - GAUGE_SIZE / 2, centerY - GAUGE_SIZE / 2,
-                        GAUGE_SIZE, GAUGE_SIZE);
-
-    // Configure pen for the indicator arc
-    QPen indicatorPen;
-    indicatorPen.setWidth(GAUGE_PEN_WIDTH);
-    indicatorPen.setCapStyle(Qt::RoundCap);
-    painter.setPen(indicatorPen);
-
-    // Draw the arc based on direction
-    const int spanAngle = calculateSpanAngle(absoluteValue, 1.0f); // Adjust max value as needed
-    if (isPositive) {
-        painter.drawArc(arcRect, STARTING_ANGLE, spanAngle);
-    } else {
-        painter.drawArc(arcRect, STARTING_ANGLE, -spanAngle);
-    }
-
-    // Draw center label
-    painter.setPen(Qt::white);
-    QFont font = painter.font();
-    font.setPixelSize(20);
-    font.setBold(true);
-    painter.setFont(font);
-    painter.drawText(QRectF(centerX - 50, centerY + 10, 100, 20), Qt::AlignCenter, label);
-}
-
-void ModelRenderer::LongFuel(QPainter &painter, int height, int width) {
-    const qreal rectWidth = static_cast<qreal>(width);
-    const qreal rectHeight = static_cast<qreal>(height);
-
-    UIState *s = uiState();
-    if (!s || !s->sm) {
-        return; // Safety check
-    }
-
-    // Get current acceleration
-    const float currentAcceleration = (*s->sm)["carControl"].getCarControl().getActuators().getAccel();
-    const float absoluteAcceleration = std::abs(currentAcceleration);
-
-    // Calculate gauge position
-    const qreal centerX = rectWidth / 17;
-    const qreal centerY = rectHeight / 2 + 120;
-
-    // Draw gauge background
-    drawGaugeBackground(painter, centerX, centerY);
-
-    // Skip drawing arc if acceleration is too small
-    if (absoluteAcceleration <= MIN_THRESHOLD) {
-        drawGaugeArc(painter, centerX, centerY, 0.0f, true, "LONG");
-        return;
-    }
-
-    // Determine indicator color based on acceleration magnitude
-    const QColor indicatorColor = getIndicatorColor(absoluteAcceleration, 0.3f, 0.6f);
-
-    // Calculate span angle (scale for better visibility)
-    const int spanAngle = static_cast<int>(QUARTER_CIRCLE_SPAN * absoluteAcceleration);
-    const int clampedSpanAngle = std::clamp(spanAngle, 0, QUARTER_CIRCLE_SPAN);
-
-    // Draw the acceleration arc
-    QPen indicatorPen(indicatorColor);
-    indicatorPen.setWidth(GAUGE_PEN_WIDTH);
-    indicatorPen.setCapStyle(Qt::RoundCap);
-    painter.setPen(indicatorPen);
-
-    const QRectF arcRect(centerX - GAUGE_SIZE / 2, centerY - GAUGE_SIZE / 2,
-                        GAUGE_SIZE, GAUGE_SIZE);
-
-    // Draw arc based on acceleration direction
-    if (currentAcceleration > 0) {
-        painter.drawArc(arcRect, STARTING_ANGLE, -clampedSpanAngle); // Left side for positive
-    } else {
-        painter.drawArc(arcRect, STARTING_ANGLE, clampedSpanAngle);  // Right side for negative
-    }
-
-    // Draw center label
-    painter.setPen(Qt::white);
-    QFont font = painter.font();
-    font.setPixelSize(20);
-    font.setBold(true);
-    painter.setFont(font);
-    painter.drawText(QRectF(centerX - 50, centerY + 10, 100, 20), Qt::AlignCenter, "LONG");
-}
-
-void ModelRenderer::LateralFuel(QPainter &painter, int height, int width) {
-    const qreal rectWidth = static_cast<qreal>(width);
-    const qreal rectHeight = static_cast<qreal>(height);
-
-    UIState *s = uiState();
-    if (!s || !s->sm) {
-        return; // Safety check
-    }
-
-    // Get current steering angle
-    const float currentLateral = (*s->sm)["carState"].getCarState().getSteeringAngleDeg();
-    const float absoluteLateral = std::abs(currentLateral);
-
-    // Calculate gauge position
-    const qreal centerX = rectWidth / 17;
-    const qreal centerY = rectHeight / 2 - 120;
-
-    // Draw gauge background
-    drawGaugeBackground(painter, centerX, centerY);
-
-    // Skip drawing arc if lateral force is too small
-    if (absoluteLateral <= 0.1f) {
-        drawGaugeArc(painter, centerX, centerY, 0.0f, true, "LAT");
-        return;
-    }
-
-    // Determine indicator color based on lateral force magnitude
-    const QColor indicatorColor = getIndicatorColor(absoluteLateral, 5.0f, 15.0f);
-
-    // Calculate span angle (normalized to max expected steering angle)
-    const float maxSteeringAngle = 15.0f; // Adjust based on your vehicle's characteristics
-    const int spanAngle = static_cast<int>(QUARTER_CIRCLE_SPAN * (absoluteLateral / maxSteeringAngle));
-    const int clampedSpanAngle = std::clamp(spanAngle, 0, QUARTER_CIRCLE_SPAN);
-
-    // Draw the lateral arc
-    QPen indicatorPen(indicatorColor);
-    indicatorPen.setWidth(GAUGE_PEN_WIDTH);
-    indicatorPen.setCapStyle(Qt::RoundCap);
-    painter.setPen(indicatorPen);
-
-    const QRectF arcRect(centerX - GAUGE_SIZE / 2, centerY - GAUGE_SIZE / 2,
-                        GAUGE_SIZE, GAUGE_SIZE);
-
-    // Draw arc based on steering direction
-    if (currentLateral < 0) {
-        painter.drawArc(arcRect, STARTING_ANGLE, -clampedSpanAngle); // Left turn
-    } else {
-        painter.drawArc(arcRect, STARTING_ANGLE, clampedSpanAngle);  // Right turn
-    }
-
-    // Draw center label
-    painter.setPen(Qt::white);
-    QFont font = painter.font();
-    font.setPixelSize(20);
-    font.setBold(true);
-    painter.setFont(font);
-    painter.drawText(QRectF(centerX - 50, centerY + 10, 100, 20), Qt::AlignCenter, "LAT");
-}
 void ModelRenderer::drawLead(QPainter &painter, const cereal::RadarState::LeadData::Reader &lead_data,
                              const QPointF &vd, const QRect &surface_rect) {
   const float speedBuff = 10.;

selfdrive/ui/qt/onroad/model.h

@@ -29,8 +29,6 @@ public:
   ModelRenderer() {}
   void setTransform(const Eigen::Matrix3f &transform) { car_space_transform = transform; }
   void draw(QPainter &painter, const QRect &surface_rect);
-  void LongFuel(QPainter &p, int height, int width);
-  void LateralFuel(QPainter &p, int height, int width);
 
 protected:
   bool mapToScreen(float in_x, float in_y, float in_z, QPointF *out);
@@ -40,16 +38,10 @@ protected:
   void update_leads(const cereal::RadarState::Reader &radar_state, const cereal::XYZTData::Reader &line);
   virtual void update_model(const cereal::ModelDataV2::Reader &model, const cereal::RadarState::LeadData::Reader &lead);
   void drawLaneLines(QPainter &painter);
-  void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height, int width);
-
-  // Gauge helper methods
-  void drawGaugeBackground(QPainter &painter, qreal centerX, qreal centerY);
-  void drawGaugeArc(QPainter &painter, qreal centerX, qreal centerY,
-                    float value, bool isPositive, const QString &label);
-  QColor getIndicatorColor(float absoluteValue, float lowThreshold, float highThreshold);
-  int calculateSpanAngle(float absoluteValue, float maxValue);
-
-
+  void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height);
+  virtual void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, const QRect &surface_rect) {;
+    drawPath(painter, model, surface_rect.height());
+  }
   void updatePathGradient(QLinearGradient &bg);
   QColor blendColors(const QColor &start, const QColor &end, float t);
 
@@ -67,21 +59,4 @@ protected:
   Eigen::Matrix3f car_space_transform = Eigen::Matrix3f::Zero();
   QRectF clip_region;
 
-  // Gauge configuration constants
-  static constexpr qreal GAUGE_SIZE = 140.0;
-  static constexpr qreal BACKGROUND_SIZE_MULTIPLIER = 1.4;
-  static constexpr qreal GAUGE_PEN_WIDTH = 30.0;
-  static constexpr qreal BORDER_PEN_WIDTH = 2.0;
-  static constexpr int SEMICIRCLE_SPAN = 180 * 16;
-  static constexpr int QUARTER_CIRCLE_SPAN = 90 * 16;
-  static constexpr int STARTING_ANGLE = 90 * 16;
-  static constexpr qreal MIN_THRESHOLD = 0.01;
-
-  // Color constants - Note: QColor cannot be constexpr, use inline static const instead
-  inline static const QColor BACKGROUND_COLOR = QColor(0, 0, 0, 80);
-  inline static const QColor BORDER_COLOR = QColor(0, 0, 0, 100);
-  inline static const QColor GAUGE_BACKGROUND_COLOR = QColor(50, 50, 50);
-  inline static const QColor LOW_INDICATOR_COLOR = QColor(23, 241, 66, 200);
-  inline static const QColor MODERATE_INDICATOR_COLOR = QColor(255, 166, 0, 200);
-  inline static const QColor HIGH_INDICATOR_COLOR = QColor(245, 0, 0, 200);
 };

selfdrive/ui/qt/widgets/wifi.cc

@@ -11,18 +11,17 @@ WiFiPromptWidget::WiFiPromptWidget(QWidget *parent) : QFrame(parent) {
   main_layout->setContentsMargins(56, 40, 56, 40);
   main_layout->setSpacing(42);  
   
-  community_popup = new SunnylinkCommunityPopup(this);
-  QLabel *title = new QLabel(tr("sunnypilot Community"));
-  title->setStyleSheet("font-size: 56px; font-weight: 500;");
+  QLabel *title = new QLabel(tr("<span style='font-family: \"Noto Color Emoji\";'>🔥</span> Firehose Mode <span style='font-family: Noto Color Emoji;'>🔥</span>"));
+  title->setStyleSheet("font-size: 64px; font-weight: 500;");
   main_layout->addWidget(title);
 
-  QLabel *desc = new QLabel(tr("Need help or have ideas?<br><b>Join</b> our community now!"));
+  QLabel *desc = new QLabel(tr("Maximize your training data uploads to improve openpilot's driving models."));
   desc->setStyleSheet("font-size: 40px; font-weight: 400;");
   desc->setWordWrap(true);
   main_layout->addWidget(desc);
 
-  QPushButton *settings_btn = new QPushButton(tr("Learn More"));
-  connect(settings_btn, &QPushButton::clicked, [=]() { community_popup->exec(); });
+  QPushButton *settings_btn = new QPushButton(tr("Open"));
+  connect(settings_btn, &QPushButton::clicked, [=]() { emit openSettings(1, "FirehosePanel"); });
   settings_btn->setStyleSheet(R"(
     QPushButton {
       font-size: 48px;

selfdrive/ui/qt/widgets/wifi.h

@@ -3,17 +3,12 @@
 #include <QFrame>
 #include <QWidget>
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink/community_widget.h"
-
 class WiFiPromptWidget : public QFrame {
   Q_OBJECT
 
 public:
   explicit WiFiPromptWidget(QWidget* parent = 0);
 
-private:
-  SunnylinkCommunityPopup *community_popup;
-
 signals:
   void openSettings(int index = 0, const QString &param = "");
 };

selfdrive/ui/soundd.py

@@ -4,7 +4,7 @@ import time
 import wave
 
 
-from cereal import car, messaging, custom
+from cereal import car, messaging
 from openpilot.common.basedir import BASEDIR
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.common.realtime import Ratekeeper
@@ -26,15 +26,8 @@ AMBIENT_DB = 30 # DB where MIN_VOLUME is applied
 DB_SCALE = 30 # AMBIENT_DB + DB_SCALE is where MAX_VOLUME is applied
 
 AudibleAlert = car.CarControl.HUDControl.AudibleAlert
-AudibleAlertSP = custom.SelfdriveStateSP.AudibleAlert
 
 
-sound_list_sp: dict[int, tuple[str, int | None, float]] = {
-  # AudibleAlertSP, file name, play count (none for infinite)
-  AudibleAlertSP.promptSingleLow: ("prompt_single_low.wav", 1, MAX_VOLUME),
-  AudibleAlertSP.promptSingleHigh: ("prompt_single_high.wav", 1, MAX_VOLUME),
-}
-
 sound_list: dict[int, tuple[str, int | None, float]] = {
   # AudibleAlert, file name, play count (none for infinite)
   AudibleAlert.engage: ("engage.wav", 1, MAX_VOLUME),
@@ -47,8 +40,6 @@ sound_list: dict[int, tuple[str, int | None, float]] = {
 
   AudibleAlert.warningSoft: ("warning_soft.wav", None, MAX_VOLUME),
   AudibleAlert.warningImmediate: ("warning_immediate.wav", None, MAX_VOLUME),
-
-  **sound_list_sp,
 }
 
 def check_selfdrive_timeout_alert(sm):

selfdrive/ui/sunnypilot/SConscript

@@ -30,13 +30,11 @@ qt_src = [
   "sunnypilot/qt/offroad/settings/max_time_offroad.cc",
   "sunnypilot/qt/offroad/settings/brightness.cc",
   "sunnypilot/qt/offroad/settings/models_panel.cc",
-  "sunnypilot/qt/offroad/settings/navigation_panel.cc",
   "sunnypilot/qt/offroad/settings/osm_panel.cc",
   "sunnypilot/qt/offroad/settings/settings.cc",
   "sunnypilot/qt/offroad/settings/software_panel.cc",
   "sunnypilot/qt/offroad/settings/sunnylink_panel.cc",
   "sunnypilot/qt/offroad/settings/sunnylink/sponsor_widget.cc",
-  "sunnypilot/qt/offroad/settings/sunnylink/community_widget.cc",
   "sunnypilot/qt/offroad/settings/trips_panel.cc",
   "sunnypilot/qt/offroad/settings/vehicle_panel.cc",
   "sunnypilot/qt/offroad/settings/visuals_panel.cc",

selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc

@@ -60,7 +60,7 @@ DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(pare
 
 void DeveloperPanelSP::updateToggles(bool offroad) {
   bool disable_updates = params.getBool("DisableUpdates");
-  bool is_release = params.getBool("IsReleaseBranch") || params.getBool("IsReleaseSpBranch");
+  bool is_release = params.getBool("IsReleaseBranch");
   bool is_tested = params.getBool("IsTestedBranch");
   bool is_development = params.getBool("IsDevelopmentBranch");
 
@@ -79,9 +79,6 @@ void DeveloperPanelSP::updateToggles(bool offroad) {
   enableGithubRunner->setVisible(!is_release);
   errorLogBtn->setVisible(!is_release);
   showAdvancedControls->setEnabled(true);
-
-  joystickToggle->setVisible(!is_release);
-  longManeuverToggle->setVisible(!is_release);
 }
 
 void DeveloperPanelSP::showEvent(QShowEvent *event) {

selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc

@@ -29,7 +29,7 @@ OnroadScreenBrightnessControl::OnroadScreenBrightnessControl(const QString &para
     "Onroad Brightness",
     "",
     "",
-    {0, 90}, 10, true);
+    {0, 100}, 10, true);
 
   connect(onroadScreenOffTimer, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);
   connect(onroadScreenBrightness, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/lane_change_settings.cc

@@ -33,12 +33,6 @@ LaneChangeSettings::LaneChangeSettings(QWidget* parent) : QWidget(parent) {
       tr("Toggle to enable a delay timer for seamless lane changes when blind spot monitoring (BSM) detects a obstructing vehicle, ensuring safe maneuvering."),
       "../assets/offroad/icon_blank.png",
     },
-    {
-      "RoadEdgeLaneChangeEnabled",
-      tr("Block Lane Change: Road Edge Detection"),
-      tr("Enable this toggle to block lane change when road edge is detected on the stalk actuated side."),
-      "../assets/offroad/icon_blank.png",
-    }
   };
 
   // Controls: Auto Lane Change Timer

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/helpers.h

@@ -13,9 +13,9 @@ enum class SpeedLimitOffsetType {
 };
 
 inline const QString SpeedLimitOffsetTypeTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "None"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Fixed"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Percent"),
+  QObject::tr("None"),
+  QObject::tr("Fixed"),
+  QObject::tr("Percent"),
 };
 
 enum class SpeedLimitSourcePolicy {
@@ -27,11 +27,11 @@ enum class SpeedLimitSourcePolicy {
 };
 
 inline const QString SpeedLimitSourcePolicyTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Car\nOnly"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Map\nOnly"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Car\nFirst"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Map\nFirst"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Combined\nData")
+  QObject::tr("Car\nOnly"),
+  QObject::tr("Map\nOnly"),
+  QObject::tr("Car\nFirst"),
+  QObject::tr("Map\nFirst"),
+  QObject::tr("Combined\nData")
 };
 
 enum class SpeedLimitMode {
@@ -42,8 +42,8 @@ enum class SpeedLimitMode {
 };
 
 inline const QString SpeedLimitModeTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Off"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Information"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Warning"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Assist"),
+  QObject::tr("Off"),
+  QObject::tr("Information"),
+  QObject::tr("Warning"),
+  QObject::tr("Assist"),
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_policy.cc

@@ -23,11 +23,11 @@ SpeedLimitPolicy::SpeedLimitPolicy(QWidget *parent) : QWidget(parent) {
   ListWidgetSP *list = new ListWidgetSP(this);
 
   std::vector<QString> speed_limit_policy_texts{
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_ONLY)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_ONLY)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_FIRST)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_FIRST)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::COMBINED)].toStdString().c_str())
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_ONLY)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_ONLY)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_FIRST)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_FIRST)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::COMBINED)]
   };
   speed_limit_policy = new ButtonParamControlSP(
     "SpeedLimitPolicy",

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc

@@ -7,8 +7,6 @@
 
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h"
 
-#include "selfdrive/ui/sunnypilot/qt/util.h"
-
 SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent) {
   subPanelFrame = new QFrame();
   QVBoxLayout *subPanelLayout = new QVBoxLayout(subPanelFrame);
@@ -27,10 +25,10 @@ SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent)
   speedLimitPolicyScreen = new SpeedLimitPolicy(this);
 
   std::vector<QString> speed_limit_mode_texts{
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::OFF)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::INFORMATION)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::WARNING)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::ASSIST)].toStdString().c_str())
+    SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::OFF)],
+    SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::INFORMATION)],
+    SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::WARNING)],
+    SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::ASSIST)],
   };
   speed_limit_mode_settings = new ButtonParamControlSP(
     "SpeedLimitMode",
@@ -66,9 +64,9 @@ SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent)
   QVBoxLayout *offsetLayout = new QVBoxLayout(offsetFrame);
 
   std::vector<QString> speed_limit_offset_texts{
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::NONE)].toStdString().c_str()),
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::FIXED)].toStdString().c_str()),
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::PERCENT)].toStdString().c_str())
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::NONE)],
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::FIXED)],
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::PERCENT)]
   };
   speed_limit_offset_settings = new ButtonParamControlSP(
     "SpeedLimitOffsetType",
@@ -105,13 +103,13 @@ SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent)
 }
 
 void SpeedLimitSettings::refresh() {
-  bool is_release = params.getBool("IsReleaseSpBranch");
   bool is_metric_param = params.getBool("IsMetric");
   SpeedLimitMode speed_limit_mode_param = static_cast<SpeedLimitMode>(std::atoi(params.get("SpeedLimitMode").c_str()));
   SpeedLimitOffsetType offset_type_param = static_cast<SpeedLimitOffsetType>(std::atoi(params.get("SpeedLimitOffsetType").c_str()));
   QString offsetLabel = QString::fromStdString(params.get("SpeedLimitValueOffset"));
 
-  bool sla_available;
+  bool has_longitudinal_control;
+  bool intelligent_cruise_button_management_available;
   auto cp_bytes = params.get("CarParamsPersistent");
   auto cp_sp_bytes = params.get("CarParamsSPPersistent");
   if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
@@ -122,24 +120,11 @@ void SpeedLimitSettings::refresh() {
     cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
     cereal::CarParamsSP::Reader CP_SP = cmsg_sp.getRoot<cereal::CarParamsSP>();
 
-    bool has_longitudinal_control = hasLongitudinalControl(CP);
-    bool has_icbm = hasIntelligentCruiseButtonManagement(CP_SP);
-
-    /*
-     * Speed Limit Assist is available when:
-     * - has_longitudinal_control or has_icbm, and
-     * - is not a release branch or not a disallowed brand, and
-     * - is not always disallowed
-     */
-    bool sla_disallow_in_release = CP.getBrand() == "tesla" && is_release;
-    bool sla_always_disallow = CP.getBrand() == "rivian";
-    sla_available = (has_longitudinal_control || has_icbm) && !sla_disallow_in_release && !sla_always_disallow;
-
-    if (!sla_available && speed_limit_mode_param == SpeedLimitMode::ASSIST) {
-      params.put("SpeedLimitMode", std::to_string(static_cast<int>(SpeedLimitMode::WARNING)));
-    }
+    has_longitudinal_control = hasLongitudinalControl(CP);
+    intelligent_cruise_button_management_available = CP_SP.getIntelligentCruiseButtonManagementAvailable();
   } else {
-    sla_available = false;
+    has_longitudinal_control = false;
+    intelligent_cruise_button_management_available = false;
   }
 
   speed_limit_mode_settings->setDescription(modeDescription(speed_limit_mode_param));
@@ -159,14 +144,13 @@ void SpeedLimitSettings::refresh() {
     speed_limit_offset->showDescription();
   }
 
-  if (sla_available) {
+  if (has_longitudinal_control || intelligent_cruise_button_management_available) {
     speed_limit_mode_settings->setEnableSelectedButtons(true, convertSpeedLimitModeValues(getSpeedLimitModeValues()));
   } else {
     speed_limit_mode_settings->setEnableSelectedButtons(true, convertSpeedLimitModeValues(
-      {SpeedLimitMode::OFF, SpeedLimitMode::INFORMATION, SpeedLimitMode::WARNING}));
+      {SpeedLimitMode::OFF,SpeedLimitMode::INFORMATION, SpeedLimitMode::WARNING}));
   }
 
-  speed_limit_mode_settings->refresh();
   speed_limit_mode_settings->showDescription();
   speed_limit_offset->showDescription();
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h

@@ -35,7 +35,6 @@ private:
   SpeedLimitPolicy *speedLimitPolicyScreen;
   ButtonParamControlSP *speed_limit_offset_settings;
   OptionControlSP *speed_limit_offset;
-  bool icbm_available = false;
 
   static QString offsetDescription(SpeedLimitOffsetType type = SpeedLimitOffsetType::NONE) {
     QString none_str = tr("⦿ None: No Offset");

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc

@@ -7,8 +7,6 @@
 
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h"
 
-#include "selfdrive/ui/sunnypilot/qt/util.h"
-
 LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) {
   setStyleSheet(R"(
     #back_btn {
@@ -38,24 +36,13 @@ LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) {
   intelligentCruiseButtonManagement = new ParamControlSP(
     "IntelligentCruiseButtonManagement",
     tr("Intelligent Cruise Button Management (ICBM) (Alpha)"),
-    "",
+    tr("When enabled, sunnypilot will attempt to manage the built-in cruise control buttons by emulating button presses for limited longitudinal control."),
     "",
     this
   );
-  QObject::connect(intelligentCruiseButtonManagement, &ParamControlSP::toggleFlipped, this, [=](bool) {
-    refresh(offroad);
-  });
+  intelligentCruiseButtonManagement->setConfirmation(true, false);
   list->addItem(intelligentCruiseButtonManagement);
 
-  dynamicExperimentalControl = new ParamControlSP(
-    "DynamicExperimentalControl",
-    tr("Dynamic Experimental Control (DEC)"),
-    tr("Enable toggle to allow the model to determine when to use sunnypilot ACC or sunnypilot End to End Longitudinal."),
-    "",
-    this
-  );
-  list->addItem(dynamicExperimentalControl);
-
   SmartCruiseControlVision = new ParamControl(
     "SmartCruiseControlVision",
     tr("Smart Cruise Control - Vision"),
@@ -75,22 +62,6 @@ LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) {
 
   QObject::connect(uiState(), &UIState::offroadTransition, this, &LongitudinalPanel::refresh);
 
-  // Acceleration Personality
-  AccelPersonalityControl = new ParamControlSP("AccelPersonalityEnabled",
-    tr("Acceleration Personality"),
-    tr("Controls acceleration behavior: Eco (efficient), Normal (balanced), Sport (responsive). "
-      "Adjust how aggressively the vehicle accelerates while maintaining smooth operation."),
-    "../assets/offroad/icon_shell.png");
-  list->addItem(AccelPersonalityControl);
-
-  // Dynamic Personality
-  DynamicPersonalityControl = new ParamControlSP("DynamicFollow",
-    tr("Following Distance Personality"),
-    tr("Controls following distance and braking behavior: Relaxed (longer distance, gentler braking), Standard (balanced), Aggressive (shorter distance, firmer braking). "
-      "Fine-tune your comfort level in traffic situations."),
-    "../assets/offroad/icon_shell.png");
-  list->addItem(DynamicPersonalityControl);
-
   speedLimitSettings = new PushButtonSP(tr("Speed Limit"), 750, this);
   connect(speedLimitSettings, &QPushButton::clicked, [&]() {
     cruisePanelScroller->setLastScrollPosition();
@@ -120,8 +91,6 @@ void LongitudinalPanel::hideEvent(QHideEvent *event) {
 }
 
 void LongitudinalPanel::refresh(bool _offroad) {
-  const QString icbm_description = tr("When enabled, sunnypilot will attempt to manage the built-in cruise control buttons by emulating button presses for limited longitudinal control.");
-
   auto cp_bytes = params.get("CarParamsPersistent");
   auto cp_sp_bytes = params.get("CarParamsSPPersistent");
   if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
@@ -134,65 +103,15 @@ void LongitudinalPanel::refresh(bool _offroad) {
 
     has_longitudinal_control = hasLongitudinalControl(CP);
     is_pcm_cruise = CP.getPcmCruise();
-    has_icbm = hasIntelligentCruiseButtonManagement(CP_SP);
-
-    if (CP_SP.getIntelligentCruiseButtonManagementAvailable() && !has_longitudinal_control) {
-      intelligentCruiseButtonManagement->setEnabled(offroad);
-      intelligentCruiseButtonManagement->setDescription(icbm_description);
-    } else {
-      params.remove("IntelligentCruiseButtonManagement");
-      intelligentCruiseButtonManagement->setEnabled(false);
-
-      const QString icbm_unavaialble = tr("Intelligent Cruise Button Management is currently unavailable on this platform.");
-
-      QString long_desc = icbm_unavaialble;
-      if (has_longitudinal_control) {
-        if (CP.getAlphaLongitudinalAvailable()) {
-          long_desc = icbm_unavaialble + " " + tr("Disable the sunnypilot Longitudinal Control (alpha) toggle to allow Intelligent Cruise Button Management.");
-        } else {
-          long_desc = icbm_unavaialble + " " + tr("sunnypilot Longitudinal Control is the default longitudinal control for this platform.");
-        }
-      }
-
-      intelligentCruiseButtonManagement->setDescription("<b>" + long_desc + "</b><br><br>" + icbm_description);
-      intelligentCruiseButtonManagement->showDescription();
-    }
-
-    if (has_longitudinal_control || has_icbm) {
-      // enable Custom ACC Increments when long is available and is not PCM cruise
-      customAccIncrement->setEnabled(((has_longitudinal_control && !is_pcm_cruise) || has_icbm) && offroad);
-      dynamicExperimentalControl->setEnabled(has_longitudinal_control);
-      SmartCruiseControlVision->setEnabled(true);
-      SmartCruiseControlMap->setEnabled(true);
-    } else {
-      params.remove("CustomAccIncrementsEnabled");
-      params.remove("DynamicExperimentalControl");
-      params.remove("SmartCruiseControlVision");
-      params.remove("SmartCruiseControlMap");
-      customAccIncrement->setEnabled(false);
-      dynamicExperimentalControl->setEnabled(false);
-      SmartCruiseControlVision->setEnabled(false);
-      SmartCruiseControlMap->setEnabled(false);
-    }
-
-    intelligentCruiseButtonManagement->refresh();
-    customAccIncrement->refresh();
-    dynamicExperimentalControl->refresh();
-    SmartCruiseControlVision->refresh();
-    SmartCruiseControlMap->refresh();
-    AccelPersonalityControl->setEnabled(true);
-    DynamicPersonalityControl->setEnabled(true);
-    AccelPersonalityControl->refresh();
-    DynamicPersonalityControl->refresh();
+    intelligent_cruise_button_management_available = CP_SP.getIntelligentCruiseButtonManagementAvailable();
   } else {
     has_longitudinal_control = false;
     is_pcm_cruise = false;
-    has_icbm = false;
-    intelligentCruiseButtonManagement->setDescription("<b>" + tr("Start the vehicle to check vehicle compatibility.") + "</br><b><b>" + icbm_description);
+    intelligent_cruise_button_management_available = false;
   }
 
   QString accEnabledDescription = tr("Enable custom Short & Long press increments for cruise speed increase/decrease.");
-  QString accNoLongDescription = tr("This feature can only be used with sunnypilot longitudinal control enabled.");
+  QString accNoLongDescription = tr("This feature can only be used with openpilot longitudinal control enabled.");
   QString accPcmCruiseDisabledDescription = tr("This feature is not supported on this platform due to vehicle limitations.");
   QString onroadOnlyDescription = tr("Start the vehicle to check vehicle compatibility.");
 
@@ -200,19 +119,33 @@ void LongitudinalPanel::refresh(bool _offroad) {
     customAccIncrement->setDescription(onroadOnlyDescription);
     customAccIncrement->showDescription();
   } else {
-    if (has_longitudinal_control || has_icbm) {
-      if (has_longitudinal_control && is_pcm_cruise) {
+    if (has_longitudinal_control || intelligent_cruise_button_management_available) {
+      if (is_pcm_cruise) {
         customAccIncrement->setDescription(accPcmCruiseDisabledDescription);
         customAccIncrement->showDescription();
       } else {
         customAccIncrement->setDescription(accEnabledDescription);
       }
     } else {
+      params.remove("CustomAccIncrementsEnabled");
       customAccIncrement->toggleFlipped(false);
       customAccIncrement->setDescription(accNoLongDescription);
       customAccIncrement->showDescription();
+      params.remove("IntelligentCruiseButtonManagement");
+      intelligentCruiseButtonManagement->toggleFlipped(false);
     }
   }
 
+  bool icbm_allowed = intelligent_cruise_button_management_available && !has_longitudinal_control;
+  intelligentCruiseButtonManagement->setEnabled(icbm_allowed && offroad);
+
+  // enable toggle when long is available and is not PCM cruise
+  bool cai_allowed = (has_longitudinal_control && !is_pcm_cruise) || icbm_allowed;
+  customAccIncrement->setEnabled(cai_allowed && !offroad);
+  customAccIncrement->refresh();
+
+  SmartCruiseControlVision->setEnabled(has_longitudinal_control || icbm_allowed);
+  SmartCruiseControlMap->setEnabled(has_longitudinal_control || icbm_allowed);
+
   offroad = _offroad;
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h

@@ -25,7 +25,7 @@ private:
   Params params;
   bool has_longitudinal_control = false;
   bool is_pcm_cruise = false;
-  bool has_icbm = false;
+  bool intelligent_cruise_button_management_available = false;;
   bool offroad = false;
 
   QStackedLayout *main_layout = nullptr;
@@ -35,10 +35,6 @@ private:
   ParamControl *SmartCruiseControlVision;
   ParamControl *SmartCruiseControlMap;
   ParamControl *intelligentCruiseButtonManagement = nullptr;
-  ParamControl *dynamicExperimentalControl = nullptr;
-
-  ParamControlSP *AccelPersonalityControl;
-  ParamControlSP *DynamicPersonalityControl;
   SpeedLimitSettings *speedLimitScreen;
   PushButtonSP *speedLimitSettings;
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/models_panel.cc

@@ -310,8 +310,9 @@ void ModelsPanel::handleCurrentModelLblBtnClicked() {
   QList<TreeNode> sortedModels;
   QSet<QString> modelFolders;
   QRegularExpression re("\\(([^)]*)\\)[^(]*$");
+  const auto bundles = model_manager.getAvailableBundles();
 
-  for (const auto &bundle : model_manager.getAvailableBundles()) {
+  for (const auto &bundle : bundles) {
     auto overrides = bundle.getOverrides();
     QString folder;
     for (const auto &override : overrides) {
@@ -391,7 +392,7 @@ void ModelsPanel::handleCurrentModelLblBtnClicked() {
     showResetParamsDialog();
   } else {
     // Find selected bundle and initiate download
-    for (const auto &bundle: model_manager.getAvailableBundles()) {
+    for (const auto &bundle: bundles) {
       if (QString::fromStdString(bundle.getRef()) == selectedBundleRef) {
         params.put("ModelManager_DownloadIndex", std::to_string(bundle.getIndex()));
         if (bundle.getGeneration() != model_manager.getActiveBundle().getGeneration()) {

selfdrive/ui/sunnypilot/qt/offroad/settings/navigation_panel.cc

@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/navigation_panel.h"
-
-NavigationPanel::NavigationPanel(QWidget* parent) : QWidget(parent) {
-  QVBoxLayout* main_layout = new QVBoxLayout(this);
-  main_layout->setContentsMargins(50, 25, 50, 25);
-
-  list = new ListWidget(this, false);
-  scroller = new ScrollViewSP(list, this);
-  main_layout->addWidget(scroller);
-
-  // Mapbox Token
-  mapbox_token = new ButtonControl(tr("Mapbox Token"), tr("Edit"), tr("Enter your Mapbox API token"));
-  QObject::connect(mapbox_token, &ButtonControl::clicked, [=]() {
-    QString current = QString::fromStdString(params.get("MapboxToken"));
-    QString token = InputDialog::getText(tr("Enter Mapbox Token"), this, "", false, -1, current);
-    if (!token.isEmpty()) {
-      params.put("MapboxToken", token.toStdString());
-      refresh();
-    }
-  });
-  list->addItem(mapbox_token);
-
-  // Mapbox Route
-  mapbox_route = new ButtonControl(tr("Mapbox Route"), tr("Edit"), tr("Enter Mapbox route data"));
-  QObject::connect(mapbox_route, &ButtonControl::clicked, [=]() {
-    QString current = QString::fromStdString(params.get("MapboxRoute"));
-    QString route = InputDialog::getText(tr("Enter Mapbox Route"), this, "", false, -1, current);
-    if (!route.isEmpty()) {
-      params.put("MapboxRoute", route.toStdString());
-      refresh();
-    }
-  });
-  list->addItem(mapbox_route);
-
-  // Allow Navigation
-  allow_navigation = new ParamControlSP("AllowNavigation", tr("Allow Navigation"), tr("Enable navigation features and start navigationd"), "", this);
-  QObject::connect(allow_navigation, &ParamControlSP::toggleFlipped, this, &NavigationPanel::updateNavigationVisibility);
-  list->addItem(allow_navigation);
-
-  // Mapbox Recompute
-  mapbox_recompute = new ParamControlSP("MapboxRecompute", tr("Mapbox Recompute"), tr("Enable automatic route recomputation"), "", this);
-  list->addItem(mapbox_recompute);
-
-  // Nav Allowed
-  nav_allowed = new ParamControlSP("NavDesiresAllowed", tr("Navigation Allowed"), tr("Allow navigation to automatically take turns"), "", this);
-  list->addItem(nav_allowed);
-}
-
-void NavigationPanel::updateNavigationVisibility(bool state) {
-  mapbox_recompute->setVisible(state);
-  nav_allowed->setVisible(state);
-}
-
-void NavigationPanel::showEvent(QShowEvent *event) {
-  refresh();
-}
-
-void NavigationPanel::refresh() {
-  allow_navigation->refresh();
-
-  bool nav_enabled = allow_navigation->isToggled();
-  updateNavigationVisibility(nav_enabled);
-
-  QString token = QString::fromStdString(params.get("MapboxToken"));
-  mapbox_token->setValue(token.isEmpty() ? tr("Not set") : token);
-
-  QString route = QString::fromStdString(params.get("MapboxRoute"));
-  mapbox_route->setValue(route.isEmpty() ? tr("Not set") : route);
-
-  mapbox_recompute->refresh();
-  nav_allowed->refresh();
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/navigation_panel.h

@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include "selfdrive/ui/qt/offroad/settings.h"
-#include "selfdrive/ui/qt/widgets/controls.h"
-#include "selfdrive/ui/qt/widgets/input.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
-#include "selfdrive/ui/sunnypilot/qt/util.h"
-
-
-class NavigationPanel : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit NavigationPanel(QWidget* parent = nullptr);
-  void showEvent(QShowEvent *event) override;
-  void refresh();
-
-public slots:
-  void updateNavigationVisibility(bool state);
-
-private:
-  Params params;
-  ListWidget* list;
-  ScrollViewSP* scroller;
-  ParamControlSP* allow_navigation;
-  ButtonControl* mapbox_token;
-  ButtonControl* mapbox_route;
-  ParamControlSP* mapbox_recompute;
-  ParamControlSP* nav_allowed;
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/settings.cc

@@ -15,7 +15,6 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/models_panel.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/navigation_panel.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/software_panel.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_panel.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral_panel.h"
@@ -86,7 +85,6 @@ SettingsWindowSP::SettingsWindowSP(QWidget *parent) : SettingsWindow(parent) {
     PanelInfo("   " + tr("Toggles"), toggles, "../../sunnypilot/selfdrive/assets/offroad/icon_toggle.png"),
     PanelInfo("   " + tr("Software"), new SoftwarePanelSP(this), "../../sunnypilot/selfdrive/assets/offroad/icon_software.png"),
     PanelInfo("   " + tr("Models"), new ModelsPanel(this), "../../sunnypilot/selfdrive/assets/offroad/icon_models.png"),
-    PanelInfo("   " + tr("Navigation"), new NavigationPanel(this), "../../sunnypilot/selfdrive/assets/offroad/icon_map.png"),
     PanelInfo("   " + tr("Steering"), new LateralPanel(this), "../../sunnypilot/selfdrive/assets/offroad/icon_lateral.png"),
     PanelInfo("   " + tr("Cruise"), new LongitudinalPanel(this), "../assets/icons/speed_limit.png"),
     PanelInfo("   " + tr("Visuals"), new VisualsPanel(this), "../../sunnypilot/selfdrive/assets/offroad/icon_visuals.png"),

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink/community_widget.cc

@@ -1,139 +0,0 @@
-/**
- * Copyright (c) 2025-, sunnypilot contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink/community_widget.h"
-
-#include "selfdrive/ui/sunnypilot/ui.h"
-#include "selfdrive/ui/sunnypilot/qt/util.h"
-
-using qrcodegen::QrCode;
-
-// --- SunnylinkCommunityQRWidget ---
-
-SunnylinkCommunityQRWidget::SunnylinkCommunityQRWidget(QWidget* parent)
-    : QWidget(parent) {}
-
-void SunnylinkCommunityQRWidget::showEvent(QShowEvent *event) {
-  updateQrCode(SUNNYLINK_COMMUNITY_URL);
-  update();
-}
-
-void SunnylinkCommunityQRWidget::updateQrCode(const QString &text) {
-  QrCode qr = QrCode::encodeText(text.toUtf8().data(), QrCode::Ecc::LOW);
-  qint32 sz = qr.getSize();
-  QImage im(sz, sz, QImage::Format_RGB32);
-
-  QRgb black = qRgb(0, 0, 0);
-  QRgb white = qRgb(255, 255, 255);
-  for (int y = 0; y < sz; y++) {
-    for (int x = 0; x < sz; x++) {
-      im.setPixel(x, y, qr.getModule(x, y) ? black : white);
-    }
-  }
-
-  int final_sz = ((width() / sz) - 1) * sz;
-  img = QPixmap::fromImage(im.scaled(final_sz, final_sz, Qt::KeepAspectRatio), Qt::MonoOnly);
-}
-
-void SunnylinkCommunityQRWidget::paintEvent(QPaintEvent *e) {
-  QPainter p(this);
-  p.fillRect(rect(), Qt::white);
-
-  if (!img.isNull()) {
-    QSize s = (size() - img.size()) / 2;
-    p.drawPixmap(s.width(), s.height(), img);
-  }
-}
-
-// --- SunnylinkCommunityPopup ---
-
-QStringList SunnylinkCommunityPopup::getInstructions() {
-  QStringList instructions;
-  instructions << tr("Scan the QR code and join us!");
-  return instructions;
-}
-
-SunnylinkCommunityPopup::SunnylinkCommunityPopup(QWidget* parent)
-    : DialogBase(parent) {
-  auto *mainLayout = new QVBoxLayout(this);
-  mainLayout->setContentsMargins(0, 0, 0, 0);
-  mainLayout->setSpacing(0);
-
-  // Solarized Light base3 background
-  setStyleSheet("SunnylinkCommunityPopup { background-color: #FDF6E3; }");
-
-  // Header spanning full width
-  auto headerWidget = new QWidget(this);
-  auto headerLayout = new QHBoxLayout(headerWidget);
-  headerLayout->setContentsMargins(85, 50, 85, 30);
-  headerLayout->setSpacing(30);
-
-  auto close = new QPushButton(QIcon(":/icons/close.svg"), "", this);
-  close->setIconSize(QSize(80, 80));
-  close->setStyleSheet("border: none;");
-  connect(close, &QPushButton::clicked, this, &QDialog::reject);
-  headerLayout->addWidget(close, 0, Qt::AlignLeft | Qt::AlignVCenter);
-
-  const auto title = new QLabel(tr("Join the sunnypilot Community Forum"), this);
-  // Solarized base02 for text
-  title->setStyleSheet("font-size: 65px; color: #073642;");
-  title->setWordWrap(false);
-  title->setAlignment(Qt::AlignCenter);
-  headerLayout->addWidget(title, 1);
-
-  // Spacer to balance the close button on the right
-  auto spacer = new QWidget(this);
-  spacer->setFixedSize(80, 80);
-  headerLayout->addWidget(spacer, 0);
-
-  mainLayout->addWidget(headerWidget);
-
-  // Two-column content layout
-  auto contentLayout = new QHBoxLayout();
-  contentLayout->setContentsMargins(0, 0, 0, 0);
-  contentLayout->setSpacing(0);
-  mainLayout->addLayout(contentLayout, 66);
-
-  // Left side: description
-  auto leftLayout = new QVBoxLayout();
-  leftLayout->setContentsMargins(85, 40, 50, 70);
-  leftLayout->setSpacing(35);
-  contentLayout->addLayout(leftLayout, 40);
-
-  // Hype / intro paragraph
-  const auto desc = new QLabel(tr(
-    "We're excited to announce our <b>sunnypilot Community Forum</b><br><br>"
-    "Over the years, Discord just hasn't scaled well for our growing community.<br>"
-    "It's noisy, unsearchable, and great discussions disappear too easily.<br>"
-    "Our new community forum aims to fix that by making it easier to <b>find answers, share ideas, track feedback, report bugs, help newcomers</b> and more!<br><br>"
-    "<b>Here's what's waiting for you:</b><br>"
-    "• Fully <b>indexable</b> and discoverable through search engines 🔎<br>"
-    "• <b>AI-powered</b>🤖 topic and chat summaries, spam detection, and more<br>"
-    "• A <b>trust-level system</b>✅ that rewards meaningful contributions<br>"
-    "• Designed to work <b>on your own time</b>.🧘<br><br>"
-    "Scan the QR code on the right and join the discussion!"
-  ), this);
-  // Solarized base01 for body text
-  desc->setStyleSheet("font-size: 40px; color: #586E75;");
-  desc->setWordWrap(true);
-  leftLayout->addWidget(desc);
-
-  leftLayout->addStretch();
-
-  // Right side: QR code and instructions
-  auto rightLayout = new QVBoxLayout();
-  rightLayout->setContentsMargins(50, 40, 85, 70);
-  rightLayout->setSpacing(40);
-  contentLayout->addLayout(rightLayout, 1);
-
-  // QR code (smaller, fixed size)
-  auto *qr = new SunnylinkCommunityQRWidget(this);
-  qr->setFixedSize(500, 500);
-  rightLayout->addStretch();
-  rightLayout->addWidget(qr, 0, Qt::AlignCenter);
-  rightLayout->addStretch();
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink/community_widget.h

@@ -1,40 +0,0 @@
-/**
-* Copyright (c) 2025-, sunnypilot contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include <QrCode.hpp>
-#include <QtCore/qjsonobject.h>
-
-#include "common/util.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-
-const QString SUNNYLINK_COMMUNITY_URL = "https://community.sunnypilot.ai/sp-qr";
-
-class SunnylinkCommunityQRWidget : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit SunnylinkCommunityQRWidget(QWidget* parent = nullptr);
-  void paintEvent(QPaintEvent*) override;
-
-private:
-  QPixmap img;
-  void updateQrCode(const QString &text);
-  void showEvent(QShowEvent *event) override;
-};
-
-// Popup widget
-class SunnylinkCommunityPopup : public DialogBase {
-  Q_OBJECT
-
-public:
-  explicit SunnylinkCommunityPopup(QWidget* parent = nullptr);
-
-private:
-  static QStringList getInstructions();
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink/sponsor_widget.cc

@@ -79,11 +79,11 @@ QStringList SunnylinkSponsorPopup::getInstructions(bool sponsor_pair) {
     instructions << tr("Scan the QR code to login to your GitHub account")
                  << tr("Follow the prompts to complete the pairing process")
                  << tr("Re-enter the \"sunnylink\" panel to verify sponsorship status")
-                 << tr("If sponsorship status was not updated, please contact a moderator on our forum at https://community.sunnypilot.ai");
+                 << tr("If sponsorship status was not updated, please contact a moderator on Discord at https://discord.gg/sunnypilot");
   } else {
     instructions << tr("Scan the QR code to visit sunnyhaibin's GitHub Sponsors page")
                  << tr("Choose your sponsorship tier and confirm your support")
-                 << tr("Join our Community Forum at https://community.sunnypilot.ai and reach out to a moderator if you have issues");
+                 << tr("Join our community on Discord at https://discord.gg/sunnypilot and reach out to a moderator to confirm your sponsor status");
   }
   return instructions;
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_panel.cc

@@ -90,7 +90,7 @@ SunnylinkPanel::SunnylinkPanel(QWidget *parent) : QFrame(parent) {
   QString sunnylinkUploaderDesc = tr("Enable sunnylink uploader to allow sunnypilot to upload your driving data to sunnypilot servers. (only for highest tiers, and does NOT bring ANY benefit to you. We are just testing data volume.)");
   sunnylinkUploaderEnabledBtn = new ParamControlSP(
     "EnableSunnylinkUploader",
-    tr("Enable sunnylink uploader (infrastructure test)"),
+    tr("[Don't use] Enable sunnylink uploader"),
     sunnylinkUploaderDesc,
     "", nullptr, true);
   list->addItem(sunnylinkUploaderEnabledBtn);
@@ -290,10 +290,7 @@ void SunnylinkPanel::updatePanel() {
   pairSponsorBtn->setEnabled(!is_onroad && is_sunnylink_enabled);
   pairSponsorBtn->setValue(is_paired ? tr("Paired") : tr("Not Paired"));
 
-  bool can_do_uploads = max_current_sponsor_rule.roleTier >= SponsorTier::Novice && is_sunnylink_enabled;
-  sunnylinkUploaderEnabledBtn->setVisible(can_do_uploads);
-  sunnylinkUploaderEnabledBtn->setEnabled(can_do_uploads);
-  
+  sunnylinkUploaderEnabledBtn->setEnabled(max_current_sponsor_rule.roleTier == SponsorTier::Guardian && is_sunnylink_enabled);
 
   if (!is_sunnylink_enabled) {
     sunnylinkEnabledBtn->setValue("");

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/hyundai_settings.h

@@ -33,7 +33,7 @@ private:
 
   static QString toggleDisableMsg(bool _offroad, bool _has_longitudinal_control) {
     if (!_has_longitudinal_control) {
-      return tr("This feature can only be used with sunnypilot longitudinal control enabled.");
+      return tr("This feature can only be used with openpilot longitudinal control enabled.");
     }
 
     if (!_offroad) {
@@ -57,7 +57,7 @@ private:
     }
 
     return QString("%1<br><br>%2<br>%3<br>%4<br>")
-             .arg(tr("Fine-tune your driving experience by adjusting acceleration smoothness with sunnypilot longitudinal control."))
+             .arg(tr("Fine-tune your driving experience by adjusting acceleration smoothness with openpilot longitudinal control."))
              .arg(off_str)
              .arg(dynamic_str)
              .arg(predictive_str);

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/subaru_settings.cc

@@ -8,52 +8,7 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/subaru_settings.h"
 
 SubaruSettings::SubaruSettings(QWidget *parent) : BrandSettingsInterface(parent) {
-  stopAndGoToggle = new ParamControl("SubaruStopAndGo", tr("Stop and Go (Beta)"), "", "");
-  stopAndGoToggle->setConfirmation(true, false);
-  list->addItem(stopAndGoToggle);
-
-  stopAndGoManualParkingBrakeToggle = new ParamControl(
-    "SubaruStopAndGoManualParkingBrake",
-    tr("Stop and Go for Manual Parking Brake (Beta)"),
-    "",
-    ""
-  );
-  stopAndGoManualParkingBrakeToggle->setConfirmation(true, false);
-  list->addItem(stopAndGoManualParkingBrakeToggle);
 }
 
 void SubaruSettings::updateSettings() {
-  auto cp_bytes = params.get("CarParamsPersistent");
-  if (!cp_bytes.empty()) {
-    AlignedBuffer aligned_buf;
-    capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
-    cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
-
-    is_subaru = CP.getBrand() == "subaru";
-
-    if (is_subaru) {
-      if (!(CP.getFlags() & (SUBARU_FLAG_GLOBAL_GEN2 | SUBARU_FLAG_HYBRID))) {
-        has_stop_and_go = true;
-      }
-    }
-  } else {
-    is_subaru = false;
-    has_stop_and_go = false;
-  }
-
-  bool stop_and_go_disabled = !offroad || !has_stop_and_go;
-  QString stop_and_go_desc = stopAndGoDescriptionBuilder(stopAndGoDesc);
-  QString stop_and_go_manual_parking_brake_desc = stopAndGoDescriptionBuilder(stopAndGoManualParkingBrakeDesc);
-  if (stop_and_go_disabled) {
-    stop_and_go_desc = stopAndGoDescriptionBuilder(stopAndGoDesc, stopAndGoDisabledMsg());
-    stop_and_go_manual_parking_brake_desc = stopAndGoDescriptionBuilder(stopAndGoManualParkingBrakeDesc, stopAndGoDisabledMsg());
-  }
-
-  stopAndGoToggle->setEnabled(has_stop_and_go);
-  stopAndGoToggle->setDescription(stop_and_go_desc);
-  stopAndGoToggle->showDescription();
-
-  stopAndGoManualParkingBrakeToggle->setEnabled(has_stop_and_go);
-  stopAndGoManualParkingBrakeToggle->setDescription(stop_and_go_manual_parking_brake_desc);
-  stopAndGoManualParkingBrakeToggle->showDescription();
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/subaru_settings.h

@@ -14,9 +14,6 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
-const int SUBARU_FLAG_GLOBAL_GEN2 = 4;
-const int SUBARU_FLAG_HYBRID = 32;
-
 class SubaruSettings : public BrandSettingsInterface {
   Q_OBJECT
 
@@ -26,32 +23,4 @@ public:
 
 private:
   bool offroad = false;
-  bool is_subaru;
-  bool has_stop_and_go;
-
-  ParamControl* stopAndGoToggle;
-  ParamControl* stopAndGoManualParkingBrakeToggle;
-
-  QString stopAndGoDesc = tr("Experimental feature to enable auto-resume during stop-and-go for certain supported Subaru platforms.");
-  QString stopAndGoManualParkingBrakeDesc = tr("Experimental feature to enable stop and go for Subaru Global models with manual handbrake. Models with electric parking brake should keep this disabled. Thanks to martinl for this implementation!");
-
-  QString stopAndGoDisabledMsg() const {
-    if (is_subaru && !has_stop_and_go) {
-      return tr("This feature is currently not available on this platform.");
-    }
-
-    if (!is_subaru) {
-      return tr("Start the car to check car compatibility.");
-    }
-
-    if (!offroad) {
-      return tr("Enable \"Always Offroad\" in Device panel, or turn vehicle off to toggle.");
-    }
-
-    return QString();
-  }
-
-  static QString stopAndGoDescriptionBuilder(const QString &base_description, const QString &custom_description = "") {
-    return "<b>" + custom_description + "</b><br><br>" + base_description;
-  }
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/tesla_settings.cc

@@ -8,41 +8,7 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/tesla_settings.h"
 
 TeslaSettings::TeslaSettings(QWidget *parent) : BrandSettingsInterface(parent) {
-  constexpr int coopSteeringMinKmh = 23; // minimum speed for cooperative steering (enforced by Tesla firmware)
-  constexpr int oemSteeringMinKmh = 48; // minimum speed for OEM lane departure avoidance (enforced by Tesla firmware)
-  bool is_metric = params.getBool("IsMetric");
-  QString unit = is_metric ? "km/h" : "mph";
-  int display_value_coop;
-  int display_value_oem;
-  if (is_metric) {
-    display_value_coop = coopSteeringMinKmh;
-    display_value_oem = oemSteeringMinKmh;
-  } else {
-    display_value_coop = static_cast<int>(std::round(coopSteeringMinKmh * KM_TO_MILE));
-    display_value_oem = static_cast<int>(std::round(oemSteeringMinKmh * KM_TO_MILE));
-  }
-  const QString coop_desc = QString("<b>%1</b><br><br>"
-                                    "%2<br>"
-                                    "%3<br>")
-                            .arg(tr("Warning: May experience steering oscillations below %5 %6 during turns, recommend disabling this feature if you experience these."))
-                            .arg(tr("Allows the driver to provide limited steering input while openpilot is engaged."))
-                            .arg(tr("Only works above %4 %6."))
-                            .arg(display_value_coop)
-                            .arg(display_value_oem)
-                            .arg(unit);
-
-  coopSteeringToggle = new ParamControlSP(
-    "TeslaCoopSteering",
-    tr("Cooperative Steering (Beta)"),
-    coop_desc,
-    "",
-    this
-  );
-  list->addItem(coopSteeringToggle);
-  coopSteeringToggle->showDescription();
-  coopSteeringToggle->setConfirmation(true, false);
 }
 
 void TeslaSettings::updateSettings() {
-  coopSteeringToggle->setEnabled(offroad);
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle/tesla_settings.h

@@ -22,5 +22,5 @@ public:
   void updateSettings() override;
 
 private:
-  ParamControlSP *coopSteeringToggle = nullptr;
+  bool offroad = false;
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_panel.cc

@@ -119,7 +119,7 @@ VisualsPanel::VisualsPanel(QWidget *parent) : QWidget(parent) {
   // Visuals: Display Metrics below Chevron
   std::vector<QString> chevron_info_settings_texts{tr("Off"), tr("Distance"), tr("Speed"), tr("Time"), tr("All")};
   chevron_info_settings = new ButtonParamControlSP(
-    "ChevronInfo", tr("Display Metrics Below Chevron"), tr("Display useful metrics below the chevron that tracks the lead car (only applicable to cars with sunnypilot longitudinal control)."),
+    "ChevronInfo", tr("Display Metrics Below Chevron"), tr("Display useful metrics below the chevron that tracks the lead car (only applicable to cars with openpilot longitudinal control)."),
     "",
     chevron_info_settings_texts,
     200);
@@ -159,8 +159,8 @@ void VisualsPanel::refreshLongitudinalStatus() {
   }
 
   if (chevron_info_settings) {
-    QString chevronEnabledDescription = tr("Display useful metrics below the chevron that tracks the lead car (only applicable to cars with sunnypilot longitudinal control).");
-    QString chevronNoLongDescription = tr("This feature requires sunnypilot longitudinal control to be available.");
+    QString chevronEnabledDescription = tr("Display useful metrics below the chevron that tracks the lead car (only applicable to cars with openpilot longitudinal control).");
+    QString chevronNoLongDescription = tr("This feature requires openpilot longitudinal control to be available.");
 
     if (has_longitudinal_control) {
       chevron_info_settings->setDescription(chevronEnabledDescription);

selfdrive/ui/sunnypilot/qt/onroad/hud.cc

@@ -5,7 +5,6 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 #include <QPainterPath>
-#include <cmath>
 
 #include "selfdrive/ui/sunnypilot/qt/onroad/hud.h"
 
@@ -13,122 +12,59 @@
 
 
 HudRendererSP::HudRendererSP() {
-  plus_arrow_up_img = loadPixmap("../../sunnypilot/selfdrive/assets/img_plus_arrow_up", {90, 90});
-  minus_arrow_down_img = loadPixmap("../../sunnypilot/selfdrive/assets/img_minus_arrow_down", {90, 90});
+  plus_arrow_up_img = loadPixmap("../../sunnypilot/selfdrive/assets/img_plus_arrow_up", {105, 105});
+  minus_arrow_down_img = loadPixmap("../../sunnypilot/selfdrive/assets/img_minus_arrow_down", {105, 105});
 
-  int size = e2e_alert_size * 2 - 40;
-  green_light_alert_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/green_light.png", {size, size});
-  lead_depart_alert_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/lead_depart.png", {size, size});
+  int small_max = e2e_alert_small * 2 - 40;
+  int large_max = e2e_alert_large * 2 - 40;
+  green_light_alert_small_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/green_light.png", {small_max, small_max});
+  green_light_alert_large_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/green_light.png", {large_max, large_max});
+  lead_depart_alert_small_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/lead_depart.png", {small_max, small_max});
+  lead_depart_alert_large_img = loadPixmap("../../sunnypilot/selfdrive/assets/images/lead_depart.png", {large_max, large_max});
 }
 
 void HudRendererSP::updateState(const UIState &s) {
   HudRenderer::updateState(s);
 
-  float speedConv = is_metric ? MS_TO_KPH : MS_TO_MPH;
-  devUiInfo = s.scene.dev_ui_info;
-  roadName = s.scene.road_name;
-  showTurnSignals = s.scene.turn_signals;
-  speedLimitMode = static_cast<SpeedLimitMode>(s.scene.speed_limit_mode);
-  speedUnit = is_metric ? tr("km/h") : tr("mph");
-  standstillTimer = s.scene.standstill_timer;
-
   const SubMaster &sm = *(s.sm);
   const auto cs = sm["controlsState"].getControlsState();
   const auto car_state = sm["carState"].getCarState();
   const auto car_control = sm["carControl"].getCarControl();
   const auto radar_state = sm["radarState"].getRadarState();
   const auto is_gps_location_external = sm.rcv_frame("gpsLocationExternal") > 1;
-  const char *gps_source = is_gps_location_external ? "gpsLocationExternal" : "gpsLocation";
-  const auto gpsLocation = is_gps_location_external ? sm[gps_source].getGpsLocationExternal() : sm[gps_source].getGpsLocation();
+  const auto gpsLocation = is_gps_location_external ? sm["gpsLocationExternal"].getGpsLocationExternal() : sm["gpsLocation"].getGpsLocation();
   const auto ltp = sm["liveTorqueParameters"].getLiveTorqueParameters();
   const auto car_params = sm["carParams"].getCarParams();
-  const auto car_params_sp = sm["carParamsSP"].getCarParamsSP();
   const auto lp_sp = sm["longitudinalPlanSP"].getLongitudinalPlanSP();
-  if (sm.updated("carParams")) {
-    steerControlType = car_params.getSteerControlType();
-  }
-
-  if (sm.updated("carParamsSP")) {
-    pcmCruiseSpeed = car_params_sp.getPcmCruiseSpeed();
-  }
-
-  if (sm.alive("mapdOut") && sm.rcv_frame("mapdOut") > 0) {
-    const auto mapd = sm["mapdOut"].getMapdOut();
-
-    // Road name can come from wayName, wayRef, or roadName
-    wayName = QString::fromStdString(mapd.getWayName());
-    wayRef = QString::fromStdString(mapd.getWayRef());
-    QString mapdRoadName = QString::fromStdString(mapd.getRoadName());
-
-    if (!mapdRoadName.isEmpty()) {
-      roadNameStr = mapdRoadName;
-    } else if (!wayRef.isEmpty() && !wayName.isEmpty()) {
-      roadNameStr = wayRef + " - " + wayName;
-    } else if (!wayName.isEmpty()) {
-      roadNameStr = wayName;
-    } else if (!wayRef.isEmpty()) {
-      roadNameStr = wayRef;
-    } else {
-      roadNameStr = "";
-    }
-
-  greenLightAlert = lp_sp.getE2eAlerts().getGreenLightAlert();
-  leadDepartAlert = lp_sp.getE2eAlerts().getLeadDepartAlert();
-
-    tileLoaded = mapd.getTileLoaded();
-
-    float mapdSpeedLimitRaw = mapd.getSpeedLimit();
-    float mapdOffsetRaw = mapd.getSpeedLimitOffset();
-
-
-    mapdSpeedLimit = mapdSpeedLimitRaw * speedConv;
-    speedLimit = mapdSpeedLimit;
-    speedLimitLast = mapdSpeedLimit;
-    speedLimitOffset = mapdOffsetRaw * speedConv;
-    speedLimitValid = tileLoaded && mapdSpeedLimitRaw > 0;
-    speedLimitLastValid = speedLimitValid;
-    speedLimitFinalLast = mapdSpeedLimit + speedLimitOffset;
-
-    if (tileLoaded) {
-      speedLimitSource = 1;  // MAP
-    } else {
-      speedLimitSource = 0;  // NONE
-    }
-
-    float nextSpeedLimitRaw = mapd.getNextSpeedLimit();
-    speedLimitAheadValid = nextSpeedLimitRaw > 0 && tileLoaded;
-    speedLimitAhead = nextSpeedLimitRaw * speedConv;
-    speedLimitAheadDistance = mapd.getNextSpeedLimitDistance();
+  const auto lmd = sm["liveMapDataSP"].getLiveMapDataSP();
 
+  float speedConv = is_metric ? MS_TO_KPH : MS_TO_MPH;
+  speedLimit = lp_sp.getSpeedLimit().getResolver().getSpeedLimit() * speedConv;
+  speedLimitLast = lp_sp.getSpeedLimit().getResolver().getSpeedLimitLast() * speedConv;
+  speedLimitOffset = lp_sp.getSpeedLimit().getResolver().getSpeedLimitOffset() * speedConv;
+  speedLimitValid = lp_sp.getSpeedLimit().getResolver().getSpeedLimitValid();
+  speedLimitLastValid = lp_sp.getSpeedLimit().getResolver().getSpeedLimitLastValid();
+  speedLimitFinalLast = lp_sp.getSpeedLimit().getResolver().getSpeedLimitFinalLast() * speedConv;
+  speedLimitMode = static_cast<SpeedLimitMode>(s.scene.speed_limit_mode);
+  speedLimitAssistState = lp_sp.getSpeedLimit().getAssist().getState();
+  speedLimitAssistActive = lp_sp.getSpeedLimit().getAssist().getActive();
+  roadName = s.scene.road_name;
+  if (sm.updated("liveMapDataSP")) {
+    roadNameStr = QString::fromStdString(lmd.getRoadName());
+    speedLimitAheadValid = lmd.getSpeedLimitAheadValid();
+    speedLimitAhead = lmd.getSpeedLimitAhead() * speedConv;
+    speedLimitAheadDistance = lmd.getSpeedLimitAheadDistance();
     if (speedLimitAheadDistance < speedLimitAheadDistancePrev && speedLimitAheadValidFrame < SPEED_LIMIT_AHEAD_VALID_FRAME_THRESHOLD) {
       speedLimitAheadValidFrame++;
     } else if (speedLimitAheadDistance > speedLimitAheadDistancePrev && speedLimitAheadValidFrame > 0) {
       speedLimitAheadValidFrame--;
     }
-
-    // SCC data from mapd
-    suggestedSpeed = mapd.getSuggestedSpeed() * speedConv;
-    visionCurveSpeed = mapd.getVisionCurveSpeed() * speedConv;
-    curveSpeed = mapd.getCurveSpeed() * speedConv;
-
-    smartCruiseControlVisionEnabled = visionCurveSpeed > 0;
-    smartCruiseControlVisionActive = visionCurveSpeed > 0 && visionCurveSpeed < speedLimit;
-
-    smartCruiseControlMapEnabled = curveSpeed > 0;
-    smartCruiseControlMapActive = curveSpeed > 0 && curveSpeed < speedLimit;
-
-    advisorySpeed = mapd.getAdvisorySpeed() * speedConv;
-    nextAdvisorySpeed = mapd.getNextAdvisorySpeed() * speedConv;
-    nextAdvisorySpeedDistance = mapd.getNextAdvisorySpeedDistance();
   }
   speedLimitAheadDistancePrev = speedLimitAheadDistance;
 
-  speedLimitAssistState = 0;
-  speedLimitAssistActive = false;
-
   static int reverse_delay = 0;
   bool reverse_allowed = false;
-  if (car_state.getGearShifter() != cereal::CarState::GearShifter::REVERSE) {
+  if (int(car_state.getGearShifter()) != 4) {
     reverse_delay = 0;
     reverse_allowed = false;
   } else {
@@ -140,47 +76,46 @@ void HudRendererSP::updateState(const UIState &s) {
 
   reversing = reverse_allowed;
 
-  if (sm.updated("liveParameters")) {
-    roll = sm["liveParameters"].getLiveParameters().getRoll();
-  }
-
-  if (sm.updated("deviceState")) {
-    memoryUsagePercent = sm["deviceState"].getDeviceState().getMemoryUsagePercent();
-  }
-
-  if (sm.updated(gps_source)) {
-    gpsAccuracy = is_gps_location_external ? gpsLocation.getHorizontalAccuracy() : 1.0;
-    altitude = gpsLocation.getAltitude();
-    bearingAccuracyDeg = gpsLocation.getBearingAccuracyDeg();
-    bearingDeg = gpsLocation.getBearingDeg();
-  }
-
-  if (sm.updated("liveTorqueParameters")) {
-    torquedUseParams = ltp.getUseParams();
-    latAccelFactorFiltered = ltp.getLatAccelFactorFiltered();
-    frictionCoefficientFiltered = ltp.getFrictionCoefficientFiltered();
-    liveValid = ltp.getLiveValid();
-  }
-
   latActive = car_control.getLatActive();
-  actuators = car_control.getActuators();
-  longOverride = car_control.getCruiseControl().getOverride();
-  carControlEnabled = car_control.getEnabled();
-
   steerOverride = car_state.getSteeringPressed();
+
+  devUiInfo = s.scene.dev_ui_info;
+
+  speedUnit = is_metric ? tr("km/h") : tr("mph");
   lead_d_rel = radar_state.getLeadOne().getDRel();
   lead_v_rel = radar_state.getLeadOne().getVRel();
   lead_status = radar_state.getLeadOne().getStatus();
+  steerControlType = car_params.getSteerControlType();
+  actuators = car_control.getActuators();
   torqueLateral = steerControlType == cereal::CarParams::SteerControlType::TORQUE;
   angleSteers = car_state.getSteeringAngleDeg();
   desiredCurvature = cs.getDesiredCurvature();
   curvature = cs.getCurvature();
+  roll = sm["liveParameters"].getLiveParameters().getRoll();
+  memoryUsagePercent = sm["deviceState"].getDeviceState().getMemoryUsagePercent();
+  gpsAccuracy = is_gps_location_external ? gpsLocation.getHorizontalAccuracy() : 1.0;  // External reports accuracy, internal does not.
+  altitude = gpsLocation.getAltitude();
   vEgo = car_state.getVEgo();
   aEgo = car_state.getAEgo();
   steeringTorqueEps = car_state.getSteeringTorqueEps();
+  bearingAccuracyDeg = gpsLocation.getBearingAccuracyDeg();
+  bearingDeg = gpsLocation.getBearingDeg();
+  torquedUseParams = ltp.getUseParams();
+  latAccelFactorFiltered = ltp.getLatAccelFactorFiltered();
+  frictionCoefficientFiltered = ltp.getFrictionCoefficientFiltered();
+  liveValid = ltp.getLiveValid();
 
+  standstillTimer = s.scene.standstill_timer;
   isStandstill = car_state.getStandstill();
-  if (!s.scene.started) standstillElapsedTime = 0.0;
+  if (not s.scene.started) standstillElapsedTime = 0.0;
+  longOverride = car_control.getCruiseControl().getOverride();
+  smartCruiseControlVisionEnabled = lp_sp.getSmartCruiseControl().getVision().getEnabled();
+  smartCruiseControlVisionActive = lp_sp.getSmartCruiseControl().getVision().getActive();
+  smartCruiseControlMapEnabled = lp_sp.getSmartCruiseControl().getMap().getEnabled();
+  smartCruiseControlMapActive = lp_sp.getSmartCruiseControl().getMap().getActive();
+
+  greenLightAlert = lp_sp.getE2eAlerts().getGreenLightAlert();
+  leadDepartAlert = lp_sp.getE2eAlerts().getLeadDepartAlert();
 
   // override stock current speed values
   float v_ego = (v_ego_cluster_seen && !s.scene.trueVEgoUI) ? car_state.getVEgoCluster() : car_state.getVEgo();
@@ -191,68 +126,10 @@ void HudRendererSP::updateState(const UIState &s) {
   rightBlinkerOn = car_state.getRightBlinker();
   leftBlindspot = car_state.getLeftBlindspot();
   rightBlindspot = car_state.getRightBlindspot();
+  showTurnSignals = s.scene.turn_signals;
 
+  carControlEnabled = car_control.getEnabled();
   speedCluster = car_state.getCruiseState().getSpeedCluster() * speedConv;
-
-  allow_e2e_alerts = sm["selfdriveState"].getSelfdriveState().getAlertSize() == cereal::SelfdriveState::AlertSize::NONE &&
-                     sm.rcv_frame("driverStateV2") > s.scene.started_frame && !reversing;
-
-  // Navigationd
-  if (sm.updated("navigationd")) {
-    auto nav = sm["navigationd"].getNavigationd();
-    navigationValid = nav.getValid();
-    if (navigationValid && nav.getAllManeuvers().size() > 0) {
-      int currManeuverIdx = nav.getAllManeuvers().size() > 1 ? 1 : 0;
-      auto maneuver = nav.getAllManeuvers()[currManeuverIdx];
-      navigationModifier = QString::fromStdString(maneuver.getModifier());
-      navigationManeuverType = QString::fromStdString(maneuver.getType());
-
-      float dist = maneuver.getDistance();
-      if (is_metric) {
-        if (dist < 1000) {
-          if (dist < 500) {
-            navigationDistance = QString::number(std::round(dist / 25.0) * 25) + " m";
-          }
-          else {
-            navigationDistance = QString::number(std::round(dist / 50.0) * 50) + " m";
-          }
-        } else {
-          navigationDistance = QString::number(dist / 1000, 'f', 1) + " km";
-        }
-      } else {
-        float dist_ft = dist * 3.28084f;
-        if (dist_ft < 1000) {
-          if (dist_ft <= 100){
-            navigationDistance = QString::number((std::round(dist_ft / 10.0) * 10)) + " ft";
-          }
-          else {
-            navigationDistance = QString::number((std::round(dist_ft / 50.0) * 50)) + " ft";
-          }
-        } else {
-          navigationDistance = QString::number(dist_ft / 5280, 'f', 1) + " mi";
-        }
-      }
-
-      QString instruction = QString::fromStdString(maneuver.getInstruction());
-      QStringList parts = instruction.split(" onto ");
-      if (parts.size() > 1) {
-        navigationStreet = parts[1].trimmed();
-      } else {
-        navigationStreet = instruction;
-      }
-      navigationStreet = navigationStreet.replace(".", "");
-
-      // Get next maneuver if available
-      if (nav.getAllManeuvers().size() > 2) {
-        auto nextManeuver = nav.getAllManeuvers()[2];
-        navigationNextModifier = QString::fromStdString(nextManeuver.getModifier());
-        navigationNextManeuverType = QString::fromStdString(nextManeuver.getType());
-        navigationHasNext = true;
-      } else {
-        navigationHasNext = false;
-      }
-    }
-  }
 }
 
 void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
@@ -323,7 +200,7 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
     const int sign_height = 204;
     QRect sign_rect(sign_x, sign_y, sign_width, sign_height);
 
-    if (speedLimitAssistState == 1) {
+    if (speedLimitAssistState == cereal::LongitudinalPlanSP::SpeedLimit::AssistState::PRE_ACTIVE) {
       speedLimitAssistFrame++;
       showSpeedLimit = speed_limit_assist_pre_active_pulse;
       drawSpeedLimitPreActiveArrow(p, sign_rect);
@@ -336,7 +213,7 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
       drawSpeedLimitSigns(p, sign_rect);
 
       // do not show during SLA's preActive state
-      if (speedLimitAssistState != 1) {
+      if (speedLimitAssistState != cereal::LongitudinalPlanSP::SpeedLimit::AssistState::PRE_ACTIVE) {
         drawUpcomingSpeedLimit(p);
       }
     }
@@ -345,7 +222,7 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
     drawRoadName(p, surface_rect);
 
     // Green Light & Lead Depart Alerts
-    if (greenLightAlert || leadDepartAlert) {
+    if (greenLightAlert or leadDepartAlert) {
       e2eAlertDisplayTimer = 3 * UI_FREQ;
       // reset onroad sleep timer for e2e alerts
       uiStateSP()->reset_onroad_sleep_timer();
@@ -355,11 +232,11 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
       e2eAlertFrame++;
       if (greenLightAlert) {
         alert_text = tr("GREEN\nLIGHT");
-        alert_img = green_light_alert_img;
+        alert_img = devUiInfo > 0 ? green_light_alert_small_img : green_light_alert_large_img;
       }
       else if (leadDepartAlert) {
         alert_text = tr("LEAD VEHICLE\nDEPARTING");
-        alert_img = lead_depart_alert_img;
+        alert_img = devUiInfo > 0 ? lead_depart_alert_small_img : lead_depart_alert_large_img;
       }
       drawE2eAlert(p, surface_rect);
     }
@@ -377,7 +254,7 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
     // No Alerts displayed
     else {
       e2eAlertFrame = 0;
-      if (!isStandstill) standstillElapsedTime = 0.0;
+      if (not isStandstill) standstillElapsedTime = 0.0;
     }
 
     // Blinker
@@ -386,8 +263,6 @@ void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
     }
   }
 
-  drawNavigationHUD(p, surface_rect);
-
   p.restore();
 }
 
@@ -407,14 +282,9 @@ bool HudRendererSP::pulseElement(int frame) {
 }
 
 void HudRendererSP::drawSmartCruiseControlOnroadIcon(QPainter &p, const QRect &surface_rect, int x_offset, int y_offset, std::string name) {
-  int base_x = surface_rect.center().x();
+  int x = surface_rect.center().x();
   int y = surface_rect.height() / 4;
 
-  if (navigationValid) {
-    base_x = 618;
-    y = 420;
-  }
-
   QString text = QString::fromStdString(name);
   QFont font = InterFont(36, QFont::Bold);
   p.setFont(font);
@@ -425,7 +295,7 @@ void HudRendererSP::drawSmartCruiseControlOnroadIcon(QPainter &p, const QRect &s
   int box_width = 160;
   int box_height = fm.height() + padding_v * 2;
 
-  QRectF bg_rect(base_x - (box_width / 2) + x_offset,
+  QRectF bg_rect(x - (box_width / 2) + x_offset,
                  y - (box_height / 2) + y_offset,
                  box_width, box_height);
 
@@ -675,8 +545,7 @@ void HudRendererSP::drawSpeedLimitSigns(QPainter &p, QRect &sign_rect) {
 }
 
 void HudRendererSP::drawUpcomingSpeedLimit(QPainter &p) {
-  bool speed_limit_ahead = speedLimitAheadValid && speedLimitAhead > 0 && speedLimitAhead != speedLimit && speedLimitAheadValidFrame > 0 &&
-                           tileLoaded;
+  bool speed_limit_ahead = speedLimitAheadValid && speedLimitAhead > 0 && speedLimitAhead != speedLimit && speedLimitAheadValidFrame > 0;
   if (!speed_limit_ahead) {
     return;
   }
@@ -751,7 +620,7 @@ void HudRendererSP::drawRoadName(QPainter &p, const QRect &surface_rect) {
 
   // Constrain to reasonable bounds
   int min_width = 200;
-  int max_width = surface_rect.width() - 40;
+  int max_width = surface_rect.width() / 3;
   rect_width = std::max(min_width, std::min(rect_width, max_width));
 
   // Center at top of screen
@@ -770,7 +639,7 @@ void HudRendererSP::drawRoadName(QPainter &p, const QRect &surface_rect) {
 
 void HudRendererSP::drawSpeedLimitPreActiveArrow(QPainter &p, QRect &sign_rect) {
   const int sign_margin = 12;
-  const int arrow_spacing = sign_margin * 1.4;
+  const int arrow_spacing = sign_margin * 3;
   int arrow_x = sign_rect.right() + arrow_spacing;
 
   int _set_speed = std::nearbyint(set_speed);
@@ -790,16 +659,15 @@ void HudRendererSP::drawSpeedLimitPreActiveArrow(QPainter &p, QRect &sign_rect)
 }
 
 void HudRendererSP::drawSetSpeedSP(QPainter &p, const QRect &surface_rect) {
-  // ICBM counter logic
-  if (!pcmCruiseSpeed && carControlEnabled) {
-    if (std::nearbyint(set_speed) != std::nearbyint(speedCluster)) {
-      icbm_active_counter = 3 * UI_FREQ;
-    } else if (icbm_active_counter > 0) {
-      icbm_active_counter--;
-    }
-  } else {
-    icbm_active_counter = 0;
-  }
+  // Draw outer box + border to contain set speed
+  const QSize default_size = {172, 204};
+  QSize set_speed_size = is_metric ? QSize(200, 204) : default_size;
+  QRect set_speed_rect(QPoint(60 + (default_size.width() - set_speed_size.width()) / 2, 45), set_speed_size);
+
+  // Draw set speed box
+  p.setPen(QPen(QColor(255, 255, 255, 75), 6));
+  p.setBrush(QColor(0, 0, 0, 166));
+  p.drawRoundedRect(set_speed_rect, 32, 32);
 
   // Colors based on status
   QColor max_color = QColor(0xa6, 0xa6, 0xa6, 0xff);
@@ -820,85 +688,52 @@ void HudRendererSP::drawSetSpeedSP(QPainter &p, const QRect &surface_rect) {
     }
   }
 
-  QString max_str = (icbm_active_counter != 0) ? QString::number(std::nearbyint(speedCluster)) : tr("MAX");
-  QString setSpeedStr = is_cruise_set ? QString::number(std::nearbyint(set_speed)) : "–";
-
-  if (!navigationValid) {
-    // Original positions when navigation is not valid
-    const QSize default_size = {172, 204};
-    QSize set_speed_size = is_metric ? QSize(200, 204) : default_size;
-    QRect set_speed_rect(QPoint(60 + (default_size.width() - set_speed_size.width()) / 2, 45), set_speed_size);
-
-    // Draw set speed box
-    p.setPen(QPen(QColor(255, 255, 255, 75), 6));
-    p.setBrush(QColor(0, 0, 0, 166));
-    p.drawRoundedRect(set_speed_rect, 32, 32);
-
-    // Draw "MAX" or carState.cruiseState.speedCluster (when ICBM is active) text
-    int max_str_size = (icbm_active_counter != 0) ? 60 : 40;
-    int max_str_y = (icbm_active_counter != 0) ? 15 : 27;
-
-    p.setFont(InterFont(max_str_size, QFont::DemiBold));
-    p.setPen(max_color);
-    p.drawText(set_speed_rect.adjusted(0, max_str_y, 0, 0), Qt::AlignTop | Qt::AlignHCenter, max_str);
-
-    // Draw set speed
-    p.setFont(InterFont(90, QFont::Bold));
-    p.setPen(set_speed_color);
-    p.drawText(set_speed_rect.adjusted(0, 77, 0, 0), Qt::AlignTop | Qt::AlignHCenter, setSpeedStr);
+  // Draw "MAX" or carState.cruiseState.speedCluster (when ICBM is active) text
+  if (carControlEnabled) {
+    if (std::nearbyint(set_speed) != std::nearbyint(speedCluster)) {
+      icbm_active_counter = 3 * UI_FREQ;
+    } else if (icbm_active_counter > 0) {
+      icbm_active_counter--;
+    }
   } else {
-    // Modified positions when navigation is valid
-    const int container_width = 200;
-    const int container_height = 320;
-    const int container_x = 40;
-    const int container_y = 45;
-
-    QRect speed_container(container_x, container_y, container_width, container_height);
-
-    // Draw outer rounded rectangle container
-    p.setPen(QPen(QColor(255, 255, 255, 75), 6));
-    p.setBrush(QColor(0, 0, 0, 166));
-    p.drawRoundedRect(speed_container, 24, 24);
-
-    int divider_y = container_y + 190;
-    p.setPen(QPen(QColor(255, 255, 255, 50), 2));
-    p.drawLine(container_x + 20, divider_y, container_x + container_width - 20, divider_y);
-
-    // max label
-    QRect max_label_rect(container_x, container_y + 200, container_width, 35);
-    p.setFont(InterFont(32, QFont::Normal));
-    p.setPen(max_color);
-    p.drawText(max_label_rect, Qt::AlignCenter, max_str);
-
-    // Set speed value
-    QRect set_speed_rect(container_x, container_y + 240, container_width, 70);
-    p.setFont(InterFont(68, QFont::Bold));
-    p.setPen(set_speed_color);
-    p.drawText(set_speed_rect, Qt::AlignCenter, setSpeedStr);
+    icbm_active_counter = 0;
   }
+  int max_str_size = (icbm_active_counter != 0) ? 60 : 40;
+  int max_str_y = (icbm_active_counter != 0) ? 15 : 27;
+  QString max_str = (icbm_active_counter != 0) ? QString::number(std::nearbyint(speedCluster)) : tr("MAX");
+
+  p.setFont(InterFont(max_str_size, QFont::DemiBold));
+  p.setPen(max_color);
+  p.drawText(set_speed_rect.adjusted(0, max_str_y, 0, 0), Qt::AlignTop | Qt::AlignHCenter, max_str);
+
+  // Draw set speed
+  QString setSpeedStr = is_cruise_set ? QString::number(std::nearbyint(set_speed)) : "–";
+  p.setFont(InterFont(90, QFont::Bold));
+  p.setPen(set_speed_color);
+  p.drawText(set_speed_rect.adjusted(0, 77, 0, 0), Qt::AlignTop | Qt::AlignHCenter, setSpeedStr);
 }
 
 void HudRendererSP::drawE2eAlert(QPainter &p, const QRect &surface_rect, const QString &alert_alt_text) {
-  if (!allow_e2e_alerts) return;
-
-  int x = surface_rect.right() - e2e_alert_size - (devUiInfo > 0 ? 180 : 100) - (UI_BORDER_SIZE * 3);
+  int size = devUiInfo > 0 ? e2e_alert_small : e2e_alert_large;
+  int x = surface_rect.center().x() + surface_rect.width() / 4;
   int y = surface_rect.center().y() + 20;
-  QRect alertRect(x - e2e_alert_size, y - e2e_alert_size, e2e_alert_size * 2, e2e_alert_size * 2);
+  x += devUiInfo > 0 ? 0 : 50;
+  QRect alertRect(x - size, y - size, size * 2, size * 2);
 
   // Alert Circle
   QPoint center = alertRect.center();
   QColor frameColor;
-  if (!alert_alt_text.isEmpty()) frameColor = QColor(255, 255, 255, 75);
+  if (not alert_alt_text.isEmpty()) frameColor = QColor(255, 255, 255, 75);
   else frameColor = pulseElement(e2eAlertFrame) ? QColor(255, 255, 255, 75) : QColor(0, 255, 0, 75);
   p.setPen(QPen(frameColor, 15));
   p.setBrush(QColor(0, 0, 0, 190));
-  p.drawEllipse(center, e2e_alert_size, e2e_alert_size);
+  p.drawEllipse(center, size, size);
 
   // Alert Text
   QColor txtColor;
   QFont font;
   int alert_bottom_adjustment;
-  if (!alert_alt_text.isEmpty()) {
+  if (not alert_alt_text.isEmpty()) {
     font = InterFont(100, QFont::Bold);
     alert_bottom_adjustment = 5;
     txtColor = QColor(255, 255, 255, 255);
@@ -915,7 +750,7 @@ void HudRendererSP::drawE2eAlert(QPainter &p, const QRect &surface_rect, const Q
   textRect.moveBottom(alertRect.bottom() - alertRect.height() / alert_bottom_adjustment);
   p.drawText(textRect, Qt::AlignCenter, alert_text);
 
-  if (!alert_alt_text.isEmpty()) {
+  if (not alert_alt_text.isEmpty()) {
     // Alert Alternate Text
     p.setFont(InterFont(80, QFont::Bold));
     p.setPen(QColor(255, 175, 3, 240));
@@ -934,45 +769,17 @@ void HudRendererSP::drawE2eAlert(QPainter &p, const QRect &surface_rect, const Q
 
 void HudRendererSP::drawCurrentSpeedSP(QPainter &p, const QRect &surface_rect) {
   QString speedStr = QString::number(std::nearbyint(speed));
-  QString unit = is_metric ? tr("km/h") : tr("mph");
 
-  int speed_x = surface_rect.center().x();
-  int speed_y = 210;
-  int unit_y = 290;
-  QFont speed_font = InterFont(176, QFont::Bold);
-  QFont unit_font = InterFont(66);
+  p.setFont(InterFont(176, QFont::Bold));
+  HudRenderer::drawText(p, surface_rect.center().x(), 210, speedStr);
 
-  if (navigationValid) {
-    speed_y = 75;
-    unit_y = 175;
-    speed_font = InterFont(100, QFont::Bold);
-    unit_font = InterFont(35, QFont::Normal);
-  }
-
-  // Draw speed
-  p.setFont(speed_font);
-  if (!navigationValid) {
-    HudRenderer::drawText(p, speed_x, speed_y, speedStr);
-  } else {
-    QRect current_speed_rect(40, speed_y, 200, 100);
-    p.setPen(Qt::white);
-    p.drawText(current_speed_rect, Qt::AlignCenter, speedStr);
-  }
-
-  // Draw unit
-  p.setFont(unit_font);
-  if (!navigationValid) {
-    HudRenderer::drawText(p, speed_x, unit_y, unit, 200);
-  } else {
-    QRect unit_rect(40, unit_y, 200, 40);
-    p.setPen(QColor(180, 180, 180, 255));
-    p.drawText(unit_rect, Qt::AlignCenter, unit);
-  }
+  p.setFont(InterFont(66));
+  HudRenderer::drawText(p, surface_rect.center().x(), 290, is_metric ? tr("km/h") : tr("mph"), 200);
 }
 
 void HudRendererSP::drawBlinker(QPainter &p, const QRect &surface_rect) {
   const bool hazard = leftBlinkerOn && rightBlinkerOn;
-  int blinkerStatus = hazard ? 2 : (leftBlinkerOn || rightBlinkerOn) ? 1 : 0;
+  int blinkerStatus = hazard ? 2 : (leftBlinkerOn or rightBlinkerOn) ? 1 : 0;
 
   if (!leftBlinkerOn && !rightBlinkerOn) {
     blinkerFrameCounter = 0;
@@ -995,7 +802,7 @@ void HudRendererSP::drawBlinker(QPainter &p, const QRect &surface_rect) {
   const int circleRadius = 60;
   const int arrowLength = 60;
   const int x_gap = 160;
-  const int y_offset = navigationValid ? 352 : 300;
+  const int y_offset = 272;
 
   const int centerX = surface_rect.center().x();
 
@@ -1053,181 +860,3 @@ void HudRendererSP::drawBlinker(QPainter &p, const QRect &surface_rect) {
 
   p.restore();
 }
-
-QString HudRendererSP::getNavigationIconName(const QString &type, const QString &mod) {
-  static QMap<QString, QString> icon_map;
-  if (icon_map.isEmpty()) {
-    icon_map["turn|uturn"] = "direction_uturn.png";
-    icon_map["turn|sharp right"] = "direction_turn_sharp_right.png";
-    icon_map["turn|right"] = "direction_turn_right.png";
-    icon_map["turn|slight right"] = "direction_turn_slight_right.png";
-    icon_map["turn|straight"] = "direction_turn_straight.png";
-    icon_map["turn|slight left"] = "direction_turn_slight_left.png";
-    icon_map["turn|left"] = "direction_turn_left.png";
-    icon_map["turn|sharp left"] = "direction_turn_sharp_left.png";
-
-    icon_map["arrive|right"] = "direction_arrive_right.png";
-    icon_map["arrive|straight"] = "direction_arrive_straight.png";
-    icon_map["arrive|left"] = "direction_arrive_left.png";
-    icon_map["arrive|"] = "direction_arrive.png";
-
-    icon_map["merge|slight right"] = "direction_merge_slight_right.png";
-    icon_map["merge|right"] = "direction_merge_right.png";
-    icon_map["merge|straight"] = "direction_merge_straight.png";
-    icon_map["merge|slight left"] = "direction_merge_slight_left.png";
-    icon_map["merge|left"] = "direction_merge_left.png";
-
-    icon_map["on ramp|sharp right"] = "direction_on_ramp_sharp_right.png";
-    icon_map["on ramp|right"] = "direction_on_ramp_right.png";
-    icon_map["on ramp|slight right"] = "direction_on_ramp_slight_right.png";
-    icon_map["on ramp|straight"] = "direction_on_ramp_straight.png";
-    icon_map["on ramp|slight left"] = "direction_on_ramp_slight_left.png";
-    icon_map["on ramp|left"] = "direction_on_ramp_left.png";
-    icon_map["on ramp|sharp left"] = "direction_on_ramp_sharp_left.png";
-
-    icon_map["off ramp|slight right"] = "direction_off_ramp_slight_right.png";
-    icon_map["off ramp|right"] = "direction_off_ramp_right.png";
-    icon_map["off ramp|slight left"] = "direction_off_ramp_slight_left.png";
-    icon_map["off ramp|left"] = "direction_off_ramp_left.png";
-
-    icon_map["roundabout|sharp right"] = "direction_roundabout_sharp_right.png";
-    icon_map["roundabout|right"] = "direction_roundabout_right.png";
-    icon_map["roundabout|slight right"] = "direction_roundabout_slight_right.png";
-    icon_map["roundabout|straight"] = "direction_roundabout_straight.png";
-    icon_map["roundabout|slight left"] = "direction_roundabout_slight_left.png";
-    icon_map["roundabout|left"] = "direction_roundabout_left.png";
-    icon_map["roundabout|sharp left"] = "direction_roundabout_sharp_left.png";
-    icon_map["roundabout|"] = "direction_roundabout.png";
-  }
-
-  QString normalized_type = type;
-  if (normalized_type == "rotary") {
-    normalized_type = "roundabout";
-  } else if (normalized_type == "new name") {
-    normalized_type = "turn";
-  } else if (normalized_type == "continue") {
-    normalized_type = "turn";
-  }
-
-  QString icon_name;
-  QStringList keys = {normalized_type + "|" + mod, normalized_type + "|", "turn|" + mod};
-  for (const QString &key : keys) {
-    icon_name = icon_map.value(key);
-    if (!icon_name.isEmpty()) break;
-  }
-  if (icon_name.isEmpty()) {
-    icon_name = "direction_turn_straight.png";
-  }
-  return icon_name;
-}
-
-void HudRendererSP::drawNavigationHUD(QPainter &p, const QRect &surface_rect) {
-  if (!navigationValid) return;
-  p.save();
-
-  const int container_width = 1080;
-  const int container_height = 225;
-  const int container_x = (surface_rect.width() - container_width) / 2;
-  const int container_y = 62;
-  const int border_radius = 42;
-
-  QRect container_rect(container_x, container_y, container_width, container_height);
-
-  p.setPen(Qt::NoPen);
-  p.setBrush(QColor(0, 0, 0, 180));
-  p.drawRoundedRect(container_rect, border_radius, border_radius);
-
-  // Navigation icon
-  const int icon_size = 150;
-  const int icon_padding = 30;
-  const int icon_x = container_x + icon_padding;
-  const int icon_y = container_y;
-
-  QString icon_name = getNavigationIconName(navigationManeuverType, navigationModifier);
-  QPixmap nav_icon = loadPixmap("../../sunnypilot/selfdrive/assets/navigation/" + icon_name, {icon_size, icon_size});
-
-  if (!nav_icon.isNull()) {
-    p.drawPixmap(icon_x, icon_y, nav_icon);
-  }
-
-  // Distance
-  p.setFont(InterFont(48, QFont::Bold));
-  p.setPen(Qt::white);
-  QRect distance_rect(icon_x, icon_y + icon_size, icon_size, 38);
-  p.drawText(distance_rect, Qt::AlignCenter, navigationDistance);
-
-  const int then_section_width = 180;
-  const int text_x = icon_x + icon_size + 53;
-  const int text_area_width = container_width - (text_x - container_x) - icon_padding - then_section_width;
-
-  // Street name
-  p.setFont(InterFont(75, QFont::Bold));
-  p.setPen(Qt::white);
-  QFontMetrics fm(p.font());
-
-  QString street_line1, street_line2;
-  QStringList words = navigationStreet.split(' ');
-  QString currentLine;
-
-  for (int i = 0; i < words.size(); ++i) {
-    QString testLine = currentLine.isEmpty() ? words[i] : currentLine + " " + words[i];
-    if (fm.horizontalAdvance(testLine) <= text_area_width) {
-      currentLine = testLine;
-    } else {
-      if (street_line1.isEmpty()) {
-        street_line1 = currentLine;
-        currentLine = words[i];
-      } else {
-        break;
-      }
-    }
-  }
-
-  if (street_line1.isEmpty()) {
-    street_line1 = currentLine;
-  } else if (!currentLine.isEmpty()) {
-    street_line2 = currentLine;
-    if (words.size() > words.indexOf(currentLine.split(' ').last()) + 1) {
-      street_line2 = fm.elidedText(street_line2, Qt::ElideRight, text_area_width);
-    }
-  }
-
-  if (street_line2.isEmpty()) {
-    QRect street_rect(text_x, container_y + (container_height - fm.height()) / 2, text_area_width, fm.height());
-    p.drawText(street_rect, Qt::AlignLeft | Qt::AlignVCenter, street_line1);
-  } else {
-    QRect street_rect1(text_x, container_y + 23, text_area_width, fm.height());
-    p.drawText(street_rect1, Qt::AlignLeft | Qt::AlignVCenter, street_line1);
-
-    QRect street_rect2(text_x, container_y + 23 + fm.height(), text_area_width, fm.height());
-    p.drawText(street_rect2, Qt::AlignLeft | Qt::AlignVCenter, street_line2);
-  }
-
-  // Next Maneuver
-  if (navigationHasNext) {
-    const int divider_x = container_x + container_width - then_section_width - 8;
-    p.setPen(QPen(QColor(255, 255, 255, 50), 2));
-    p.drawLine(divider_x, container_y + 23, divider_x, container_y + container_height - 23);
-
-    const int then_x = divider_x + 15;
-    const int then_icon_size = 105;
-
-    QRect then_label_rect(then_x, container_y + 30, then_section_width - 23, 38);
-    p.setFont(InterFont(53, QFont::Medium));
-    p.setPen(Qt::white);
-    p.drawText(then_label_rect, Qt::AlignCenter, tr("Then"));
-
-    // Next maneuver icon
-    const int then_icon_x = then_x + (then_section_width - 23 - then_icon_size) / 2;
-    const int then_icon_y = container_y + 75;
-
-    QString next_icon_name = getNavigationIconName(navigationNextManeuverType, navigationNextModifier);
-    QPixmap next_nav_icon = loadPixmap("../../sunnypilot/selfdrive/assets/navigation/" + next_icon_name, {then_icon_size, then_icon_size});
-
-    if (!next_nav_icon.isNull()) {
-      p.drawPixmap(then_icon_x, then_icon_y, next_nav_icon);
-    }
-  }
-
-  p.restore();
-}

selfdrive/ui/sunnypilot/qt/onroad/hud.h

@@ -39,8 +39,6 @@ private:
   void drawE2eAlert(QPainter &p, const QRect &surface_rect, const QString &alert_alt_text = "");
   void drawCurrentSpeedSP(QPainter &p, const QRect &surface_rect);
   void drawBlinker(QPainter &p, const QRect &surface_rect);
-  void drawNavigationHUD(QPainter &p, const QRect &surface_rect);
-  QString getNavigationIconName(const QString &type, const QString &mod);
 
   bool lead_status;
   float lead_d_rel;
@@ -85,7 +83,6 @@ private:
   bool speedLimitValid;
   bool speedLimitLastValid;
   float speedLimitFinalLast;
-  int speedLimitSource;  // 0=NONE, 1=MAP
   bool speedLimitAheadValid;
   float speedLimitAhead;
   float speedLimitAheadDistance;
@@ -94,19 +91,21 @@ private:
   SpeedLimitMode speedLimitMode = SpeedLimitMode::OFF;
   bool roadName;
   QString roadNameStr;
-  int speedLimitAssistState;  // 0=NONE, 1=PRE_ACTIVE, etc.
+  cereal::LongitudinalPlanSP::SpeedLimit::AssistState speedLimitAssistState;
   bool speedLimitAssistActive;
   int speedLimitAssistFrame;
   QPixmap plus_arrow_up_img;
   QPixmap minus_arrow_down_img;
-  int e2e_alert_size = 250;
-  QPixmap green_light_alert_img;
+  int e2e_alert_small = 250;
+  int e2e_alert_large = 300;
+  QPixmap green_light_alert_small_img;
+  QPixmap green_light_alert_large_img;
   bool greenLightAlert;
   int e2eAlertFrame;
   int e2eAlertDisplayTimer = 0;
-  bool allow_e2e_alerts;
   bool leadDepartAlert;
-  QPixmap lead_depart_alert_img;
+  QPixmap lead_depart_alert_small_img;
+  QPixmap lead_depart_alert_large_img;
   QString alert_text;
   QPixmap alert_img;
   bool hideVEgoUI;
@@ -121,25 +120,4 @@ private:
   bool carControlEnabled;
   float speedCluster = 0;
   int icbm_active_counter = 0;
-  bool pcmCruiseSpeed = true;
-
-  bool navigationValid;
-  QString navigationStreet;
-  QString navigationDistance;
-  QString navigationModifier;
-  QString navigationManeuverType;
-  QString navigationNextModifier;
-  QString navigationNextManeuverType;
-  bool navigationHasNext;
-
-  QString wayName;
-  QString wayRef;
-  float mapdSpeedLimit;
-  float advisorySpeed;
-  float nextAdvisorySpeed;
-  float nextAdvisorySpeedDistance;
-  float suggestedSpeed;
-  float visionCurveSpeed;
-  float curveSpeed;
-  bool tileLoaded;
 };

selfdrive/ui/sunnypilot/qt/onroad/model.cc

@@ -21,73 +21,74 @@ void ModelRendererSP::update_model(const cereal::ModelDataV2::Reader &model, con
   mapLineToPolygon(model.getLaneLines()[2], 0.2, -0.05, &right_blindspot_vertices, max_idx_barrier);
 }
 
-void ModelRendererSP::draw(QPainter &painter, const QRect &surface_rect) {
+void ModelRendererSP::drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, const QRect &surface_rect) {
   auto *s = uiState();
   auto &sm = *(s->sm);
+  bool blindspot = s->scene.blindspot_ui;
 
-  if (sm.rcv_frame("liveCalibration") < s->scene.started_frame ||
-      sm.rcv_frame("modelV2") < s->scene.started_frame) {
-    return;
+  if (blindspot) {
+    bool left_blindspot = sm["carState"].getCarState().getLeftBlindspot();
+    bool right_blindspot = sm["carState"].getCarState().getRightBlindspot();
+
+    //painter.setBrush(QColor::fromRgbF(1.0, 0.0, 0.0, 0.4));  // Red with alpha for blind spot
+
+    if (left_blindspot && !left_blindspot_vertices.isEmpty()) {
+      QLinearGradient gradient(0, 0, surface_rect.width(), 0); // Horizontal gradient from left to right
+      gradient.setColorAt(0.0, QColor(255, 165, 0, 102)); // Orange with alpha
+      gradient.setColorAt(1.0, QColor(255, 255, 0, 102)); // Yellow with alpha
+      painter.setBrush(gradient);
+      painter.drawPolygon(left_blindspot_vertices);
+    }
+
+    if (right_blindspot && !right_blindspot_vertices.isEmpty()) {
+      QLinearGradient gradient(surface_rect.width(), 0, 0, 0); // Horizontal gradient from right to left
+      gradient.setColorAt(0.0, QColor(255, 165, 0, 102)); // Orange with alpha
+      gradient.setColorAt(1.0, QColor(255, 255, 0, 102)); // Yellow with alpha
+      painter.setBrush(gradient);
+      painter.drawPolygon(right_blindspot_vertices);
+    }
   }
 
-  clip_region = surface_rect.adjusted(-CLIP_MARGIN, -CLIP_MARGIN, CLIP_MARGIN, CLIP_MARGIN);
-  experimental_mode = sm["selfdriveState"].getSelfdriveState().getExperimentalMode();
-  longitudinal_control = sm["carParams"].getCarParams().getOpenpilotLongitudinalControl();
-  path_offset_z = sm["liveCalibration"].getLiveCalibration().getHeight()[0];
+  bool rainbow = s->scene.rainbow_mode;
+  //float v_ego = sm["carState"].getCarState().getVEgo();
 
-  painter.save();
+  if (rainbow) {
+    // Simple time-based animation
+    float time_offset = std::chrono::duration_cast<std::chrono::milliseconds>(
+        std::chrono::steady_clock::now().time_since_epoch()).count() / 1000.0f;
 
-  const auto &model = sm["modelV2"].getModelV2();
-  const auto &radar_state = sm["radarState"].getRadarState();
-  const auto &lead_one = radar_state.getLeadOne();
-  const auto &car_state = sm["carState"].getCarState();
+    // simple linear gradient from bottom to top
+    QLinearGradient bg(0, surface_rect.height(), 0, 0);
 
-  update_model(model, lead_one);
-  drawLaneLines(painter);
+    // evenly spaced colors across the spectrum
+    // The animation shifts the entire spectrum smoothly
+    float animation_speed = 40.0f; // speed vroom vroom
+    float hue_offset = fmod(time_offset * animation_speed, 360.0f);
 
-  if (s->scene.rainbow_mode) {
-    drawRainbowPath(painter, surface_rect);
+    // 6-8 color stops for smooth transitions more color makes it laggy
+    const int num_stops = 7;
+    for (int i = 0; i < num_stops; i++) {
+      float position = static_cast<float>(i) / (num_stops - 1);
+
+      float hue = fmod(hue_offset + position * 360.0f, 360.0f);
+      float saturation = 0.9f;
+      float lightness = 0.6f;
+
+      // Alpha fades out towards the far end of the path
+      float alpha = 0.8f * (1.0f - position * 0.3f);
+
+      QColor color = QColor::fromHslF(hue / 360.0f, saturation, lightness, alpha);
+      bg.setColorAt(position, color);
+    }
+
+    painter.setBrush(bg);
+    painter.drawPolygon(track_vertices);
   } else {
-    ModelRenderer::drawPath(painter, model, surface_rect.height(), surface_rect.width());
+    // Normal path rendering
+    ModelRenderer::drawPath(painter, model, surface_rect.height());
   }
 
-  if (longitudinal_control && sm.alive("radarState")) {
-    update_leads(radar_state, model.getPosition());
-    const auto &lead_two = radar_state.getLeadTwo();
-    if (lead_one.getStatus()) {
-      drawLead(painter, lead_one, lead_vertices[0], surface_rect);
-    }
-    if (lead_two.getStatus() && (std::abs(lead_one.getDRel() - lead_two.getDRel()) > 3.0)) {
-      drawLead(painter, lead_two, lead_vertices[1], surface_rect);
-    }
-  }
-
-  if (s->scene.blindspot_ui) {
-    const bool left_blindspot = car_state.getLeftBlindspot();
-    const bool right_blindspot = car_state.getRightBlindspot();
-    drawBlindspot(painter, surface_rect, left_blindspot, right_blindspot);
-  }
   drawLeadStatus(painter, surface_rect.height(), surface_rect.width());
-
-  painter.restore();
-}
-
-void ModelRendererSP::drawBlindspot(QPainter &painter, const QRect &surface_rect, bool left_blindspot, bool right_blindspot) {
-  if (left_blindspot && !left_blindspot_vertices.isEmpty()) {
-    QLinearGradient gradient(0, 0, surface_rect.width(), 0); // Horizontal gradient from left to right
-    gradient.setColorAt(0.0, QColor(255, 165, 0, 102)); // Orange with alpha
-    gradient.setColorAt(1.0, QColor(255, 255, 0, 102)); // Yellow with alpha
-    painter.setBrush(gradient);
-    painter.drawPolygon(left_blindspot_vertices);
-  }
-
-  if (right_blindspot && !right_blindspot_vertices.isEmpty()) {
-    QLinearGradient gradient(surface_rect.width(), 0, 0, 0); // Horizontal gradient from right to left
-    gradient.setColorAt(0.0, QColor(255, 165, 0, 102)); // Orange with alpha
-    gradient.setColorAt(1.0, QColor(255, 255, 0, 102)); // Yellow with alpha
-    painter.setBrush(gradient);
-    painter.drawPolygon(right_blindspot_vertices);
-  }
 }
 
 void ModelRendererSP::drawLeadStatus(QPainter &painter, int height, int width) {
@@ -120,16 +121,19 @@ void ModelRendererSP::drawLeadStatus(QPainter &painter, int height, int width) {
   }
 
   if (has_lead_one) {
-    drawLeadStatusPosition(painter, lead_one, lead_vertices[0], height, width);
+    drawLeadStatusAtPosition(painter, lead_one, lead_vertices[0], height, width, "L1");
   }
 
   if (has_lead_two && std::abs(lead_one.getDRel() - lead_two.getDRel()) > 3.0) {
-    drawLeadStatusPosition(painter, lead_two, lead_vertices[1], height, width);
+    drawLeadStatusAtPosition(painter, lead_two, lead_vertices[1], height, width, "L2");
   }
 }
 
-void ModelRendererSP::drawLeadStatusPosition(QPainter &painter, const cereal::RadarState::LeadData::Reader &lead_data,
-                                             const QPointF &chevron_pos, int height, int width) {
+void ModelRendererSP::drawLeadStatusAtPosition(QPainter &painter,
+                                               const cereal::RadarState::LeadData::Reader &lead_data,
+                                               const QPointF &chevron_pos,
+                                               int height, int width,
+                                               const QString &label) {
   float d_rel = lead_data.getDRel();
   float v_rel = lead_data.getVRel();
   auto *s = uiState();
@@ -219,36 +223,3 @@ void ModelRendererSP::drawLeadStatusPosition(QPainter &painter, const cereal::Ra
 
   painter.setPen(Qt::NoPen);
 }
-
-void ModelRendererSP::drawRainbowPath(QPainter &painter, const QRect &surface_rect) {
-  // Simple time-based animation
-  float time_offset = std::chrono::duration_cast<std::chrono::milliseconds>(
-      std::chrono::steady_clock::now().time_since_epoch()).count() / 1000.0f;
-
-  // simple linear gradient from bottom to top
-  QLinearGradient bg(0, surface_rect.height(), 0, 0);
-
-  // evenly spaced colors across the spectrum
-  // The animation shifts the entire spectrum smoothly
-  float animation_speed = 40.0f; // speed vroom vroom
-  float hue_offset = fmod(time_offset * animation_speed, 360.0f);
-
-  // 6-8 color stops for smooth transitions more color makes it laggy
-  const int num_stops = 7;
-  for (int i = 0; i < num_stops; i++) {
-    float position = static_cast<float>(i) / (num_stops - 1);
-
-    float hue = fmod(hue_offset + position * 360.0f, 360.0f);
-    float saturation = 0.9f;
-    float lightness = 0.6f;
-
-    // Alpha fades out towards the far end of the path
-    float alpha = 0.8f * (1.0f - position * 0.3f);
-
-    QColor color = QColor::fromHslF(hue / 360.0f, saturation, lightness, alpha);
-    bg.setColorAt(position, color);
-  }
-
-  painter.setBrush(bg);
-  painter.drawPolygon(track_vertices);
-}

selfdrive/ui/sunnypilot/qt/onroad/model.h

@@ -13,15 +13,17 @@ class ModelRendererSP : public ModelRenderer {
 public:
   ModelRendererSP() = default;
 
-  void draw(QPainter &painter, const QRect &surface_rect);
-
 private:
   void update_model(const cereal::ModelDataV2::Reader &model, const cereal::RadarState::LeadData::Reader &lead) override;
+  void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, const QRect &rect) override;
+
+  // Lead status display methods
   void drawLeadStatus(QPainter &painter, int height, int width);
-  void drawLeadStatusPosition(QPainter &painter, const cereal::RadarState::LeadData::Reader &lead_data,
-                              const QPointF &chevron_pos, int height, int width);
-  void drawBlindspot(QPainter &painter, const QRect &surface_rect, bool left_blindspot, bool right_blindspot);
-  void drawRainbowPath(QPainter &painter, const QRect &surface_rect);
+  void drawLeadStatusAtPosition(QPainter &painter,
+                                const cereal::RadarState::LeadData::Reader &lead_data,
+                                const QPointF &chevron_pos,
+                                int height, int width,
+                                const QString &label);
 
   QPolygonF left_blindspot_vertices;
   QPolygonF right_blindspot_vertices;

selfdrive/ui/sunnypilot/qt/util.cc

@@ -122,7 +122,3 @@ std::optional<cereal::Event::Reader> loadCerealEvent(Params& params, const std::
     return std::nullopt;
   }
 }
-
-bool hasIntelligentCruiseButtonManagement(const cereal::CarParamsSP::Reader &car_params_sp) {
-  return car_params_sp.getIntelligentCruiseButtonManagementAvailable() && Params().getBool("IntelligentCruiseButtonManagement");
-}

selfdrive/ui/sunnypilot/qt/util.h

@@ -23,4 +23,3 @@ std::optional<QString> getParamIgnoringDefault(const std::string &param_name, co
 QMap<QString, QVariantMap> loadPlatformList();
 QStringList searchFromList(const QString &query, const QStringList &list);
 std::optional<cereal::Event::Reader> loadCerealEvent(Params& params, const std::string& _param);
-bool hasIntelligentCruiseButtonManagement(const cereal::CarParamsSP::Reader &car_params_sp);

selfdrive/ui/sunnypilot/qt/widgets/controls.h

@@ -390,7 +390,7 @@ class ButtonParamControlSP : public MultiButtonControlSP {
   Q_OBJECT
 public:
   ButtonParamControlSP(const QString &param, const QString &title, const QString &desc, const QString &icon,
-                     const std::vector<QString> &button_texts, const int minimum_button_width = 380, const bool inline_layout = false, bool advancedControl = false) : MultiButtonControlSP(title, desc, icon,
+                     const std::vector<QString> &button_texts, const int minimum_button_width = 225, const bool inline_layout = false, bool advancedControl = false) : MultiButtonControlSP(title, desc, icon,
                                                                                                                           button_texts, minimum_button_width, inline_layout, advancedControl) {
     key = param.toStdString();
     int value = atoi(params.get(key).c_str());

selfdrive/ui/sunnypilot/ui.cc

@@ -29,8 +29,7 @@ UIStateSP::UIStateSP(QObject *parent) : UIState(parent) {
     "wideRoadCameraState", "managerState", "selfdriveState", "longitudinalPlan",
     "modelManagerSP", "selfdriveStateSP", "longitudinalPlanSP", "backupManagerSP",
     "carControl", "gpsLocationExternal", "gpsLocation", "liveTorqueParameters",
-    "carStateSP", "liveParameters", "liveMapDataSP", "carParamsSP", "navigationd",
-    "mapdOut"
+    "carStateSP", "liveParameters", "liveMapDataSP"
   });
 
   // update timer

selfdrive/ui/tests/cycle_offroad_alerts.py

@@ -18,7 +18,7 @@ if __name__ == "__main__":
   while True:
     print("setting alert update")
     params.put_bool("UpdateAvailable", True)
-    r = open(os.path.join(BASEDIR, "CHANGELOG.md")).read()
+    r = open(os.path.join(BASEDIR, "RELEASES.md")).read()
     r = r[:r.find('\n\n')]  # Slice latest release notes
     params.put("UpdaterNewReleaseNotes", r + "\n")
 

selfdrive/ui/tests/test_ui/run.py

@@ -188,7 +188,7 @@ def setup_offroad_alert(click, pm: PubMaster, scroll=None):
 
 def setup_update_available(click, pm: PubMaster, scroll=None):
   Params().put_bool("UpdateAvailable", True)
-  release_notes_path = os.path.join(BASEDIR, "CHANGELOG.md")
+  release_notes_path = os.path.join(BASEDIR, "RELEASES.md")
   with open(release_notes_path) as file:
     release_notes = file.read().split('\n\n', 1)[0]
   Params().put("UpdaterNewReleaseNotes", release_notes + "\n")

selfdrive/ui/translations/main_ko.ts

@@ -1778,6 +1778,62 @@ Warning: You are on a metered connection!</source>
         <source>sunnypilot</source>
         <translation>sunnypilot</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation>고정</translation>
+    </message>
+    <message>
+        <source>Percent</source>
+        <translation>비율</translation>
+    </message>
+    <message>
+        <source>Car
+Only</source>
+        <translation>차량만</translation>
+    </message>
+    <message>
+        <source>Map
+Only</source>
+        <translation>지도만</translation>
+    </message>
+    <message>
+        <source>Car
+First</source>
+        <translation>차량
+우선</translation>
+    </message>
+    <message>
+        <source>Map
+First</source>
+        <translation>지도
+우선</translation>
+    </message>
+    <message>
+        <source>Combined
+Data</source>
+        <translation>결합
+데이터</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>끄기</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>경고</translation>
+    </message>
+    <message>
+        <source>Assist</source>
+        <translation>보조</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWindow</name>
@@ -2142,34 +2198,6 @@ Warning: You are on a metered connection!</source>
         <source>⦿ Combined: Use combined Speed Limit data from Car &amp; OpenStreetMaps</source>
         <translation>⦿ 결합: 차량 및 OpenStreetMaps의 속도 제한 결합 데이터 사용</translation>
     </message>
-    <message>
-        <source>Car
-Only</source>
-        <translation>차량만</translation>
-    </message>
-    <message>
-        <source>Map
-Only</source>
-        <translation>지도만</translation>
-    </message>
-    <message>
-        <source>Car
-First</source>
-        <translation>차량
-우선</translation>
-    </message>
-    <message>
-        <source>Map
-First</source>
-        <translation>지도
-우선</translation>
-    </message>
-    <message>
-        <source>Combined
-Data</source>
-        <translation>결합
-데이터</translation>
-    </message>
 </context>
 <context>
     <name>SpeedLimitSettings</name>
@@ -2217,34 +2245,6 @@ Data</source>
         <source>⦿ Assist: Adjusts the vehicle&apos;s cruise speed based on the current road&apos;s speed limit when operating the +/- buttons.</source>
         <translation>⦿ 보조: +/- 버튼을 조작할 때 현재 도로의 제한 속도를 기준으로 차량의 크루즈 속도를 조정합니다.</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation>없음</translation>
-    </message>
-    <message>
-        <source>Fixed</source>
-        <translation>고정</translation>
-    </message>
-    <message>
-        <source>Percent</source>
-        <translation>비율</translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation>끄기</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation>정보</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation>경고</translation>
-    </message>
-    <message>
-        <source>Assist</source>
-        <translation>보조</translation>
-    </message>
 </context>
 <context>
     <name>SshControl</name>

selfdrive/ui/ui.h

@@ -60,7 +60,6 @@ typedef struct UIScene {
   cereal::PandaState::PandaType pandaType;
 
   cereal::LongitudinalPersonality personality;
-  cereal::LongitudinalPlanSP::AccelerationPersonality accel_personality;
 
   float light_sensor = -1;
   bool started, ignition, is_metric, recording_audio;

sunnypilot/__init__.py

@@ -5,7 +5,6 @@ This file is part of sunnypilot and is licensed under the MIT License.
 See the LICENSE.md file in the root directory for more details.
 """
 
-from enum import IntEnum
 import hashlib
 
 PARAMS_UPDATE_PERIOD = 3  # seconds
@@ -17,23 +16,3 @@ def get_file_hash(path: str) -> str:
     for byte_block in iter(lambda: f.read(4096), b""):
       sha256_hash.update(byte_block)
   return sha256_hash.hexdigest()
-
-
-class IntEnumBase(IntEnum):
-  @classmethod
-  def min(cls):
-    return min(cls)
-
-  @classmethod
-  def max(cls):
-    return max(cls)
-
-
-def get_sanitize_int_param(key: str, min_val: int, max_val: int, params) -> int:
-  val: int = params.get(key, return_default=True)
-  clipped_val = max(min_val, min(max_val, val))
-
-  if clipped_val != val:
-    params.put(key, clipped_val)
-
-  return clipped_val

sunnypilot/common/version.h

@@ -1 +0,0 @@
-#define SUNNYPILOT_VERSION "2025.003.000"

sunnypilot/mapd/live_map_data/base_map_data.py

@@ -8,12 +8,8 @@ from abc import abstractmethod, ABC
 
 import cereal.messaging as messaging
 from openpilot.common.params import Params
-from openpilot.common.constants import CV
-from openpilot.selfdrive.car.cruise import V_CRUISE_UNSET
 from openpilot.sunnypilot.navd.helpers import coordinate_from_param
 
-MAX_SPEED_LIMIT = V_CRUISE_UNSET * CV.KPH_TO_MS
-
 
 class BaseMapData(ABC):
   def __init__(self):
@@ -50,9 +46,9 @@ class BaseMapData(ABC):
     mapd_sp_send.valid = self.sm['liveLocationKalman'].gpsOK
     live_map_data = mapd_sp_send.liveMapDataSP
 
-    live_map_data.speedLimitValid = bool(MAX_SPEED_LIMIT > speed_limit > 0)
+    live_map_data.speedLimitValid = bool(speed_limit > 0)
     live_map_data.speedLimit = speed_limit
-    live_map_data.speedLimitAheadValid = bool(MAX_SPEED_LIMIT > next_speed_limit > 0)
+    live_map_data.speedLimitAheadValid = bool(next_speed_limit > 0)
     live_map_data.speedLimitAhead = next_speed_limit
     live_map_data.speedLimitAheadDistance = next_speed_limit_distance
     live_map_data.roadName = self.get_current_road_name()

sunnypilot/modeld/modeld.py

@@ -28,7 +28,6 @@ from openpilot.sunnypilot.modeld.constants import ModelConstants, Plan
 from openpilot.sunnypilot.models.helpers import get_active_bundle, get_model_path, load_metadata, prepare_inputs, load_meta_constants
 from openpilot.sunnypilot.modeld.models.commonmodel_pyx import ModelFrame, CLContext
 from openpilot.sunnypilot.modeld.modeld_base import ModelStateBase
-from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
 
 
 PROCESS_NAME = "selfdrive.modeld.modeld_snpe"
@@ -210,7 +209,6 @@ def main(demo=False):
   prev_action = log.ModelDataV2.Action()
 
   DH = DesireHelper()
-  RELC = RoadEdgeLaneChangeController(params.get_bool("RoadEdgeLaneChangeEnabled"))
 
   while True:
     # Keep receiving frames until we are at least 1 frame ahead of previous extra frame
@@ -316,10 +314,7 @@ def main(demo=False):
       l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
       r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
       lane_change_prob = l_lane_change_prob + r_lane_change_prob
-      RELC.update(modelv2_send.modelV2.roadEdgeStds, modelv2_send.modelV2.laneLineProbs)
-      mdv2sp_send.modelDataV2SP.leftLaneChangeEdgeBlock = RELC.left_edge_detected
-      mdv2sp_send.modelDataV2SP.rightLaneChangeEdgeBlock = RELC.right_edge_detected
-      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob, RELC.left_edge_detected, RELC.right_edge_detected)
+      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob)
       modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
       modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
       mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction

sunnypilot/modeld_v2/modeld.py

@@ -26,7 +26,6 @@ from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
 from openpilot.sunnypilot.modeld.modeld_base import ModelStateBase
 from openpilot.sunnypilot.models.helpers import get_active_bundle
 from openpilot.sunnypilot.models.runners.helpers import get_model_runner
-from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
 
 PROCESS_NAME = "selfdrive.modeld.modeld_tinygrad"
 
@@ -240,9 +239,6 @@ def main(demo=False):
   prev_action = log.ModelDataV2.Action()
 
   DH = DesireHelper()
-  RELC = RoadEdgeLaneChangeController(params.get_bool("RoadEdgeLaneChangeEnabled"))
-
-
 
   while True:
     # Keep receiving frames until we are at least 1 frame ahead of previous extra frame
@@ -344,10 +340,7 @@ def main(demo=False):
       l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
       r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
       lane_change_prob = l_lane_change_prob + r_lane_change_prob
-      RELC.update(modelv2_send.modelV2.roadEdgeStds, modelv2_send.modelV2.laneLineProbs)
-      mdv2sp_send.modelDataV2SP.leftLaneChangeEdgeBlock = RELC.left_edge_detected
-      mdv2sp_send.modelDataV2SP.rightLaneChangeEdgeBlock = RELC.right_edge_detected
-      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob, RELC.left_edge_detected, RELC.right_edge_detected)
+      DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob)
       modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
       modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
       mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction

sunnypilot/models/fetcher.py

@@ -116,7 +116,7 @@ class ModelCache:
 
 class ModelFetcher:
   """Handles fetching and caching of model data from remote source"""
-  MODEL_URL = "https://raw.githubusercontent.com/sunnypilot/sunnypilot-docs/refs/heads/gh-pages/docs/driving_models_v9.json"
+  MODEL_URL = "https://docs.sunnypilot.ai/driving_models_v7.json"
 
   def __init__(self, params: Params):
     self.params = params

sunnypilot/models/helpers.py

@@ -19,8 +19,8 @@ from openpilot.system.hardware.hw import Paths
 from pathlib import Path
 
 # see the README.md for more details on the model selector versioning
-CURRENT_SELECTOR_VERSION = 11
-REQUIRED_MIN_SELECTOR_VERSION = 11
+CURRENT_SELECTOR_VERSION = 10
+REQUIRED_MIN_SELECTOR_VERSION = 9
 
 USE_ONNX = os.getenv('USE_ONNX', PC)
 

sunnypilot/models/runners/model_runner.py

@@ -14,10 +14,13 @@ CUSTOM_MODEL_PATH = Paths.model_root()
 # Set QCOM environment variable for TICI devices, potentially enabling hardware acceleration
 USBGPU = "USBGPU" in os.environ
 if USBGPU:
-  os.environ['DEV'] = 'AMD'
+  os.environ['AMD'] = '1'
   os.environ['AMD_IFACE'] = 'USB'
+elif TICI:
+  os.environ['QCOM'] = '1'
 else:
-  os.environ['DEV'] = 'QCOM' if TICI else 'CPU'
+  os.environ['LLVM'] = '1'
+  os.environ['JIT'] = '2'  # TODO: This may cause issues
 
 
 class ModelData:

sunnypilot/navd/README.md

@@ -1,6 +0,0 @@
-# Navigation
-
-Navigation daemon with Mapbox integration for semi-offline navigation. This module handles route planning, geocoding, and turn-by-turn instructions to support autonomous driving features.
-
-- `navigation_helpers/`: Mapbox API integration and navigation instructions processing.
-- `navigationd`: Navigation service which uses mapbox integration to generate a route and keep it up to date. This service runs at three hz, using keep time to ensure the while loop only updates three times a second rather than every time sm updates, which in this case would be twenty hz (LLK).

sunnypilot/navd/constants.py

@@ -1,16 +0,0 @@
-"""
-Copyright (c) 2021-, James Vecellio, Haibin Wen, sunnypilot, and a number of other contributors.
-
-This file is part of sunnypilot and is licensed under the MIT License.
-See the LICENSE.md file in the root directory for more details.
-"""
-
-
-class NAV_CV:
-  """ These distances are expected in meters format and convert to desired format """
-  SHORT_DISTANCE_METERS = 200.0
-  QUARTER_MILE = 402.336
-  POINT_ONE_MILE = 160.9344
-  METERS_TO_KILO = 1000  # divide n by this
-  METERS_TO_MILE = 1609.344  # divide n by this
-  METERS_TO_FEET = 3.280839895  # multiply n by this

sunnypilot/navd/helpers.py

@@ -126,8 +126,6 @@ def string_to_direction(direction: str) -> str:
     if d in direction:
       if 'slight' in direction and d in MODIFIABLE_DIRECTIONS:
         return 'slight' + d.capitalize()
-      elif 'sharp' in direction and d in MODIFIABLE_DIRECTIONS:
-        return 'sharp' + d.capitalize()
       return d
   return 'none'
 

sunnypilot/navd/navigation_desires/navigation_desires.py

@@ -1,44 +0,0 @@
-"""
-Copyright (c) 2021-, James Vecellio, Haibin Wen, sunnypilot, and a number of other contributors.
-
-This file is part of sunnypilot and is licensed under the MIT License.
-See the LICENSE.md file in the root directory for more details.
-"""
-import cereal.messaging as messaging
-from cereal import car, log
-from openpilot.common.constants import CV
-from openpilot.common.params import Params
-
-
-class NavigationDesires:
-  def __init__(self):
-    self.sm = messaging.SubMaster(['navigationd'])
-    self.desire = log.Desire.none
-    self._turn_speed_limit = 20 * CV.MPH_TO_MS
-    self._params = Params()
-    self.param_counter = -1
-    self.nav_allowed: bool = False
-
-  def update_params(self):
-    self.param_counter += 1
-    if self.param_counter % 60 == 0:  # every 3 seconds at 20hz
-      self.nav_allowed = self._params.get("NavDesiresAllowed", return_default=True)
-
-  def update(self, CS: car.CarState, lateral_active: bool) -> log.Desire:
-    self.update_params()
-    self.sm.update(0)
-    nav_msg = self.sm['navigationd']
-    self.desire = log.Desire.none
-    if self.nav_allowed and nav_msg.valid and lateral_active:
-      upcoming = nav_msg.upcomingTurn
-      if upcoming == 'slightLeft' and (not CS.leftBlindspot or CS.vEgo < self._turn_speed_limit):
-        self.desire = log.Desire.keepLeft
-      elif upcoming == 'slightRight' and (not CS.rightBlindspot or CS.vEgo < self._turn_speed_limit):
-        self.desire = log.Desire.keepRight
-      elif (upcoming == 'left' and CS.steeringPressed and CS.steeringTorque > 0 and not CS.rightBlinker
-            and not CS.leftBlindspot and CS.vEgo < self._turn_speed_limit):
-        self.desire = log.Desire.turnLeft
-      elif (upcoming == 'right' and CS.steeringPressed and CS.steeringTorque < 0 and not CS.leftBlinker
-            and not CS.rightBlindspot and CS.vEgo < self._turn_speed_limit):
-        self.desire = log.Desire.turnRight
-    return self.desire

sunnypilot/navd/navigation_desires/tests/test_navigation_desires.py

@@ -1,96 +0,0 @@
-"""
-Copyright (c) 2021-, James Vecellio, Haibin Wen, sunnypilot, and a number of other contributors.
-
-This file is part of sunnypilot and is licensed under the MIT License.
-See the LICENSE.md file in the root directory for more details.
-"""
-import pytest
-import types
-
-from cereal import log
-from openpilot.common.params import Params
-
-from openpilot.selfdrive.controls.lib.desire_helper import DesireHelper
-from openpilot.sunnypilot.navd.navigation_desires.navigation_desires import NavigationDesires
-
-
-def make_car(vEgo=0, leftBlinker=False, rightBlinker=False, leftBlindspot=False, rightBlindspot=False, steeringPressed=False, steeringTorque=0):
-  return types.SimpleNamespace(
-    vEgo=vEgo, leftBlinker=leftBlinker, rightBlinker=rightBlinker,
-    leftBlindspot=leftBlindspot, rightBlindspot=rightBlindspot,
-    steeringPressed=steeringPressed, steeringTorque=steeringTorque
-  )
-
-NAVIGATION_PARAMS: list[tuple] = [
-  ('slightLeft', make_car(), log.Desire.keepLeft),
-  ('slightRight', make_car(), log.Desire.keepRight),
-  ('slightLeft', make_car(vEgo=9, leftBlindspot=True), log.Desire.none),
-  ('slightRight', make_car(vEgo=9, rightBlindspot=True), log.Desire.none),
-  ('left', make_car(vEgo=5, leftBlinker=True, rightBlinker=False, leftBlindspot=False, steeringPressed=True, steeringTorque=1), log.Desire.turnLeft),
-  ('left', make_car(vEgo=5, leftBlinker=False, rightBlinker=True), log.Desire.none),
-  ('right', make_car(vEgo=6, rightBlinker=True, leftBlindspot=False, steeringPressed=True, steeringTorque=-1), log.Desire.turnRight),
-  ('right', make_car(vEgo=6, rightBlinker=True, rightBlindspot=True), log.Desire.none),
-  ('left', make_car(vEgo=9, leftBlinker=True), log.Desire.none),
-]
-
-INTEGRATION_PARAMS: list[tuple] = [(carstate, upcoming, log.Desire.none, expected) for upcoming, carstate, expected in NAVIGATION_PARAMS] + [
-  (make_car(vEgo=9, leftBlinker=True, steeringPressed=True, steeringTorque=1), 'slightLeft', log.Desire.turnLeft, log.Desire.keepLeft),
-  (make_car(vEgo=9, rightBlinker=True, steeringPressed=True, steeringTorque=-1), 'slightRight', log.Desire.turnRight, log.Desire.keepRight),
-  (make_car(vEgo=9, leftBlinker=True), 'slightLeft', log.Desire.laneChangeLeft, log.Desire.laneChangeLeft),
-  (make_car(vEgo=9, rightBlinker=True), 'slightRight', log.Desire.laneChangeRight, log.Desire.laneChangeRight),
-  (make_car(vEgo=9), 'none', log.Desire.none, log.Desire.none),
-]
-
-def make_nav_msg(valid=False, upcoming='none'):
-  return types.SimpleNamespace(valid=valid, upcomingTurn=upcoming)
-
-def params_setter(allowed: bool):
-  params = Params()
-  params.put("NavDesiresAllowed", allowed)
-
-@pytest.fixture
-def mock_submaster(mocker):
-  mock_sm = mocker.patch('cereal.messaging.SubMaster')
-  mock_sm_instance = mocker.Mock()
-  mock_sm.return_value = mock_sm_instance
-  mock_sm_instance.__getitem__ = mocker.Mock(return_value=make_nav_msg(valid=False))
-  params_setter(True)
-  return mock_sm_instance
-
-@pytest.mark.parametrize("upcoming, carstate, expected", NAVIGATION_PARAMS)
-def test_navigation_desires_update(mock_submaster, mocker, upcoming, carstate, expected):
-  nav_desires = NavigationDesires()
-  nav_desires.sm.__getitem__ = mocker.Mock(return_value=make_nav_msg(valid=True, upcoming=upcoming))
-  nav_desires.update(carstate, True)
-  assert nav_desires.desire == expected
-
-@pytest.mark.parametrize("msg_valid,lateral_active", [(False, True), (True, False)])
-def test_invalid_or_inactive(mock_submaster, mocker, msg_valid, lateral_active):
-  nav_desires = NavigationDesires()
-  nav_desires.sm.__getitem__ = mocker.Mock(return_value=make_nav_msg(valid=msg_valid, upcoming='slightLeft'))
-  nav_desires.update(make_car(), lateral_active)
-  assert nav_desires.desire == log.Desire.none
-
-def test_update(mock_submaster, mocker):
-  mock_submaster.__getitem__ = mocker.Mock(return_value=make_nav_msg(valid=True, upcoming='left'))
-  nav_desires = NavigationDesires()
-
-  assert nav_desires.update(make_car(leftBlinker=True, steeringPressed=True, steeringTorque=1), True) == log.Desire.turnLeft
-
-  params_setter(False)
-  nav_desires.param_counter = 59
-  nav_desires.update(make_car(leftBlinker=True), True)
-  assert nav_desires.desire == log.Desire.none
-
-@pytest.mark.parametrize("carstate, upcoming, current_desire, expected", INTEGRATION_PARAMS)
-def test_desire_helper(mock_submaster, mocker, carstate, upcoming, current_desire, expected):
-  mock_submaster.__getitem__ = mocker.Mock(return_value=make_nav_msg(valid=True, upcoming=upcoming))
-  dh = DesireHelper()
-  dh.desire = current_desire
-
-  if current_desire in (log.Desire.laneChangeLeft, log.Desire.laneChangeRight):
-    dh.lane_change_state = log.LaneChangeState.laneChangeStarting
-    dh.lane_change_direction = log.LaneChangeDirection.left if current_desire == log.Desire.laneChangeLeft else log.LaneChangeDirection.right
-
-  dh.update(carstate, True, 1.0)
-  assert dh.desire == expected