Sync: commaai/openpilot:master into sunnypilot/sunnypilot:master (#357)

# Conflicts:
#	cereal/services.py
#	msgq_repo
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/controls/lib/longcontrol.py
#	selfdrive/controls/plannerd.py

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [sunnyhaibin] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: sunnyhaibin # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://paypal.me/sunnyhaibin0850'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,14 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Join the Discord
-    url: https://discord.comma.ai
-    about: The community Discord is for both openpilot development and experience discussion
   - name: Report model bugs
-    url: https://discord.com/channels/469524606043160576/1254834193066623017
-    about: Feedback for the driving and driver monitoring models goes in the #driving-feedback in Discord
+    url: https://github.com/commaai/openpilot/discussions/categories/model-feedback
+    about: Provide feedback for the driving or driver monitoring models
+  - name: Discussions
+    url: https://github.com/commaai/openpilot/discussions
+    about: For questions and general discussion about openpilot
   - name: Community Wiki
     url: https://github.com/commaai/openpilot/wiki
     about: Check out our community wiki
+  - name: Community Discord
+    url: https://discord.comma.ai
+    about: Check out our community discord

.github/PULL_REQUEST_TEMPLATE/car_port.md

@@ -8,7 +8,7 @@ assignees: ''
 
 **Checklist**
 
-- [ ] added entry to CAR in selfdrive/car/*/values.py and ran `selfdrive/opcar/docs.py` to generate new docs
+- [ ] added entry to CAR in selfdrive/car/*/values.py and ran `selfdrive/car/docs.py` to generate new docs
 - [ ] test route added to [routes.py](https://github.com/commaai/openpilot/blob/master/selfdrive/car/tests/routes.py)
 - [ ] route with openpilot:
 - [ ] route with stock system:

.github/labeler.yaml

@@ -4,7 +4,59 @@ CI / testing:
 
 car:
   - changed-files:
-    - any-glob-to-all-files: '{selfdrive/car/**,opendbc_repo}'
+    - any-glob-to-all-files: 'selfdrive/car/**'
+
+body:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/body/*'
+
+chrysler:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/chrysler/*'
+
+ford:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/ford/*'
+
+gm:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/gm/*'
+
+honda:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/honda/*'
+
+hyundai:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/hyundai/*'
+
+mazda:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/mazda/*'
+
+nissan:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/nissan/*'
+
+subaru:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/subaru/*'
+
+tesla:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/telsa/*'
+
+toyota:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/toyota/*'
+
+volkswagen:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/volkswagen/*'
+
+fingerprint:
+  - changed-files:
+    - any-glob-to-all-files: 'selfdrive/car/*/fingerprints.py'
 
 simulation:
   - changed-files:
@@ -22,6 +74,6 @@ multilanguage:
   - changed-files:
     - any-glob-to-all-files: 'selfdrive/ui/translations/**'
 
-autonomy:
+research:
   - changed-files:
     - any-glob-to-all-files: "{selfdrive/modeld/models/**,selfdrive/test/process_replay/model_replay_ref_commit}"

.github/pull_request_template.md

@@ -44,7 +44,7 @@ Explain how you tested this bug fix.
 
 **Checklist**
 
-- [ ] added entry to CAR in selfdrive/car/*/values.py and ran `selfdrive/opcar/docs.py` to generate new docs
+- [ ] added entry to CAR in selfdrive/car/*/values.py and ran `selfdrive/car/docs.py` to generate new docs
 - [ ] test route added to [routes.py](https://github.com/commaai/openpilot/blob/master/selfdrive/car/tests/routes.py)
 - [ ] route with openpilot:
 - [ ] route with stock system:

.github/workflows/auto_pr_review.yaml

@@ -35,12 +35,11 @@ jobs:
         already-exists-comment: "Your PR should be made against the `master` branch"
 
     # Welcome comment
-    - name: "First timers PR"
-      uses: actions/first-interaction@v1
+    - name: comment
+      uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6
       if: github.event.pull_request.head.repo.full_name != 'commaai/openpilot'
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-message: |
+        message: |
             <!-- _(run_id **${{ github.run_id }}**)_ -->
             Thanks for contributing to openpilot! In order for us to review your PR as quickly as possible, check the following:
             * Convert your PR to a draft unless it's ready to review
@@ -50,4 +49,5 @@ jobs:
               * all the tests are passing
               * the change is [something we merge](https://github.com/commaai/openpilot/blob/master/docs/CONTRIBUTING.md#what-gets-merged)
               * include a route or your device' dongle ID if relevant
-      
+        comment_tag: run_id
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/badges.yaml

@@ -7,7 +7,7 @@ on:
 env:
   BASE_IMAGE: openpilot-base
   DOCKER_REGISTRY: ghcr.io/commaai
-  RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -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 $DOCKER_REGISTRY/$BASE_IMAGE:latest /bin/bash -c
+  RUN: docker run --shm-size 1G -v $PWD:/tmp/openpilot -w /tmp/openpilot -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 $DOCKER_REGISTRY/$BASE_IMAGE:latest /bin/bash -c
 
 jobs:
   badges:
@@ -23,7 +23,7 @@ jobs:
     - uses: ./.github/workflows/setup-with-retry
     - name: Push badges
       run: |
-        ${{ env.RUN }} "scons -j$(nproc) && python3 selfdrive/ui/translations/create_badges.py"
+        ${{ env.RUN }} "scons -j$(nproc) && python selfdrive/ui/translations/create_badges.py"
 
         rm .gitattributes
 

.github/workflows/ci_weekly_report.yaml

@@ -10,30 +10,38 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  CI_RUNS: ${{ github.event.inputs.ci_runs || '50' }}
-
 jobs:
   setup:
     if: github.repository == 'commaai/openpilot'
     runs-on: ubuntu-latest
     outputs:
-      ci_runs: ${{ steps.ci_runs_setup.outputs.matrix }}
+      ci_runs: ${{ steps.ci_runs_setup.outputs.value }}
     steps:
       - id: ci_runs_setup
-        name: CI_RUNS=${{ env.CI_RUNS }}
         run: |
-          matrix=$(python3 -c "import json; print(json.dumps({ 'run_number' : list(range(${{ env.CI_RUNS }})) }))")
-          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+          CI_RUNS=${{ inputs.ci_runs || '50' }}
+          mylist="value=["
 
+          for i in $(seq 1 $CI_RUNS);
+          do
+              if [ $i != $CI_RUNS ]; then
+                  mylist+="\"$i\", "
+              else
+                  mylist+="\"$i\"]"
+              fi
+          done
+
+          echo "$mylist" >> $GITHUB_OUTPUT
+          echo "Number of CI runs for report: $CI_RUNS"
   ci_matrix_run:
     needs: [ setup ]
     strategy:
       fail-fast: false
-      matrix: ${{fromJSON(needs.setup.outputs.ci_runs)}}
+      matrix:
+        value: ${{fromJSON(needs.setup.outputs.ci_runs)}}
     uses: commaai/openpilot/.github/workflows/ci_weekly_run.yaml@master
     with:
-      run_number: ${{ matrix.run_number }}
+      run_number: ${{ matrix.value }}
 
   report:
     needs: [ci_matrix_run]
@@ -54,48 +62,62 @@ jobs:
               })
             var report = {}
             jobs.slice(1, jobs.length-1).forEach(job => {
-              if (job.conclusion === "skipped") return;
-              const jobName = job.name.split(" / ")[2];
-              const runRegex = /\((.*?)\)/;
-              const run = job.name.match(runRegex)[1];
-              report[jobName] = report[jobName] || { successes: [], failures: [], canceled: [] };
+              const jobName = job.name.split('/')[2].trim();
+              report[jobName] = report[jobName] || { successes: [], failures: [], cancelled: [] };
               switch (job.conclusion) {
                 case "success":
-                  report[jobName].successes.push({ "run_number": run, "link": job.html_url}); break;
+                  report[jobName].successes.push(job.html_url); break;
                 case "failure":
-                  report[jobName].failures.push({ "run_number": run, "link": job.html_url }); break;
-                case "canceled":
-                  report[jobName].canceled.push({ "run_number": run, "link": job.html_url }); break;
+                  report[jobName].failures.push(job.html_url); break;
+                case "cancelled":
+                  report[jobName].cancelled.push(job.html_url); break;
               }
             });
-            return JSON.stringify({"jobs": report});
+            return JSON.stringify(report);
 
       - name: Add job results to summary
         env:
           JOB_RESULTS: ${{ fromJSON(steps.get-job-results.outputs.result) }}
         run: |
-          cat <<EOF >> template.html
-          <table>
-            <thead>
-              <tr>
-                <th></th>
-                <th>Job</th>
-                <th>✅ Passing</th>
-                <th>❌ Failure Details</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% for key in jobs.keys() %}<tr>
-                <td>{% for i in range(5) %}{% if i+1 <= (5 * jobs[key]["successes"]|length // ${{ env.CI_RUNS }}) %}🟩{% else %}🟥{% endif %}{% endfor%}</td>
-                <td>{{ key }}</td>
-                <td>{{ 100 * jobs[key]["successes"]|length // ${{ env.CI_RUNS }} }}%</td>
-                <td>{% if jobs[key]["failures"]|length > 0 %}<details>{% for failure in jobs[key]["failures"] %}<a href="{{ failure['link'] }}">Log for run #{{ failure['run_number'] }}</a><br>{% endfor %}</details>{% else %}{% endif %}</td>
-                </td>
-              </tr>{% endfor %}
-          </table>
-          EOF
+          echo $JOB_RESULTS > job_results.json
+          generate_html_table() {
+            echo "<table>"
+            echo "<thead>"
+            echo "  <tr>"
+            echo "    <th>Job</th>"
+            echo "    <th>Succeeded ✅</th>"
+            echo "    <th>Failed ❌</th>"
+            echo "    <th>Cancelled (timed out) ⏰</th>"
+            echo "  </tr>"
+            echo "</thead>"
+            jq -r '
+              "<tbody>",
+              keys[] as $job |
+              "<tr>",
+              "  <td>\($job)</td>",
+              "  <td>",
+              "    <details>",
+              "      <summary>(\(.[$job].successes | length))</summary>",
+              "      \(.[$job].successes[])<br>",
+              "    </details>",
+              "  </td>",
+              "  <td>",
+              "    <details>",
+              "      <summary>(\(.[$job].failures | length))</summary>",
+              "      \(.[$job].failures[])<br>",
+              "    </details>",
+              "  </td>",
+              "  <td>",
+              "    <details>",
+              "      <summary>(\(.[$job].cancelled | length))</summary>",
+              "      \(.[$job].cancelled[])<br>",
+              "    </details>",
+              "  </td>",
+              "</tr>"
+            ' job_results.json
+            echo  "</tbody>"
+            echo  "</table>"
+          }
+          echo "# CI Job Summary" >> $GITHUB_STEP_SUMMARY
+          generate_html_table >> $GITHUB_STEP_SUMMARY
 
-          pip install jinja2-cli
-          echo $JOB_RESULTS | jinja2 template.html > report.html
-          echo "# CI Test Report - ${{ env.CI_RUNS }} Runs" >> $GITHUB_STEP_SUMMARY
-          cat report.html >> $GITHUB_STEP_SUMMARY

.github/workflows/docs.yaml

@@ -15,24 +15,31 @@ concurrency:
   group: docs-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }}
   cancel-in-progress: true
 
+env:
+  BASE_IMAGE: openpilot-base
+
+  BUILD: selfdrive/test/docker_build.sh base
+
+  RUN: docker run --shm-size 1G -v $GITHUB_WORKSPACE:/tmp/openpilot -w /tmp/openpilot -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
+
 jobs:
   docs:
     name: build docs
     runs-on: ubuntu-latest
-    timeout-minutes: 1
+    timeout-minutes: 45
+    if: false  # TODO: replace this with the new docs
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
-
-    # Build
+    - uses: ./.github/workflows/setup-with-retry
+    - name: Build openpilot
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc)"
     - name: Build docs
       run: |
-        # TODO: can we install just the "docs" dependency group without the normal deps?
-        pip install mkdocs
-        mkdocs build
+        ${{ env.RUN }} "apt update && apt install -y doxygen && cd docs && make -j$(nproc) html"
 
-    # Push to docs.comma.ai
     - uses: actions/checkout@v4
       if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
       with:
@@ -47,17 +54,16 @@ jobs:
         source release/identity.sh
 
         cd openpilot-docs
+
         git checkout --orphan tmp
         git rm -rf .
 
-        # copy over docs
-        cp -r ../docs_site/ docs/
-
-        # GitHub pages config
+        cp -r ../build/docs/html/ docs/
+        cp -r ../docs/README.md .
         touch docs/.nojekyll
         echo -n docs.comma.ai > docs/CNAME
-
         git add -f .
+
         git commit -m "build docs"
 
         # docs live in different repo to not bloat openpilot's full clone size

.github/workflows/jenkins-pr-trigger.yaml

@@ -1,45 +0,0 @@
-name: jenkins scan
-
-on:
-  issue_comment:
-    types: [created, edited]
-
-jobs:
-  # TODO: gc old branches in a separate job in this workflow
-  scan-comments:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.issue.pull_request }}
-    steps:
-    - name: Check for trigger phrase
-      id: check_comment
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const triggerPhrase = "trigger-jenkins";
-          const comment = context.payload.comment.body;
-          const commenter = context.payload.comment.user.login;
-
-          const { data: permissions } = await github.rest.repos.getCollaboratorPermissionLevel({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            username: commenter
-          });
-
-          const hasWriteAccess = permissions.permission === 'write' || permissions.permission === 'admin';
-
-          return (hasWriteAccess && comment.includes(triggerPhrase));
-        result-encoding: json
-
-    - name: Checkout repository
-      if: steps.check_comment.outputs.result == 'true'
-      uses: actions/checkout@v4
-      with:
-        ref: refs/pull/${{ github.event.issue.number }}/head
-
-    - name: Push to tmp-jenkins branch
-      if: steps.check_comment.outputs.result == 'true'
-      run: |
-        git config --global user.name "github-actions[bot]"
-        git config --global user.email "github-actions[bot]@users.noreply.github.com"
-        git checkout -b tmp-jenkins-${{ github.event.issue.number }}
-        GIT_LFS_SKIP_PUSH=1 git push -f origin tmp-jenkins-${{ github.event.issue.number }}

.github/workflows/repo-maintenance.yaml

@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  package_updates:
-    name: package_updates
+  bump_submodules:
+    name: bump_submodules
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/commaai/openpilot-base:latest
@@ -16,28 +16,47 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: uv lock
-      run: |
-        python3 -m ensurepip --upgrade
-        pip3 install uv
-        uv lock --upgrade
     - name: bump submodules
       run: |
         git config --global --add safe.directory '*'
         git -c submodule."tinygrad".update=none submodule update --remote
         git add .
-    - name: update car docs
-      run: |
-        scons -j$(nproc) --minimal opendbc
-        PYTHONPATH=. python selfdrive/car/docs.py
-        git add docs/CARS.md
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
       with:
         author: Vehicle Researcher <user@comma.ai>
         token: ${{ secrets.ACTIONS_CREATE_PR_PAT }}
-        commit-message: Update Python packages
-        title: '[bot] Update Python packages'
+        commit-message: bump submodules
+        title: '[bot] Bump submodules'
+        branch: auto-bump-submodules
+        base: master
+        delete-branch: true
+        body: 'Automatic PR from repo-maintenance -> bump_submodules'
+        labels: bot
+  package_updates:
+    name: package_updates
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/commaai/openpilot-base:latest
+    if: github.repository == 'commaai/openpilot'
+    steps:
+    - uses: actions/checkout@v4
+    - name: uv lock
+      run: |
+        python3 -m ensurepip --upgrade
+        pip3 install uv
+        uv lock --upgrade
+    - name: pre-commit autoupdate
+      run: |
+        git config --global --add safe.directory '*'
+        pre-commit autoupdate
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
+      with:
+        author: Vehicle Researcher <user@comma.ai>
+        token: ${{ secrets.ACTIONS_CREATE_PR_PAT }}
+        commit-message: Update Python packages and pre-commit hooks
+        title: '[bot] Update Python packages and pre-commit hooks'
         branch: auto-package-updates
         base: master
         delete-branch: true

.github/workflows/selfdrive_tests.yaml

@@ -25,7 +25,7 @@ env:
   DOCKER_LOGIN: docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
   BUILD: selfdrive/test/docker_build.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 -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 1G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PRE_COMMIT_HOME=/tmp/pre-commit -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/pre-commit:/tmp/pre-commit -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 --cov --cov-report=xml --cov-append --durations=0 --durations-min=5 --hypothesis-seed 0 -n logical
 
@@ -45,6 +45,7 @@ jobs:
     - name: Build devel
       timeout-minutes: 1
       run: TARGET_DIR=$STRIPPED_DIR release/build_devel.sh
+    - uses: ./.github/workflows/setup-pre-commit
     - uses: ./.github/workflows/setup-with-retry
     - name: Check submodules
       if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
@@ -54,29 +55,27 @@ jobs:
       timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 10 || 30) }} # allow more time when we missed the scons cache
       run: |
         cd $STRIPPED_DIR
-        ${{ env.RUN }} "python3 system/manager/build.py"
+        ${{ env.RUN }} "python system/manager/build.py"
     - name: Run tests
       timeout-minutes: 3
       run: |
         cd $STRIPPED_DIR
         ${{ env.RUN }} "release/check-dirty.sh && \
                         MAX_EXAMPLES=5 $PYTEST -m 'not slow' selfdrive/car"
-    - name: Static analysis
-      timeout-minutes: 1
+    - name: pre-commit
+      timeout-minutes: 3
       run: |
         cd $GITHUB_WORKSPACE
+        cp .pre-commit-config.yaml $STRIPPED_DIR
         cp pyproject.toml $STRIPPED_DIR
         cd $STRIPPED_DIR
-        ${{ env.RUN }} "scripts/lint/lint.sh --skip check_added_large_files"
+        ${{ env.RUN }} "unset PYTHONWARNINGS && SKIP=check-added-large-files,check-hooks-apply,check-useless-excludes pre-commit run --all && chmod -R 777 /tmp/pre-commit"
 
   build:
     strategy:
       matrix:
-        arch: ${{ fromJson(
-           ((github.repository == 'commaai/openpilot') &&
-              ((github.event_name != 'pull_request') ||
-               (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
-    runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-latest' }}
+        arch: ${{ fromJson('["x86_64"]') }} # TODO: Re-add build test for aarch64 once we switched to ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:
@@ -85,7 +84,7 @@ jobs:
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
       run: |
         echo "PUSH_IMAGE=true" >> "$GITHUB_ENV"
-        echo "TARGET_ARCHITECTURE=${{ matrix.arch }}" >> "$GITHUB_ENV"
+        : # (TODO: Re-add this once we test other archs) echo "TARGET_ARCHITECTURE=${{ matrix.arch }}" >> "$GITHUB_ENV"
         $DOCKER_LOGIN
     - uses: ./.github/workflows/setup-with-retry
       with:
@@ -94,7 +93,7 @@ jobs:
       timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 15 || 30) }} # allow more time when we missed the scons cache
 
   build_mac:
-    name: build macOS
+    name: build macos
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v4
@@ -104,51 +103,28 @@ jobs:
     - name: Install dependencies
       run: ./tools/mac_setup.sh
       env:
+        SKIP_PROMPT: 1
         # package install has DeprecationWarnings
         PYTHONWARNINGS: default
-    - run: echo "CACHE_COMMIT_DATE=$(git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d-%H:%M')" >> $GITHUB_ENV
-    - name: Getting scons cache
-      uses: 'actions/cache@v4'
-      with:
-        path: /tmp/scons_cache
-        key: scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
-        restore-keys: |
-          scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}
-          scons-${{ runner.arch }}-macos
-    - name: Building openpilot
-      run: . .venv/bin/activate && scons -j$(nproc)
-
-  docker_push_multiarch:
-    name: docker push multiarch tag
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
-    needs: [build]
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: false
-    - name: Setup docker
-      run: |
-        $DOCKER_LOGIN
-    - name: Merge x64 and arm64 tags
-      run: |
-        export PUSH_IMAGE=true
-        scripts/retry.sh selfdrive/test/docker_tag_multiarch.sh base x86_64 aarch64
+    - name: Test openpilot environment
+      run: . .venv/bin/activate && scons -h
 
   static_analysis:
     name: static analysis
     runs-on: ${{ ((github.repository == 'commaai/openpilot') &&
                    ((github.event_name != 'pull_request') ||
-                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-24.04' }}
-    env:
-      PYTHONWARNINGS: default
+                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
     steps:
     - uses: actions/checkout@v4
-    - name: Setup
-      run: tools/op.sh setup
-    - name: Static analysis
-      timeout-minutes: 1
-      run: tools/op.sh lint
+      with:
+        submodules: true
+    - uses: ./.github/workflows/setup-pre-commit
+    - uses: ./.github/workflows/setup-with-retry
+    - name: Build openpilot
+      run: ${{ env.RUN }} "scons -j$(nproc)"
+    - name: pre-commit
+      timeout-minutes: 4
+      run: ${{ env.RUN }} "unset PYTHONWARNINGS && pre-commit run --all && chmod -R 777 /tmp/pre-commit"
 
   unit_tests:
     name: unit tests
@@ -221,7 +197,7 @@ jobs:
     - name: Upload reference logs
       if: ${{ failure() && steps.print-diff.outcome == 'success' && github.repository == 'commaai/openpilot' && env.AZURE_TOKEN != '' }}
       run: |
-        ${{ env.RUN }} "unset PYTHONWARNINGS && AZURE_TOKEN='$AZURE_TOKEN' python3 selfdrive/test/process_replay/test_processes.py -j$(nproc) --upload-only"
+        ${{ env.RUN }} "unset PYTHONWARNINGS && AZURE_TOKEN='$AZURE_TOKEN' python selfdrive/test/process_replay/test_processes.py -j$(nproc) --upload-only"
     # PYTHONWARNINGS triggers a SyntaxError in onnxruntime
     - name: Run model replay with ONNX
       timeout-minutes: 4
@@ -281,8 +257,7 @@ jobs:
   car_docs_diff:
     name: PR comments
     runs-on: ubuntu-latest
-    #if: github.event_name == 'pull_request'
-    if: false  # TODO: run this in opendbc?
+    if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -292,7 +267,7 @@ jobs:
       - uses: ./.github/workflows/setup-with-retry
       - name: Get base car info
         run: |
-          ${{ env.RUN }} "scons -j$(nproc) && python3 selfdrive/debug/dump_car_docs.py --path /tmp/openpilot_cache/base_car_docs"
+          ${{ env.RUN }} "scons -j$(nproc) && python selfdrive/debug/dump_car_docs.py --path /tmp/openpilot_cache/base_car_docs"
           sudo chown -R $USER:$USER ${{ github.workspace }}
       - uses: actions/checkout@v4
         with:
@@ -304,7 +279,7 @@ jobs:
         run: |
           cd current
           ${{ env.RUN }} "scons -j$(nproc)"
-          output=$(${{ env.RUN }} "python3 selfdrive/debug/print_docs_diff.py --path /tmp/openpilot_cache/base_car_docs")
+          output=$(${{ env.RUN }} "python selfdrive/debug/print_docs_diff.py --path /tmp/openpilot_cache/base_car_docs")
           output="${output//$'\n'/'%0A'}"
           echo "::set-output name=diff::$output"
       - name: Find comment
@@ -334,10 +309,8 @@ jobs:
             })
 
   create_ui_report:
-    # This job name needs to be the same as UI_JOB_NAME in ui_preview.yaml
     name: Create UI Report
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -349,9 +322,59 @@ jobs:
         run: >
             ${{ env.RUN }} "PYTHONWARNINGS=ignore &&
                             source selfdrive/test/setup_xvfb.sh &&
-                            python3 selfdrive/ui/tests/test_ui/run.py"
+                            python selfdrive/ui/tests/test_ui/run.py"
       - name: Upload Test Report
         uses: actions/upload-artifact@v4
         with:
-          name: report-${{ github.event.number }}
-          path: selfdrive/ui/tests/test_ui/report_1/screenshots
+          name: report-${{ inputs.run_number }}
+          path: selfdrive/ui/tests/test_ui/report_${{ inputs.run_number }}
+      - name: Get changes to selfdrive/ui
+        if: ${{ github.event_name == 'pull_request' }}
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+         files: |
+            selfdrive/ui/**
+      - name: Checkout ci-artifacts
+        if: ${{ github.event_name == 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }}
+        uses: actions/checkout@v4
+        with:
+          repository: commaai/ci-artifacts
+          ssh-key: ${{ secrets.CI_ARTIFACTS_DEPLOY_KEY }}
+          path: ${{ github.workspace }}/ci-artifacts
+          ref: master
+      - name: Push Screenshots
+        if: ${{ github.event_name == 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }}
+        working-directory: ${{ github.workspace }}/ci-artifacts
+        run: |
+          git checkout -b openpilot/pr-${{ github.event.pull_request.number }}
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+          sudo mv ${{ github.workspace }}/selfdrive/ui/tests/test_ui/report/screenshots/* .
+          git add .
+          git commit -m "screenshots for PR #${{ github.event.pull_request.number }}"
+          git push origin openpilot/pr-${{ github.event.pull_request.number }} --force
+      - name: Comment Screenshots on PR
+        if: ${{ github.event_name == 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: |
+            <!-- _(run_id_screenshots **${{ github.run_id }}**)_ -->
+            ## UI Screenshots
+            <table>
+              <tr>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/homescreen.png"></td>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/onroad.png"></td>
+              </tr>
+              <tr>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/onroad_map.png"></td>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/onroad_sidebar.png"></td>
+              </tr>
+              <tr>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/settings_network.png"></td>
+                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.pull_request.number }}/settings_device.png"></td>
+              </tr>
+            </table>
+          comment_tag: run_id_screenshots
+          pr_number: ${{ github.event.pull_request.number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/setup-pre-commit/action.yaml

@@ -0,0 +1,12 @@
+name: 'set up pre-commit environment'
+
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/workflows/auto-cache
+      with:
+        path: .ci_cache/pre-commit
+        key: pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
+        restore-keys: |
+          pre-commit-
+        save: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot' }}

.github/workflows/stale.yaml

@@ -5,8 +5,8 @@ on:
   workflow_dispatch:
 
 env:
-  DAYS_BEFORE_PR_CLOSE: 2
-  DAYS_BEFORE_PR_STALE: 9
+  DAYS_BEFORE_PR_CLOSE: 3
+  DAYS_BEFORE_PR_STALE: 14
 
 jobs:
   stale:

.github/workflows/tools_tests.yaml

@@ -21,7 +21,7 @@ env:
 
   BUILD: selfdrive/test/docker_build.sh base
 
-  RUN: docker run --shm-size 2G -v $GITHUB_WORKSPACE:/tmp/openpilot -w /tmp/openpilot -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
+  RUN: docker run --shm-size 1G -v $GITHUB_WORKSPACE:/tmp/openpilot -w /tmp/openpilot -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
 
 
 jobs:
@@ -73,6 +73,12 @@ jobs:
           scons-${{ runner.arch }}-ubuntu2004
     - name: Building openpilot
       run: uv run scons -u -j$(nproc)
+    - name: Saving scons cache
+      uses: actions/cache/save@v4
+      if: github.ref == 'refs/heads/master'
+      with:
+        path: /tmp/scons_cache
+        key: scons-${{ runner.arch }}-ubuntu2004-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
 
   devcontainer:
     name: devcontainer

.github/workflows/ui_preview.yaml

@@ -1,104 +0,0 @@
-name: "ui preview"
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened, edited]
-    branches:
-      - 'master'
-    paths:
-      - 'selfdrive/ui/**'
-  workflow_dispatch:
-
-env:
-  UI_JOB_NAME: "Create UI Report"
-
-jobs:
-  preview:
-    if: github.repository == 'commaai/openpilot'
-    name: preview
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    permissions:
-      contents: read
-      pull-requests: write
-      actions: read
-    steps:
-      - name: Waiting for ui test to start
-        run: sleep 30
-
-      - name: Wait for ui report
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          check-name: ${{ env.UI_JOB_NAME }}
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          allowed-conclusions: success
-          wait-interval: 20
-
-      - name: Get workflow run ID
-        id: get_run_id
-        run: |
-          echo "run_id=$(curl https://api.github.com/repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha }}/check-runs | jq -r '.check_runs[] | select(.name == "${{ env.UI_JOB_NAME }}") | .html_url | capture("(?<number>[0-9]+)") | .number')" >> $GITHUB_OUTPUT
-
-      - name: Checkout ci-artifacts
-        uses: actions/checkout@v4
-        with:
-          repository: commaai/ci-artifacts
-          ssh-key: ${{ secrets.CI_ARTIFACTS_DEPLOY_KEY }}
-          path: ${{ github.workspace }}/ci-artifacts
-          ref: master
-
-      - name: Download artifact
-        id: download-artifact
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          run_id: ${{ steps.get_run_id.outputs.run_id }}
-          search_artifacts: true
-          name: report-${{ github.event.number }}
-          path: ${{ github.workspace }}/ci-artifacts
-
-      - name: Push Screenshots
-        working-directory: ${{ github.workspace }}/ci-artifacts
-        run: |
-          git checkout -b openpilot/pr-${{ github.event.number }}
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<>"
-          git add ${{ github.workspace }}/ci-artifacts/*
-          git commit -m "screenshots for PR #${{ github.event.number }}"
-          git push origin openpilot/pr-${{ github.event.number }} --force
-
-      - name: Comment Screenshots on PR
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            <!-- _(run_id_screenshots **${{ github.run_id }}**)_ -->
-            ## UI Screenshots
-            <table>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/homescreen.png"></td>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/settings_network.png"></td>
-              </tr>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad.png"></td>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_sidebar.png"></td>
-              </tr>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_wide.png"></td>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_wide_sidebar.png"></td>
-              </tr>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/settings_device.png"></td>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_alert_small.png"></td>
-              </tr>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_alert_mid.png"></td>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/onroad_alert_full.png"></td>
-              </tr>
-              <tr>
-                <td><img src="https://raw.githubusercontent.com/commaai/ci-artifacts/openpilot/pr-${{ github.event.number }}/driver_camera.png"></td>
-                <td></td>
-              </tr>
-            </table>
-          comment_tag: run_id_screenshots
-          pr_number: ${{ github.event.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -14,8 +14,6 @@ model2.png
 a.out
 .hypothesis
 
-/docs_site/
-
 *.dylib
 *.DSYM
 *.d
@@ -104,4 +102,4 @@ Pipfile
 ### VisualStudioCode Patch ###
 # Ignore all local history of files
 .history
-.ionide
+.ionide

.gitmodules

@@ -1,18 +1,21 @@
 [submodule "panda"]
   path = panda
-  url = ../../commaai/panda.git
+  url = ../../sunnyhaibin/panda.git
 [submodule "opendbc"]
-  path = opendbc_repo
-  url = ../../commaai/opendbc.git
+  path = opendbc
+  url = ../../sunnyhaibin/opendbc.git
 [submodule "msgq"]
   path = msgq_repo
   url = ../../commaai/msgq.git
 [submodule "rednose_repo"]
   path = rednose_repo
   url = ../../commaai/rednose.git
+[submodule "body"]
+  path = body
+  url = ../../commaai/body.git
 [submodule "teleoprtc_repo"]
   path = teleoprtc_repo
   url = ../../commaai/teleoprtc
 [submodule "tinygrad"]
   path = tinygrad_repo
-  url = https://github.com/tinygrad/tinygrad.git
+  url = https://github.com/geohot/tinygrad.git

.lfsconfig

@@ -1,4 +1,4 @@
 [lfs]
-	url = https://gitlab.com/commaai/openpilot-lfs.git/info/lfs
-	pushurl = ssh://git@gitlab.com/commaai/openpilot-lfs.git
+	url = https://gitlab.com/sunnypilot/public/sunnypilot-lfs.git/info/lfs
+	pushurl = ssh://git@gitlab.com/sunnypilot/public/sunnypilot-lfs.git
 	locksverify = false

.lfsconfig-comma

@@ -0,0 +1,4 @@
+[lfs]
+	url = https://gitlab.com/commaai/openpilot-lfs.git/info/lfs
+	pushurl = ssh://git@gitlab.com/commaai/openpilot-lfs.git
+	locksverify = false

.pre-commit-config.yaml

@@ -0,0 +1,98 @@
+exclude: '^(tinygrad_repo)'
+repos:
+-   repo: meta
+    hooks:
+    -   id: check-hooks-apply
+    -   id: check-useless-excludes
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+    -   id: check-ast
+        exclude: '^(third_party)/'
+    -   id: check-json
+        exclude: '.devcontainer/devcontainer.json|.vscode/'  # these support JSON with comments
+    -   id: check-toml
+    -   id: check-xml
+    -   id: check-yaml
+    -   id: check-merge-conflict
+    -   id: check-symlinks
+    -   id: check-executables-have-shebangs
+    -   id: check-shebang-scripts-are-executable
+    -   id: check-added-large-files
+        exclude: '(docs/CARS.md)|(uv.lock)|(third_party/acados/include/blasfeo/include/blasfeo_d_kernel.h)'
+        args:
+        - --maxkb=120
+        - --enforce-all
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.3.0
+    hooks:
+    -   id: codespell
+        exclude: '^(third_party/)|(body/)|(msgq/)|(panda/)|(opendbc/)|(rednose/)|(rednose_repo/)|(teleoprtc/)|(teleoprtc_repo/)|(selfdrive/ui/translations/.*.ts)|(uv.lock)'
+        args:
+        # if you've got a short variable name that's getting flagged, add it here
+        - -L bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn
+        - --builtins clear,rare,informal,usage,code,names,en-GB_to_en-US
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.0
+    hooks:
+    -   id: ruff
+        exclude: '^(third_party/)|(msgq/)|(panda/)|(rednose/)|(rednose_repo/)|(tinygrad/)|(tinygrad_repo/)|(teleoprtc/)|(teleoprtc_repo/)'
+-   repo: local
+    hooks:
+    -   id: mypy
+        name: mypy
+        entry: mypy
+        language: system
+        types: [python]
+        args:
+        - --local-partial-types
+        - --explicit-package-bases
+        exclude: '^(third_party/)|(body/)|(msgq/)|(opendbc/)|(panda/)|(rednose/)|(rednose_repo/)|(tinygrad/)|(tinygrad_repo/)|(teleoprtc/)|(teleoprtc_repo/)'
+-   repo: local
+    hooks:
+    -   id: cppcheck
+        name: cppcheck
+        entry: cppcheck
+        language: system
+        types: [c++]
+        exclude: '^(third_party/)|(msgq/)|(body/)|(rednose/)|(rednose_repo/)|(opendbc/)|(panda/)|(tools/)|(selfdrive/modeld/thneed/debug/)|(selfdrive/modeld/test/)|(selfdrive/camerad/test/)|(installer/)'
+        args:
+        - --error-exitcode=1
+        - --language=c++
+        - --quiet
+        - --force
+        - -j8
+        - --library=qt
+        - --include=third_party/kaitai/kaitaistream.h
+-   repo: https://github.com/cpplint/cpplint
+    rev: 1.6.1
+    hooks:
+    -   id: cpplint
+        exclude: '^(third_party/)|(msgq/)|(body/)|(rednose/)|(rednose_repo/)|(opendbc/)|(panda/)|(generated/)'
+        args:
+        - --quiet
+        - --counting=total
+        - --linelength=240
+        # https://google.github.io/styleguide/cppguide.html
+        # relevant rules are whitelisted, see all options with: cpplint --filter=
+        - --filter=-build,-legal,-readability,-runtime,-whitespace,+build/include_subdir,+build/forward_decl,+build/include_what_you_use,+build/deprecated,+whitespace/comma,+whitespace/line_length,+whitespace/empty_if_body,+whitespace/empty_loop_body,+whitespace/empty_conditional_body,+whitespace/forcolon,+whitespace/parens,+whitespace/semicolon,+whitespace/tab,+readability/braces
+-   repo: https://github.com/MarcoGorelli/cython-lint
+    rev: v0.16.2
+    hooks:
+    -   id: cython-lint
+        exclude: '^(third_party/)|(msgq/)|(body/)|(rednose/)|(rednose_repo/)|(opendbc/)|(panda/)|(generated/)'
+        args:
+        - --max-line-length=240
+        - --ignore=E111, E302, E305
+-   repo: local
+    hooks:
+    -   id: test_translations
+        name: test translations
+        entry: pytest selfdrive/ui/tests/test_translations.py
+        language: system
+        pass_filenames: false
+        files: '^selfdrive/ui/translations/'
+-   repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.28.6
+    hooks:
+    -   id: check-github-workflows

CHANGELOGS.md

@@ -0,0 +1,923 @@
+sunnypilot - 0.9.8.0 (2024-xx-xx)
+========================
+* Always on driver monitoring toggle
+
+sunnypilot - 0.9.7.1 (2024-06-13)
+========================
+* New driving model
+  * Inputs the past curvature for smoother and more accurate lateral control
+  * Simplified neural network architecture in the model's last layers
+  * Minor fixes to desire augmentation and weight decay
+* New driver monitoring model
+  * Improved end-to-end bit for phone detection
+* Adjust driving personality with the follow distance button
+* Support for hybrid variants of supported Ford models
+* Fingerprinting without the OBD-II port on all cars
+* Improved fuzzy fingerprinting for Ford and Volkswagen
+************************
+* UPDATED: Synced with commaai's openpilot
+  * master commit f8cb04e (June 10, 2024)
+* NEW❗: sunnylink (Alpha early access)
+  * NEW❗: Config/Settings Backup
+    * Remotely back up and restore sunnypilot settings easily
+    * Device registration with sunnylink ensures a secure, integrated experience across services
+    * AES encryption derived from the device's RSA private key is used for utmost security
+    * Settings are encrypted on-device, transmitted securely via HTTPS, and stored encrypted on sunnylink
+    * Prevents loss of settings after device resets, offering peace of mind through end-to-end encryption
+    * Early alpha access to all current and previous GitHub Sponsors and Patreon supporters
+  * GitHub account pairing from device settings scanning QR code
+    * Pairing your account will allow you to access features via our API (still WIP but accessible if you dig a little on our code 😉)
+    * Allow inheritance of your sponsorship status, allowing you to get extra features and early access whenever applicable
+* NEW❗: iOS Siri Shortcuts Navigation support thanks to twilsonco and mike86437!
+  * iOS and macOS Shortcuts to quickly set navigation destinations from your iOS device
+  * comma Prime support
+  * Personal Mapbox/Amap/Google Maps token support
+  * Instructions on how to set up your iOS Siri Shortcuts: https://routinehub.co/shortcut/17677/
+* NEW❗: Forced Offroad mode
+  * Force sunnypilot in the offroad state even when the car is on
+  * When Forced Offroad mode is on, allows changing offroad-only settings even when the car is turned on
+  * To engage/disengage Force Offroad, go to Settings -> Device panel
+* UPDATED: Auto Lane Change Timer -> Auto Lane Change by Blinker
+  * NEW❗: New "Off" option to disable lane change by blinker
+* UPDATED: Pause Lateral Below Speed with Blinker
+  * NEW❗: Customizable Pause Lateral Speed
+    * Pause lateral actuation with blinker when traveling below the desired speed selected. Default is 20 MPH or 32 km/h.
+* UPDATED: Hyundai CAN Longitudinal
+  * Auto-enable radar tracks on platforms with applicable Mando radar
+* UPDATED: Hyundai CAN-FD Camera-based SCC
+  * NEW❗: Parse lead info for camera-based SCC platforms with longitudinal support
+    * Improve lead tracking when using openpilot longitudinal
+* RE-ENABLED: Map-based Turn Speed Control (M-TSC) for supported platforms
+  * openpilot Longitudinal Control available cars
+  * Custom Stock Longitudinal Control available cars
+* UPDATED: Continued support for comma Pedal
+  * In response to the official deprecation of support for comma Pedal in the upstream, sunnypilot will continue maintaining software support for comma Pedal
+* UPDATED: Driving Model Selector v4
+  * NEW❗: Driving Model additions
+    * North Dakota (April 29, 2024) - NDv2
+    * WD40 (April 09, 2024) - WD40
+    * Duck Amigo (March 18, 2024) - DA
+    * Recertified Herbalist (March 01, 2024) - CHLR
+  * Legacy Driving Models with Navigate on openpilot (NoO) support
+    * Includes Duck Amigo and all preceding models
+* UPDATED: Bumping mapd by [@pfeiferj](https://github.com/pfeiferj) to version [v1.9.0](https://github.com/pfeiferj/mapd/releases/tag/v1.9.0) thanks to pfeiferj!
+* UPDATED: Reset Mapbox Access Token -> Reset Access Tokens for Map Services
+  * Reset self-service access tokens for Mapbox, Amap, and Google Maps
+* UPDATED: Upstream native support for Gap Adjust Cruise
+* UPDATED: Neural Network Lateral Control (NNLC)
+  * Due to upstream changes with platform simplifications, most platforms will match and fallback to combined platform model
+  * This will be updated when the new mapping of platforms are restructured (thanks @twilsonco 😉)
+* UI Updates
+  * Display Metrics Below Chevron
+    * NEW❗: Metrics is now being displayed below the chevron instead of above
+    * NEW❗: Display both Distance and Speed simultaneously
+    * NEW❗: View sunnylink connectivity status on the left sidebar!
+
+sunnypilot - 0.9.6.2 (2024-05-29)
+========================
+* REMOVED: Screen Recorder
+  * Screen Recorder is removed due to unnecessary resource usage
+  * An improved version will be available in the near future. Stay tuned!
+
+sunnypilot - 0.9.6.1 (2024-02-27)
+========================
+* New driving model
+  * Vision model trained on more data
+  * Improved driving performance
+  * Directly outputs curvature for lateral control
+* New driver monitoring model
+  * Trained on larger dataset
+* AGNOS 9
+* comma body streaming and controls over WebRTC
+* Improved fuzzy fingerprinting for many makes and models
+* Alpha longitudinal support for new Toyota models
+* Chevrolet Equinox 2019-22 support thanks to JasonJShuler and nworb-cire!
+* Dodge Durango 2020-21 support
+* Hyundai Staria 2023 support thanks to sunnyhaibin!
+* Kia Niro Plug-in Hybrid 2022 support thanks to sunnyhaibin!
+* Lexus LC 2024 support thanks to nelsonjchen!
+* Toyota RAV4 2023-24 support
+* Toyota RAV4 Hybrid 2023-24 support
+************************
+* UPDATED: Synced with commaai's openpilot
+  * master commit db57a21 (February 22, 2024)
+  * v0.9.6 release (February 27, 2024)
+* UPDATED: Dynamic Experimental Control (DEC)
+  * Synced with dragonpilot-community/dragonpilot:beta3 commit f4ee52f
+* NEW❗: Default Driving Model: Certified Herbalist v2 (February 13, 2024)
+* UPDATED: Driving Model Selector v3
+  * NEW❗: Driving Model additions
+    * Certified Herbalist v2 (February 13, 2024) - CHv2
+    * Certified Herbalist (February 5, 2024) - CH
+    * Los Angeles v2 (January 24, 2024) - LAv2
+    * Los Angeles (January 22, 2024) - LAv1
+  * NEW❗: Model Caching thanks to DevTekVE!
+    * Model caching allows the selection of previously downloaded Driving Model
+    * Users can now access cached versions of selected models, eliminating redundant downloads for previously fetched models
+  * Legacy Driving Models support
+    * New Delhi (December 21, 2023) - ND
+    * Blue Diamond v2 (December 11, 2023) - BDv2
+    * Blue Diamond (November 18, 2023) - BDv1
+    * Farmville (November 7, 2023) - FV
+    * Night Strike (October 3, 2023) - NS
+  * Certain features are deprecated with newer Driving Models
+    * Dynamic Lane Profile (DLP)
+    * Custom Offsets
+* UPDATED: Dynamic Lane Profile (DLP)
+  * Continued support for Legacy Driving Models (e.g., ND, BDv2, BDv1, FV, NS)
+  * Deprecated support for newer Driving Models (e.g., CHv2, CH, LAv2, LAv1)
+* UPDATED: Custom Offsets
+  * Continued support for Legacy Driving Models (e.g., ND, BDv2, BDv1, FV, NS)
+  * Deprecated support for newer Driving Models (e.g., CHv2, CH, LAv2, LAv1)
+* UPDATED: Hyundai/Kia/Genesis - ESCC Radar Interceptor
+  * Message parsing improvements with the latest firmware update: https://github.com/sunnypilot/panda/tree/test-escc-smdps
+* UI Updates
+  * NEW❗: Visuals: Display Feature Status toggle
+    * Display the statuses of certain features on the driving screen
+  * NEW❗: Visuals: Enable Onroad Settings toggle
+    * Display the Onroad Settings button on the driving screen to adjust feature options on the driving screen, without navigating into the settings menu
+  * REMOVED: "Device ambient" temperature option on the sidebar
+* FIXED: New comma 3X support
+* FIXED: New comma eSIM support
+* Bug fixes and performance improvements
+
+sunnypilot - 0.9.5.3 (2023-12-24)
+========================
+* UPDATED: Dynamic Experimental Control (DEC)
+  * Synced with dragonpilot-community/dragonpilot:lp-dp-beta2 commit 578d38b
+* UPDATED: Driving Model Selector v2
+  * Driving models sort in descending order based on availability date
+  * Experimental/unmerged driving models are only available in "dev-c3" branch
+    * To select and use experimental driving models, navigate to "Software" panel, select the "dev-c3" branch, and check for update
+* UPDATED: Vision-based Turn Speed Control (V-TSC) implementation
+  * Refactored implementation thanks to pfeiferj!
+  * More accurate and consistent velocity calculation to achieve smoother longitudinal control in curves
+* NEW❗: Speed Limit Warning
+  * Display alert and/or chime to warn the driver when the cruising speed is faster than the speed limit plus the Warning Offset
+  * Customizable Warning Offset, independent of Speed Limit Control (SLC)'s Limit Offset
+* UPDATED: Speed Limit Source Policy
+  * Selectable speed limit source for Speed Limit Control and Speed Limit Warning
+  * Applicable to: Speed Limit Control, Speed Limit Warning
+* UPDATED: Speed Limit Control (SLC)
+  * Engage Mode: Removed "Warning Only" mode - this has been replaced by the new Speed Limit Warning sub-menu
+* UPDATED: OpenStreetMap (OSM) implementation
+  * Refactored implementation thanks to pfeiferj!
+    * Less resource impact
+    * Significantly smaller sizes with databases
+    * All regions are available to download
+    * Weekly map updates thanks to pfeiferj!
+    * Increased the font size of the road name
+  * C3X-specific changes
+    * Altitude (ALT.) display on Developer UI
+    * Current street name on top of driving screen when "OSM Debug UI" is enabled
+* UPDATED: Map-based Turn Speed Control (M-TSC) implementation
+  * Only available in "staging-c3" and "dev-c3" branches. If you are using "release-c3" branch, navigate to "Software" panel, select the desired target branch, and check for update
+  * Refactored implementation thanks to pfeiferj!
+  * Based on the new OpenStreetMap implementation
+  * Improved predicted curvature calculations from OpenStreetMap data
+* UI updates
+  * RE-ENABLED: Navigation: Full screen support
+    * Display the map view in full screen
+    * To switch back to driving view, tap on the border edge
+* Hyundai Bayon Non-SCC 2019 support thanks to polein78!
+
+sunnypilot - 0.9.5.2 (2023-12-07)
+========================
+* NEW❗: MADS: Allow Navigate on openpilot in Chill Mode
+  * Allow navigation to feed map view into the driving model while using Chill Mode
+  * Support all platforms, including platforms that do not support openpilot longitudinal control & Experimental Mode
+* NEW❗: Neural Network Lateral Controller
+  * Formerly known as "NNFF", this replaces the lateral "torque" controller with one using a neural network trained on each car's (actually, each separate EPS firmware) driving data for increased controls accuracy
+  * Contact @twilsonco in the sunnypilot Discord server with feedback, or to provide log data for your car if your car is currently unsupported
+* NEW❗: Driving Model Selector
+  * Easily switch between driving models without reinstalling branches. Offering immediate access to the latest models upon release
+    * An internet connection is required for downloading models. Each model switch currently involves downloading the model again. Future updates may allow for offline switching
+  * Warning is displayed for metered connections to avoid unexpected data usage if on cellular data
+  * Change driving models via **Settings -> Software -> Current Driving Model**.
+* NEW❗: Hyundai CAN longitudinal:
+  * NEW❗: Enable radar tracks for certain Santa Fe platforms
+    * Internal Combustion Engine (ICE) 2021-23
+    * Hybrid 2022-23
+    * Plug-in Hybrid 2022-23
+* NEW❗: Lane Change: When manually braking with steering engaged, turning on the turn signal will default to Nudge mode
+* Volkswagen MQB CC only platforms (radar or no radar) support thanks to jyoung8607!
+
+sunnypilot - 0.9.5.1 (2023-11-17)
+========================
+* UPDATED: Synced with commaai's master commit e94c3c5
+* NEW❗: Farmville driving model
+* NEW❗: Onroad Settings Panel
+  * Onroad buttons (i.e., DLP, GAC) moved to its dedicated panel
+    * Driving Personality
+    * Dynamic Lane Profile (DLP)
+    * Dynamic Experimental Control (DEC)
+    * Speed Limit Control (SLC)
+* NEW❗: Display main feature status on onroad view in real-time
+  * GAP - Driving Personality
+  * DLP - Dynamic Lane Profile
+  * DEC - Dynamic Experimental Control
+  * SLC - Speed Limit Control
+* NEW❗: Dynamic Experimental Control (DEC) thanks to dragonpilot-community!
+  * Automatically determines and selects between openpilot ACC and openpilot End to End longitudinal based on conditions for a more natural drive
+  * Dynamic Experimental Control is only active while in Experimental Mode
+  * When Dynamic Experimental Control is ON, initially setting cruise speed will set to the vehicle's current speed
+* NEW❗: Hyundai CAN longitudinal:
+  * NEW❗: Parse lead info for camera-based SCC platforms
+    * Improve lead tracking when using openpilot longitudinal
+  * NEW❗: Parse lead distance to display on car cluster
+    * Introduced better lead distance calculation to display on the car's cluster, replacing the binary "lead visible" indication on the SCC cluster
+    * Lead distance is now categorized into different ranges for more detailed and comprehensive information to the driver similar to how stock ACC does it
+  * NEW❗: Parse speed limit sign recognition from camera for certain supported platforms
+* NEW❗: Subaru - Stop and Go auto-resume support thanks to martinl!
+  * Global (excluding Gen 2 and Hybrid) and Pre-Global support
+* NEW❗: Toyota - Stop and Go hack
+  * Allow some Toyota/Lexus cars to auto resume during stop and go traffic
+  * Only applicable to certain models and model years
+* NEW❗: Toyota: ZSS support thanks to dragonpilot-community and ErichMoraga!
+* NEW❗: MSPA (Cereal structs refactor)
+  * Make sunnypilot Parsable Again - @sshane
+  * sunnypilot is now parsable with stock openpilot tools
+* NEW❗: Display 3D buildings on map thanks to jakethesnake420!
+* openpilot Longitudianl Control capable cars only
+  * UPDATED: Gap Adjust Cruise is now a part of Driving Personality
+    * [DISTANCE/FOLLOW DISTANCE/GAP DISTANCE] physical button on the steering wheel to select Driving Personality on by default
+    * Status now viewable in onroad view or Onroad Settings Panel
+    * REMOVED: Gap Adjust Cruise toggle
+* UPDATED: Speed Limit Control (SLC)
+  * NEW❗: Speed Limit Engage Mode
+    * Select the desired mode to set the cruising speed to the speed limit
+      * Warning Only: Warn the driver when the vehicle is driven faster than the speed limit
+      * Auto: Automatic speed adjustment on motorways based on speed limit data
+      * User Confirm: Inform the driver to change set speed of Adaptive Cruise Control to help the driver stay within the speed limit
+    * Supported platforms
+      * openpilot Longitudinal Control available cars (Excluding certain Toyota/Lexus, Ford, explained below)
+      * Custom Stock Longitudinal Control available cars
+    * Unsupported platforms
+      * Toyota/Lexus and Ford - most platforms do not allow us to control the PCM's set speed, requires testers to verify
+  * NEW❗: Speed limit source selector
+    * Select the desired precedence order of sources used to adapt cruise speed to road limits
+* UPDATED: Custom Stock Longitudinal Control
+  * RE-ENABLED: Hyundai/Kia/Genesis CAN-FD platforms
+* UPDATED: Custom Offsets reimplementation
+  * Camera Offset only works in Laneful (Laneful Only or Laneful in Auto mode when using Dynamic Lane Profile)
+  * Path Offset can be applied to both Laneless and Laneful
+* UPDATED: Refactored Torque Lateral Control custom tuning menu
+  * NEW❗: Less Restrict Settings for Self-Tune (Beta)
+  * NEW❗: Custom Tuning for setting offline and live values in real-time
+* UPDATED: Auto-detect custom Mapbox token if a personal Mapbox token is provided
+  * REMOVED: "Enable Mapbox Navigation" toggle
+* UI updates
+  * New Settings menu redesign and improved interactions
+* FIXED: Retain hotspot/tethering state was not consistently saved
+* FIXED: Map stuck in "Map Loading" if comma Prime is active
+* FIXED: OpenStreetMap implementation on C3X devices
+  * M-TSC
+  * Altitude (ALT.) display on Developer UI
+  * Current street name on top of driving screen when "OSM Debug UI" is enabled
+* Hyundai Kona Non-SCC 2019 support thanks to Quex!
+* Kia Seltos Non-SCC 2023-24 support thanks to Moodkiller and jeroid_!
+
+sunnypilot - 0.9.4.1 (2023-08-11)
+========================
+* UPDATED: Synced with commaai's 0.9.4 release
+* NEW❗: Moonrise driving model
+* NEW❗: Ford upstream models support
+* UPDATED: Dynamic Lane Profile selector in the "SP - Controls" menu
+* REMOVED: Dynamic Lane Profile driving screen UI button
+* FIXED: Disallow torque lateral control for angle control platforms (e.g. Ford, Nissan, Tesla)
+  * Torque lateral control cannot be used by angle control platforms, and would cause a "Controls Unresponsive" error if Torque lateral control is enforced in settings
+* REMOVED: Speed Limit Style override
+* Honda Accord 2016-17 support thanks to mlocoteta!
+  * Serial Steering hardware required. For more information, see https://github.com/mlocoteta/serialSteeringHardware
+* mapd: utilize advisory speed limit in curves (#142) thanks to pfeiferj!
+
+sunnypilot - 0.9.3.1 (2023-07-09)
+========================
+* UPDATED: Synced with commaai's 0.9.3 release
+* NEW❗: Display Temperature on Sidebar toggle
+  * Display Ambient temperature, memory temperature, CPU core with the highest temperature, GPU temperature, or max of Memory/CPU/GPU on the sidebar
+  * Replace "Display CPU Temperature on Sidebar" toggle
+* NEW❗: Hot Coffee driving model
+* NEW❗: HKG CAN: Smoother Stopping Performance (Beta) toggle
+  * Smoother stopping behind a stopped car or desired stopping event.
+  * This is only applicable to HKG CAN platforms using openpilot longitudinal control
+* NEW❗: Toyota: TSS2 longitudinal: Custom Tuning
+  * Smoother longitudinal performance for Toyota/Lexus TSS2/LSS2 cars thanks to dragonpilot-community!
+* NEW❗: Enable Screen Recorder toggle
+  * Enable this will display a button on the onroad screen to toggle on or off real-time screen recording with UI elements.
+* IMPROVED: Dynamic Lane Profile: when using Laneline planner via Laneline Mode or Auto Mode, enforce Laneless planner while traveling below 10 MPH or 16 km/h
+* REMOVED: Display CPU Temperature on Sidebar
+
+sunnypilot - 0.9.2.3 (2023-06-18)
+========================
+* NEW❗: Auto Lane Change: Delay with Blind Spot
+  * Toggle to enable a delay timer for seamless lane changes when blind spot monitoring (BSM) detects an obstructing vehicle, ensuring safe maneuvering
+* NEW❗: Driving Screen Off: Wake with Non-Critical Events
+  * When Driving Screen Off Timer is not set to "Always On":
+    * Enabled: Wake the brightness of the screen to display all events
+    * Disabled: Wake the brightness of the screen to display critical events
+  * Currently, all non-nudge modes are default to continue lane change after 1 seconds of blind spot detection
+* NEW❗: Fleet Manager PIN Requirement toggle
+  * User can now enable or disable PIN requirement on the comma device before accessing Fleet Manager
+* NEW❗: Reset all sunnypilot settings toggle
+* NEW❗: Turn signals display on screen when blinker is used
+  * Green: Blinker is on
+  * Red: Blinker is on, car detected in the adjacent blind spot or road edge detected
+* IMPROVED: mapd: better exceptions handling when loading dependencies
+* UPDATED: Green Traffic Light Chime no longer displays an orange border when executed
+* FIXED: mapd: Road name flashing caused by desync with last GPS timestamp
+* FIXED: Ram HD (2500/3500): Ignore paramsd sanity check
+  * Live parameters have trouble with self-tuning on this platform with upstream openpilot 0.9.2
+* Hyundai: Longitudinal support for CAN-based Camera SCC cars thanks to Zack1010OP's Patreon sponsor!
+
+sunnypilot - 0.9.2.2 (2023-06-13)
+========================
+* NEW❗: Toyota: Allow M.A.D.S. toggling with LKAS Button (Beta)
+* IMPROVED: Ram: cruise button handling
+
+sunnypilot - 0.9.2.1 (2023-06-10)
+========================
+* UPDATED: Synced with commaai's 0.9.2 release
+* UPDATED: feature revamp with better stability
+* UPDATED:
+  * M.A.D.S.
+    * Path color becomes LIGHT ORANGE during Driver Steering Override
+  * Gap Adjust Cruise (now known as Driving Personality in upstream openpilot 0.9.3):
+    * Updated profiles and jerk changes
+    * Experimental Mode support
+    * Three settings: Stock, Aggressive, and Maniac
+    * Stock is recommended and the default
+    * In Aggressive/Maniac mode, lead follow distance is shorter and quicker gas/brake response
+  * Dynamic Lane Profile
+    * Display blue borders on both sides of the driving path when Laneline mode is being used in the planner
+    * Auto Mode optimization
+      * Permanent: Laneless during Auto Lane Change execution
+  * Mapd
+    * OpenStreetMap Database: new regions added
+  * Developer UI (Dev UI)
+    * REMOVED: 2-column design
+    * NEW❗: 1-column + 1-row design
+  * Custom Stock Longitudinal Control
+    * NEW❗: Chrysler/Jeep/Ram support
+    * NEW❗: Mazda support
+    * NEW❗: Volkswagen PQ support
+    * DISABLED: Hyundai/Kia/Genesis CAN-FD platforms
+* NEW❗: Switch between Chill (openpilot ACC) and Experimental (E2E longitudinal) with DISTANCE button on the steering wheel
+  * To switch between Chill and Experimental Mode: press and hold the DISTANCE button on the steering wheel for over 0.5 second
+  * All openpilot longitudinal capable cars support
+* NEW❗: Nicki Minaj driving model
+* NEW❗: Nissan and Mazda upstream models support
+* NEW❗: Pre-Global Subaru upstream models support
+* NEW❗: Display End-to-end Longitudinal Status (Beta)
+  * Display an icon that appears when the End-to-end model decides to start or stop
+* NEW❗: Green Traffic Light Chime (Beta)
+  * A chime will play when the traffic light you are waiting for turns green, and you have no vehicle in front of you.
+* NEW❗: Lead Vehicle Departure Alert
+  * Notify when the leading vehicle drives away
+* NEW❗: Speedometer: Display True Speed
+  * Display the true vehicle current speed from wheel speed sensors.
+* NEW❗: Speedometer: Hide from Onroad Screen
+* NEW❗: Auto-Hide UI Buttons
+  * Hide UI buttons on driving screen after a 30-second timeout. Tap on the screen at anytime to reveal the UI buttons
+  * Applicable to Dynamic Lane Profile (DLP) and Gap Adjust Cruise (GAC)
+* NEW❗: Display DM Camera in Reverse Gear
+  * Show Driver Monitoring camera while the car is in reverse gear
+* NEW❗: Block Lane Change: Road Edge Detection (Beta)
+  * Block lane change when road edge is detected on the stalk actuated side
+* NEW❗: Display CPU Temperature on Sidebar
+  * Display the CPU core with the highest temperature on the sidebar
+* NEW❗: Display current driving model in Software settings
+* NEW❗: HKG: smartMDPS automatic detection (installed with applicable firmware)
+* FIXED: Unintended siren/alarm from the comma device if the vehicle is turned off too quickly in PARK gear
+* FIXED: mapd: Exception handling for loading dependencies
+* Fleet Manager via Browser support thanks to actuallylemoncurd, AlexandreSato, ntegan1, and royjr!
+  * Access your dashcam footage, screen recordings, and error logs when the car is turned off
+  * Connect to the device via Wi-Fi, mobile hotspot, or tethering on the comma device, then navigate to http://ipAddress:5050 to access.
+* Honda Clarity 2018-22 support thanks to mcallbosco, vanillagorillaa and wirelessnet2!
+* Ram: Steer to 0/7 MPH support thanks to vincentw56!
+* Retain hotspot/tethering state across reboots thanks to rogerioaguas!
+
+sunnypilot - Version Latest (2023-02-22)
+========================
+* UPDATED: Synced with commaai's master branch - 2023.02.19-04:52:00:GMT - 0.9.2
+* Refactor sunnypilot features to be more stable
+
+sunnypilot - Version Latest (2022-12-16)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.12.16-06:31:00:GMT - 0.9.1
+* NEW❗: GM:
+    * NEW❗: Gap Adjust Cruise support - Chill, Normal, Aggressive
+    * NEW❗: Experimental Mode: Hold DISTANCE button on the steering wheel for 0.5 second to switch between Experimental Mode and Chill Mode
+* REMOVED❌: Toytoa: SnG Hack
+    * This method is not recommended and may cause some cars to not behave as expected
+    * SDSU is strongly recommended to enable SnG for Toyota vehicles without SnG from factory
+* commaai: radard: add missing accel data for vision-only leads (commaai/openpilot#26619) - pending PR
+    * VOACC performance is drastically improved when using Chill Mode
+* IMPROVED: M.A.D.S. events handling
+* IMPROVED: UI: screen recorder button change
+* IMPROVED: OpenStreetMap Offline Database optimization
+* FIXED: Toyota: vehicles' LKAS button no longer has a delay with toggling M.A.D.S.
+* FIXED: Toyota: brake pedal press at standstill causing Cruise Fault
+* FIXED: Volkswagen MQB: reduce Camera Malfunction occurrences (requires testing)
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-12-10)
+========================
+* IMPROVED: NEW❗ Developer UI design
+    * Second column metrics is now moved to the bottom of the screen
+        * ACC. = Acceleration
+        * L.S. = Lead Speed
+        * E.T. = EPS Torque
+        * B.D. = Bearing Degree
+        * FRI. = Friction
+        * L.A. = Lateral Acceleration
+        * ALT. = Altitude
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-12-07)
+========================
+* NEW❗: Screen Recorder support thanks to neokii and Kumar!
+* NEW❗: End-to-end longitudinal start/stop status icon
+    * Only appears when Experimental Mode is enabled
+* NEW❗: End-to-end longitudinal car chime when starting
+    * Hyundai/Kia/Genesis CAN platform, Honda/Acura Bosch/Nidec, Toyota/Lexus
+    * i.e. Traffic light turns green, stop sign ready to go, etc.
+    * Only appears when Experimental Mode is enabled AND longitudinal control is disengaged
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-12-05)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.12.04-22:46:00:GMT - 0.9.1
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-11-12)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.11.12-10:02:00:GMT - 0.8.17
+* FIXED: CAN Error for CAN HKG cars that do not have navigation from the factory
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-11-11)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.11.11-21:22:00:GMT - 0.8.17
+* commaai: AGNOS 6.2 (commaai/openpilot#26441)
+* NEW❗: Speed Limit Control - HKG - add speed limit from car's navigation head unit
+    * Compatible with certain models, trims, and model years
+* DISABLED: FCA: RAM HD - steer down to 0
+* FIXED: UI: End-to-end longitudinal button on driving screen synchronization
+* FIXED: Honda: Longitudinal status with set cruise speed now displays properly in the car's dashboard
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-11-08)
+========================
+* ADDED: New Zealand offline OpenStreetMap database
+
+sunnypilot - Version Latest (2022-11-04)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.11.05-01:44:00:GMT - 0.8.17
+* RE-ENABLED: Dynamic Lane Profile - preserves lanelines
+    * Can be found in "SP - Controls" menu
+* NEW❗: DLP: switch to laneless for current/future curves thanks to @twilsonco!
+    * Can be found in "SP - Controls" menu
+* NEW❗: UI: Road Camera Selector
+    * Enable this will display a button on the driving screen to select the driving camera
+    * Can be found in "SP - Visuals" menu
+* NEW❗: Controls: Camera & Path Custom Offsets
+    * Only applicable to laneline mode when using Dynamic Lane Profile
+* NEW❗: Buttons on driving screen are now sorted based on priority and availability
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-28)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.28-03:53:00:GMT - 0.8.17
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-26)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.26-06:20:00:GMT - 0.8.17
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-25)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.25-23:53:00:GMT - 0.8.17
+* Pre-Global Subaru support thanks to @martinl!
+* NEW❗: Speed Limit values turn red when current speed is higher than posted speed limit
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-23)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.22-23:15:00:GMT - 0.8.17
+* IMPROVED: Custom Stock Longitudinal Control - HKG - only allow engagement on user button press
+* IMPROVED: Custom Stock Longitudinal Control - Volkswagen MQB & PQ - more consistent set speed change
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-21)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.21-17:33:00:GMT - 0.8.17
+* IMPROVED: Custom Stock Longitudinal Control - Volkswagen MQB & PQ - more predictable button send logic
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-20)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.20-20:25:00:GMT - 0.8.17
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-19)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.19-08:31:00:GMT - 0.8.17
+* IMPROVED: Controls: Speed Limit Control - accelerator press only disengage if "Disengage on Accelerator Pedal" is enabled
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-18)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.18-04:44:00:GMT - 0.8.17
+* RE-ENABLED: Volkswagen MQB & PQ with Custom Stock Longitudinal Control
+* NEW❗: Steering Rate Cost Live Tune
+    * Enables live tune for Steering Rate Cost. Lower value allows steering wheel to move more freely at low speed
+    * Can be found in "SP - Controls" menu
+* FIXED: MADS: GM - include Regen Paddle logic thanks to @twilsonco!
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-17)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.17-23:54:00:GMT+1 - 0.8.17
+* ENABLED: "Custom Stock Longitudinal Control" toggle for CAN-FD cars
+* FIXED: HKG CAN-FD: Could not engage when openpilot longitudinal is enabled
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-13)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.13-19:43:00:GMT+1 - 0.8.17
+* ADDED: Live Tmux toggle
+    * Can be found in "SP - General" menu
+* IMPROVED: OpenStreetMap Database Update - only check for database update with explicit user decision
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-11)
+========================
+* ADDED: Hyundai openpilot longitudinal improvements - huge thanks to @aragon7777!
+* ADDED: Check for OpenStreetMap Database Update button
+* UPDATED: commaai: Low speed lateral control improvements (commaai:openpilot#26022, bbcd448) - pending PR
+* FIXED: MUTCD speed limit spacing adjusts dynamically when no subtext is shown (i.e., speed limit offset, distance to next speed limit)
+* FIXED: MADS: Intermittent CAN Error when engaging for Toyota Prius TSS-P
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-09)
+========================
+* ADDED: commaai: Low speed lateral control improvements (commaai:openpilot#26022, bca288bb) - pending PR
+* FIXED: MADS: Intermittent CAN Error when engaging for Toyota Prius TSS-P
+* IMPROVED: mapd: stop signs and other supported traffic_calming tags are now slowing/stopping as expected
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-08)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.08-12:07:00:GMT+1 - 0.8.17
+* FIXED: MADS: Intermittent CAN Error when engaging for Toyota Prius TSS-P
+* IMPROVED: mapd: Speed Humps are now set at 20 MPH or 32 km/h
+* IMPROVED: OpenStreetMap Offline Database download experience
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-10-07)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.10.07-08:16:00:GMT - 0.8.17
+* NEW❗: OpenStreetMap database can now be downloaded locally for offline use
+    * Now offering US South, US West, US Northeast, US Florida, Taiwan, and South Africa
+    * Databases updated - 2022.10.05-03:30:00:GMT
+* NEW❗: mapd: Stop Sign, Yield, Speed Bump, Speed Hump, Sharp Curve support - huge thanks to @move-fast and @dragonpilot-community!
+    * Go to https://openstreetmap.org and start mapping out your area!
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-09-30)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.30-22:43:00:GMT - 0.8.17
+* RE-ADDED: Torque Lateral Controller Live Tune Menu
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-09-23)
+========================
+* ADDED: Developer UI: latAccelFactorFiltered & frictionCoefficientFiltered values displays in green if Torque is using live params
+* Bug fixes and performance improvements
+
+sunnypilot - Version Latest (2022-09-22)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.19-22:19:00:GMT - 0.8.17
+* NEW❗: Toggle to explicitly enable Custom Stock Longitudinal Control
+    * Applicable cars only: Honda, Hyundai/Kia/Genesis
+    * Settings -> Toggles menu
+
+sunnypilot - Version Latest (2022-09-21)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.19-22:19:00:GMT - 0.8.17
+* ADDED: Toggle to enable Live Torque (self/auto tune) with Torque lateral controller
+    * To enable, first enable "Enforce Torque Lateral Controller" toggle
+* UPDATED: New metrics in Developer UI (when Live Torque is enabled)
+    * REMOVED: latAccelFactorRaw & frictionCoefficientRaw from torqued
+    * ADDED: latAccelFactorFiltered & frictionCoefficientFiltered from torqued
+* REMOVED: Temporary remove Torque Lateral Controller Live Tune Menu
+
+sunnypilot - Version Latest (2022-09-20)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.19-22:19:00:GMT - 0.8.17
+* ADDED: Toggle to enable Live Torque (self/auto tune) with Torque lateral controller
+    * To enable, first enable "Enforce Torque Lateral Controller" toggle
+* REMOVED: Temporary remove Torque Lateral Controller Live Tune Menu
+
+sunnypilot - Version Latest (2022-09-18)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.17-11:23:00:GMT - 0.8.17
+* ADDED: Kia Forte Non-SCC 2019 support for @askalice
+* FIXED: Torque Lateral Control Live Tune now syncs with commaai:openpilot#25822
+* FIXED: mapd dependencies no longer need to be re-downloaded after unknown reboots
+
+sunnypilot - Version Latest (2022-09-17)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.17-11:23:00:GMT - 0.8.17
+* NEW❗: Non SCC HKG support
+    * Custom Stock Longitudinal Control
+    * ❗No❗ openpilot longitudinal control
+* FIXED: Honda Bosch random low-value set speed changes
+
+sunnypilot - Version Latest (2022-09-16)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.16-20:23:00:GMT - 0.8.17
+
+sunnypilot - Version Latest (2022-09-15)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.16-02:00:00:GMT - 0.8.17
+* FIXED: Block additional auto lane change actions if blinker stays on after the first lane change
+* REVERTED: Some Toyota with LKAS button no longer requires double press to engage/disengage M.A.D.S.
+
+sunnypilot - Version Latest (2022-09-14)u
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.11-02:47:00:GMT - 0.8.17
+* NEW❗: GM models supported in Force Car Recognition (FCR)
+    * Under "SP - Vehicles"
+* NEW❗: Prompt to select car in "SP - Vehicles" if car unrecognized on startup
+* FIXED: Some Toyota with LKAS button no longer requires double press to engage/disengage M.A.D.S.
+* UPDATED: ESCC: Use radar tracks from radar if available
+
+sunnypilot - Version Latest (2022-09-13)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.11-02:47:00:GMT - 0.8.17
+* NEW❗: New metric in Developer UI
+    * Actual Lateral Acceleration (Roll Compensated)
+
+sunnypilot - Version Latest (2022-09-12)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.11-02:47:00:GMT - 0.8.17
+* FIXED: Honda Nidec models not gaining speed when longitudinal engaged
+
+sunnypilot - Version Latest (2022-09-11)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.11-02:47:00:GMT - 0.8.17
+* NEW❗: Hyundai Enhanced SCC now forwards FCW and AEB signals and commands from radar to car
+* RE-ENABLED: MADS Status Icon toggle
+
+sunnypilot - Version Latest (2022-09-10)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.11-02:47:00:GMT - 0.8.17
+* NEW❗: RAM improvement implementation thanks to realfast!
+* DISABLED: Chrysler/Jeep/Ram with Custom Stock Longitudinal Control
+* DISABLED: Volkswagen MQB & PQ with Custom Stock Longitudinal Control
+
+sunnypilot - Version Latest (2022-09-09)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.09-07:35:00:GMT - 0.8.17
+* NEW❗: MADS now supporting General Motors (GM)
+* ADDED: Custom Stock Longitudinal Control - Volkswagen
+    * MQB & PQ
+* ADDED: Reverse ACC Change
+    * ACC +/-: Short=5, Long=1
+* ADDED: Custom Stock Longitudinal Control
+    * Hyundai/Kia/Genesis
+    * Honda Bosch
+* ADDED: Hyundai: 2015-16 Genesis resume from standstill fix (commaai:openpilot#25579) - pending PR
+* Vision Turn Speed Control re-enabled
+* Disable Onroad Uploads toggle re-enabled
+
+sunnypilot - Version Latest (2022-09-08)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.08-04:05:00:GMT - 0.8.17
+* NEW❗: Block lane change initiation while brake is pressed
+
+sunnypilot - Version Latest (2022-09-07)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.08-04:05:00:GMT - 0.8.17
+* NEW❗: Display End-to-end longitudinal 🌮 on screen
+    * NEW❗: Hold DISTANCE button on the steering wheel for 1 second to switch between E2E Long and ACC mode
+    * Enable toggle on the driving screen to switch between modes with End-to-end longitudinal
+    * Only applicable to cars with openpilot longitudinal control
+* NEW❗: Block lane change initiation while brake is pressed
+* REMOVED: Dynamic Lane Profile - upstream laneless model is now on by default
+* REMOVED: hyundai: consistent start from stop (commaai:openpilot#25672) - pending PR
+
+sunnypilot - Version Latest (2022-09-06)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.06 - 0.8.17
+* NEW❗: Display useful metrics above the chevron that tracks the lead car
+    * Under "SP - Visuals" menu
+    * Only applicable to cars with openpilot longitudinal control
+* ADDED: hyundai: consistent start from stop (commaai:openpilot#25672) - pending PR
+* FIXED: Vienna speed limit interface now scales properly with the outer box
+* REMOVED: Hyundai long improvements (commaai:openpilot#25604) - closed PR
+
+sunnypilot - Version Latest (2022-09-05)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.03 - 0.8.17
+* NEW❗: Speed Limit Control (SLC) interface integrated with upstream
+* NEW❗: Speed limit from active navigation is now prioritized for Speed Limit Control
+* NEW❗: MUTCD (U.S.) or Vienna (E.U.) speed limit interfaces can now be selected under "SP - Controls"
+
+sunnypilot - Version Latest (2022-09-04)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.03 - 0.8.17
+* FIXED: Gap Adjust Cruise status now displays properly on screen
+* FIXED: mapd - missing index in list caused mapd to crash
+* REMOVED: Temporary removed Vision Turn Speed Control
+
+sunnypilot - Version Latest (2022-09-03)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.09.03 - 0.8.17
+* ADDED: New border colors for different operation engagements
+* ADDED: UI: Show barrier when car detected in blind spot
+    * Only applicable to cars that have BSM detection with openpilot
+* FIXED: Cruise Cancel button no longer display prompt if cruise not engaged
+* TWEAKED: Update changelogs on startup in Settings -> Software -> Version
+* REMOVED: Upload Raw Logs and Full Resolution Videos toggles
+
+sunnypilot - Version Latest (2022-08-31)
+========================
+* UPDATED: Synced with commaai's master branch - 2022.08.31 - 0.8.17
+* ADDED: New border colors for different operation engagements
+* ADDED: UI: Show barrier when car detected in blind spot
+    * Only applicable to cars that have BSM detection with openpilot
+* FIXED: Cruise Cancel button no longer display prompt if cruise not engaged
+* REMOVED: Upload Raw Logs and Full Resolution Videos toggles
+
+sunnypilot - Version 0.8.16 (2022-07-16)
+========================
+* Sync with commaai's master branches
+* NEW❗: Add toggle to pause lateral actuation below 30 MPH / 50 KM/H
+* IMPROVED: Better controls mismatch handling
+* IMPROVED: Less frequent Low Memory alert
+* IMPROVED: Only allow lateral control when in forward gears
+* IMPROVED: Better alerts handling on gear changes
+
+sunnypilot - Version 0.8.14-1.3 (2022-06-29)
+========================
+* Hyundai/Kia/Genesis
+    * NEW❗: MADS: Add GAP/Distance button on the steering wheel to engage/disengage
+        * To engage/disengage MADS: Hold the button for 0.5 second
+* NEW❗: Dynamic Lane Profile: Add toggle to enable "Laneless for Curves in Auto Lane"
+* HOTFIX🛠: Improve Torque lateral control and reduce ping pong for some Toyota cars
+    * Torque control: higher low speed gains and better steering angle deadzone logic
+* Developer UI: Remove Distance Traveled, replace with Memory Usage %
+    * This may have a potential to fix the Low Memory alert that may appear
+
+sunnypilot - Version 0.8.14-1 (2022-06-27)
+========================
+* HOTFIX🛠: Honda, Toyota, Volkswagen now initialized correctly with Torque Lateral Live Tune
+
+sunnypilot - Version 0.8.14-1 (2022-06-27)
+========================
+* NEW❗: Added toggle to enable updates for sunnypilot
+* HOTFIX🛠: Volkswagen car list now displays properly in Force Car Recognition menu
+* REVERTED: Honda - temporary removes CRUISE (MAIN) for MADS engagement
+    * LKAS button continues to be used for MADS engagement/disengagement
+
+sunnypilot - Version 0.8.14-1 (2022-06-26)
+========================
+Visit https://bit.ly/sunnyreadme for more details
+* sunnypilot 0.8.14 release - based on openpilot 0.8.14 devel
+* "0.8.14-prod-c3" branch only supports comma three
+    * If you have a comma two, EON, or other devices than a comma three, visit sunnyhaibin's discord server for more details: https://discord.gg/wRW3meAgtx
+* Mono-branch support
+    * Honda/Acura
+    * Hyundai/Kia/Genesis
+    * Toyota/Lexus
+    * Volkswagen MQB
+* Modified Assistive Driving Safety (MADS) Mode
+    * NEW❗: CRUISE (MAIN) now engages MADS for all supported car makes
+    * NEW❗: Added toggle to disable disengaging Automatic Lane Centering (ALC) on the brake pedal
+* Dynamic Lane Profile (DLP)
+* NEW❗: Gap Adjust Cruise (GAC)
+    * openpilot longitudinal cars can now adjust between the lead car's following distance gap via 3 modes:
+        * Steering Wheel (SW) | User Interface (UI) | Steering Wheel + User Interface (SW+UI)
+* NEW❗: Custom Camera & Path Offsets
+* NEW❗: Torque Lateral Control from openpilot 0.8.15 master (as of 2022-06-15)
+* NEW❗: Torque Lateral Control Live Tune Menu
+* NEW❗: Speed Limit Sign from openpilot 0.8.15 master (as of 2022-06-22)
+* NEW❗: Mapbox Speed Limit data will now be utilized in Speed Limit Control (SLC)
+    * Speed limit data will be utilized in the following availability:
+        * Mapbox (active navigation) -> OpenStreetMap -> Car Interface (Toyota's TSR)
+* Custom Stock Longitudinal Control
+    * NEW❗: Volkswagen MQB
+    * Honda
+    * Hyundai/Kia/Genesis
+* NEW❗: Mapbox navigation support for non-Prime users
+    * Visit sunnyhaibin's discord server for more details: https://discord.gg/wRW3meAgtx
+* Hyundai/Kia/Genesis
+    * NEW❗: Enhanced SCC (ESCC) Support
+        * Requires hardware modification. Visit sunnyhaibin's discord server for more details: https://discord.gg/wRW3meAgtx
+    * NEW❗: Smart MDPS (SMDPS) Support - Auto-detection
+        * Requires hardware modification and custom firmware for the SMDPS. Visit sunnyhaibin's discord server for more details: https://discord.gg/wRW3meAgtx
+* Toyota/Lexus
+    * NEW❗: Added toggle to enforce stock longitudinal control
+
+sunnypilot - Version 0.8.12-4
+========================
+* NEW❗: Custom Stock Longitudinal Control by setting the target speed via openpilot's "MAX" speed thanks to multikyd!
+    * Speed Limit Control
+    * Vision-based Turn Control
+    * Map-based Turn Control
+* NEW❗: HDA status integration with Custom Stock Longitudinal Control on applicable HKG cars only
+* NEW❗: Roll Compensation and SteerRatio fix from comma's 0.8.13
+* NEW❗: Dev UI to display different metrics on screen
+    * Click on the "MAX" box on the top left of the openpilot display to toggle different metrics display
+    * Lead car relative distance; Lead car relative speed; Actual steering degree; Desired steering degree; Engine RPM; Longitudinal acceleration; Lead car actual speed; EPS torque; Current altitude; Compass direction
+* NEW❗: Stand Still Timer to display time spent at a stop with M.A.D.S engaged (i.e., stop lights, stop signs, traffic congestions)
+* NEW❗: Current car speed text turns red when the car is braking
+* NEW❗: Export GPS tracks into GPX files and upload to OSM thanks to eFini!
+* NEW❗: Enable ACC and M.A.D.S with a single press of the RES+/SET- button
+* NEW❗: ACC +/-: Short=5, Long=1
+    * Change the ACC +/- buttons behavior with cruise speed change in openpilot
+    * Disabled (Stock):  Short=1, Long=5
+    * Enabled:  Short=5, Long=1
+* NEW❗: Speed Limit Value Offset (not %)*
+    * Set speed limit higher or lower than actual speed limit for a more personalized drive.
+    * *To use this feature, turn off "Enable Speed Limit % Offset"*
+* NEW❗: Dedicated icon to show the status of M.A.D.S.
+* NEW❗: No Offroad Fix for non-official devices that cannot shut down after the car is turned off
+* NEW❗: Stop N' Go Resume Alternative
+    * Offer alternative behavior to auto resume when stopped behind a lead car using stock SCC/ACC. This feature removes the repeating prompt chime when stopped and/or allows some cars to use auto resume (i.e., Genesis)
+* IMPROVED: Show the lead car icon in the car's dashboard when a lead car is detected by openpilot's camera vision
+* FIXED: MADS button unintentionally set MAX when using stock longitudinal control thanks to Spektor56!
+
+sunnypilot - Version 0.8.12-3
+========================
+* NEW❗: Bypass "System Malfunction" alert toggle
+    * Prevent openpilot from returning the "System Malfunction" alert that hinders the ability use openpilot
+* FIXED: Hyundai/Kia/Genesis Brake Hold Active now outputs the correct events on screen with M.A.D.S. engaged
+
+sunnypilot - Version 0.8.12-2
+========================
+* NEW❗: Disable M.A.D.S. toggle to disable the beloved M.A.D.S. feature
+    * Enable Stock openpilot engagement/disengagement
+* ADJUST: Initialize Driving Screen Off Brightness at 50%
+
+sunnypilot - Version 0.8.12-1
+========================
+* sunnypilot 0.8.12 release - based on openpilot 0.8.12 devel
+* Dedicated Hyundai/Kia/Genesis branch support
+* NEW❗: OpenStreetMap integration thanks to the Move Fast team!
+    * NEW❗: Vision-based Turn Control
+    * NEW❗: Map-Data-based Turn Control
+    * NEW❗: Speed Limit Control w/ optional Speed Limit Offset
+    * NEW❗: OpenStreetMap integration debug UI
+    * Only available to openpilot longitudinal enabled cars
+* NEW❗: Hands on Wheel Monitoring according to EU r079r4e regulation
+* NEW❗: Disable Onroad Uploads for data-limited Wi-Fi hotspots when using OpenStreetMap related features
+* NEW❗: Fast Boot (Prebuilt)
+* NEW❗: Auto Lane Change Timer
+* NEW❗: Screen Brightness Control (Global)
+* NEW❗: Driving Screen Off Timer
+* NEW❗: Driving Screen Off Brightness (%)
+* NEW❗: Max Time Offroad
+* Improved user feedback with M.A.D.S. operations thanks to Spektor56!
+    * Lane Path
+        * Green🟢 (Laneful), Red🔴 (Laneless): M.A.D.S. engaged
+        * White⚪: M.A.D.S. suspended or disengaged
+        * Black⚫: M.A.D.S. engaged, steering is being manually override by user
+    * Screen border now only illuminates Green when SCC/ACC is engaged
+
+sunnypilot - Version 0.8.10-1 (Unreleased)
+========================
+* sunnypilot 0.8.10 release - based on openpilot 0.8.10 `devel`
+* Add Toyota cars to Force Car Recognition
+
+sunnypilot - Version 0.8.9-4
+========================
+* Hyundai: Fix Ioniq Hybrid signals
+
+sunnypilot - Version 0.8.9-3
+========================
+* Update home screen brand and version structure
+
+sunnypilot - Version 0.8.9-2
+========================
+* Added additional Sonata Hybrid Firmware Versions
+* Features
+    * Modified Assistive Driving Safety (MADS) Mode
+    * Dynamic Lane Profile (DLP)
+    * Quiet Drive 🤫
+    * Force Car Recognition (FCR)
+    * PID Controller: add kd into the stock PID controller
+
+sunnypilot - Version 0.8.9-1
+========================
+* First changelog!
+* Features
+    * Modified Assistive Driving Safety (MADS) Mode
+    * Dynamic Lane Profile (DLP)
+    * Quiet Drive 🤫
+    * Force Car Recognition (FCR)
+    * PID Controller: add kd into the stock PID controller

Dockerfile.openpilot_base

@@ -13,7 +13,7 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 COPY tools/install_ubuntu_dependencies.sh /tmp/tools/
-RUN /tmp/tools/install_ubuntu_dependencies.sh && \
+RUN INSTALL_EXTRA_PACKAGES=no /tmp/tools/install_ubuntu_dependencies.sh && \
     rm -rf /var/lib/apt/lists/* /tmp/* && \
     cd /usr/lib/gcc/arm-none-eabi/* && \
     rm -rf arm/ thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp

Jenkinsfile

@@ -82,7 +82,7 @@ def deviceStage(String stageName, String deviceType, List extra_env, def steps)
 
     lock(resource: "", label: deviceType, inversePrecedence: true, variable: 'device_ip', quantity: 1, resourceSelectStrategy: 'random') {
       docker.image('ghcr.io/commaai/alpine-ssh').inside('--user=root') {
-        timeout(time: 35, unit: 'MINUTES') {
+        timeout(time: 20, unit: 'MINUTES') {
           retry (3) {
             device(device_ip, "git checkout", extra + "\n" + readFile("selfdrive/test/setup_device_ci.sh"))
           }
@@ -95,6 +95,42 @@ def deviceStage(String stageName, String deviceType, List extra_env, def steps)
   }
 }
 
+def pcStage(String stageName, Closure body) {
+  node {
+  stage(stageName) {
+    if (currentBuild.result != null) {
+        return
+    }
+
+    checkout scm
+
+    def dockerArgs = "--user=batman -v /tmp/comma_download_cache:/tmp/comma_download_cache -v /tmp/scons_cache:/tmp/scons_cache -e PYTHONPATH=${env.WORKSPACE} --cpus=8 --memory 16g -e PYTEST_ADDOPTS='-n8'";
+
+    def openpilot_base = retryWithDelay (3, 15) {
+      return docker.build("openpilot-base:build-${env.GIT_COMMIT}", "-f Dockerfile.openpilot_base .")
+    }
+
+    lock(resource: "", label: 'pc', inversePrecedence: true, quantity: 1) {
+      openpilot_base.inside(dockerArgs) {
+        timeout(time: 20, unit: 'MINUTES') {
+          try {
+            retryWithDelay (3, 15) {
+              sh "git config --global --add safe.directory '*'"
+              sh "git submodule update --init --recursive"
+              sh "git lfs pull"
+            }
+            body()
+          } finally {
+              sh "rm -rf ${env.WORKSPACE}/* || true"
+              sh "rm -rf .* || true"
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 def setupCredentials() {
   withCredentials([
     string(credentialsId: 'azure_token', variable: 'AZURE_TOKEN'),

README.md

@@ -1,98 +1,460 @@
-<div align="center" style="text-align: center;">
+![](https://user-images.githubusercontent.com/47793918/233812617-beab2e71-57b9-479e-8bff-c3931347ca40.png)
 
-<h1>openpilot</h1>
+Table of Contents
+=======================
 
-<p>
-  <b>openpilot is an operating system for robotics.</b>
+* [Join our Discord](#-join-our-discord)
+* [What is sunnypilot?](#-what-is-sunnypilot)
+* [Running in a car](#-running-on-a-dedicated-device-in-a-car)
+* [Read Before Installing](#-read-before-installing)
+* [Prohibited Safety Modifications](#-prohibited-safety-modifications)
+* [Installation](#-installation)
+* [Highlight Features](#-highlight-features)
+* [Driving Enhancements](#-driving-enhancements)
+* [Branch Definitions](#-branch-definitions)
+* [Recommended Branches](#-recommended-branches)
+* [How-To's](#-How-Tos)
+* [Pull Requests](#-Pull-Requests)
+* [Special Thanks](#-special-thanks)
+* [User Data](#-user-data)
+* [Licensing](#licensing)
+* [Donate](#-support-sunnypilot)
+
+---
+
+<details><summary><h3>💭 Join our Discord</h3></summary>
+
+---
+
+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)
+
+</details>
+
+<details><summary><h3>🌞 What is sunnypilot?</h3></summary>
+
+---
+
+[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 250+ supported car makes and models with modified behaviors of driving assist engagements. sunnypilot complies with comma.ai's safety rules as accurately as possible.
+
+</details>
+
+<details><summary><h3>🚘 Running on a dedicated device in a car</h3></summary>
+
+---
+
+To use sunnypilot in a car, you need the following:
+* A supported device to run this software
+    * a [comma three](https://comma.ai/shop/products/three), or
+    * a comma two (only with older versions below 0.8.13)
+* This software
+* One of [the 250+ 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).
+
+</details>
+
+<details><summary><h3>🚨 Read Before Installing</h3></summary>
+
+---
+
+It is recommended to read this **entire page** before proceeding. This will ensure that you fully understand each added feature on sunnypilot, and you are selecting the right branch for your car to have the best driving experience.
+
+This is a fork of [comma.ai's openpilot](https://github.com/commaai/openpilot). By installing this software, you accept all responsibility for anything that might occur while you use it. All contributors to sunnypilot are not liable. ❗<ins>**Use at your own risk.**</ins>❗
+
+</details>
+
+<details><summary><h3>⛔ Prohibited Safety Modifications</h3></summary>
+
+---
+
+All [official sunnypilot branches](https://github.com/sunnyhaibin/sunnypilot/branches) strictly adhere to [comma.ai's safety policy](https://github.com/commaai/openpilot/blob/master/docs/SAFETY.md). Any changes that go against this policy will result in your fork and your device being banned from both comma.ai and sunnypilot channels.
+
+The following changes are a **VIOLATION** of this policy and **ARE NOT** included in any sunnypilot branches:
+* Driver Monitoring:
+    * ❌ "Nerfing" or reducing monitoring parameters.
+* Panda safety:
+    * ❌ No preventing disengaging of <ins>**LONGITUDINAL CONTROL**</ins> (acceleration/brake) on brake pedal press.
+    * ❌ No auto re-engaging of <ins>**LONGITUDINAL CONTROL**</ins> (acceleration/brake) on brake pedal release.
+    * ❌ No disengaging on ACC MAIN in OFF state.
+
+</details>
+
+
+<details><summary><h3>⚒ Installation</h3></summary>
+
+---
+
+  <details><summary>URL (Easy)</summary>
+
+comma three
+------
+
+Please refer to [Recommended Branches](#-recommended-branches) to find your preferred/supported branch. This guide will assume you want to install the latest `release-c3` branch.
+
+* 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: ```release-c3.sunnypilot.ai``` [^4] (note: `https://` is not requirement on the comma three)
+  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, 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](#-recommended-branches). Example: `release-c3`
+
+|    Branch    |         Installation URL         |
+|:------------:|:--------------------------------:|
+| `release-c3` | https://release-c3.sunnypilot.ai |
+| `staging-c3` | https://staging-c3.sunnypilot.ai |
+|   `dev-c3`   | https://dev-c3.sunnypilot.ai     |
+
+Requires further assistance with software installation? Join the [sunnypilot Discord server](https://discord.sunnypilot.com) and message us in the `#installation-help` channel.
+
+comma two
+------
+
+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://smiskol.com/fork/sunnyhaibin/0.8.12-4-prod```
+4. Complete the rest of the installation following the onscreen instructions.
+
+Requires further assistance with software installation? Join the [sunnypilot Discord server](https://discord.sunnypilot.com) and message us in the `#installation-help` channel.
+
+  </details>
+
+  <details>
+  <summary>SSH (More Versatile)</summary>
   <br>
-  Currently, it upgrades the driver assistance system in 275+ supported cars.
-</p>
 
-<h3>
-  <a href="https://docs.comma.ai">Docs</a>
-  <span> · </span>
-  <a href="https://docs.comma.ai/contributing/roadmap/">Roadmap</a>
-  <span> · </span>
-  <a href="https://github.com/commaai/openpilot/blob/master/docs/CONTRIBUTING.md">Contribute</a>
-  <span> · </span>
-  <a href="https://discord.comma.ai">Community</a>
-  <span> · </span>
-  <a href="https://comma.ai/shop">Try it on a comma 3X</a>
-</h3>
+Prerequisites: [How to SSH](https://github.com/commaai/openpilot/wiki/SSH)
 
-Quick start: `bash <(curl -fsSL openpilot.comma.ai)`
+If you are looking to install sunnypilot via SSH, run the following command in an SSH terminal after connecting to your device:
 
-![openpilot tests](https://github.com/commaai/openpilot/actions/workflows/selfdrive_tests.yaml/badge.svg)
-[![codecov](https://codecov.io/gh/commaai/openpilot/branch/master/graph/badge.svg)](https://codecov.io/gh/commaai/openpilot)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
-[![X Follow](https://img.shields.io/twitter/follow/comma_ai)](https://x.com/comma_ai)
-[![Discord](https://img.shields.io/discord/469524606043160576)](https://discord.comma.ai)
-
-</div>
-
-<table>
-  <tr>
-    <td><a href="https://youtu.be/NmBfgOanCyk" title="Video By Greer Viau"><img src="https://github.com/commaai/openpilot/assets/8762862/2f7112ae-f748-4f39-b617-fabd689c3772"></a></td>
-    <td><a href="https://youtu.be/VHKyqZ7t8Gw" title="Video By Logan LeGrand"><img src="https://github.com/commaai/openpilot/assets/8762862/92351544-2833-40d7-9e0b-7ef7ae37ec4c"></a></td>
-    <td><a href="https://youtu.be/SUIZYzxtMQs" title="A drive to Taco Bell"><img src="https://github.com/commaai/openpilot/assets/8762862/05ceefc5-2628-439c-a9b2-89ce77dc6f63"></a></td>
-  </tr>
-</table>
-
-To start using openpilot in a car
+comma three:
 ------
+* [`release-c3`](https://github.com/sunnyhaibin/openpilot/tree/release-c3):
 
-To use openpilot in a car, you need four things:
-1. **Supported Device:** a comma 3/3X, available at [comma.ai/shop](https://comma.ai/shop/comma-3x).
-2. **Software:** The setup procedure for the comma 3/3X allows users to enter a URL for custom software. Use the URL `openpilot.comma.ai` to install the release version.
-3. **Supported Car:** Ensure that you have one of [the 275+ supported cars](docs/CARS.md).
-4. **Car Harness:** You will also need a [car harness](https://comma.ai/shop/car-harness) to connect your comma 3/3X to your car.
+  ```
+  cd /data; rm -rf ./openpilot; git clone -b release-c3 --recurse-submodules https://github.com/sunnyhaibin/sunnypilot.git openpilot; cd openpilot; sudo reboot
+  ```
 
-We have detailed instructions for [how to install the harness and device in a car](https://comma.ai/setup). Note that it's possible to run openpilot on [other hardware](https://blog.comma.ai/self-driving-car-for-free/), although it's not plug-and-play.
-
-To start developing openpilot
+comma two:
 ------
+* [`0.8.12-prod-personal-hkg`](https://github.com/sunnyhaibin/openpilot/tree/0.8.12-prod-personal-hkg):
 
-openpilot is developed by [comma](https://comma.ai/) and by users like you. We welcome both pull requests and issues on [GitHub](http://github.com/commaai/openpilot).
+  ```
+  cd /data; rm -rf ./openpilot; git clone -b 0.8.12-prod-personal-hkg --recurse-submodules https://github.com/sunnyhaibin/sunnypilot.git openpilot; cd openpilot; sudo reboot
+  ```
 
-* Join the [community Discord](https://discord.comma.ai)
-* Check out [the contributing docs](docs/CONTRIBUTING.md)
-* Check out the [openpilot tools](tools/)
-* Read about the [development workflow](docs/WORKFLOW.md)
-* Code documentation lives at https://docs.comma.ai
-* Information about running openpilot lives on the [community wiki](https://github.com/commaai/openpilot/wiki)
+After running the command to install the desired branch, your comma device should reboot.
+  </details>
 
-Want to get paid to work on openpilot? [comma is hiring](https://comma.ai/jobs#open-positions) and offers lots of [bounties](https://comma.ai/bounties) for external contributors.
+</details>
 
-Safety and Testing
-----
 
-* openpilot observes [ISO26262](https://en.wikipedia.org/wiki/ISO_26262) guidelines, see [SAFETY.md](docs/SAFETY.md) for more details.
-* openpilot has software-in-the-loop [tests](.github/workflows/selfdrive_tests.yaml) that run on every commit.
-* The code enforcing the safety model lives in panda and is written in C, see [code rigor](https://github.com/commaai/panda#code-rigor) for more details.
-* panda has software-in-the-loop [safety tests](https://github.com/commaai/panda/tree/master/tests/safety).
-* Internally, we have a hardware-in-the-loop Jenkins test suite that builds and unit tests the various processes.
-* panda has additional hardware-in-the-loop [tests](https://github.com/commaai/panda/blob/master/Jenkinsfile).
-* We run the latest openpilot in a testing closet containing 10 comma devices continuously replaying routes.
+<details><summary><h3>🚗 Highlight Features</h3></summary>
 
-Licensing
-------
+---
+
+### Quality of Life Enhancements
+- [**Modified Assistive Driving Safety (MADS)**](#modified-assistive-driving-safety-mads) - Automatic Lane Centering (ALC) / Lane Keep Assist System (LKAS) and Adaptive Cruise Control (ACC) / Smart Cruise Control (SCC) can be engaged independently of each other
+- [**Dynamic Lane Profile (DLP)**](#dynamic-lane-profile-dlp) - Dynamically switch lane profile (between Laneful and Laneless) based on lane recognition confidence
+- [**Enhanced Speed Control**](#enhanced-speed-control) - Automatically adjust cruise control speed using vision model, OpenStreetMap (OSM) data, and/or Speed Limit control (SLC) without user interaction
+    * Vision-based Turn Speed Control (V-TSC) - lower speed when going around corners using vision model
+    * Map-Data-based Turn Speed Control (M-TSC) - lower speed when going around corners using OSM data[^1]
+    * Speed Limit Control (SLC) - Set speed limit based on map data or car interface (if applicable)
+    * HKG only: Highway Driving Assist (HDA) status integration - Use cars native speed sign detection to set desired speed (on applicable HKG cars only)
+- [**Gap Adjust Cruise (GAC)**](#gap-adjust-cruise) - Allow `GAP`/`INTERVAL`/`DISTANCE` button on the steering wheel or on-screen button to adjust the follow distance from the lead car. See table below for options
+    - [**Quiet Drive 🤫**](#-quiet-drive) - Toggle to mute all notification sounds (excluding driver safety warnings)
+    - [**Auto Lane Change Timer**](#Auto-Lane-Change-Timer) - Set a timer to delay the auto lane change operation when the blinker is used. No nudge on the steering wheel is required to auto lane change if a timer is set
+    - [**Force Car Recognition (FCR)**](#Force-Car-Recognition-) - Use a selector to force your car to be recognized by sunnypilot
+    - [**Fix sunnypilot No Offroad**](#Fix-sunnypilot-No-Offroad) - Enforce sunnypilot to go offroad and turns off after shutting down the car. This feature fixes non-official devices running sunnypilot without comma power
+    - [**Enable ACC+MADS with RES+/SET-**](#Enable-ACC+MADS-with-RES+/SET-) - Engage both ACC and MADS with a single press of RES+ or SET- button
+    - [**Offline OSM Maps**](#Offline-OSM-Maps) - OSM database can now be downloaded locally for offline use[^2]. This enables offline SLC, V-TSC and M-TSC. Currently available for US South, US West, US Northeast, Florida, Taiwan, South Africa and New Zealand
+    - [**Various Live Tuning**](#Various-Live-Tuning) - Ability to tailor your driving experience on the fly:
+        * Enforce Torque Lateral Control - Use the newest [torque controller](https://blog.comma.ai/0815release/#torque-controller) for all vehicles.
+        * Torque Lateral Control Live Tune - Ability to adjust the torque controller’s `FRICTION` and `LAT_ACCEL_FACTOR` values to suit your vehicle.
+        * Torque Lateral Controller Self-Tune - Enable automatic turning for the Torque controller.
+
+### Visual Enhancements
+* **M.A.D.S Status Icon** - Dedicated icon to display M.A.D.S. engagement status
+    * Green🟢: M.A.D.S. engaged
+    * White⚪: M.A.D.S. suspended or disengaged
+* **Lane Path Color** - Various lane path colors to display real-time Lane Model and M.A.D.S. engagement status
+    * 0.8.14 and later:
+        * Blue🔵: Laneful mode & M.A.D.S. engaged
+        * Green🟢: Laneless mode & M.A.D.S. engaged
+        * Yellow🟡: Experimental e2e & M.A.D.S. engaged
+    * Pre 0.8.14:
+        * Green🟢: Laneful mode & M.A.D.S. engaged
+        * Red🔴: Laneless mode & M.A.D.S. engaged
+    * White⚪: M.A.D.S. suspended or disengaged
+    * Black⚫: M.A.D.S. engaged, steering is being manually overridden by user
+* **Developer (Dev) UI** - Display various real-time metrics on screen while driving
+* **Stand Still Timer** - Display time spent at a stop with M.A.D.S engaged (i.e., at traffic lights, stop signs, traffic congestions)
+* **Braking Status** - Current car speed text turns red when the car is braking by the driver or ACC/SCC
+
+### Operational Enhancements
+* **Fast Boot** - sunnypilot will fast boot by creating a Prebuilt file
+* **Disable Onroad Uploads** - Disable uploads completely when onroad. Necessary to avoid high data usage when connected to Wi-Fi hotspot
+* **Brightness Control (Global)** - Manually adjusts the global brightness of the screen
+* **Driving Screen Off Timer** - Turns off the device screen or reduces brightness to protect the screen after car starts
+* **Driving Screen Off Brightness (%)** - When using the Driving Screen Off feature, the brightness is reduced according to the automatic brightness ratio
+* **Max Time Offroad** - Device is automatically turned off after a set time when the engine is turned off (off-road) after driving (on-road)
+
+</details>
+
+<details><summary><h3>🚗 Driving Enhancements</h3></summary>
+
+---
+
+### Modified Assistive Driving Safety (MADS)
+The goal of Modified Assistive Driving Safety (MADS) is to enhance the user driving experience with modified behaviors of driving assist engagements. This feature complies with comma.ai's safety rules as accurately as possible with the following changes:
+* sunnypilot Automatic Lane Centering (ALC) and ACC/SCC can be engaged independently of each other
+* Dedicated button to toggle sunnypilot ALC:
+    * `CRUISE (MAIN)` button: All supported cars on sunnypilot
+        * `LFA` button: Newer HKG cars with `LFA` button
+        * `LKAS` button: Honda, Toyota, Global Subaru
+* `SET-` button enables ACC/SCC
+* `CANCEL` button only disables ACC/SCC
+* `CRUISE (MAIN)` must be `ON` to use ACC/SCC
+* `CRUISE (MAIN)` button disables sunnypilot completely when `OFF` **(strictly enforced in panda safety code)**
+
+### Disengage Lateral ALC on Brake Press Mode toggle
+Dedicated toggle to handle Lateral state on brake pedal press and release:
+1. `ON`: `BRAKE pedal` press will pause Automatic Lane Centering; `BRAKE pedal` release will resume Automatic Lane Centering. Note: `BRAKE pedal` release will NOT resume ACC/SCC/Long control without explicit user engagement **(strictly enforced in panda safety code)**
+2. `OFF`: `BRAKE pedal` press will NOT pause Automatic Lane Centering; `BRAKE pedal` release will NOT resume ACC/SCC/Long control without explicit user engagement **(strictly enforced in panda safety code)**
+
+### Miscellaneous
+* `TURN SIGNALS` (`Left` or `Right`) will pause Automatic Lane Centering if the vehicle speed is below the [threshold](https://github.com/commaai/openpilot/blob/master/selfdrive/controls/lib/desire_helper.py#L8) for Automatic Lane Change
+* Event audible alerts are more relaxed to match manufacturer's stock behavior
+* Critical events trigger disengagement of Automatic Lane Centering completely. The disengagement is enforced in sunnypilot and panda safety
+
+### Dynamic Lane Profile (DLP)
+
+Dynamic Lane Profile (DLP) aims to provide the best driving experience at staying within a lane confidently. Dynamic Lane Profile allows sunnypilot to dynamically switch between lane profiles based on lane recognition confidence level on road.
+
+There are 3 modes to select on the onroad camera screen:
+* **Auto Lane**: sunnypilot dynamically chooses between `Laneline` or `Laneless` model
+* **Laneline**: sunnypilot uses Laneline model only.
+* **Laneless**: sunnypilot uses Laneless model only.
+
+To use Dynamic Lane Profile, do the following:
+```
+1. sunnypilot Settings -> `SP - Controls` -> Enable Dynamic Lane Profile -> ON toggle
+2. Reboot.
+3. Before driving, on the onroad camera screen, toggle between the 3 modes by pressing on the button.
+4. Drive.
+```
+
+### Enhanced Speed Control
+This fork now allows supported cars to dynamically adjust the longitudinal plan based on the fetched map data. Big thanks to the Move Fast team for the amazing implementation!
+
+**Supported cars:**
+* sunnypilot Longitudinal Control capable
+* Stock Longitudinal Control
+    * Hyundai/Kia/Genesis (non CAN-FD)
+    * Honda Bosch
+    * Volkswagen MQB
+
+Certain features are only available with an active data connection, via:
+* [comma Prime](https://comma.ai/prime) - Intuitive service provided directly by comma, or
+* Personal Hotspot - From your mobile device, or a dedicated hotspot from a cellular carrier.
+
+**Features:**
+* Vision-based Turn Speed Control (VTSC) - Use vision path predictions to estimate the appropriate speed to drive through turns ahead - i.e. slowing down for curves
+* Map-Data-based Turn Speed Control (MTSC) - Use curvature information from map data to define speed limits to take turns ahead - i.e. slowing down for curves[^1]
+* Speed Limit Control (SLC) - Use speed limit signs information from map data and car interface to automatically adapt cruise speed to road limits
+    * HKG only: Highway Driving Assist (HDA) status integration - on applicable HKG cars only[^1]
+    * Speed Limit Offset - When Speed Limit Control is enabled, set speed limit slightly higher than the actual speed limit for a more natural drive[^1]
+* Toggle Hands on Wheel Monitoring - Monitors and alerts the driver when their hands have not been on the steering wheel for an extended time
+
+### Custom Stock Longitudinal Control
+While using stock Adaptive/Smart Cruise Control, Custom Stock Longitudinal Control in sunnypilot allows sunnypilot to manipulate and take over the set speed on the car's dashboard.
+
+**Supported Cars:**
+* Hyundai/Kia/Genesis
+    * CAN platform
+    * CAN-FD platform with 0x1CF broadcasted in CAN traffic
+* Honda Bosch
+* Volkswagen MQB
+
+**Instruction**
+
+**📗 How to use Custom Longitudinal Control on sunnypilot **
+
+When using Speed Limit, Vision, or Map based Turn control, you will be setting the "MAX" ACC speed on the sunnypilot display instead of the one in the dashboard. The car will then set the ACC setting in the dashboard to the targeted speed, but will never exceed the max speed set on the sunnypilot display. A quick press of the RES+ or SET- buttons will change this speed by 5 MPH or KM/H on the sunnypilot display, while a long deliberate press (about a 1/2 second press) changes it by 1 MPH or KM/H. DO NOT hold the RES+ or SET- buttons for longer that a 1 second. Either make quick or long deliberate presses only.
+
+**‼ Where to look when setting ACC speed ‼**
+
+Do not look at the dashboard when setting your ACC max speed. Instead, only look at the one on the sunnypilot display, "MAX". The reason you need to look at the sunnypilot display is because sunnypilot will be changing the one in the dashboard. It will be adjusting it as needed, never raising it above the one set on the sunnypilot display. ONLY look at the MAX speed on the sunnypilot display when setting the ACC speed instead of the dashboard!
+
+(Courtesy instructions from John, author of jvePilot)
+
+### Gap Adjust Cruise
+This fork now allows supported openpilot longitudinal cars to adjust the cruise gap between the car and the lead car.
+
+**Supported cars:**
+* sunnypilot Longitudinal Control capable
+
+🚨**PROCEED WITH EXTREME CAUTION AND BE READY TO MANUALLY TAKE OVER AT ALL TIMES**
+
+There are 4 modes to select on the steering wheel and/or the onroad camera screen:
+* **Stock Gap**: Stock sunnypilot distance - 1.45 second profile
+* **Mild Gap**: Semi-aggressive distance - 1.25 second profile
+* 🚨**Aggro Gap**🚨: Aggressive distance - 1.0 second profile
+
+**Availability**
+
+|      Car Make       | Stock Gap | Mild Gap | Aggro Gap |
+|:-------------------:|:---------:|:--------:|:---------:|
+|     Honda/Acura     |     ✅     |    ✅     |     ✅     |
+| Hyundai/Kia/Genesis |     ✅     |    ✅     |     ✅     |
+|    Toyota/Lexus     |     ✅     |    ✅     |     ✅     |
+|  Volkswagen MQB/PQ  |     ✅     |    ✅     |     ✅     |
+
+</details>
+
+
+<details><summary><h3>⚒ Branch Definitions</h3></summary>
+
+---
+
+|    Tag    | Definition           | Description                                                                                                                                                                                 |
+|:---------:|----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `release` | Release branches     | Include features that are **verified** by trusted testers and the community. Ready to use. ✅                                                                                                |
+| `staging` | Staging branches     | Include new features that are **tested** by trusted testers and the community. Stability may vary. ⚠                                                                                        |
+|   `dev`   | Development branches | All features are gathered in respective versions. Reviewed and merged features will be committed to `dev`. Stability may vary. ⚠                                                            |
+| `master`  | Main branch          | Syncs with [commaai's openpilot `master`](https://github.com/commaai/openpilot) upstream branch. Accepts all pull requests. Does not include all sunnypilot features. Stability may vary. ⚠ |
+
+Example:
+* [`release-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/release-c3): Latest release branch for comma three that are verified by trusted testers and the community. Ready to use.
+* [`staging-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/staging-c3): Latest staging branch for comma three that are tested by trusted testers and the community. Verification required.
+* [`dev-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/dev-c3): Latest development branch for comma three that include all sunnypilot features. Testing required.
+
+</details>
+
+<details><summary><h3>✅ Recommended Branches</h3></summary>
+
+---
+
+| Branch                                                                              | Definition                                              | Compatible Device | Changelogs                                                                                 |
+|:------------------------------------------------------------------------------------|---------------------------------------------------------|-------------------|--------------------------------------------------------------------------------------------|
+| [`release-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/release-c3)           | • Latest release/stable branch                          | comma three       | [`CHANGELOGS.md`](https://github.com/sunnyhaibin/sunnypilot/blob/release-c3/CHANGELOGS.md) |
+| [`staging-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/staging-c3)           | • Latest staging branch                                 | comma three       | [`CHANGELOGS.md`](https://github.com/sunnyhaibin/sunnypilot/blob/staging-c3/CHANGELOGS.md) |
+| [`dev-c3`](https://github.com/sunnyhaibin/sunnypilot/tree/dev-c3)                   | • Latest development branch with experimental features  | comma three       | [`CHANGELOGS.md`](https://github.com/sunnyhaibin/sunnypilot/blob/dev-c3/CHANGELOGS.md)     |
+
+</details>
+
+<details><summary><h3>📗 How To's</h3></summary>
+
+---
+
+How-To instructions can be found in [HOW-TOS.md](https://github.com/sunnyhaibin/openpilot/blob/(!)README/HOW-TOS.md).
+
+</details>
+
+
+<details><summary><h3>🎆 Pull Requests</h3></summary>
+
+---
+
+We welcome both pull requests and issues on GitHub. Bug fixes are encouraged.
+
+Pull requests should be against the most current `master` branch.
+
+</details>
+
+<details><summary><h3>🏆 Special Thanks</h3></summary>
+
+---
+
+* [spektor56](https://github.com/spektor56/openpilot)
+* [rav4kumar](https://github.com/rav4kumar/openpilot)
+* [mob9221](https://github.com/mob9221/opendbc)
+* [briantran33](https://github.com/briantran33/openpilot)
+* [Aragon7777](https://github.com/aragon7777/openpilot)
+* [sshane](https://github.com/sshane/openpilot-installer-generator)
+* [jung](https://github.com/chanhojung/openpilot)
+* [dri94](https://github.com/dri94/openpilot)
+* [FrogAi](https://github.com/frogAi/FrogPilot/)
+* [twilsonco](https://github.com/twilsonco/openpilot)
+* [martinl](https://github.com/martinl/openpilot)
+* [multikyd](https://github.com/openpilotkr)
+* [Move Fast GmbH](https://github.com/move-fast/openpilot)
+* [dragonpilot](https://github.com/dragonpilot-community/dragonpilot)
+* [neokii](https://github.com/neokii/openpilot)
+* [AlexandreSato](https://github.com/AlexandreSato/openpilot)
+* [Moodkiller](https://github.com/moodkiller)
+
+</details>
+
+<details><summary><h3>📊 User Data</h3></summary>
+
+---
+
+By default, sunnypilot uploads the driving data to comma servers. You can also access your data through [comma connect](https://connect.comma.ai/).
+
+sunnypilot is open source software. The user is free to disable data collection if they wish to do so.
+
+sunnypilot logs the road-facing camera, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
+The driver-facing camera is only logged if you explicitly opt-in in settings. The microphone is not recorded.
+
+By using this software, you understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma for the use of this data.
+
+</details>
+
+<details><summary><h3>Licensing</h3></summary>
 
 openpilot is released under the MIT license. Some parts of the software are released under other licenses as specified.
 
-Any user of this software shall indemnify and hold harmless Comma.ai, Inc. and its directors, officers, employees, agents, stockholders, affiliates, subcontractors and customers from and against all allegations, claims, actions, suits, demands, damages, liabilities, obligations, losses, settlements, judgments, costs and expenses (including without limitation attorneys’ fees and costs) which arise out of, relate to or result from any use of this software by user.
+Any user of this software shall indemnify and hold harmless comma.ai, Inc. and its directors, officers, employees, agents, stockholders, affiliates, subcontractors and customers from and against all allegations, claims, actions, suits, demands, damages, liabilities, obligations, losses, settlements, judgments, costs and expenses (including without limitation attorneys’ fees and costs) which arise out of, relate to or result from any use of this software by user.
 
 **THIS IS ALPHA QUALITY SOFTWARE FOR RESEARCH PURPOSES ONLY. THIS IS NOT A PRODUCT.
 YOU ARE RESPONSIBLE FOR COMPLYING WITH LOCAL LAWS AND REGULATIONS.
 NO WARRANTY EXPRESSED OR IMPLIED.**
 
-User Data and comma Account
-------
+</details>
 
-By default, openpilot uploads the driving data to our servers. You can also access your data through [comma connect](https://connect.comma.ai/). We use your data to train better models and improve openpilot for everyone.
+<h3>💰 Support sunnypilot</h3>
 
-openpilot is open source software: the user is free to disable data collection if they wish to do so.
+---
 
-openpilot logs the road-facing cameras, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
-The driver-facing camera is only logged if you explicitly opt-in in settings. The microphone is not recorded.
+If you find any of the features useful, consider becoming a [patron on Patreon](https://www.patreon.com/sunnyhaibin) or a [sponsor on GitHub](https://github.com/sponsors/sunnyhaibin) to support future feature development and improvements.
 
-By using openpilot, you agree to [our Privacy Policy](https://comma.ai/privacy). You understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma for the use of this data.
+
+By becoming a patron/sponsor, you will gain access to exclusive content, early access to new features, and the opportunity to directly influence the project's development.
+
+<h3>Patreon</h3>
+
+<a href="https://www.patreon.com/sunnyhaibin">
+  <img src="https://user-images.githubusercontent.com/47793918/244128051-bc7e913e-a196-4455-926e-23aec9a4bd3b.png" alt="Become a Patron" width="300" style="max-width: 100%; height: auto;">
+</a>
+<br>
+
+<h3>GitHub Sponsor</h3>
+
+<a href="https://github.com/sponsors/sunnyhaibin">
+  <img src="https://user-images.githubusercontent.com/47793918/244135584-9800acbd-69fd-4b2b-bec9-e5fa2d85c817.png" alt="Become a Sponsor" width="300" style="max-width: 100%; height: auto;">
+</a>
+<br>
+
+<h3>PayPal</h3>
+
+<a href="https://paypal.me/sunnyhaibin0850" target="_blank">
+<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" alt="PayPal this" title="PayPal - The safer, easier way to pay online!" border="0" />
+</a>
+<br></br>
+
+Your continuous love and support are greatly appreciated! Enjoy 🥰
+
+<span>-</span> Jason, Founder of sunnypilot
+
+[^1]:Requires data connection if not using Offline Maps data
+[^2]:At least 50 GB of storage space is required. If you have the 32 GB version of comma three, upgrading with a compatible 250 GB or 1 TB SSD is strongly recommended
+[^4]:Shortened URL for convenience. Full URL is ```smiskol.com/fork/sunnyhaibin/release-c3```

SConstruct

@@ -102,6 +102,7 @@ if arch == "larch64":
 
   libpath = [
     "/usr/local/lib",
+    "/usr/lib",
     "/system/vendor/lib64",
     f"#third_party/acados/{arch}/lib",
   ]
@@ -168,6 +169,10 @@ else:
 if arch != "Darwin":
   ldflags += ["-Wl,--as-needed", "-Wl,--no-undefined"]
 
+# Enable swaglog include in submodules
+cflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
+cxxflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
+
 ccflags_option = GetOption('ccflags')
 if ccflags_option:
   ccflags += ccflags_option.split(' ')
@@ -182,9 +187,12 @@ env = Environment(
     "-Werror",
     "-Wshadow",
     "-Wno-unknown-warning-option",
+    "-Wno-deprecated-register",
+    "-Wno-register",
     "-Wno-inconsistent-missing-override",
     "-Wno-c99-designator",
     "-Wno-reorder-init-list",
+    "-Wno-error=unused-but-set-variable",
     "-Wno-vla-cxx-extension",
   ] + cflags + ccflags,
 
@@ -198,8 +206,11 @@ env = Environment(
     "#third_party/json11",
     "#third_party/linux/include",
     "#third_party/snpe/include",
+    "#third_party/qrcode",
     "#third_party",
+    "#cereal",
     "#msgq",
+    "#opendbc/can",
   ],
 
   CC='clang',
@@ -221,7 +232,7 @@ env = Environment(
   COMPILATIONDB_USE_ABSPATH=True,
   REDNOSE_ROOT="#",
   tools=["default", "cython", "compilation_db", "rednose_filter"],
-  toolpath=["#site_scons/site_tools", "#rednose_repo/site_scons/site_tools"],
+  toolpath=["#rednose_repo/site_scons/site_tools"],
 )
 
 if arch == "Darwin":
@@ -260,12 +271,11 @@ if arch == "Darwin":
 else:
   envCython["LINKFLAGS"] = ["-pthread", "-shared"]
 
-np_version = SCons.Script.Value(np.__version__)
-Export('envCython', 'np_version')
+Export('envCython')
 
 # Qt build environment
 qt_env = env.Clone()
-qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "DBus", "Xml"]
+qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "Multimedia", "Quick", "Qml", "QuickWidgets", "DBus", "Xml"]
 
 qt_libs = []
 if arch == "Darwin":
@@ -305,12 +315,15 @@ try:
 except SCons.Errors.UserError:
   qt_env.Tool('qt')
 
-qt_env['CPPPATH'] += qt_dirs + ["#third_party/qrcode"]
+qt_env['CPPPATH'] += qt_dirs# + ["#selfdrive/ui/qt/"]
 qt_flags = [
   "-D_REENTRANT",
   "-DQT_NO_DEBUG",
   "-DQT_WIDGETS_LIB",
   "-DQT_GUI_LIB",
+  "-DQT_QUICK_LIB",
+  "-DQT_QUICKWIDGETS_LIB",
+  "-DQT_QML_LIB",
   "-DQT_CORE_LIB",
   "-DQT_MESSAGELOGCONTEXT",
 ]
@@ -335,27 +348,25 @@ Export('env', 'qt_env', 'arch', 'real_arch')
 SConscript(['common/SConscript'])
 Import('_common', '_gpucommon')
 
-common = [_common, 'json11', 'zmq']
+common = [_common, 'json11']
 gpucommon = [_gpucommon]
 
 Export('common', 'gpucommon')
 
 # Build messaging (cereal + msgq + socketmaster + their dependencies)
-# Enable swaglog include in submodules
-env_swaglog = env.Clone()
-env_swaglog['CXXFLAGS'].append('-DSWAGLOG="\\"common/swaglog.h\\""')
-SConscript(['msgq_repo/SConscript'], exports={'env': env_swaglog})
-SConscript(['opendbc/can/SConscript'], exports={'env': env_swaglog})
-
+SConscript(['msgq_repo/SConscript'])
 SConscript(['cereal/SConscript'])
-
 Import('socketmaster', 'msgq')
 messaging = [socketmaster, msgq, 'zmq', 'capnp', 'kj',]
 Export('messaging')
 
 
 # Build other submodules
-SConscript(['panda/SConscript'])
+SConscript([
+  'body/board/SConscript',
+  'opendbc/can/SConscript',
+  'panda/SConscript',
+])
 
 # Build rednose library
 SConscript(['rednose/SConscript'])

cereal/SConscript

@@ -1,20 +1,31 @@
-Import('env', 'common', 'msgq')
+Import('env', 'envCython', 'arch', 'common', 'msgq')
+
+import shutil
 
 cereal_dir = Dir('.')
 gen_dir = Dir('gen')
+other_dir = Dir('#msgq')
 
 # Build cereal
 schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp', 'custom.capnp']
+env.Command(["gen/c/include/c++.capnp.h"], [], "mkdir -p " + gen_dir.path + "/c/include && touch $TARGETS")
 env.Command([f'gen/cpp/{s}.c++' for s in schema_files] + [f'gen/cpp/{s}.h' for s in schema_files],
             schema_files,
             f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/")
 
-cereal = env.Library('cereal', [f'gen/cpp/{s}.c++' for s in schema_files])
+# TODO: remove non shared cereal and messaging
+cereal_objects = env.SharedObject([f'gen/cpp/{s}.c++' for s in schema_files])
+
+cereal = env.Library('cereal', cereal_objects)
+env.SharedLibrary('cereal_shared', cereal_objects)
 
 # Build messaging
-services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET')
-env.Program('messaging/bridge', ['messaging/bridge.cc', 'messaging/msgq_to_zmq.cc'], LIBS=[msgq, common, 'pthread'])
 
-socketmaster = env.Library('socketmaster', ['messaging/socketmaster.cc'])
+services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET')
+env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[msgq, 'zmq', common])
+
+
+socketmaster = env.SharedObject(['messaging/socketmaster.cc'])
+socketmaster = env.Library('socketmaster', socketmaster)
 
 Export('cereal', 'socketmaster')

cereal/car.capnp

@@ -117,7 +117,26 @@ struct CarEvent @0x9b1657f34caf3ad3 {
     paramsdPermanentError @119;
     actuatorsApiUnavailable @120;
     espActive @121;
-    personalityChanged @122;
+    manualSteeringRequired @122;
+    manualLongitudinalRequired @123;
+    silentPedalPressed @124;
+    silentButtonEnable @125;
+    silentBrakeHold @126;
+    silentWrongGear @127;
+    spReverseGear @128;
+    preKeepHandsOnWheel @129;
+    promptKeepHandsOnWheel @130;
+    keepHandsOnWheel @131;
+    speedLimitActive @132;
+    speedLimitValueChange @133;
+    e2eLongStop @134;
+    e2eLongStart @135;
+    controlsMismatchLong @136;
+    cruiseEngageBlocked @137;
+    laneChangeRoadEdge @138;
+    speedLimitPreActive @139;
+    speedLimitConfirmed @140;
+    torqueNNLoad @141;
 
     radarCanErrorDEPRECATED @15;
     communityFeatureDisallowedDEPRECATED @62;
@@ -197,7 +216,6 @@ struct CarState {
   accFaulted @42 :Bool;
   carFaultedNonCritical @47 :Bool;  # some ECU is faulted, but car remains controllable
   espActive @51 :Bool;
-  vehicleSensorsInvalid @52 :Bool;  # invalid steering angle readings, etc.
 
   # cruise state
   cruiseState @10 :CruiseState;
@@ -218,6 +236,27 @@ struct CarState {
   # clutch (manual transmission only)
   clutchPressed @28 :Bool;
 
+  madsEnabled @52 :Bool;
+  leftBlinkerOn @53 :Bool;
+  rightBlinkerOn @54 :Bool;
+  disengageByBrake @55 :Bool;
+  belowLaneChangeSpeed @56 :Bool;
+  accEnabled @57 :Bool;
+  latActive @58 :Bool;
+  gapAdjustCruiseTr @59 :Int32;
+  endToEndLong @60 :Bool;
+  customStockLong @61 :CustomStockLong;
+
+  struct CustomStockLong {
+    cruiseButton @0 :Int16;
+    finalSpeedKph @1 :Float32;
+    vCruiseKphPrev @2 :Float32;
+    targetSpeed @3 :Float32;
+    vSetDis @4 :Float32;
+    speedDiff @5 :Float32;
+    buttonType @6 :Int16;
+  }
+
   # blindspot sensors
   leftBlindspot @33 :Bool; # Is there something blocking the left lane change
   rightBlindspot @34 :Bool; # Is there something blocking the right lane change
@@ -244,6 +283,7 @@ struct CarState {
     speedOffset @3 :Float32;
     standstill @4 :Bool;
     nonAdaptive @5 :Bool;
+    speedLimit @7 :Float32;
   }
 
   enum GearShifter {
@@ -329,6 +369,7 @@ struct CarControl {
   enabled @0 :Bool;
   latActive @11: Bool;
   longActive @12: Bool;
+  vCruise @17 :Float32;  # actual set speed
 
   # Actuator commands as computed by controlsd
   actuators @6 :Actuators;
@@ -416,6 +457,9 @@ struct CarControl {
       prompt @6;
       promptRepeat @7;
       promptDistracted @8;
+      promptStarting @9;
+      promptSingleLow @10;
+      promptSingleHigh @11;
     }
   }
 
@@ -448,6 +492,9 @@ struct CarParams {
   enableBsm @56 :Bool;       # blind spot monitoring
   flags @64 :UInt32;         # flags for car specific quirks
   experimentalLongitudinalAvailable @71 :Bool;
+  pcmCruiseSpeed @74 :Bool;  # is openpilot's state tied to the PCM's cruise speed?
+  customStockLongAvailable @75 :Bool;
+  spFlags @76 :UInt32;       # flags for car specific quirks in sunnypilot
 
   minEnableSpeed @7 :Float32;
   minSteerSpeed @8 :Float32;
@@ -537,6 +584,8 @@ struct CarParams {
     steeringAngleDeadzoneDeg @5 :Float32;
     latAccelFactor @6 :Float32;
     latAccelOffset @7 :Float32;
+    nnModelName @8 :Text;
+    nnModelFuzzyMatch @9 :Bool;
   }
 
   struct LongitudinalPIDTuning {

cereal/custom.capnp

@@ -1,6 +1,8 @@
 using Cxx = import "./include/c++.capnp";
 $Cxx.namespace("cereal");
 
+using Car = import "car.capnp";
+
 @0xb526ba661d550a59;
 
 # custom.capnp: a home for empty structs reserved for custom forks
@@ -8,25 +10,176 @@ $Cxx.namespace("cereal");
 # cereal, so use these if you want custom events in your fork.
 
 # you can rename the struct, but don't change the identifier
-struct CustomReserved0 @0x81c2f05a394cf4af {
+
+enum LongitudinalPersonalitySP {
+  aggressive @0;
+  moderate @1;
+  standard @2;
+  relaxed @3;
 }
 
-struct CustomReserved1 @0xaedffd8f31e7b55d {
+struct ControlsStateSP @0x81c2f05a394cf4af {
+  lateralState @0 :Text;
+  personality @8 :LongitudinalPersonalitySP;
+
+  lateralControlState :union {
+    indiState @1 :LateralINDIState;
+    pidState @2 :LateralPIDState;
+    angleState @3 :LateralAngleState;
+    debugState @4 :LateralDebugState;
+    torqueState @5 :LateralTorqueState;
+    curvatureState @6 :LateralCurvatureState;
+
+    lqrStateDEPRECATED @7 :LateralLQRState;
+  }
+
+  struct LateralINDIState {
+  }
+
+  struct LateralPIDState {
+  }
+
+  struct LateralAngleState {
+  }
+
+  struct LateralDebugState {
+  }
+
+  struct LateralTorqueState {
+    nnLog @0 :List(Float32);
+  }
+
+  struct LateralCurvatureState {
+  }
+
+  struct LateralLQRState {
+  }
 }
 
-struct CustomReserved2 @0xf35cc4560bbf6ec2 {
+struct LongitudinalPlanSP @0xaedffd8f31e7b55d {
+  visionTurnControllerState @0 :VisionTurnControllerState;
+  visionTurnSpeed @1 :Float32;
+  visionCurrentLatAcc @16 :Float32;
+  visionMaxPredLatAcc @17 :Float32;
+
+  speedLimitControlState @2 :SpeedLimitControlState;
+  speedLimit @3 :Float32;
+  speedLimitOffset @4 :Float32;
+  distToSpeedLimit @5 :Float32;
+  isMapSpeedLimit @6 :Bool;
+  speedLimitPercOffset @11 :Bool;
+  speedLimitValueOffset @12 :Float32;
+  desiredTF @13 :Float32;
+  notSpeedLimit @14 :Int16;
+  e2eX @15 :List(Float32);
+  e2eBlended @18 :Text;
+  e2eStatus @22 :Bool;
+
+  distToTurn @7 :Float32;
+  turnSpeed @8 :Float32;
+  turnSpeedControlState @9 :SpeedLimitControlState;
+  turnSign @10 :Int16;
+
+  events @19 :List(Car.CarEvent);
+  longitudinalPlanSource @20 :LongitudinalPlanSource;
+
+  personalityDEPRECATED @21 :LongitudinalPersonalitySP;
+
+  enum SpeedLimitControlState {
+    inactive @0; # No speed limit set or not enabled by parameter.
+    tempInactive @1; # User wants to ignore speed limit until it changes.
+    adapting @2; # Reducing speed to match new speed limit.
+    active @3; # Cruising at speed limit.
+    preActive @4;
+  }
+
+  enum VisionTurnControllerState {
+    disabled @0; # No predicted substantial turn on vision range or feature disabled.
+    entering @1; # A substantial turn is predicted ahead, adapting speed to turn comfort levels.
+    turning @2; # Actively turning. Managing acceleration to provide a roll on turn feeling.
+    leaving @3; # Road ahead straightens. Start to allow positive acceleration.
+  }
+
+  enum LongitudinalPlanSource {
+    cruise @0;
+    lead0 @1;
+    lead1 @2;
+    lead2 @3;
+    e2e @4;
+    turn @5;
+    limit @6;
+    turnlimit @7;
+  }
 }
 
-struct CustomReserved3 @0xda96579883444c35 {
+struct LateralPlanSP @0xf35cc4560bbf6ec2 {
+  laneWidth @0 :Float32;
+  lProb @1 :Float32;
+  rProb @2 :Float32;
+
+  dProb @3 :Float32;
+
+  dynamicLaneProfile @4 :Int8;
+  standstillElapsed @5 :Float32;
+  dynamicLaneProfileStatus @9 :Bool;
+
+  dPathWLinesXDEPRECATED @6 :List(Float32);
+  dPathWLinesYDEPRECATED @7 :List(Float32);
+  laneChangePrevDEPRECATED @8 :Bool;
+  laneChangeEdgeBlockDEPRECATED @10 :Bool;
 }
 
-struct CustomReserved4 @0x80ae746ee2596b11 {
+struct DriverMonitoringStateSP @0xda96579883444c35 {
+  handsOnWheelState @0 :HandsOnWheelState;
+  notModified @1 :Float32;
+
+  enum HandsOnWheelState {
+    none @0;          # hand on wheel monitoring inactive
+    ok @1;            # driver has hands on steering wheel
+    minor @2;         # hands off steering wheel for acceptable period
+    warning @3;       # hands off steering wheel for warning period
+    critical @4;      # # hands off steering wheel for critical period
+    terminal @5;      # # hands off steering wheel for terminal period
+  }
 }
 
-struct CustomReserved5 @0xa5cd762cd951a455 {
+struct LiveMapDataSP @0x80ae746ee2596b11 {
+  speedLimitValid @0 :Bool;
+  speedLimit @1 :Float32;
+  speedLimitAheadValid @2 :Bool;
+  speedLimitAhead @3 :Float32;
+  speedLimitAheadDistance @4 :Float32;
+  turnSpeedLimitValid @5 :Bool;
+  turnSpeedLimit @6 :Float32;
+  turnSpeedLimitEndDistance @7 :Float32;
+  turnSpeedLimitSign @8 :Int16;
+  turnSpeedLimitsAhead @9 :List(Float32);
+  turnSpeedLimitsAheadDistances @10 :List(Float32);
+  turnSpeedLimitsAheadSigns @11 :List(Int16);
+  lastGpsTimestamp @12 :Int64;  # Milliseconds since January 1, 1970.
+  currentRoadName @13 :Text;
+  lastGpsLatitude @14 :Float64;
+  lastGpsLongitude @15 :Float64;
+  lastGpsSpeed @16 :Float32;
+  lastGpsBearingDeg @17 :Float32;
+  lastGpsAccuracy @18 :Float32;
+  lastGpsBearingAccuracyDeg @19 :Float32;
+  dataType @20 :DataType;
+
+  enum DataType {
+    default @0;
+    offline @1;
+    online @2;
+  }
 }
 
-struct CustomReserved6 @0xf98d843bfd7004a3 {
+struct E2eLongStateSP @0xa5cd762cd951a455 {
+  status @0 :UInt16;
+}
+
+struct ModelDataV2SP @0xf98d843bfd7004a3 {
+  laneChangePrev @0 :Bool;
+  laneChangeEdgeBlock @1 :Bool;
 }
 
 struct CustomReserved7 @0xb86e6369214c01c8 {

cereal/log.capnp

@@ -137,6 +137,8 @@ struct FrameData {
   requestId @28 :UInt32;
   encodeId @1 :UInt32;
 
+  frameType @7 :FrameType;
+
   # Timestamps
   timestampEof @2 :UInt64;
   timestampSof @8 :UInt64;
@@ -156,7 +158,7 @@ struct FrameData {
 
   temperaturesC @24 :List(Float32);
 
-  enum FrameTypeDEPRECATED {
+  enum FrameType {
     unknown @0;
     neo @1;
     chffrAndroid @2;
@@ -173,7 +175,6 @@ struct FrameData {
 
   frameLengthDEPRECATED @3 :Int32;
   globalGainDEPRECATED @5 :Int32;
-  frameTypeDEPRECATED @7 :FrameTypeDEPRECATED;
   androidCaptureResultDEPRECATED @9 :AndroidCaptureResult;
   lensPosDEPRECATED @11 :Int32;
   lensSagDEPRECATED @12 :Float32;
@@ -336,9 +337,9 @@ enum LaneChangeDirection {
 
 struct CanData {
   address @0 :UInt32;
+  busTime @1 :UInt16;
   dat     @2 :Data;
   src     @3 :UInt8;
-  busTimeDEPRECATED @1 :UInt16;
 }
 
 struct DeviceState @0xa4d8b5af2aa492eb {
@@ -684,53 +685,18 @@ struct LiveTracks {
   oncoming @9 :Bool;
 }
 
-struct SelfdriveState {
-  # high level system state
-  state @0 :OpenpilotState;
-  enabled @1 :Bool;
-  active @2 :Bool;
-  engageable @9 :Bool;  # can OP be engaged?
-
-  # UI alerts
-  alertText1 @3 :Text;
-  alertText2 @4 :Text;
-  alertStatus @5 :AlertStatus;
-  alertSize @6 :AlertSize;
-  alertType @7 :Text;
-  alertSound @8 :Car.CarControl.HUDControl.AudibleAlert;
-
-  # configurable driving settings
-  experimentalMode @10 :Bool;
-  personality @11 :LongitudinalPersonality;
-
-  enum OpenpilotState @0xdbe58b96d2d1ac61 {
-    disabled @0;
-    preEnabled @1;
-    enabled @2;
-    softDisabling @3;
-    overriding @4;  # superset of overriding with steering or accelerator
-  }
-
-  enum AlertStatus @0xa0d0dcd113193c62 {
-    normal @0;
-    userPrompt @1;
-    critical @2;
-  }
-
-  enum AlertSize @0xe98bb99d6e985f64 {
-    none @0;
-    small @1;
-    mid @2;
-    full @3;
-  }
-}
-
 struct ControlsState @0x97ff69c53601abf1 {
-  cumLagMs @15 :Float32;
   startMonoTime @48 :UInt64;
   longitudinalPlanMonoTime @28 :UInt64;
   lateralPlanMonoTime @50 :UInt64;
 
+  state @31 :OpenpilotState;
+  enabled @19 :Bool;
+  active @36 :Bool;
+
+  experimentalMode @64 :Bool;
+  personality @66 :LongitudinalPersonality;
+
   longControlState @30 :Car.CarControl.Actuators.LongControlState;
   vTargetLead @3 :Float32;
   vCruise @22 :Float32;  # actual set speed
@@ -741,21 +707,19 @@ struct ControlsState @0x97ff69c53601abf1 {
   aTarget @35 :Float32;
   curvature @37 :Float32;  # path curvature from vehicle model
   desiredCurvature @61 :Float32;  # lag adjusted curvatures used by lateral controllers
+  forceDecel @51 :Bool;
 
-  # TODO: remove these, they're now in selfdriveState
+  # UI alerts
   alertText1 @24 :Text;
   alertText2 @25 :Text;
-  alertStatus @38 :SelfdriveState.AlertStatus;
-  alertSize @39 :SelfdriveState.AlertSize;
+  alertStatus @38 :AlertStatus;
+  alertSize @39 :AlertSize;
+  alertBlinkingRate @42 :Float32;
   alertType @44 :Text;
   alertSound @56 :Car.CarControl.HUDControl.AudibleAlert;
   engageable @41 :Bool;  # can OP be engaged?
-  forceDecel @51 :Bool;
-  state @31 :SelfdriveState.OpenpilotState;
-  enabled @19 :Bool;
-  active @36 :Bool;
-  experimentalMode @64 :Bool;
-  personality @66 :LongitudinalPersonality;
+
+  cumLagMs @15 :Float32;
 
   lateralControlState :union {
     indiState @52 :LateralINDIState;
@@ -768,6 +732,27 @@ struct ControlsState @0x97ff69c53601abf1 {
     lqrStateDEPRECATED @55 :LateralLQRState;
   }
 
+  enum OpenpilotState @0xdbe58b96d2d1ac61 {
+    disabled @0;
+    preEnabled @1;
+    enabled @2;
+    softDisabling @3;
+    overriding @4;  # superset of overriding with steering or accelerator
+  }
+
+  enum AlertStatus {
+    normal @0;       # low priority alert for user's convenience
+    userPrompt @1;   # mid priority alert that might require user intervention
+    critical @2;     # high priority alert that needs immediate user intervention
+  }
+
+  enum AlertSize {
+    none @0;    # don't display the alert
+    small @1;   # small box
+    mid @2;     # mid screen
+    full @3;    # full screen
+  }
+
   struct LateralINDIState {
     active @0 :Bool;
     steeringAngleDeg @1 :Float32;
@@ -881,7 +866,6 @@ struct ControlsState @0x97ff69c53601abf1 {
   desiredCurvatureRateDEPRECATED @62 :Float32;
   canErrorCounterDEPRECATED @57 :UInt32;
   vPidDEPRECATED @2 :Float32;
-  alertBlinkingRateDEPRECATED @42 :Float32;
 }
 
 struct DrivingModelData {
@@ -1027,8 +1011,6 @@ struct ModelDataV2 {
     brake3MetersPerSecondSquaredProbs @4 :List(Float32);
     brake4MetersPerSecondSquaredProbs @5 :List(Float32);
     brake5MetersPerSecondSquaredProbs @6 :List(Float32);
-    gasPressProbs @7 :List(Float32);
-    brakePressProbs @8 :List(Float32);
   }
 
   struct Pose {
@@ -1270,38 +1252,6 @@ struct LiveLocationKalman {
   }
 }
 
-
-struct LivePose {
-  # More info on reference frames:
-  # https://github.com/commaai/openpilot/tree/master/common/transformations
-  orientationNED @0 :XYZMeasurement;
-  velocityDevice @1 :XYZMeasurement;
-  accelerationDevice @2 :XYZMeasurement;
-  angularVelocityDevice @3 :XYZMeasurement;
-
-  inputsOK @4 :Bool = false;
-  posenetOK @5 :Bool = false;
-  sensorsOK @6 :Bool = false;
-
-  filterState @7 :FilterState;
-
-  struct XYZMeasurement {
-    x @0 :Float32;
-    y @1 :Float32;
-    z @2 :Float32;
-    xStd @3 :Float32;
-    yStd @4 :Float32;
-    zStd @5 :Float32;
-    valid @6 :Bool;
-  }
-
-  struct FilterState {
-    value @0 : List(Float64);
-    std @1 : List(Float64);
-    valid @2 : Bool;
-  }
-}
-
 struct ProcLog {
   cpuTimes @0 :List(CPUTimes);
   mem @1 :Mem;
@@ -2101,15 +2051,9 @@ struct LiveParametersData {
   stiffnessFactorStd @12 :Float32;
   steerRatioStd @13 :Float32;
   roll @14 :Float32;
-  debugFilterState @16 :FilterState;
+  filterState @15 :LiveLocationKalman.Measurement;
 
   yawRateDEPRECATED @7 :Float32;
-  filterStateDEPRECATED @15 :LiveLocationKalman.Measurement;
-
-  struct FilterState {
-    value @0 : List(Float64);
-    std @1 : List(Float64);
-  }
 }
 
 struct LiveTorqueParametersData {
@@ -2317,7 +2261,6 @@ struct Event {
     gpsNMEA @3 :GPSNMEAData;
     can @5 :List(CanData);
     controlsState @7 :ControlsState;
-    selfdriveState @130 :SelfdriveState;
     gyroscope @99 :SensorEventData;
     gyroscope2 @100 :SensorEventData;
     accelerometer @98 :SensorEventData;
@@ -2349,7 +2292,7 @@ struct Event {
     onroadEvents @68: List(Car.CarEvent);
     carParams @69: Car.CarParams;
     driverMonitoringState @71: DriverMonitoringState;
-    livePose @129 :LivePose;
+    liveLocationKalman @72 :LiveLocationKalman;
     modelV2 @75 :ModelDataV2;
     drivingModelData @128 :DrivingModelData;
     driverStateV2 @92 :DriverStateV2;
@@ -2406,13 +2349,13 @@ struct Event {
     customReservedRawData2 @126 :Data;
 
     # *********** Custom: reserved for forks ***********
-    customReserved0 @107 :Custom.CustomReserved0;
-    customReserved1 @108 :Custom.CustomReserved1;
-    customReserved2 @109 :Custom.CustomReserved2;
-    customReserved3 @110 :Custom.CustomReserved3;
-    customReserved4 @111 :Custom.CustomReserved4;
-    customReserved5 @112 :Custom.CustomReserved5;
-    customReserved6 @113 :Custom.CustomReserved6;
+    controlsStateSP @107 :Custom.ControlsStateSP;
+    longitudinalPlanSP @108 :Custom.LongitudinalPlanSP;
+    lateralPlanSPDEPRECATED @109 :Custom.LateralPlanSP;
+    driverMonitoringStateSP @110 :Custom.DriverMonitoringStateSP;
+    liveMapDataSP @111 :Custom.LiveMapDataSP;
+    e2eLongStateSP @112 :Custom.E2eLongStateSP;
+    modelV2SP @113 :Custom.ModelDataV2SP;
     customReserved7 @114 :Custom.CustomReserved7;
     customReserved8 @115 :Custom.CustomReserved8;
     customReserved9 @116 :Custom.CustomReserved9;
@@ -2421,7 +2364,7 @@ struct Event {
     model @9 :Legacy.ModelData; # TODO: rename modelV2 and mark this as deprecated
     liveMpcDEPRECATED @36 :LiveMpcData;
     liveLongitudinalMpcDEPRECATED @37 :LiveLongitudinalMpcData;
-    liveLocationKalmanLegacyDEPRECATED @51 :Legacy.LiveLocationData;
+    liveLocationKalmanDEPRECATED @51 :Legacy.LiveLocationData;
     orbslamCorrectionDEPRECATED @45 :Legacy.OrbslamCorrection;
     liveUIDEPRECATED @14 :Legacy.LiveUI;
     sensorEventDEPRECATED @4 :SensorEventData;
@@ -2458,6 +2401,5 @@ struct Event {
     lateralPlanDEPRECATED @64 :LateralPlan;
     navModelDEPRECATED @104 :NavModelData;
     uiPlanDEPRECATED @106 :UiPlan;
-    liveLocationKalmanDEPRECATED @72 :LiveLocationKalman;
   }
 }

cereal/messaging/__init__.py

@@ -2,8 +2,7 @@
 from msgq.ipc_pyx import Context, Poller, SubSocket, PubSocket, SocketEventHandle, toggle_fake_events, \
                                 set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event
 from msgq.ipc_pyx import MultiplePublishersError, IpcError
-from msgq import fake_event_handle, pub_sock, sub_sock, drain_sock_raw
-import msgq
+from msgq import fake_event_handle, pub_sock, sub_sock, drain_sock_raw, context
 
 import os
 import capnp
@@ -18,12 +17,8 @@ from cereal.services import SERVICE_LIST
 NO_TRAVERSAL_LIMIT = 2**64-1
 
 
-def reset_context():
-  msgq.context = Context()
-
-
-def log_from_bytes(dat: bytes, struct: capnp.lib.capnp._StructModule = log.Event) -> capnp.lib.capnp._DynamicStructReader:
-  with struct.from_bytes(dat, traversal_limit_in_words=NO_TRAVERSAL_LIMIT) as msg:
+def log_from_bytes(dat: bytes) -> capnp.lib.capnp._DynamicStructReader:
+  with log.Event.from_bytes(dat, traversal_limit_in_words=NO_TRAVERSAL_LIMIT) as msg:
     return msg
 
 
@@ -92,63 +87,26 @@ def recv_one_retry(sock: SubSocket) -> capnp.lib.capnp._DynamicStructReader:
       return log_from_bytes(dat)
 
 
-class FrequencyTracker:
-  def __init__(self, service_freq: float, update_freq: float, is_poll: bool):
-    freq = max(min(service_freq, update_freq), 1.)
-    if is_poll:
-      min_freq = max_freq = freq
-    else:
-      max_freq = min(freq, update_freq)
-      if service_freq >= 2 * update_freq:
-        min_freq = update_freq
-      elif update_freq >= 2* service_freq:
-        min_freq = freq
-      else:
-        min_freq = min(freq, freq / 2.)
-
-    self.min_freq = min_freq * 0.8
-    self.max_freq = max_freq * 1.2
-    self.recv_dts: Deque[float] = deque(maxlen=int(10 * freq))
-    self.prev_time = 0.0
-
-  def record_recv_time(self, cur_time: float) -> None:
-    # TODO: Handle case where cur_time is less than prev_time
-    if self.prev_time > 1e-5:
-      self.recv_dts.append(cur_time - self.prev_time)
-    self.prev_time = cur_time
-
-  @property
-  def valid(self) -> bool:
-    if not self.recv_dts:
-      return False
-
-    avg_freq = len(self.recv_dts) / sum(self.recv_dts)
-    if self.min_freq <= avg_freq <= self.max_freq:
-      return True
-
-    recent_dts = list(self.recv_dts)[-int(self.recv_dts.maxlen / 10):]
-    avg_freq_recent = len(recent_dts) / sum(recent_dts)
-    return self.min_freq <= avg_freq_recent <= self.max_freq
-
-
 class SubMaster:
   def __init__(self, services: List[str], poll: Optional[str] = None,
                ignore_alive: Optional[List[str]] = None, ignore_avg_freq: Optional[List[str]] = None,
                ignore_valid: Optional[List[str]] = None, addr: str = "127.0.0.1", frequency: Optional[float] = None):
     self.frame = -1
-    self.services = services
     self.seen = {s: False for s in services}
     self.updated = {s: False for s in services}
     self.recv_time = {s: 0. for s in services}
     self.recv_frame = {s: 0 for s in services}
     self.alive = {s: False for s in services}
     self.freq_ok = {s: False for s in services}
+    self.recv_dts: Dict[str, Deque[float]] = {}
     self.sock = {}
     self.data = {}
     self.valid = {}
     self.logMonoTime = {}
 
-    self.freq_tracker: Dict[str, FrequencyTracker] = {}
+    self.max_freq = {}
+    self.min_freq = {}
+
     self.poller = Poller()
     polled_services = set([poll, ] if poll is not None else services)
     self.non_polled_services = set(services) - polled_services
@@ -175,7 +133,22 @@ class SubMaster:
       self.data[s] = getattr(data.as_reader(), s)
       self.logMonoTime[s] = 0
       self.valid[s] = True  # FIXME: this should default to False
-      self.freq_tracker[s] = FrequencyTracker(SERVICE_LIST[s].frequency, self.update_freq, s == poll)
+
+      freq = max(min([SERVICE_LIST[s].frequency, self.update_freq]), 1.)
+      if s == poll:
+        max_freq = freq
+        min_freq = freq
+      else:
+        max_freq = min(freq, self.update_freq)
+        if SERVICE_LIST[s].frequency >= 2*self.update_freq:
+          min_freq = self.update_freq
+        elif self.update_freq >= 2*SERVICE_LIST[s].frequency:
+          min_freq = freq
+        else:
+          min_freq = min(freq, freq / 2.)
+      self.max_freq[s] = max_freq*1.2
+      self.min_freq[s] = min_freq*0.8
+      self.recv_dts[s] = deque(maxlen=int(10*freq))
 
   def __getitem__(self, s: str) -> capnp.lib.capnp._DynamicStructReader:
     return self.data[s]
@@ -195,7 +168,7 @@ class SubMaster:
 
   def update_msgs(self, cur_time: float, msgs: List[capnp.lib.capnp._DynamicStructReader]) -> None:
     self.frame += 1
-    self.updated = dict.fromkeys(self.services, False)
+    self.updated = dict.fromkeys(self.updated, False)
     for msg in msgs:
       if msg is None:
         continue
@@ -204,30 +177,54 @@ class SubMaster:
       self.seen[s] = True
       self.updated[s] = True
 
-      self.freq_tracker[s].record_recv_time(cur_time)
+      if self.recv_time[s] > 1e-5:
+        self.recv_dts[s].append(cur_time - self.recv_time[s])
       self.recv_time[s] = cur_time
       self.recv_frame[s] = self.frame
       self.data[s] = getattr(msg, s)
       self.logMonoTime[s] = msg.logMonoTime
       self.valid[s] = msg.valid
 
-    for s in self.services:
+    for s in self.data:
       if SERVICE_LIST[s].frequency > 1e-5 and not self.simulation:
         # alive if delay is within 10x the expected frequency
         self.alive[s] = (cur_time - self.recv_time[s]) < (10. / SERVICE_LIST[s].frequency)
-        self.freq_ok[s] = self.freq_tracker[s].valid
+
+        # check average frequency; slow to fall, quick to recover
+        dts = self.recv_dts[s]
+        assert dts.maxlen is not None
+        recent_dts = list(dts)[-int(dts.maxlen / 10):]
+        try:
+          avg_freq = 1 / (sum(dts) / len(dts))
+          avg_freq_recent = 1 / (sum(recent_dts) / len(recent_dts))
+        except ZeroDivisionError:
+          avg_freq = 0
+          avg_freq_recent = 0
+
+        avg_freq_ok = self.min_freq[s] <= avg_freq <= self.max_freq[s]
+        recent_freq_ok = self.min_freq[s] <= avg_freq_recent <= self.max_freq[s]
+        self.freq_ok[s] = avg_freq_ok or recent_freq_ok
       else:
         self.freq_ok[s] = True
-        self.alive[s] = self.seen[s] if self.simulation else True
+        if self.simulation:
+          self.alive[s] = self.seen[s] # alive is defined as seen when simulation flag set
+        else:
+          self.alive[s] = True
 
   def all_alive(self, service_list: Optional[List[str]] = None) -> bool:
-    return all(self.alive[s] for s in (service_list or self.services) if s not in self.ignore_alive)
+    if service_list is None:
+      service_list = list(self.sock.keys())
+    return all(self.alive[s] for s in service_list if s not in self.ignore_alive)
 
   def all_freq_ok(self, service_list: Optional[List[str]] = None) -> bool:
-    return all(self.freq_ok[s] for s in (service_list or self.services) if self._check_avg_freq(s))
+    if service_list is None:
+      service_list = list(self.sock.keys())
+    return all(self.freq_ok[s] for s in service_list if self._check_avg_freq(s))
 
   def all_valid(self, service_list: Optional[List[str]] = None) -> bool:
-    return all(self.valid[s] for s in (service_list or self.services) if s not in self.ignore_valid)
+    if service_list is None:
+      service_list = list(self.sock.keys())
+    return all(self.valid[s] for s in service_list if s not in self.ignore_valid)
 
   def all_checks(self, service_list: Optional[List[str]] = None) -> bool:
     return self.all_alive(service_list) and self.all_freq_ok(service_list) and self.all_valid(service_list)

cereal/messaging/bridge.cc

@@ -1,10 +1,25 @@
+#include <algorithm>
 #include <cassert>
+#include <csignal>
+#include <iostream>
+#include <map>
+#include <string>
+
+typedef void (*sighandler_t)(int sig);
 
-#include "cereal/messaging/msgq_to_zmq.h"
 #include "cereal/services.h"
-#include "common/util.h"
+#include "msgq/impl_msgq.h"
+#include "msgq/impl_zmq.h"
 
-ExitHandler do_exit;
+std::atomic<bool> do_exit = false;
+static void set_do_exit(int sig) {
+  do_exit = true;
+}
+
+void sigpipe_handler(int sig) {
+  assert(sig == SIGPIPE);
+  std::cout << "SIGPIPE received" << std::endl;
+}
 
 static std::vector<std::string> get_services(std::string whitelist_str, bool zmq_to_msgq) {
   std::vector<std::string> service_list;
@@ -19,22 +34,41 @@ static std::vector<std::string> get_services(std::string whitelist_str, bool zmq
   return service_list;
 }
 
-void msgq_to_zmq(const std::vector<std::string> &endpoints, const std::string &ip) {
-  MsgqToZmq bridge;
-  bridge.run(endpoints, ip);
-}
+int main(int argc, char** argv) {
+  signal(SIGPIPE, (sighandler_t)sigpipe_handler);
+  signal(SIGINT, (sighandler_t)set_do_exit);
+  signal(SIGTERM, (sighandler_t)set_do_exit);
 
-void zmq_to_msgq(const std::vector<std::string> &endpoints, const std::string &ip) {
-  auto poller = std::make_unique<ZMQPoller>();
-  auto pub_context = std::make_unique<MSGQContext>();
-  auto sub_context = std::make_unique<ZMQContext>();
-  std::map<SubSocket *, PubSocket *> sub2pub;
+  bool zmq_to_msgq = argc > 2;
+  std::string ip = zmq_to_msgq ? argv[1] : "127.0.0.1";
+  std::string whitelist_str = zmq_to_msgq ? std::string(argv[2]) : "";
 
-  for (auto endpoint : endpoints) {
-    auto pub_sock = new MSGQPubSocket();
-    auto sub_sock = new ZMQSubSocket();
-    pub_sock->connect(pub_context.get(), endpoint);
-    sub_sock->connect(sub_context.get(), endpoint, ip, false);
+  Poller *poller;
+  Context *pub_context;
+  Context *sub_context;
+  if (zmq_to_msgq) {  // republishes zmq debugging messages as msgq
+    poller = new ZMQPoller();
+    pub_context = new MSGQContext();
+    sub_context = new ZMQContext();
+  } else {
+    poller = new MSGQPoller();
+    pub_context = new ZMQContext();
+    sub_context = new MSGQContext();
+  }
+
+  std::map<SubSocket*, PubSocket*> sub2pub;
+  for (auto endpoint : get_services(whitelist_str, zmq_to_msgq)) {
+    PubSocket * pub_sock;
+    SubSocket * sub_sock;
+    if (zmq_to_msgq) {
+      pub_sock = new MSGQPubSocket();
+      sub_sock = new ZMQSubSocket();
+    } else {
+      pub_sock = new ZMQPubSocket();
+      sub_sock = new MSGQSubSocket();
+    }
+    pub_sock->connect(pub_context, endpoint);
+    sub_sock->connect(sub_context, endpoint, ip, false);
 
     poller->registerSocket(sub_sock);
     sub2pub[sub_sock] = pub_sock;
@@ -42,30 +76,17 @@ void zmq_to_msgq(const std::vector<std::string> &endpoints, const std::string &i
 
   while (!do_exit) {
     for (auto sub_sock : poller->poll(100)) {
-      std::unique_ptr<Message> msg(sub_sock->receive(true));
-      if (msg) {
-        sub2pub[sub_sock]->sendMessage(msg.get());
-      }
+      Message * msg = sub_sock->receive();
+      if (msg == NULL) continue;
+      int ret;
+      do {
+        ret = sub2pub[sub_sock]->sendMessage(msg);
+      } while (ret == -1 && errno == EINTR && !do_exit);
+      assert(ret >= 0 || do_exit);
+      delete msg;
+
+      if (do_exit) break;
     }
   }
-
-  // Clean up allocated sockets
-  for (auto &[sub_sock, pub_sock] : sub2pub) {
-    delete sub_sock;
-    delete pub_sock;
-  }
-}
-
-int main(int argc, char **argv) {
-  bool is_zmq_to_msgq = argc > 2;
-  std::string ip = is_zmq_to_msgq ? argv[1] : "127.0.0.1";
-  std::string whitelist_str = is_zmq_to_msgq ? std::string(argv[2]) : "";
-  std::vector<std::string> endpoints = get_services(whitelist_str, is_zmq_to_msgq);
-
-  if (is_zmq_to_msgq) {
-    zmq_to_msgq(endpoints, ip);
-  } else {
-    msgq_to_zmq(endpoints, ip);
-  }
   return 0;
 }

cereal/messaging/msgq_to_zmq.cc

@@ -1,143 +0,0 @@
-#include "cereal/messaging/msgq_to_zmq.h"
-
-#include <cassert>
-
-#include "common/util.h"
-
-extern ExitHandler do_exit;
-
-// Max messages to process per socket per poll
-constexpr int MAX_MESSAGES_PER_SOCKET = 50;
-
-static std::string recv_zmq_msg(void *sock) {
-  zmq_msg_t msg;
-  zmq_msg_init(&msg);
-  std::string ret;
-  if (zmq_msg_recv(&msg, sock, 0) > 0) {
-    ret.assign((char *)zmq_msg_data(&msg), zmq_msg_size(&msg));
-  }
-  zmq_msg_close(&msg);
-  return ret;
-}
-
-void MsgqToZmq::run(const std::vector<std::string> &endpoints, const std::string &ip) {
-  zmq_context = std::make_unique<ZMQContext>();
-  msgq_context = std::make_unique<MSGQContext>();
-
-  // Create ZMQPubSockets for each endpoint
-  for (const auto &endpoint : endpoints) {
-    auto &socket_pair = socket_pairs.emplace_back();
-    socket_pair.endpoint = endpoint;
-    socket_pair.pub_sock = std::make_unique<ZMQPubSocket>();
-    int ret = socket_pair.pub_sock->connect(zmq_context.get(), endpoint);
-    if (ret != 0) {
-      printf("Failed to create ZMQ publisher for [%s]: %s\n", endpoint.c_str(), zmq_strerror(zmq_errno()));
-      return;
-    }
-  }
-
-  // Start ZMQ monitoring thread to monitor socket events
-  std::thread thread(&MsgqToZmq::zmqMonitorThread, this);
-
-  // Main loop for processing messages
-  while (!do_exit) {
-    {
-      std::unique_lock lk(mutex);
-      cv.wait(lk, [this]() { return do_exit || !sub2pub.empty(); });
-      if (do_exit) break;
-
-      for (auto sub_sock : msgq_poller->poll(100)) {
-        // Process messages for each socket
-        for (int i = 0; i < MAX_MESSAGES_PER_SOCKET; ++i) {
-          auto msg = std::unique_ptr<Message>(sub_sock->receive(true));
-          if (!msg) break;
-
-          while (sub2pub[sub_sock]->sendMessage(msg.get()) == -1) {
-            if (errno != EINTR) break;
-          }
-        }
-      }
-    }
-    util::sleep_for(1);  // Give zmqMonitorThread a chance to acquire the mutex
-  }
-
-  thread.join();
-}
-
-void MsgqToZmq::zmqMonitorThread() {
-  std::vector<zmq_pollitem_t> pollitems;
-
-  // Set up ZMQ monitor for each pub socket
-  for (int i = 0; i < socket_pairs.size(); ++i) {
-    std::string addr = "inproc://op-bridge-monitor-" + std::to_string(i);
-    zmq_socket_monitor(socket_pairs[i].pub_sock->sock, addr.c_str(), ZMQ_EVENT_ACCEPTED | ZMQ_EVENT_DISCONNECTED);
-
-    void *monitor_socket = zmq_socket(zmq_context->getRawContext(), ZMQ_PAIR);
-    zmq_connect(monitor_socket, addr.c_str());
-    pollitems.emplace_back(zmq_pollitem_t{.socket = monitor_socket, .events = ZMQ_POLLIN});
-  }
-
-  while (!do_exit) {
-    int ret = zmq_poll(pollitems.data(), pollitems.size(), 1000);
-    if (ret < 0) {
-      if (errno == EINTR) {
-        // Due to frequent EINTR signals from msgq, introduce a brief delay (200 ms)
-        // to reduce CPU usage during retry attempts.
-        util::sleep_for(200);
-      }
-      continue;
-    }
-
-    for (int i = 0; i < pollitems.size(); ++i) {
-      if (pollitems[i].revents & ZMQ_POLLIN) {
-        // First frame in message contains event number and value
-        std::string frame = recv_zmq_msg(pollitems[i].socket);
-        if (frame.empty()) continue;
-
-        uint16_t event_type = *(uint16_t *)(frame.data());
-
-        // Second frame in message contains event address
-        frame = recv_zmq_msg(pollitems[i].socket);
-        if (frame.empty()) continue;
-
-        std::unique_lock lk(mutex);
-        auto &pair = socket_pairs[i];
-        if (event_type & ZMQ_EVENT_ACCEPTED) {
-          printf("socket [%s] connected\n", pair.endpoint.c_str());
-          if (++pair.connected_clients == 1) {
-            // Create new MSGQ subscriber socket and map to ZMQ publisher
-            pair.sub_sock = std::make_unique<MSGQSubSocket>();
-            pair.sub_sock->connect(msgq_context.get(), pair.endpoint, "127.0.0.1");
-            sub2pub[pair.sub_sock.get()] = pair.pub_sock.get();
-            registerSockets();
-          }
-        } else if (event_type & ZMQ_EVENT_DISCONNECTED) {
-          printf("socket [%s] disconnected\n", pair.endpoint.c_str());
-          if (pair.connected_clients == 0 || --pair.connected_clients == 0) {
-            // Remove MSGQ subscriber socket from mapping and reset it
-            sub2pub.erase(pair.sub_sock.get());
-            pair.sub_sock.reset(nullptr);
-            registerSockets();
-          }
-        }
-        cv.notify_one();
-      }
-    }
-  }
-
-  // Clean up monitor sockets
-  for (int i = 0; i < pollitems.size(); ++i) {
-    zmq_socket_monitor(socket_pairs[i].pub_sock->sock, nullptr, 0);
-    zmq_close(pollitems[i].socket);
-  }
-  cv.notify_one();
-}
-
-void MsgqToZmq::registerSockets() {
-  msgq_poller = std::make_unique<MSGQPoller>();
-  for (const auto &socket_pair : socket_pairs) {
-    if (socket_pair.sub_sock) {
-      msgq_poller->registerSocket(socket_pair.sub_sock.get());
-    }
-  }
-}

cereal/messaging/msgq_to_zmq.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <condition_variable>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <vector>
-
-#define private public
-#include "msgq/impl_msgq.h"
-#include "msgq/impl_zmq.h"
-
-class MsgqToZmq {
-public:
-  MsgqToZmq() {}
-  void run(const std::vector<std::string> &endpoints, const std::string &ip);
-
-protected:
-  void registerSockets();
-  void zmqMonitorThread();
-
-  struct SocketPair {
-    std::string endpoint;
-    std::unique_ptr<ZMQPubSocket> pub_sock;
-    std::unique_ptr<MSGQSubSocket> sub_sock;
-    int connected_clients = 0;
-  };
-
-  std::unique_ptr<MSGQContext> msgq_context;
-  std::unique_ptr<ZMQContext> zmq_context;
-  std::mutex mutex;
-  std::condition_variable cv;
-  std::unique_ptr<MSGQPoller> msgq_poller;
-  std::map<SubSocket *, ZMQPubSocket *> sub2pub;
-  std::vector<SocketPair> socket_pairs;
-};

cereal/messaging/tests/test_messaging.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import os
 import capnp
 import multiprocessing
@@ -5,8 +6,8 @@ import numbers
 import random
 import threading
 import time
+import unittest
 from parameterized import parameterized
-import pytest
 
 from cereal import log, car
 import cereal.messaging as messaging
@@ -27,6 +28,12 @@ def zmq_sleep(t=1):
   if "ZMQ" in os.environ:
     time.sleep(t)
 
+def zmq_expected_failure(func):
+  if "ZMQ" in os.environ:
+    return unittest.expectedFailure(func)
+  else:
+    return func
+
 
 # TODO: this should take any capnp struct and returrn a msg with random populated data
 def random_carstate():
@@ -51,12 +58,12 @@ def delayed_send(delay, sock, dat):
   threading.Timer(delay, send_func).start()
 
 
-class TestMessaging:
+class TestMessaging(unittest.TestCase):
   def setUp(self):
     # TODO: ZMQ tests are too slow; all sleeps will need to be
     # replaced with logic to block on the necessary condition
     if "ZMQ" in os.environ:
-      pytest.skip()
+      raise unittest.SkipTest
 
     # ZMQ pub socket takes too long to die
     # sleep to prevent multiple publishers error between tests
@@ -68,9 +75,9 @@ class TestMessaging:
       msg = messaging.new_message(evt)
     except capnp.lib.capnp.KjException:
       msg = messaging.new_message(evt, random.randrange(200))
-    assert (time.monotonic() - msg.logMonoTime) < 0.1
-    assert not msg.valid
-    assert evt == msg.which()
+    self.assertLess(time.monotonic() - msg.logMonoTime, 0.1)
+    self.assertFalse(msg.valid)
+    self.assertEqual(evt, msg.which())
 
   @parameterized.expand(events)
   def test_pub_sock(self, evt):
@@ -92,8 +99,8 @@ class TestMessaging:
 
     # no wait and no msgs in queue
     msgs = func(sub_sock)
-    assert isinstance(msgs, list)
-    assert len(msgs) == 0
+    self.assertIsInstance(msgs, list)
+    self.assertEqual(len(msgs), 0)
 
     # no wait but msgs are queued up
     num_msgs = random.randrange(3, 10)
@@ -101,9 +108,9 @@ class TestMessaging:
       pub_sock.send(messaging.new_message(sock).to_bytes())
     time.sleep(0.1)
     msgs = func(sub_sock)
-    assert isinstance(msgs, list)
-    assert all(isinstance(msg, expected_type) for msg in msgs)
-    assert len(msgs) == num_msgs
+    self.assertIsInstance(msgs, list)
+    self.assertTrue(all(isinstance(msg, expected_type) for msg in msgs))
+    self.assertEqual(len(msgs), num_msgs)
 
   def test_recv_sock(self):
     sock = "carState"
@@ -113,14 +120,14 @@ class TestMessaging:
 
     # no wait and no msg in queue, socket should timeout
     recvd = messaging.recv_sock(sub_sock)
-    assert recvd is None
+    self.assertTrue(recvd is None)
 
     # no wait and one msg in queue
     msg = random_carstate()
     pub_sock.send(msg.to_bytes())
     time.sleep(0.01)
     recvd = messaging.recv_sock(sub_sock)
-    assert isinstance(recvd, capnp._DynamicStructReader)
+    self.assertIsInstance(recvd, capnp._DynamicStructReader)
     # https://github.com/python/mypy/issues/13038
     assert_carstate(msg.carState, recvd.carState)
 
@@ -132,16 +139,16 @@ class TestMessaging:
 
     # no msg in queue, socket should timeout
     recvd = messaging.recv_one(sub_sock)
-    assert recvd is None
+    self.assertTrue(recvd is None)
 
     # one msg in queue
     msg = random_carstate()
     pub_sock.send(msg.to_bytes())
     recvd = messaging.recv_one(sub_sock)
-    assert isinstance(recvd, capnp._DynamicStructReader)
+    self.assertIsInstance(recvd, capnp._DynamicStructReader)
     assert_carstate(msg.carState, recvd.carState)
 
-  @pytest.mark.xfail(condition="ZMQ" in os.environ, reason='ZMQ detected')
+  @zmq_expected_failure
   def test_recv_one_or_none(self):
     sock = "carState"
     pub_sock = messaging.pub_sock(sock)
@@ -150,13 +157,13 @@ class TestMessaging:
 
     # no msg in queue, socket shouldn't block
     recvd = messaging.recv_one_or_none(sub_sock)
-    assert recvd is None
+    self.assertTrue(recvd is None)
 
     # one msg in queue
     msg = random_carstate()
     pub_sock.send(msg.to_bytes())
     recvd = messaging.recv_one_or_none(sub_sock)
-    assert isinstance(recvd, capnp._DynamicStructReader)
+    self.assertIsInstance(recvd, capnp._DynamicStructReader)
     assert_carstate(msg.carState, recvd.carState)
 
   def test_recv_one_retry(self):
@@ -172,7 +179,7 @@ class TestMessaging:
       p = multiprocessing.Process(target=messaging.recv_one_retry, args=(sub_sock,))
       p.start()
       time.sleep(sock_timeout*15)
-      assert p.is_alive()
+      self.assertTrue(p.is_alive())
       p.terminate()
 
     # wait 15 socket timeouts before sending
@@ -180,6 +187,9 @@ class TestMessaging:
     delayed_send(sock_timeout*15, pub_sock, msg.to_bytes())
     start_time = time.monotonic()
     recvd = messaging.recv_one_retry(sub_sock)
-    assert (time.monotonic() - start_time) >= sock_timeout*15
-    assert isinstance(recvd, capnp._DynamicStructReader)
+    self.assertGreaterEqual(time.monotonic() - start_time, sock_timeout*15)
+    self.assertIsInstance(recvd, capnp._DynamicStructReader)
     assert_carstate(msg.carState, recvd.carState)
+
+if __name__ == "__main__":
+  unittest.main()

cereal/messaging/tests/test_pub_sub_master.py

@@ -1,6 +1,8 @@
+#!/usr/bin/env python3
 import random
 import time
 from typing import Sized, cast
+import unittest
 
 import cereal.messaging as messaging
 from cereal.messaging.tests.test_messaging import events, random_sock, random_socks, \
@@ -8,9 +10,9 @@ from cereal.messaging.tests.test_messaging import events, random_sock, random_so
                                                   zmq_sleep
 
 
-class TestSubMaster:
+class TestSubMaster(unittest.TestCase):
 
-  def setup_method(self):
+  def setUp(self):
     # ZMQ pub socket takes too long to die
     # sleep to prevent multiple publishers error between tests
     zmq_sleep(3)
@@ -19,21 +21,21 @@ class TestSubMaster:
     sm = messaging.SubMaster(events)
     for p in [sm.updated, sm.recv_time, sm.recv_frame, sm.alive,
               sm.sock, sm.data, sm.logMonoTime, sm.valid]:
-      assert len(cast(Sized, p)) == len(events)
+      self.assertEqual(len(cast(Sized, p)), len(events))
 
   def test_init_state(self):
     socks = random_socks()
     sm = messaging.SubMaster(socks)
-    assert sm.frame == -1
-    assert not any(sm.updated.values())
-    assert not any(sm.alive.values())
-    assert all(t == 0. for t in sm.recv_time.values())
-    assert all(f == 0 for f in sm.recv_frame.values())
-    assert all(t == 0 for t in sm.logMonoTime.values())
+    self.assertEqual(sm.frame, -1)
+    self.assertFalse(any(sm.updated.values()))
+    self.assertFalse(any(sm.alive.values()))
+    self.assertTrue(all(t == 0. for t in sm.recv_time.values()))
+    self.assertTrue(all(f == 0 for f in sm.recv_frame.values()))
+    self.assertTrue(all(t == 0 for t in sm.logMonoTime.values()))
 
     for p in [sm.updated, sm.recv_time, sm.recv_frame, sm.alive,
               sm.sock, sm.data, sm.logMonoTime, sm.valid]:
-      assert len(cast(Sized, p)) == len(socks)
+      self.assertEqual(len(cast(Sized, p)), len(socks))
 
   def test_getitem(self):
     sock = "carState"
@@ -57,8 +59,8 @@ class TestSubMaster:
       msg = messaging.new_message(sock)
       pub_sock.send(msg.to_bytes())
       sm.update(1000)
-      assert sm.frame == i
-      assert all(sm.updated.values())
+      self.assertEqual(sm.frame, i)
+      self.assertTrue(all(sm.updated.values()))
 
   def test_update_timeout(self):
     sock = random_sock()
@@ -68,9 +70,9 @@ class TestSubMaster:
       start_time = time.monotonic()
       sm.update(timeout)
       t = time.monotonic() - start_time
-      assert t >= timeout/1000.
-      assert t < 5
-      assert not any(sm.updated.values())
+      self.assertGreaterEqual(t, timeout/1000.)
+      self.assertLess(t, 5)
+      self.assertFalse(any(sm.updated.values()))
 
   def test_avg_frequency_checks(self):
     for poll in (True, False):
@@ -89,8 +91,8 @@ class TestSubMaster:
       for service, (max_freq, min_freq) in checks.items():
         if max_freq is not None:
           assert sm._check_avg_freq(service)
-          assert sm.freq_tracker[service].max_freq == max_freq*1.2
-          assert sm.freq_tracker[service].min_freq == min_freq*0.8
+          assert sm.max_freq[service] == max_freq*1.2
+          assert sm.min_freq[service] == min_freq*0.8
         else:
           assert not sm._check_avg_freq(service)
 
@@ -116,12 +118,12 @@ class TestSubMaster:
       pub_sock.send(msg.to_bytes())
       time.sleep(0.01)
     sm.update(1000)
-    assert sm[sock].vEgo == n
+    self.assertEqual(sm[sock].vEgo, n)
 
 
-class TestPubMaster:
+class TestPubMaster(unittest.TestCase):
 
-  def setup_method(self):
+  def setUp(self):
     # ZMQ pub socket takes too long to die
     # sleep to prevent multiple publishers error between tests
     zmq_sleep(3)
@@ -154,4 +156,8 @@ class TestPubMaster:
         if capnp:
           msg.clear_write_flag()
           msg = msg.to_bytes()
-        assert msg == recvd, i
+        self.assertEqual(msg, recvd, i)
+
+
+if __name__ == "__main__":
+  unittest.main()

cereal/messaging/tests/test_services.py

@@ -1,21 +1,26 @@
+#!/usr/bin/env python3
 import os
 import tempfile
 from typing import Dict
+import unittest
 from parameterized import parameterized
 
 import cereal.services as services
 from cereal.services import SERVICE_LIST
 
 
-class TestServices:
+class TestServices(unittest.TestCase):
 
   @parameterized.expand(SERVICE_LIST.keys())
   def test_services(self, s):
     service = SERVICE_LIST[s]
-    assert service.frequency <= 104
-    assert service.decimation != 0
+    self.assertTrue(service.frequency <= 104)
+    self.assertTrue(service.decimation != 0)
 
   def test_generated_header(self):
     with tempfile.NamedTemporaryFile(suffix=".h") as f:
       ret = os.system(f"python3 {services.__file__} > {f.name} && clang++ {f.name}")
-      assert ret == 0, "generated services header is not valid C"
+      self.assertEqual(ret, 0, "generated services header is not valid C")
+
+if __name__ == "__main__":
+  unittest.main()

cereal/services.py

@@ -16,15 +16,14 @@ _services: dict[str, tuple] = {
   "gyroscope2": (True, 100., 100),
   "accelerometer": (True, 104., 104),
   "accelerometer2": (True, 100., 100),
-  "magnetometer": (True, 25.),
+  "magnetometer": (True, 25., 25),
   "lightSensor": (True, 100., 100),
   "temperatureSensor": (True, 2., 200),
   "temperatureSensor2": (True, 2., 200),
   "gpsNMEA": (True, 9.),
   "deviceState": (True, 2., 1),
-  "can": (True, 100., 2053),  # decimation gives ~3 msgs in a full segment
+  "can": (True, 100., 1223),  # decimation gives ~5 msgs in a full segment
   "controlsState": (True, 100., 10),
-  "selfdriveState": (True, 100., 10),
   "pandaStates": (True, 10., 1),
   "peripheralState": (True, 2., 1),
   "radarState": (True, 20., 5),
@@ -39,7 +38,7 @@ _services: dict[str, tuple] = {
   "carState": (True, 100., 10),
   "carControl": (True, 100., 10),
   "carOutput": (True, 100., 10),
-  "longitudinalPlan": (True, 20., 10),
+  "longitudinalPlan": (True, 20., 5),
   "procLog": (True, 0.5, 15),
   "gpsLocationExternal": (True, 10., 10),
   "gpsLocation": (True, 1., 1),
@@ -48,9 +47,10 @@ _services: dict[str, tuple] = {
   "gnssMeasurements": (True, 10., 10),
   "clocks": (True, 0.1, 1),
   "ubloxRaw": (True, 20.),
-  "livePose": (True, 20., 4),
+  "liveLocationKalman": (True, 20., 5),
   "liveParameters": (True, 20., 5),
-  "cameraOdometry": (True, 20., 10),
+  "cameraOdometry": (True, 20., 5),
+  "lateralPlanDEPRECATED": (True, 20., 5),
   "thumbnail": (True, 0.2, 1),
   "onroadEvents": (True, 1., 1),
   "carParams": (True, 0.02, 1),
@@ -68,10 +68,21 @@ _services: dict[str, tuple] = {
   "navInstruction": (True, 1., 10),
   "navRoute": (True, 0.),
   "navThumbnail": (True, 0.),
+  "navModelDEPRECATED": (True, 2., 4.),
+  "mapRenderState": (True, 2., 1.),
+  "uiPlanDEPRECATED": (True, 20., 40.),
   "qRoadEncodeIdx": (False, 20.),
   "userFlag": (True, 0., 1),
   "microphone": (True, 10., 10),
 
+  "controlsStateSP": (True, 100., 10),
+  "longitudinalPlanSP": (True, 20., 5),
+  "lateralPlanSPDEPRECATED": (True, 20., 5),
+  "driverMonitoringStateSP": (True, 20., 10),
+  "liveMapDataSP": (True, 0.),
+  "e2eLongStateSP": (True, 0.),
+  "modelV2SP": (True, 20., 40),
+
   # debug
   "uiDebug": (True, 0., 1),
   "testJoystick": (True, 0.),

common/gps.py

@@ -1,8 +0,0 @@
-from openpilot.common.params import Params
-
-
-def get_gps_location_service(params: Params) -> str:
-  if params.get_bool("UbloxAvailable"):
-    return "gpsLocationExternal"
-  else:
-    return "gpsLocation"

common/mock/__init__.py

@@ -8,12 +8,12 @@ import functools
 import threading
 from cereal.messaging import PubMaster
 from cereal.services import SERVICE_LIST
-from openpilot.common.mock.generators import generate_livePose
+from openpilot.common.mock.generators import generate_liveLocationKalman
 from openpilot.common.realtime import Ratekeeper
 
 
 MOCK_GENERATOR = {
-  "livePose": generate_livePose
+  "liveLocationKalman": generate_liveLocationKalman
 }
 
 

common/mock/generators.py

@@ -1,14 +1,20 @@
 from cereal import messaging
 
 
-def generate_livePose():
-  msg = messaging.new_message('livePose')
-  meas = {'x': 0.0, 'y': 0.0, 'z': 0.0, 'xStd': 0.0, 'yStd': 0.0, 'zStd': 0.0, 'valid': True}
-  msg.livePose.orientationNED = meas
-  msg.livePose.velocityDevice = meas
-  msg.livePose.angularVelocityDevice = meas
-  msg.livePose.accelerationDevice = meas
-  msg.livePose.inputsOK = True
-  msg.livePose.posenetOK = True
-  msg.livePose.sensorsOK = True
+LOCATION1 = (32.7174, -117.16277)
+LOCATION2 = (32.7558, -117.2037)
+
+LLK_DECIMATION = 10
+RENDER_FRAMES = 15
+DEFAULT_ITERATIONS = RENDER_FRAMES * LLK_DECIMATION
+
+
+def generate_liveLocationKalman(location=LOCATION1):
+  msg = messaging.new_message('liveLocationKalman')
+  msg.liveLocationKalman.positionGeodetic = {'value': [*location, 0], 'std': [0., 0., 0.], 'valid': True}
+  msg.liveLocationKalman.positionECEF = {'value': [0., 0., 0.], 'std': [0., 0., 0.], 'valid': True}
+  msg.liveLocationKalman.calibratedOrientationNED = {'value': [0., 0., 0.], 'std': [0., 0., 0.], 'valid': True}
+  msg.liveLocationKalman.velocityCalibrated = {'value': [0., 0., 0.], 'std': [0., 0., 0.], 'valid': True}
+  msg.liveLocationKalman.status = 'valid'
+  msg.liveLocationKalman.gpsOK = True
   return msg

common/params.cc

@@ -24,8 +24,8 @@ int fsync_dir(const std::string &path) {
   int result = -1;
   int fd = HANDLE_EINTR(open(path.c_str(), O_RDONLY, 0755));
   if (fd >= 0) {
-    result = HANDLE_EINTR(fsync(fd));
-    HANDLE_EINTR(close(fd));
+    result = fsync(fd);
+    close(fd);
   }
   return result;
 }
@@ -104,6 +104,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"CarParamsCache", CLEAR_ON_MANAGER_START},
     {"CarParamsPersistent", PERSISTENT},
     {"CarParamsPrevRoute", PERSISTENT},
+    {"CarVin", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION},
     {"CompletedTrainingVersion", PERSISTENT},
     {"ControlsReady", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION},
     {"CurrentBootlog", PERSISTENT},
@@ -199,6 +200,100 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"UpdaterTargetBranch", CLEAR_ON_MANAGER_START},
     {"UpdaterLastFetchTime", PERSISTENT},
     {"Version", PERSISTENT},
+
+    {"AccMadsCombo", PERSISTENT},
+    {"AmapKey1", PERSISTENT},
+    {"AmapKey2", PERSISTENT},
+    {"AutoLaneChangeTimer", PERSISTENT},
+    {"AutoLaneChangeBsmDelay", PERSISTENT},
+    {"BelowSpeedPause", PERSISTENT},
+    {"BrakeLights", PERSISTENT},
+    {"BrightnessControl", PERSISTENT},
+    {"ButtonAutoHide", PERSISTENT},
+    {"CameraControl", PERSISTENT},
+    {"CameraControlToggle", PERSISTENT},
+    {"CameraOffset", PERSISTENT},
+    {"CarModel", PERSISTENT},
+    {"CarModelText", PERSISTENT},
+    {"ChevronInfo", PERSISTENT},
+    {"CustomBootScreen", PERSISTENT},
+    {"CustomMapboxTokenPk", PERSISTENT},
+    {"CustomMapboxTokenSk", PERSISTENT},
+    {"CustomOffsets", PERSISTENT},
+    {"CustomStockLong", PERSISTENT},
+    {"CustomTorqueLateral", PERSISTENT},
+    {"DevUI", PERSISTENT},
+    {"DevUIInfo", PERSISTENT},
+    {"DisableOnroadUploads", PERSISTENT},
+    {"DisengageLateralOnBrake", PERSISTENT},
+    {"DynamicExperimentalControl", PERSISTENT},
+    {"DynamicExperimentalControlToggle", PERSISTENT},
+    {"DynamicLaneProfile", PERSISTENT},
+    {"DynamicLaneProfileToggle", PERSISTENT},
+    {"EnableAmap", PERSISTENT},
+    {"EnableDebugSnapshot", PERSISTENT},
+    {"EnableGmap", PERSISTENT},
+    {"EnableMads", PERSISTENT},
+    {"EndToEndLongAlertLead", PERSISTENT},
+    {"EndToEndLongAlertLight", PERSISTENT},
+    {"EndToEndLongAlertUI", PERSISTENT},
+    {"EndToEndLongToggle", PERSISTENT},
+    {"EnforceTorqueLateral", PERSISTENT},
+    {"EnhancedScc", PERSISTENT},
+    {"FleetManagerPin", PERSISTENT},
+    {"GapAdjustCruise", PERSISTENT},
+    {"GapAdjustCruiseMax", PERSISTENT},
+    {"GapAdjustCruiseMin", PERSISTENT},
+    {"GapAdjustCruiseMode", PERSISTENT},
+    {"GapAdjustCruiseTr", PERSISTENT},
+    {"GmapKey", PERSISTENT},
+    {"HandsOnWheelMonitoring", PERSISTENT},
+    {"HideVEgoUi", PERSISTENT},
+    {"HkgSmoothStop", PERSISTENT},
+    {"HotspotOnBoot", PERSISTENT},
+    {"LastCarModel", PERSISTENT},
+    {"LastSpeedLimitSignTap", PERSISTENT},
+    {"LiveTorque", PERSISTENT},
+    {"LkasToggle", PERSISTENT},
+    {"MadsCruiseMain", PERSISTENT},
+    {"MadsIconToggle", PERSISTENT},
+    {"MapboxFullScreen", PERSISTENT},
+    {"MaxTimeOffroad", PERSISTENT},
+    {"OnroadScreenOff", PERSISTENT},
+    {"OnroadScreenOffBrightness", PERSISTENT},
+    {"OnroadScreenOffEvent", PERSISTENT},
+    {"OsmDbUpdatesCheck", PERSISTENT},
+    {"OsmLocal", PERSISTENT},
+    {"OsmLocalDb", PERSISTENT},
+    {"OsmLocationName", PERSISTENT},
+    {"OsmLocationTitle", PERSISTENT},
+    {"OsmLocationUrl", PERSISTENT},
+    {"OsmWayTest", PERSISTENT},
+    {"PathOffset", PERSISTENT},
+    {"QuietDrive", PERSISTENT},
+    {"RoadEdge", PERSISTENT},
+    {"ReverseAccChange", PERSISTENT},
+    {"ReverseDmCam", PERSISTENT},
+    {"ScreenRecorder", PERSISTENT},
+    {"ShowDebugUI", PERSISTENT},
+    {"SidebarTemperature", PERSISTENT},
+    {"SidebarTemperatureOptions", PERSISTENT},
+    {"SpeedLimitControl", PERSISTENT},
+    {"SpeedLimitPercOffset", PERSISTENT},
+    {"SpeedLimitValueOffset", PERSISTENT},
+    {"SpeedLimitOffsetType", PERSISTENT},
+    {"StandStillTimer", PERSISTENT},
+    {"StockLongToyota", PERSISTENT},
+    {"TorqueDeadzoneDeg", PERSISTENT},
+    {"TorqueFriction", PERSISTENT},
+    {"TorqueMaxLatAccel", PERSISTENT},
+    {"ToyotaTSS2Long", PERSISTENT},
+    {"TrueVEgoUi", PERSISTENT},
+    {"TurnSpeedControl", PERSISTENT},
+    {"TurnVisionControl", PERSISTENT},
+    {"VisionCurveLaneless", PERSISTENT},
+    {"VwAccType", PERSISTENT},
+    {"Offroad_SupersededUpdate", PERSISTENT},
 };
 
 } // namespace

common/realtime.py

@@ -4,7 +4,7 @@ import os
 import time
 from collections import deque
 
-from setproctitle import getproctitle
+from openpilot.common.threadname import getthreadname
 
 from openpilot.system.hardware import PC
 
@@ -52,7 +52,7 @@ class Ratekeeper:
     self._print_delay_threshold = print_delay_threshold
     self._frame = 0
     self._remaining = 0.0
-    self._process_name = getproctitle()
+    self._thread_name = getthreadname()
     self._dts = deque([self._interval], maxlen=100)
     self._last_monitor_time = time.monotonic()
 
@@ -87,7 +87,7 @@ class Ratekeeper:
     remaining = self._next_frame_time - time.monotonic()
     self._next_frame_time += self._interval
     if self._print_delay_threshold is not None and remaining < -self._print_delay_threshold:
-      print(f"{self._process_name} lagging by {-remaining * 1000:.2f} ms")
+      print(f"{self._thread_name} lagging by {-remaining * 1000:.2f} ms")
       lagged = True
     self._frame += 1
     self._remaining = remaining

common/swaglog.py

@@ -104,15 +104,6 @@ class UnixDomainSocketHandler(logging.Handler):
       pass
 
 
-class ForwardingHandler(logging.Handler):
-  def __init__(self, target_logger):
-    super().__init__()
-    self.target_logger = target_logger
-
-  def emit(self, record):
-    self.target_logger.handle(record)
-
-
 def add_file_handler(log):
   """
   Function to add the file log handler to swaglog.

common/tests/test_threadname.py

@@ -0,0 +1,8 @@
+from openpilot.common.threadname import setthreadname, getthreadname, LINUX
+
+class TestThreadName:
+  def test_set_get_threadname(self):
+    if LINUX:
+      name = 'TESTING'
+      setthreadname(name)
+      assert name == getthreadname()

common/threadname.py

@@ -0,0 +1,19 @@
+import ctypes
+import os
+
+LINUX = os.name == 'posix' and os.uname().sysname == 'Linux'
+
+if LINUX:
+  libc = ctypes.CDLL('libc.so.6')
+
+def setthreadname(name: str) -> None:
+  if LINUX:
+    name = name[-15:] + '\0'
+    libc.prctl(15, str.encode(name), 0, 0, 0)
+
+def getthreadname() -> str:
+  if LINUX:
+    name = ctypes.create_string_buffer(16)
+    libc.prctl(16, name)
+    return name.value.decode('utf-8')
+  return ""

common/time.py

@@ -1,7 +1,7 @@
 import datetime
 from pathlib import Path
 
-_MIN_DATE = datetime.datetime(year=2024, month=8, day=26)
+_MIN_DATE = datetime.datetime(year=2024, month=3, day=30)
 
 def min_date():
   # on systemd systems, the default time is the systemd build time

common/transformations/camera.py

@@ -47,9 +47,9 @@ class DeviceCameraConfig:
         yield cam, getattr(self, cam)
 
 _ar_ox_fisheye = CameraConfig(1928, 1208, 567.0)  # focal length probably wrong? magnification is not consistent across frame
-_os_fisheye = CameraConfig(2688 // 2, 1520 // 2, 567.0 / 4 * 3)
+_os_fisheye = CameraConfig(2688, 1520, 567.0 / 2 * 3)
 _ar_ox_config = DeviceCameraConfig(CameraConfig(1928, 1208, 2648.0), _ar_ox_fisheye, _ar_ox_fisheye)
-_os_config = DeviceCameraConfig(CameraConfig(2688 // 2, 1520 // 2, 1522.0 * 3 / 4), _os_fisheye, _os_fisheye)
+_os_config = DeviceCameraConfig(CameraConfig(2688, 1520, 2648.0 * 2 / 3), _os_fisheye, _os_fisheye)
 _neo_config = DeviceCameraConfig(CameraConfig(1164, 874, 910.0), CameraConfig(816, 612, 650.0), _NoneCameraConfig())
 
 DEVICE_CAMERAS = {

common/utils.py

@@ -0,0 +1,11 @@
+class Freezable:
+  _frozen: bool = False
+
+  def freeze(self):
+    if not self._frozen:
+      self._frozen = True
+
+  def __setattr__(self, *args, **kwargs):
+    if self._frozen:
+      raise Exception("cannot modify frozen object")
+    super().__setattr__(*args, **kwargs)

common/version.h

@@ -1 +1 @@
-#define COMMA_VERSION "0.9.8"
+#define COMMA_VERSION "0.9.8.0"

docs/BOUNTIES.md

@@ -0,0 +1,62 @@
+# [Bounties](https://github.com/orgs/commaai/projects/26/views/1)
+
+Get paid to improve openpilot!
+
+## Rules
+
+* code must be merged into openpilot master
+* bounty eligibility is solely at our discretion
+* once you open a PR, the bounty is locked to you until you stop working on it
+* open a ticket at [comma.ai/support](https://comma.ai/support/shop-order) with links to your PRs to claim
+* get an extra 20% if you redeem your bounty in [comma shop](https://comma.ai/shop) credit (including refunds on previous orders)
+* for bounties >$100, the first PR gets a lock, which times out after a week of no progress
+
+We put up each bounty with the intention that it'll get merged, but occasionally the right resolution is to close the bounty, which only becomes clear once some effort is put in. 
+This is still valuable work, so we'll pay out $100 for getting any bounty closed with a good explanation.
+
+## Issue bounties
+
+We've tagged bounty-eligible issues across openpilot and the rest of our repos; check out all the open ones [here](https://github.com/orgs/commaai/projects/26/views/1). These bounties roughly work out like this:
+* **$100** - a few hours of work for an experienced openpilot developer; a good intro for someone new to openpilot
+* **$300** - a day of work for an experienced openpilot developer
+* **$500** - a few days of work for an experienced openpilot developer
+* **$1k+** - a week or two of work (could be less for the right person)
+
+New bounties can be proposed in the [**#contributing**](https://discord.com/channels/469524606043160576/1183173332531687454) channel in Discord.
+
+## Car bounties
+
+The car bounties only apply to cars that have a path to ship in openpilot release, which excludes unsupportable cars (e.g. Fords with a steering lockout) or cars that require extra hardware (Honda Accord with serial steering).
+
+#### Brand or platform port - $2000
+Example PR: [commaai/openpilot#23331](https://github.com/commaai/openpilot/pull/23331)
+
+This is for adding support for an entirely new brand or a substantially new ADAS platform within a brand (e.g. the Volkswagen PQ platform).
+
+#### Model port - $250
+Example PR: [commaai/openpilot#30245](https://github.com/commaai/openpilot/pull/30245)
+
+This is for porting a new car model that runs on a platform openpilot already supports.
+In the average case, this is a few hours of work for an experienced software developer.
+
+This bounty also covers getting openpilot supported on a previously unsupported trim of an already supported car, e.g. the Chevy Bolt without ACC.
+
+#### Reverse Engineering a new Actuation Message - $300
+
+This is for cars that are already supported, and it has three components:
+* reverse a new steering, adaptive cruise, or AEB message
+* merge the DBC definitions to [opendbc](http://github.com/commaai/opendbc)
+* merge the openpilot code to use it and post a demo route
+
+The control doesn't have to be perfect, but it should generally do what it's supposed to do.
+
+### Specific Cars
+
+#### Rivian R1T or R1S - $3000
+
+Get a Rivian driving with openpilot.
+Requires a merged port with lateral control and at least a POC of longitudinal control.
+
+#### Chevy Bolt with SuperCruise - $2500
+
+The Bolt is already supported on the trim with standard ACC. Get openpilot working on the trim with SuperCruise. It must be a normal install: no extra pandas or other hardware, no ECU reflashes, etc. The full bounty is for a port with lateral and longitudinal control. $1500 of the bounty can be claimed with a lateral-only port.

docs/CARS.md

@@ -4,12 +4,12 @@
 
 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.
 
-# 287 Supported Cars
+# 288 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|
 |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-|Acura|ILX 2016-19|AcuraWatch Plus|openpilot|26 mph|25 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Acura&model=ILX 2016-19">Buy Here</a></sub></details>||
-|Acura|RDX 2016-18|AcuraWatch Plus|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Acura&model=RDX 2016-18">Buy Here</a></sub></details>||
+|Acura|ILX 2016-19|AcuraWatch Plus|openpilot|25 mph|25 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Acura&model=ILX 2016-19">Buy Here</a></sub></details>||
+|Acura|RDX 2016-18|AcuraWatch Plus|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Acura&model=RDX 2016-18">Buy Here</a></sub></details>||
 |Acura|RDX 2019-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Acura&model=RDX 2019-22">Buy Here</a></sub></details>||
 |Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</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<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Audi&model=A3 2014-19">Buy Here</a></sub></details>||
 |Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</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<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Audi&model=A3 Sportback e-tron 2017-18">Buy Here</a></sub></details>||
@@ -25,7 +25,8 @@ A supported vehicle is one that just works when you install a comma device. All
 |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 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica 2017-18">Buy Here</a></sub></details>||
 |Chrysler|Pacifica 2019-20|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica 2019-20">Buy Here</a></sub></details>||
 |Chrysler|Pacifica 2021-23|All|Stock|0 mph|39 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica 2021-23">Buy Here</a></sub></details>||
-|Chrysler|Pacifica Hybrid 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 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica Hybrid 2017-18">Buy Here</a></sub></details>||
+|Chrysler|Pacifica Hybrid 2017|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 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica Hybrid 2017">Buy Here</a></sub></details>||
+|Chrysler|Pacifica Hybrid 2018|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 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica Hybrid 2018">Buy Here</a></sub></details>||
 |Chrysler|Pacifica Hybrid 2019-24|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Chrysler&model=Pacifica Hybrid 2019-24">Buy Here</a></sub></details>||
 |comma|body|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|None||
 |CUPRA|Ateca 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</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<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=CUPRA&model=Ateca 2018-23">Buy Here</a></sub></details>||
@@ -64,20 +65,20 @@ A supported vehicle is one that just works when you install a comma device. All
 |Honda|Civic 2022-24|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 Honda Bosch B connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Civic 2022-24">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
 |Honda|Civic Hatchback 2017-21|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Civic Hatchback 2017-21">Buy Here</a></sub></details>||
 |Honda|Civic Hatchback 2022-24|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 Honda Bosch B connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Civic Hatchback 2022-24">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
-|Honda|CR-V 2015-16|Touring Trim|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=CR-V 2015-16">Buy Here</a></sub></details>||
+|Honda|CR-V 2015-16|Touring Trim|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=CR-V 2015-16">Buy Here</a></sub></details>||
 |Honda|CR-V 2017-22|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=CR-V 2017-22">Buy Here</a></sub></details>||
 |Honda|CR-V Hybrid 2017-21|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=CR-V Hybrid 2017-21">Buy Here</a></sub></details>||
 |Honda|e 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=e 2020">Buy Here</a></sub></details>||
-|Honda|Fit 2018-20|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Fit 2018-20">Buy Here</a></sub></details>||
-|Honda|Freed 2020|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Freed 2020">Buy Here</a></sub></details>||
-|Honda|HR-V 2019-22|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=HR-V 2019-22">Buy Here</a></sub></details>||
+|Honda|Fit 2018-20|Honda Sensing|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Fit 2018-20">Buy Here</a></sub></details>||
+|Honda|Freed 2020|Honda Sensing|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Freed 2020">Buy Here</a></sub></details>||
+|Honda|HR-V 2019-22|Honda Sensing|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=HR-V 2019-22">Buy Here</a></sub></details>||
 |Honda|HR-V 2023|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 Honda Bosch B connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=HR-V 2023">Buy Here</a></sub></details>||
 |Honda|Insight 2019-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Insight 2019-22">Buy Here</a></sub></details>||
 |Honda|Inspire 2018|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Inspire 2018">Buy Here</a></sub></details>||
-|Honda|Odyssey 2018-20|Honda Sensing|openpilot|26 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Odyssey 2018-20">Buy Here</a></sub></details>||
-|Honda|Passport 2019-23|All|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Passport 2019-23">Buy Here</a></sub></details>||
-|Honda|Pilot 2016-22|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Pilot 2016-22">Buy Here</a></sub></details>||
-|Honda|Ridgeline 2017-24|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Ridgeline 2017-24">Buy Here</a></sub></details>||
+|Honda|Odyssey 2018-20|Honda Sensing|openpilot|25 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Odyssey 2018-20">Buy Here</a></sub></details>||
+|Honda|Passport 2019-23|All|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Passport 2019-23">Buy Here</a></sub></details>||
+|Honda|Pilot 2016-22|Honda Sensing|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Pilot 2016-22">Buy Here</a></sub></details>||
+|Honda|Ridgeline 2017-24|Honda Sensing|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Honda&model=Ridgeline 2017-24">Buy Here</a></sub></details>||
 |Hyundai|Azera 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 Hyundai K connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Hyundai&model=Azera 2022">Buy Here</a></sub></details>||
 |Hyundai|Azera Hybrid 2019|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 Hyundai C connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Hyundai&model=Azera Hybrid 2019">Buy Here</a></sub></details>||
 |Hyundai|Azera Hybrid 2020|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 Hyundai K connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<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.html?make=Hyundai&model=Azera Hybrid 2020">Buy Here</a></sub></details>||

docs/CONTRIBUTING.md

@@ -1,8 +1,6 @@
 # How to contribute
 
-Our software is open source so you can solve your own problems without needing help from others. And if you solve a problem and are so kind, you can upstream it for the rest of the world to use. Check out our [post about externalization](https://blog.comma.ai/a-2020-theme-externalization/).
-
-Development is coordinated through [Discord](https://discord.comma.ai) and GitHub.
+Our software is open source so you can solve your own problems without needing help from others. And if you solve a problem and are so kind, you can upstream it for the rest of the world to use. Check out our [post about externalization](https://blog.comma.ai/a-2020-theme-externalization/). Development activity is coordinated through our GitHub Issues, [GitHub Discussions](https://github.com/commaai/openpilot/discussions), and [Discord](https://discord.comma.ai).
 
 ### Getting Started
 
@@ -13,8 +11,7 @@ Development is coordinated through [Discord](https://discord.comma.ai) and GitHu
 
 ## What contributions are we looking for?
 
-**openpilot's priorities are [safety](SAFETY.md), stability, quality, and features, in that order.**
-openpilot is part of comma's mission to *solve self-driving cars while delivering shippable intermediaries*, and all development is towards that goal. 
+**openpilot's priorities are [safety](SAFETY.md), stability, quality, and features, in that order.** openpilot is part of comma's mission to *solve self-driving cars while delivering shippable intermediaries*, and **all** development is towards that goal. 
 
 ### What gets merged?
 
@@ -30,21 +27,24 @@ All of these are examples of good PRs:
 
 ### What doesn't get merged?
 
-* **style changes**: code is art, and it's up to the author to make it beautiful 
+* **arbitrary style changes**: code is art, and it's up to the author to make it beautiful
 * **500+ line PRs**: clean it up, break it up into smaller PRs, or both
 * **PRs without a clear goal**: every PR must have a singular and clear goal
-* **UI design**: we do not have a good review process for this yet
+* **UI design changes**: we do not have a good review process for this yet
 * **New features**: We believe openpilot is mostly feature-complete, and the rest is a matter of refinement and fixing bugs. As a result of this, most feature PRs will be immediately closed, however the beauty of open source is that forks can and do offer features that upstream openpilot doesn't.
-* **Negative expected value**: This a class of PRs that makes an improvement, but the risk or validation costs more than the improvement. The risk can be mitigated by first getting a failing test merged.
 
 ### First contribution
 
-[Bounties](https://comma.ai/bounties) are the best place to get started.
-There's lot of bounties that don't require a comma 3/3X or a car.
+Check out any [good first issue](https://github.com/commaai/openpilot/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) to get started.
+
+### What do I need to contribute?
+
+A lot of openpilot work requires only a PC, and some requires a comma device.
+Most car-related contributions require access to that car, plus a comma device installed in the car.
 
 ## Pull Requests
 
-Pull requests should be against the master branch.
+Pull requests should be against the master branch. If you're unsure about a contribution, feel free to open a discussion, issue, or draft PR to discuss the problem you're trying to solve.
 
 A good pull request has all of the following:
 * a clearly stated purpose

docs/HOW-TOS.md

@@ -0,0 +1,77 @@
+# How Tos
+This page is a repository of useful how-tos as a supplement for additional information.
+
+Table of Contents
+=======================
+
+* [Radar Tracks](#Radar-Tracks)
+    * [Enable Radar Tracks](#-Enable-Radar-Tracks)
+* [Enable Mapbox Navigation](#-Enable-Mapbox-Navigation)
+
+---
+
+<details><summary><h3>📡 Radar Tracks</h3></summary>
+
+Radar tracks can now be enabled manually on applicable cars through SSH thanks to [@greghogan](https://github.com/greghogan) and [@pd0wm](https://github.com/pd0wm).
+
+Some Hyundai radars can be reconfigured to output (debug) radar points on bus 1.
+Reconfiguration is done over UDS by reading/writing to 0x0142 using the Read/Write Data By Identifier
+endpoints (0x22 & 0x2E). This script checks your radar firmware version against a list of known
+firmware versions. If you want to try on a new radar, make sure to note the default config value
+in case it is different from the other radars and you need to revert the changes.
+After changing the config the car should not show any faults when openpilot is not running.
+These config changes are persistent across car reboots. You need to run this script again
+to go back to the default values.
+
+**USE AT YOUR OWN RISK!** Stock system safety features, like AEB and FCW, might be affected by these changes.
+
+**How radar points can be used along with vision:**
+* Current OP long policy is identify with vision first, if vision sees a vehicle match it to a radar point. If vision sees nothing you get a false negative and no lead car detection. (Source: [Hubblesphere#7894 from comma.ai community Discord](https://discord.com/channels/469524606043160576/872899198738104330/872913890793635872))
+
+### 🚨 Enable Radar Tracks
+
+***(EXPERIMENTAL, as of January 1st, 2022)***
+
+***(Only applicable to some Hyundai, Kia, and Genesis cars, as of January 1st, 2022)***
+
+*(Base on version 0.8.12 [`devel`](https://github.com/commaai/openpilot/tree/devel))*
+
+**USE AT YOUR OWN RISK!** Stock system safety features, like AEB and FCW, might be affected by these changes.
+
+1. Ensure the car is at the `OFF` ignition position.
+2. Connect your compatible comma device (EON, C2, C3) to the car. comma device power should be ON.
+3. Use a laptop or applicable device to connect to your comma device via SSH. (Tips: Instructions to SSH in [HERE](https://github.com/commaai/openpilot/wiki/SSH))
+4. In the SSH terminal after successfully connected to your comma device, execute the following commands:
+    1. `pkill -f openpilot`
+    2. `python /data/openpilot/selfdrive/debug/hyundai_enable_radar_points.py`
+    3. Follow the instructions in the script:
+        * `Power on the vehicle keeping the engine off (press start button twice) then type OK to continue`.
+            * If successful, the following message should appear: `[DONE]. Restart your vehicle and ensure there are no faults`.
+            * If the script did not run successfully, reach out to the community in [Sunnyhaibin's Openpilot Discord Server](https://discord.gg/wRW3meAgtx) or `#hyundai-kia-genesis channel` on [commaai community Discord Server](https://discord.comma.ai) for assistance.
+    4. Reboot your comma device:
+        1. C3: `sudo reboot`
+        2. C2 or EON: `reboot`
+5. Once your comma device is rebooted, start your car with engine on (with or without comma device connected). Ensure that there are no faults from the car. If there are faults, reach out to the community in [Sunnyhaibin's Openpilot Discord Server](https://discord.gg/wRW3meAgtx) or `#hyundai-kia-genesis channel` on [commaai community Discord Server](https://discord.comma.ai) for assistance.
+6. Go for a quick drive and drive behind a lead car with varied follow distance. Then, come back and allow the drive to upload its `rlogs` in [comma Connect](https://connect.comma.ai).
+7. With all `rlogs` uploaded, open the drive in Cabana from [comma Connect](https://connect.comma.ai). Load DBC -> `hyundai_kia_mando_front_radar.dbc`, then search `RADAR_TRACK_50x` (`x` could be anything), open any of them, and look at `LONG_DIST`.
+8. If the radar tracks data is relevant with the lead car you drove behind, you are done! Your car now have radar tracks enabled.
+</details>
+
+<details><summary><h3>🗺 Enable Mapbox Navigation</h3></summary>
+
+1) Create a free mapbox account. Account will ask for a credit card for verification. You will not be charged for the free tier.
+2) On the Dashboard, you will see a section called Access Tokens. Click `Create a Token`. Name it whatever you like. Set the scopes to allow everything for both Public and Secret. Copy both of these keys. **YOU WON'T BE ABLE TO ACCESS THE SECRET KEY AFTER THIS WINDOW.**
+3) Once rebooted, connect your C3 to a network with internet access and find the C3’s IP address.
+4) In a browser, navigate to that IP with **port 8082** (i.e 192.168.1.69:8082). You should be greeted with the Comma logo and a public key input field.
+5) Paste your Public token (pk.xx), click enter, paste your Secret key (sk.xx), click enter. You can now search for places. This page will be available at your devices’s IP address/port 8082 to search for destinations.
+6) To set Home and Work addresses, search for a place, select Home/Work from the dropdown and click Navigate. For non-Home/Work destinations, select Recent Places.<br>*At this time, it is not possible to search directly on the C3.*
+
+**TIPS:**
+- If your C3 is showing a black screen that says “Map Loading”, performing a reboot via the UI should fix it.
+- If your phone can create a Hotspot, you are able to connect the C3 to your phone hotspot and use your phone browser to search for places.
+- In the Navigation panel on the C3, you can select Home, Work, and from a list of Recent Places you have navigated to without needing a browser (assuming the C3 is connected to the internet.)
+
+**IMPORTANT NOTE:** Your C3 will require an active internet connection to download map data, generate driving directions, and ETA. Once map data and directions are downloaded, it *is* possible to use it offline, however nothing will update (such as new driving direction after a missed turn, updated ETA, map data further into your drive etc.)
+
+***NAVIGATION NOTE:** At this time, mapbox does not support alphanumeric addresses (i.e W123N1234 Main St). There is currently no known workaround for this.*
+</details>

docs/README.md

@@ -1,26 +1,3 @@
-# openpilot docs
+# openpilot-docs
 
-This is the source for [docs.comma.ai](https://docs.comma.ai).
-The site is updated on pushes to master by this [workflow](../.github/workflows/docs.yaml).
-
-## Development
-NOTE: Those commands must be run in the root directory of openpilot, **not /docs**
-
-**1. Install the docs dependencies**
-``` bash
-pip install .[docs]
-```
-
-**2. Build the new site**
-``` bash
-mkdocs build
-```
-
-**3. Run the new site locally**
-``` bash
-mkdocs serve
-```
-
-References:
-* https://www.mkdocs.org/getting-started/
-* https://github.com/ntno/mkdocs-terminal
+These docs are autogenerated from [this folder](https://github.com/commaai/openpilot/tree/master/docs) in the main openpilot repository.

docs/WORKFLOW.md

@@ -29,7 +29,7 @@ pytest
 cd system/loggerd && pytest .
 
 # run the linter
-op lint
+pre-commit run --all
 ```
 
 ## Testing

docs/car-porting/what-is-a-car-port.md

@@ -1,22 +0,0 @@
-# What is a car port?
-
-A car port enables openpilot support on a particular car. Each car model openpilot supports needs to be individually ported. All car ports live in `openpilot/selfdrive/car/car_specific.py` and `opendbc_repo/opendbc/car`.
-
-The complexity of a car port varies depending on many factors including:
-* existing openpilot support for similar cars
-* architecture and APIs available in the car
-
-
-# Structure of a car port
-* `interface.py`: Interface for the car, defines the CarInterface class
-* `carstate.py`: Reads CAN from car and builds openpilot CarState message
-* `carcontroller.py`: Builds CAN messages to send to car
-* `values.py`: Limits for actuation, general constants for cars, and supported car documentation
-* `radar_interface.py`: Interface for parsing radar points from the car
-
-
-# Overiew
-
-[Jason Young](https://github.com/jyoung8607) gave a talk at COMMA_CON with an overview of the car porting process. The talk is available on YouTube:
-
-https://youtu.be/KcfzEHB6ms4?si=5szh1PX6TksOCKmM

docs/concepts/glossary.md

@@ -1,8 +0,0 @@
-# openpilot glossary
-
-* **route**:
-* **segment**: routes are split into one minute chunks called segments.
-* **panda**: this is . See the repo.
-* **onroad**:
-* **offroad**:
-* **comma 3X**:

docs/concepts/safety.md

@@ -1 +0,0 @@
-../SAFETY.md

docs/contributing/architecture.md

@@ -1 +0,0 @@
-# Architecture

docs/contributing/roadmap.md

@@ -1,31 +0,0 @@
-# Roadmap
-
-This is the roadmap for the next major openpilot releases. Also check out
-
-* [Milestones](https://github.com/commaai/openpilot/milestones) for minor releases
-* [Projects](https://github.com/commaai/openpilot/projects?query=is%3Aopen) for shorter-term projects not tied to releases
-* [Bounties](https://comma.ai/bounties) for paid individual issues
-* [#current-projects](https://discord.com/channels/469524606043160576/1249579909739708446) in Discord for discussion on work-in-progress projects
-
-## openpilot 0.10
-
-openpilot 0.10 will be the first release with a driving policy trained in
-a [learned simulator](https://youtu.be/EqQNZXqzFSI).
-
-* Driving model trained in a learned simlator
-* Always-on driver monitoring (behind a toggle)
-* GPS removed from the driving stack
-* 100KB qlogs
-* `master-ci` pushed after 1000 hours of hardware-in-the-loop testing
-* Car interface code moved into [opendbc](https://github.com/commaai/opendbc)
-* openpilot on PC for Linux x86, Linux arm64, and Mac (Apple Silicon)
-
-## openpilot 1.0
-
-openpilot 1.0 will feature a fully end-to-end driving policy.
-
-* End-to-end longitudinal control in Chill mode
-* Automatic Emergency Braking (AEB)
-* Driver monitoring with sleep detection
-* Rolling updates/releases pushed out by CI
-* [panda safety 1.0](https://github.com/orgs/commaai/projects/27)

docs/how-to/replay-a-drive.md

@@ -1,14 +0,0 @@
-# Replay
-
-Replaying is a critical tool for openpilot development and debugging.
-
-## Replaying a route
-*Hardware required: none*
-
-Just run `tools/replay/replay --demo`.
-
-## Replaying CAN data
-*Hardware required: jungle and comma 3/3X*
-
-1. Connect your PC to a jungle.
-2.

docs/how-to/turn-the-speed-blue.md

@@ -1,98 +0,0 @@
-# Turn the speed blue
-*A getting started guide for openpilot development*
-
-In 30 minutes, we'll get an openpilot development environment setup on your computer and make some changes to openpilot's UI.
-
-And if you have a comma 3/3X, we'll deploy the change to your device for testing.
-
-## 1. Setup your development environment
-
-Run this to clone openpilot and install all the dependencies:
-```bash
-bash <(curl -fsSL openpilot.comma.ai)
-```
-
-Navigate to openpilot folder & activate a Python virtual environment
-```bash
-cd openpilot
-source .venv/bin/activate
-```
-
-Then, compile openpilot:
-```bash
-scons -j8
-```
-
-## 2. Run replay
-
-We'll run the `replay` tool with the demo route to get data streaming for testing our UI changes.
-```bash
-# in terminal 1
-tools/replay/replay --demo
-
-# in terminal 2
-selfdrive/ui/ui
-```
-
-The openpilot UI should launch and show a replay of the demo route.
-
-If you have your own comma device, you can replace `--demo` with one of your own routes from comma connect.
-
-## 3. Make the speed blue
-
-Search for “mph” with git grep in the `ui` folder.
-```bash
-$ git grep "mph" selfdrive/ui/
-paint.cc:  ui_draw_text(s, s->fb_w/2, 290, s->scene.is_metric ? "km/h" : "mph", 36 * 2.5, COLOR_WHITE_ALPHA(200), "sans-regular");
-```
-
-The line right above contains the actual speed. Unfortunately, COLOR_BLUE isn’t defined, but a git grep of COLOR_WHITE shows it’s nvgRGBA(255, 255, 255, 255). Personally, I like a lighter blue, so I went with #8080FF.
-```bash
-$ git diff
-diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc
-index 821d95115..cc996eaa1 100644
---- a/selfdrive/ui/paint.cc
-+++ b/selfdrive/ui/paint.cc
-@@ -175,8 +175,8 @@ static void ui_draw_vision_speed(UIState *s) {
-   const float speed = std::max(0.0, (*s->sm)["carState"].getCarState().getVEgo() * (s->scene.is_metric ? 3.6 : 2.2369363));
-   const std::string speed_str = std::to_string((int)std::nearbyint(speed));
-   nvgTextAlign(s->vg, NVG_ALIGN_CENTER | NVG_ALIGN_BASELINE);
--  ui_draw_text(s, s->fb_w/2, 210, speed_str.c_str(), 96 * 2.5, COLOR_WHITE, "sans-bold");
--  ui_draw_text(s, s->fb_w/2, 290, s->scene.is_metric ? "km/h" : "mph", 36 * 2.5, COLOR_WHITE_ALPHA(200), "sans-regular");
-+  ui_draw_text(s, s->fb_w/2, 210, speed_str.c_str(), 96 * 2.5, nvgRGBA(128, 128, 255, 255), "sans-bold");
-+  ui_draw_text(s, s->fb_w/2, 290, s->scene.is_metric ? "km/h" : "mph", 36 * 2.5, nvgRGBA(128, 128, 255, 200), "sans-regular");
- }
-
- static void ui_draw_vision_event(UIState *s) {
-```
-
-
-## 4. Rebuild UI, and admire your work
-
-```
-scons -j8 && selfdrive/ui/ui
-```
-
-![](https://blog.comma.ai/img/blue_speed_ui.png)
-
-## 5. Push your fork to GitHub
-
-Click fork on GitHub. Then, push with:
-```bash
-git remote rm origin
-git remote add origin git@github.com:<your-github-username>/openpilot.git
-git add .
-git commit -m "Make the speed blue."
-git push --set-upstream origin master
-```
-
-## 6. Run your fork on device in your car!
-
-Uninstall openpilot from your device through the settings. Then, enter the URL for your very own installer:
-```
-installer.comma.ai/<your-github-username>/master
-```
-
-## 7. Admire your work IRL
-
-![](https://blog.comma.ai/img/c3_blue_ui.jpg)

docs/index.md

@@ -1 +0,0 @@
-getting-started/what-is-openpilot.md

docs/new/README.md

@@ -0,0 +1,12 @@
+This is the source for a new https://docs.comma.ai. It's not hosted anywhere yet, but it's easy to run locally.
+
+https://www.mkdocs.org/getting-started/
+
+```
+pip install mkdocs mkdocs-terminal
+mkdocs serve
+```
+
+inspiration:
+* https://rerun.io/docs/
+* https://docs.expo.dev/

docs/new/docs/car-porting/what-is-a-car-port.md

@@ -0,0 +1,9 @@
+# What is a car port?
+
+All car ports live in `openpilot/selfdrive/car/`.
+
+* interface.py: Interface for the car, defines the CarInterface class
+* carstate.py: Reads CAN from car and builds openpilot CarState message
+* carcontroller.py: Builds CAN messages to send to car
+* values.py: Limits for actuation, general constants for cars, and supported car documentation
+* radar_interface.py: Interface for parsing radar points from the car

docs/new/docs/getting-started/what-is-openpilot.md

@@ -1,6 +1,6 @@
 # What is openpilot?
 
-[openpilot](http://github.com/commaai/openpilot) is an open source driver assistance system. Currently, openpilot performs the functions of Adaptive Cruise Control (ACC), Automated Lane Centering (ALC), Forward Collision Warning (FCW), and Lane Departure Warning (LDW) for a growing variety of [supported car makes, models, and model years](https://github.com/commaai/openpilot/blob/master/docs/CARS.md). In addition, while openpilot is engaged, a camera-based Driver Monitoring (DM) feature alerts distracted and asleep drivers. See more about [the vehicle integration](https://github.com/commaai/openpilot/blob/master/docs/INTEGRATION.md) and [limitations](https://github.com/commaai/openpilot/blob/master/docs/LIMITATIONS.md).
+[openpilot](http://github.com/commaai/openpilot) is an open source driver assistance system. Currently, openpilot performs the functions of Adaptive Cruise Control (ACC), Automated Lane Centering (ALC), Forward Collision Warning (FCW), and Lane Departure Warning (LDW) for a growing variety of [supported car makes, models, and model years](docs/CARS.md). In addition, while openpilot is engaged, a camera-based Driver Monitoring (DM) feature alerts distracted and asleep drivers. See more about [the vehicle integration](docs/INTEGRATION.md) and [limitations](docs/LIMITATIONS.md).
 
 
 ## How do I use it?

docs/new/docs/how-to/turning-the-speed-blue.md

@@ -0,0 +1,4 @@
+This section is for how-to's on common workflows.
+
+They'll be like this blog post we wrote:
+https://blog.comma.ai/turning-the-speed-blue/

docs/new/mkdocs.yml

@@ -0,0 +1,18 @@
+site_name: openpilot docs
+docs_dir: docs
+repo_url: https://github.com/commaai/openpilot/
+
+theme:
+  name: terminal
+  features:
+    - navigation.side.toc.hide
+
+nav:
+  - Getting Started:
+    - What is openpilot?: getting-started/what-is-openpilot.md
+  - How-to:
+    - Turn the speed blue: how-to/turning-the-speed-blue.md
+  - Car Porting:
+    - What is a car port?: car-porting/what-is-a-car-port.md
+    - Porting a car brand: car-porting/brand-port.md
+    - Porting a car model: car-porting/model-port.md

docs/sunnyhaibin0850_qrcode_paypal.me.png

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

launch_chffrplus.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 if [ -z "$BASEDIR" ]; then
   BASEDIR="/data/openpilot"

launch_env.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 export OMP_NUM_THREADS=1
 export MKL_NUM_THREADS=1

launch_openpilot.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 exec ./launch_chffrplus.sh

mkdocs.yml

@@ -1,38 +0,0 @@
-site_name: openpilot docs
-repo_url: https://github.com/commaai/openpilot/
-site_url: https://docs.comma.ai
-
-exclude_docs: README.md
-
-strict: true
-docs_dir: docs
-site_dir: docs_site/
-
-theme:
-  name: readthedocs
-  navigation_depth: 3
-
-nav:
-  - Getting Started:
-    - What is openpilot?: getting-started/what-is-openpilot.md
-  - How-to:
-    - Turn the speed blue: how-to/turn-the-speed-blue.md
-    - Connect to a comma 3/3X: how-to/connect-to-comma.md
-    #- Replay a drive: how-to/replay-a-drive.md
-  - Concepts:
-    - Logs: concepts/logs.md
-    - Safety: concepts/safety.md
-  - Car Porting:
-    - What is a car port?: car-porting/what-is-a-car-port.md
-    - Porting a car brand: car-porting/brand-port.md
-    - Porting a car model: car-porting/model-port.md
-  - Contributing:
-    - Roadmap: contributing/roadmap.md
-    #- Architecture: contributing/architecture.md
-    - Contributing Guide →: https://github.com/commaai/openpilot/blob/master/docs/CONTRIBUTING.md
-  - Links:
-    - Blog →: https://blog.comma.ai
-    - Bounties →: https://comma.ai/bounties
-    - GitHub →: https://github.com/commaai
-    - Discord →: https://discord.comma.ai
-    - X →: https://x.com/comma_ai

opendbc

@@ -1 +0,0 @@
-opendbc_repo/opendbc

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "pycapnp",
   "Cython",
   "setuptools",
-  "numpy < 2.0.0",
+  "numpy < 2.0.0", # control does not support numpy 2
 
   # body / webrtcd
   "aiohttp",
@@ -52,29 +52,27 @@ dependencies = [
   "websocket_client",
 
   # acados deps
-  "casadi >=3.6.6",  # 3.12 fixed in 3.6.6
+  "casadi",
   "future-fstrings",
 
   # these should be removed
   "psutil",
   "pycryptodome", # used in updated/casync, panda, body, and a test
-  "setproctitle",
 
-  # logreader
-  "zstandard",
+  #logreader
+  "zstd",
 ]
 
 [project.optional-dependencies]
 docs = [
   "Jinja2",
-  "natsort",
-  "mkdocs",
 ]
 
 testing = [
   "coverage",
   "hypothesis ==6.47.*",
   "mypy",
+  "pre-commit",
   "pytest",
   "pytest-cov",
   "pytest-cpp",
@@ -85,37 +83,45 @@ testing = [
   "pytest-asyncio",
   "pytest-mock",
   "pytest-repeat",
-  "ruff",
-  "codespell",
-  "pre-commit-hooks",
+  "ruff"
 ]
 
 dev = [
   "av",
   "azure-identity",
   "azure-storage-blob",
+  "breathe",
+  "control",
   "dictdiffer",
   "flaky",
   "inputs",
   "lru-dict",
   "matplotlib",
-  "metadrive-simulator @ https://github.com/commaai/metadrive/releases/download/MetaDrive-minimal/metadrive_simulator-0.4.2.3-py3-none-any.whl ; (platform_machine != 'aarch64')",
+  "metadrive-simulator; platform_machine != 'aarch64'",
+  "mpld3",
+  "myst-parser",
+  "natsort",
+  "opencv-python-headless",
   "parameterized >=0.8, <0.9",
-  #"pprofile",
+  #pprofile = "*"
   "pyautogui",
+  "pygame",
   "pyopencl; platform_machine != 'aarch64'", # broken on arm64
-  "pytools < 2024.1.11; platform_machine != 'aarch64'", # pyopencl use a broken version
   "pywinctl",
   "pyprof2calltree",
-  "rerun-sdk >= 0.18",
+  "rerun-sdk",
   "tabulate",
   "types-requests",
   "types-tabulate",
 
   # this is only pinned since 5.15.11 is broken
   "pyqt5 ==5.15.2; platform_machine == 'x86_64'", # no aarch64 wheels for macOS/linux
+
 ]
 
+[tool.uv.sources]
+metadrive-simulator = { git = "https://github.com/commaai/metadrive.git", branch = "opencv_headless" }
+
 [project.urls]
 Homepage = "https://comma.ai"
 
@@ -126,12 +132,9 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = [ "." ]
 
-[tool.hatch.metadata]
-allow-direct-references = true
-
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "--ignore=openpilot/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/  -Werror --strict-config --strict-markers --durations=10 -n auto --dist=loadgroup"
+addopts = "--ignore=openpilot/ --ignore=cereal/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/  -Werror --strict-config --strict-markers --durations=10 -n auto --dist=loadgroup"
 cpp_files = "test_*"
 cpp_harness = "selfdrive/test/cpp_harness.py"
 python_files = "test_*.py"
@@ -144,7 +147,6 @@ testpaths = [
   "common",
   "selfdrive/pandad",
   "selfdrive/car",
-  "selfdrive/opcar",
   "selfdrive/controls",
   "selfdrive/locationd",
   "selfdrive/monitoring",
@@ -165,24 +167,15 @@ testpaths = [
   "cereal/messaging/tests",
 ]
 
-[tool.codespell]
-quiet-level = 3
-# if you've got a short variable name that's getting flagged, add it here
-ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead"
-builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
-skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.ts, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*"
-
 [tool.mypy]
 python_version = "3.11"
 plugins = [
   "numpy.typing.mypy_plugin",
 ]
 exclude = [
+  "body/",
   "cereal/",
-  "msgq/",
-  "msgq_repo/",
   "opendbc/",
-  "opendbc_repo/",
   "panda/",
   "rednose/",
   "rednose_repo/",
@@ -207,10 +200,6 @@ warn_return_any=true
 # allow implicit optionals for default args
 implicit_optional = true
 
-local_partial_types=true
-explicit_package_bases=true
-disable_error_code = "annotation-unchecked"
-
 # https://beta.ruff.rs/docs/configuration/#using-pyprojecttoml
 [tool.ruff]
 indent-width = 2
@@ -234,7 +223,7 @@ lint.ignore = [
   "UP038",   # (x, y) -> x|y for isinstance
 ]
 line-length = 160
-target-version ="py311"
+target-version="py311"
 exclude = [
   "body",
   "cereal",
@@ -246,8 +235,7 @@ exclude = [
   "teleoprtc_repo",
   "third_party",
 ]
-lint.flake8-implicit-str-concat.allow-multiline = false
-
+lint.flake8-implicit-str-concat.allow-multiline=false
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 "selfdrive".msg = "Use openpilot.selfdrive"
 "common".msg = "Use openpilot.common"
@@ -259,6 +247,5 @@ lint.flake8-implicit-str-concat.allow-multiline = false
 
 [tool.coverage.run]
 concurrency = ["multiprocessing", "thread"]
-
 [tool.ruff.format]
 quote-style = "preserve"

release/build_devel.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 set -ex
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

release/build_release.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 set -e
 set -x
 

release/check-dirty.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 set -e
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

release/check-submodules.sh

@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 while read hash submodule ref; do
-  git -C $submodule fetch --depth 4000 origin master
+  git -C $submodule fetch --depth 3000 origin master
   git -C $submodule branch -r --contains $hash | grep "origin/master"
   if [ "$?" -eq 0 ]; then
     echo "$submodule ok"

release/release_files.py

@@ -10,12 +10,14 @@ ROOT = HERE + "/.."
 # - minimizing release download size
 # - keeping the diff readable
 blacklist = [
+  "body/STL/",
+
   "panda/drivers/",
   "panda/examples/",
   "panda/tests/safety/",
 
-  "opendbc_repo/dbc/.*.dbc$",
-  "opendbc_repo/dbc/generator/",
+  "opendbc/.*.dbc$",
+  "opendbc/generator/",
 
   "cereal/.*test.*",
   "^common/tests/",
@@ -26,6 +28,7 @@ blacklist = [
   "selfdrive/car/tests/test_models.*",
 
   "^tools/",
+  "^scripts/",
   "^tinygrad_repo/",
 
   "matlab.*.md",
@@ -73,51 +76,55 @@ whitelist = [
   "tinygrad_repo/tinygrad/.*.py",
 
   # TODO: do this automatically
-  "opendbc_repo/dbc/comma_body.dbc",
-  "opendbc_repo/dbc/chrysler_ram_hd_generated.dbc",
-  "opendbc_repo/dbc/chrysler_ram_dt_generated.dbc",
-  "opendbc_repo/dbc/chrysler_pacifica_2017_hybrid_generated.dbc",
-  "opendbc_repo/dbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc",
-  "opendbc_repo/dbc/gm_global_a_powertrain_generated.dbc",
-  "opendbc_repo/dbc/gm_global_a_object.dbc",
-  "opendbc_repo/dbc/gm_global_a_chassis.dbc",
-  "opendbc_repo/dbc/FORD_CADS.dbc",
-  "opendbc_repo/dbc/ford_fusion_2018_adas.dbc",
-  "opendbc_repo/dbc/ford_lincoln_base_pt.dbc",
-  "opendbc_repo/dbc/honda_accord_2018_can_generated.dbc",
-  "opendbc_repo/dbc/acura_ilx_2016_can_generated.dbc",
-  "opendbc_repo/dbc/acura_rdx_2018_can_generated.dbc",
-  "opendbc_repo/dbc/acura_rdx_2020_can_generated.dbc",
-  "opendbc_repo/dbc/honda_civic_touring_2016_can_generated.dbc",
-  "opendbc_repo/dbc/honda_civic_hatchback_ex_2017_can_generated.dbc",
-  "opendbc_repo/dbc/honda_crv_touring_2016_can_generated.dbc",
-  "opendbc_repo/dbc/honda_crv_ex_2017_can_generated.dbc",
-  "opendbc_repo/dbc/honda_crv_ex_2017_body_generated.dbc",
-  "opendbc_repo/dbc/honda_crv_executive_2016_can_generated.dbc",
-  "opendbc_repo/dbc/honda_fit_ex_2018_can_generated.dbc",
-  "opendbc_repo/dbc/honda_odyssey_exl_2018_generated.dbc",
-  "opendbc_repo/dbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc",
-  "opendbc_repo/dbc/honda_insight_ex_2019_can_generated.dbc",
-  "opendbc_repo/dbc/acura_ilx_2016_nidec.dbc",
-  "opendbc_repo/dbc/honda_civic_ex_2022_can_generated.dbc",
-  "opendbc_repo/dbc/hyundai_canfd.dbc",
-  "opendbc_repo/dbc/hyundai_kia_generic.dbc",
-  "opendbc_repo/dbc/hyundai_kia_mando_front_radar_generated.dbc",
-  "opendbc_repo/dbc/mazda_2017.dbc",
-  "opendbc_repo/dbc/nissan_x_trail_2017_generated.dbc",
-  "opendbc_repo/dbc/nissan_leaf_2018_generated.dbc",
-  "opendbc_repo/dbc/subaru_global_2017_generated.dbc",
-  "opendbc_repo/dbc/subaru_global_2020_hybrid_generated.dbc",
-  "opendbc_repo/dbc/subaru_outback_2015_generated.dbc",
-  "opendbc_repo/dbc/subaru_outback_2019_generated.dbc",
-  "opendbc_repo/dbc/subaru_forester_2017_generated.dbc",
-  "opendbc_repo/dbc/toyota_tnga_k_pt_generated.dbc",
-  "opendbc_repo/dbc/toyota_new_mc_pt_generated.dbc",
-  "opendbc_repo/dbc/toyota_nodsu_pt_generated.dbc",
-  "opendbc_repo/dbc/toyota_adas.dbc",
-  "opendbc_repo/dbc/toyota_tss2_adas.dbc",
-  "opendbc_repo/dbc/vw_golf_mk4.dbc",
-  "opendbc_repo/dbc/vw_mqb_2010.dbc",
+  "opendbc/comma_body.dbc",
+  "opendbc/chrysler_ram_hd_generated.dbc",
+  "opendbc/chrysler_ram_dt_generated.dbc",
+  "opendbc/chrysler_pacifica_2017_hybrid_generated.dbc",
+  "opendbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc",
+  "opendbc/gm_global_a_powertrain_generated.dbc",
+  "opendbc/gm_global_a_object.dbc",
+  "opendbc/gm_global_a_chassis.dbc",
+  "opendbc/FORD_CADS.dbc",
+  "opendbc/ford_fusion_2018_adas.dbc",
+  "opendbc/ford_lincoln_base_pt.dbc",
+  "opendbc/honda_accord_2018_can_generated.dbc",
+  "opendbc/acura_ilx_2016_can_generated.dbc",
+  "opendbc/acura_rdx_2018_can_generated.dbc",
+  "opendbc/acura_rdx_2020_can_generated.dbc",
+  "opendbc/honda_civic_touring_2016_can_generated.dbc",
+  "opendbc/honda_civic_hatchback_ex_2017_can_generated.dbc",
+  "opendbc/honda_crv_touring_2016_can_generated.dbc",
+  "opendbc/honda_crv_ex_2017_can_generated.dbc",
+  "opendbc/honda_crv_ex_2017_body_generated.dbc",
+  "opendbc/honda_crv_executive_2016_can_generated.dbc",
+  "opendbc/honda_fit_ex_2018_can_generated.dbc",
+  "opendbc/honda_odyssey_exl_2018_generated.dbc",
+  "opendbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc",
+  "opendbc/honda_insight_ex_2019_can_generated.dbc",
+  "opendbc/acura_ilx_2016_nidec.dbc",
+  "opendbc/honda_civic_ex_2022_can_generated.dbc",
+  "opendbc/hyundai_canfd.dbc",
+  "opendbc/hyundai_kia_generic.dbc",
+  "opendbc/hyundai_kia_mando_front_radar_generated.dbc",
+  "opendbc/mazda_2017.dbc",
+  "opendbc/nissan_x_trail_2017_generated.dbc",
+  "opendbc/nissan_leaf_2018_generated.dbc",
+  "opendbc/subaru_global_2017_generated.dbc",
+  "opendbc/subaru_global_2020_hybrid_generated.dbc",
+  "opendbc/subaru_outback_2015_generated.dbc",
+  "opendbc/subaru_outback_2019_generated.dbc",
+  "opendbc/subaru_forester_2017_generated.dbc",
+  "opendbc/toyota_tnga_k_pt_generated.dbc",
+  "opendbc/toyota_new_mc_pt_generated.dbc",
+  "opendbc/toyota_nodsu_pt_generated.dbc",
+  "opendbc/toyota_adas.dbc",
+  "opendbc/toyota_tss2_adas.dbc",
+  "opendbc/vw_golf_mk4.dbc",
+  "opendbc/vw_mqb_2010.dbc",
+  "opendbc/tesla_can.dbc",
+  "opendbc/tesla_radar_bosch_generated.dbc",
+  "opendbc/tesla_radar_continental_generated.dbc",
+  "opendbc/tesla_powertrain.dbc",
 ]
 
 

scripts/apply-pr.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [ $# -eq 0 ]; then
   echo "usage: $0 <pull-request-number>"

scripts/build_small.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -ex
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

scripts/cell.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 nmcli connection modify --temporary esim ipv4.route-metric 1 ipv6.route-metric 1
 nmcli con up esim

scripts/checkout-pr.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
 if [ $# -eq 0 ]; then

scripts/count_cars.py

@@ -2,7 +2,7 @@
 from collections import Counter
 from pprint import pprint
 
-from opendbc.car.docs import get_all_car_docs
+from openpilot.selfdrive.car.docs import get_all_car_docs
 
 if __name__ == "__main__":
   cars = get_all_car_docs()

scripts/git_rewrite/rewrite-git-history.sh

@@ -1,391 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SRC=/tmp/openpilot/
-SRC_CLONE=/tmp/openpilot-clone/
-OUT=/tmp/openpilot-tiny/
-
-REWRITE_IGNORE_BRANCHES=(
-  dashcam3
-  devel
-  master-ci
-  nightly
-  release2
-  release3
-  release3-staging
-)
-
-VALIDATE_IGNORE_FILES=(
-  ".github/ISSUE_TEMPLATE/bug_report.md"
-  ".github/pull_request_template.md"
-)
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
-cd $DIR
-
-LOGS_DIR=$DIR/git-rewrite-$(date +"%Y-%m-%dT%H:%M:%S%z")
-mkdir -p $LOGS_DIR
-
-GIT_REWRITE_LOG=$LOGS_DIR/git-rewrite-log.txt
-BRANCH_DIFF_LOG=$LOGS_DIR/branch-diff-log.txt
-COMMIT_DIFF_LOG=$LOGS_DIR/commit-diff-log.txt
-
-START_TIME=$(date +%s)
-exec > >(while IFS= read -r line; do
-  CURRENT_TIME=$(date +%s)
-  ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
-  echo "[${ELAPSED_TIME}s] $line"
-done | tee -a "$GIT_REWRITE_LOG") 2>&1
-
-# INSTALL git-filter-repo
-if [ ! -f /tmp/git-filter-repo ]; then
-  echo "Installing git-filter-repo..."
-  curl -sSo /tmp/git-filter-repo https://raw.githubusercontent.com/newren/git-filter-repo/main/git-filter-repo
-  chmod +x /tmp/git-filter-repo
-fi
-
-# MIRROR openpilot
-if [ ! -d $SRC ]; then
-  echo "Mirroring openpilot..."
-  git clone --mirror https://github.com/commaai/openpilot.git $SRC # 4.18 GiB (488034 objects)
-
-  cd $SRC
-
-  echo "Starting size $(du -sh .)"
-
-  git remote update
-
-  # the git-filter-repo analysis is bliss - can be found in the repo root/filter-repo/analysis
-  echo "Analyzing with git-filter-repo..."
-  /tmp/git-filter-repo --force --analyze
-
-  echo "Pushing to openpilot-archive..."
-  # push to archive repo - in smaller parts because the 2 GB push limit - https://docs.github.com/en/get-started/using-git/troubleshooting-the-2-gb-push-limit
-  ARCHIVE_REPO=git@github.com:commaai/openpilot-archive.git
-  git push --prune $ARCHIVE_REPO +refs/heads/master:refs/heads/master # push master first so it's the default branch (when openpilot-archive is an empty repo)
-  git push --prune $ARCHIVE_REPO +refs/heads/*:refs/heads/* # 956.39 MiB (110725 objects)
-  git push --prune $ARCHIVE_REPO +refs/tags/*:refs/tags/* # 1.75 GiB (21694 objects)
-  # git push --mirror $ARCHIVE_REPO || true # fails to push refs/pull/* (deny updating a hidden ref) for pull requests
-  # we fail and continue - more reading: https://stackoverflow.com/a/34266401/639708 and https://blog.plataformatec.com.br/2013/05/how-to-properly-mirror-a-git-repository/
-fi
-
-# REWRITE master and tags
-if [ ! -d $SRC_CLONE ]; then
-  echo "Cloning $SRC..."
-  GIT_LFS_SKIP_SMUDGE=1 git clone $SRC $SRC_CLONE
-
-  cd $SRC_CLONE
-
-  echo "Checking out old history..."
-
-  git checkout tags/v0.7.1 > /dev/null 2>&1
-  # checkout as main, since we need master ref later
-  git checkout -b main
-
-  echo "Creating setup commits..."
-
-  # rm these so we don't get conflicts later
-  git rm -r cereal opendbc panda selfdrive/ui/ui > /dev/null
-  git commit -m "removed conflicting files" > /dev/null
-
-  # skip-smudge to get rid of some lfs errors that it can't find the reference of some lfs files
-  # we don't care about fetching/pushing lfs right now
-  git lfs install --skip-smudge --local
-
-  # squash initial setup commits
-  git cherry-pick -n -X theirs 6c33a5c..59b3d06 > /dev/null
-  git commit -m "switching to master" > /dev/null
-
-  # squash the two commits
-  git reset --soft HEAD~2
-  git commit -m "switching to master" -m "$(git log --reverse --format=%B 6c33a5c..59b3d06)" -m "removed conflicting files" > /dev/null
-
-  # get commits we want to cherry-pick
-  # will start with the next commit after #59b3d06 tools is local now
-  COMMITS=$(git rev-list --reverse 59b3d06..master)
-
-  # we need this for logging
-  TOTAL_COMMITS=$(echo $COMMITS | wc -w | xargs)
-  CURRENT_COMMIT_NUMBER=0
-
-  # empty this file
-  > commit-map.txt
-
-  echo "Rewriting master commits..."
-
-  for COMMIT in $COMMITS; do
-      CURRENT_COMMIT_NUMBER=$((CURRENT_COMMIT_NUMBER + 1))
-      # echo -ne "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Cherry-picking commit: $COMMIT"\\r
-      echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Cherry-picking commit: $COMMIT"
-
-      # set environment variables to preserve author/committer and dates
-      export GIT_AUTHOR_NAME=$(git show -s --format='%an' $COMMIT)
-      export GIT_AUTHOR_EMAIL=$(git show -s --format='%ae' $COMMIT)
-      export GIT_COMMITTER_NAME=$(git show -s --format='%cn' $COMMIT)
-      export GIT_COMMITTER_EMAIL=$(git show -s --format='%ce' $COMMIT)
-      export GIT_AUTHOR_DATE=$(git show -s --format='%ad' $COMMIT)
-      export GIT_COMMITTER_DATE=$(git show -s --format='%cd' $COMMIT)
-
-      # cherry-pick the commit
-      if ! GIT_OUTPUT=$(git cherry-pick -m 1 -X theirs $COMMIT 2>&1); then
-        # check if the failure is because of an empty commit
-        if [[ "$GIT_OUTPUT" == *"The previous cherry-pick is now empty"* ]]; then
-          echo "Empty commit detected. Skipping commit $COMMIT"
-          git cherry-pick --skip
-          # log it was empty to the mapping file
-          echo "$COMMIT EMPTY" >> commit-map.txt
-        else
-          # handle other errors or conflicts
-          echo "Cherry-pick failed. Handling error..."
-          echo "$GIT_OUTPUT"
-          exit 1
-        fi
-      else
-        # capture the new commit hash
-        NEW_COMMIT=$(git rev-parse HEAD)
-
-        # save the old and new commit hashes to the mapping file
-        echo "$COMMIT $NEW_COMMIT" >> commit-map.txt
-
-        # append the old commit ID to the commit message
-        git commit --amend -m "$(git log -1 --pretty=%B)" -m "Former-commit-id: $COMMIT" > /dev/null
-      fi
-
-    # prune every 3000 commits to avoid gc errors
-    if [ $((CURRENT_COMMIT_NUMBER % 3000)) -eq 0 ]; then
-      echo "Pruning repo..."
-      git gc
-    fi
-  done
-
-  echo "Rewriting tags..."
-
-  # remove all old tags
-  git tag -l | xargs git tag -d
-
-  # read each line from the tag-commit-map.txt
-  while IFS=' ' read -r TAG OLD_COMMIT; do
-    # search for the new commit in commit-map.txt corresponding to the old commit
-    NEW_COMMIT=$(grep "^$OLD_COMMIT " "commit-map.txt" | awk '{print $2}')
-
-    # check if this is a rebased commit
-    if [ -z "$NEW_COMMIT" ]; then
-      # if not, then just use old commit hash
-      NEW_COMMIT=$OLD_COMMIT
-    fi
-
-    echo "Rewriting tag $TAG from commit $NEW_COMMIT"
-    git tag -f "$TAG" "$NEW_COMMIT"
-  done < "$DIR/tag-commit-map.txt"
-
-  # uninstall lfs since we don't want to touch (push to) lfs right now
-  # git push will also push lfs, if we don't uninstall (--local so just for this repo)
-  git lfs uninstall --local
-
-  # force push new master
-  git push --force origin main:master
-
-  # force push new tags
-  git push --force --tags
-fi
-
-# REWRITE branches based on master
-if [ ! -f "$SRC_CLONE/rewrite-branches-done" ]; then
-  cd $SRC_CLONE
-  > rewrite-branches-done
-
-  # empty file
-  > $BRANCH_DIFF_LOG
-
-  echo "Rewriting branches based on master..."
-
-  # will store raw diffs here, if exist
-  mkdir -p differences
-
-  # get a list of all branches except master and REWRITE_IGNORE_BRANCHES
-  BRANCHES=$(git branch -r | grep -v ' -> ' | sed 's/.*origin\///' | grep -v '^master$' | grep -v -f <(echo "${REWRITE_IGNORE_BRANCHES[*]}" | tr ' ' '\n'))
-
-  for BRANCH in $BRANCHES; do
-    # check if the branch is based on master history
-    MERGE_BASE=$(git merge-base master origin/$BRANCH) || true
-    if [ -n "$MERGE_BASE" ]; then
-      echo "Rewriting branch: $BRANCH"
-
-      # create a new branch based on the new master
-      NEW_MERGE_BASE=$(grep "^$MERGE_BASE " "commit-map.txt" | awk '{print $2}')
-      if [ -z "$NEW_MERGE_BASE" ]; then
-        echo "Error: could not find new merge base for branch $BRANCH" >> $BRANCH_DIFF_LOG
-        continue
-      fi
-      git checkout -b ${BRANCH}_new $NEW_MERGE_BASE
-
-      # get the range of commits unique to this branch
-      COMMITS=$(git rev-list --reverse $MERGE_BASE..origin/${BRANCH})
-
-      HAS_ERROR=0
-
-      # simple delimiter
-      echo "BRANCH ${BRANCH}" >> commit-map.txt
-
-      for COMMIT in $COMMITS; do
-        # set environment variables to preserve author/committer and dates
-        export GIT_AUTHOR_NAME=$(git show -s --format='%an' $COMMIT)
-        export GIT_AUTHOR_EMAIL=$(git show -s --format='%ae' $COMMIT)
-        export GIT_COMMITTER_NAME=$(git show -s --format='%cn' $COMMIT)
-        export GIT_COMMITTER_EMAIL=$(git show -s --format='%ce' $COMMIT)
-        export GIT_AUTHOR_DATE=$(git show -s --format='%ad' $COMMIT)
-        export GIT_COMMITTER_DATE=$(git show -s --format='%cd' $COMMIT)
-
-        # cherry-pick the commit
-        if ! GIT_OUTPUT=$(git cherry-pick -m 1 -X theirs $COMMIT 2>&1); then
-          # check if the failure is because of an empty commit
-          if [[ "$GIT_OUTPUT" == *"The previous cherry-pick is now empty"* ]]; then
-            echo "Empty commit detected. Skipping commit $COMMIT"
-            git cherry-pick --skip
-            # log it was empty to the mapping file
-            echo "$COMMIT EMPTY" >> commit-map.txt
-          else
-            # handle other errors or conflicts
-            echo "Cherry-pick of ${BRANCH} branch failed. Removing branch upstream..." >> $BRANCH_DIFF_LOG
-            echo "$GIT_OUTPUT" > "$LOGS_DIR/branch-${BRANCH}"
-            git cherry-pick --abort
-            git push --delete origin ${BRANCH}
-            HAS_ERROR=1
-            break
-          fi
-        else
-          # capture the new commit hash
-          NEW_COMMIT=$(git rev-parse HEAD)
-
-          # save the old and new commit hashes to the mapping file
-          echo "$COMMIT $NEW_COMMIT" >> commit-map.txt
-
-          # append the old commit ID to the commit message
-          git commit --amend -m "$(git log -1 --pretty=%B)" -m "Former-commit-id: $COMMIT" > /dev/null
-        fi
-      done
-
-      # force push the new branch
-      if [ $HAS_ERROR -eq 0 ]; then
-        # git lfs goes haywire here, so we need to install and uninstall
-        # git lfs install --skip-smudge --local
-        git lfs uninstall --local > /dev/null
-        git push -f origin ${BRANCH}_new:${BRANCH}
-      fi
-
-      # clean up local branch
-      git checkout master > /dev/null
-      git branch -D ${BRANCH}_new > /dev/null
-    else
-      echo "Deleting branch $BRANCH as it's not based on master history" >> $BRANCH_DIFF_LOG
-      git push --delete origin ${BRANCH}
-    fi
-  done
-fi
-
-# VALIDATE cherry-pick
-if [ ! -f "$SRC_CLONE/validation-done" ]; then
-  cd $SRC_CLONE
-  > validation-done
-
-  TOTAL_COMMITS=$(grep -cve '^\s*$' commit-map.txt)
-  CURRENT_COMMIT_NUMBER=0
-  COUNT_SAME=0
-  COUNT_DIFF=0
-
-  # empty file
-  > $COMMIT_DIFF_LOG
-
-  echo "Validating commits..."
-
-  # will store raw diffs here, if exist
-  mkdir -p differences
-
-  # read each line from commit-map.txt
-  while IFS=' ' read -r OLD_COMMIT NEW_COMMIT; do
-    if [ "$NEW_COMMIT" == "EMPTY" ]; then
-      continue
-    fi
-    if [ "$OLD_COMMIT" == "BRANCH" ]; then
-      echo "Branch ${NEW_COMMIT} below:" >> $COMMIT_DIFF_LOG
-      continue
-    fi
-    CURRENT_COMMIT_NUMBER=$((CURRENT_COMMIT_NUMBER + 1))
-    # retrieve short hashes and dates for the old and new commits
-    OLD_COMMIT_SHORT=$(git rev-parse --short $OLD_COMMIT)
-    NEW_COMMIT_SHORT=$(git rev-parse --short $NEW_COMMIT)
-    OLD_DATE=$(git show -s --format='%cd' $OLD_COMMIT)
-    NEW_DATE=$(git show -s --format='%cd' $NEW_COMMIT)
-
-    # echo -ne "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Comparing old commit $OLD_COMMIT_SHORT ($OLD_DATE) with new commit $NEW_COMMIT_SHORT ($NEW_DATE)"\\r
-    echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Comparing old commit $OLD_COMMIT_SHORT ($OLD_DATE) with new commit $NEW_COMMIT_SHORT ($NEW_DATE)"
-
-    # generate lists of files and their hashes for the old and new commits, excluding ignored files
-    OLD_FILES=$(git ls-tree -r $OLD_COMMIT | grep -vE "$(IFS='|'; echo "${VALIDATE_IGNORE_FILES[*]}")")
-    NEW_FILES=$(git ls-tree -r $NEW_COMMIT | grep -vE "$(IFS='|'; echo "${VALIDATE_IGNORE_FILES[*]}")")
-
-    # Compare the diffs
-    if diff <(echo "$OLD_FILES") <(echo "$NEW_FILES") > /dev/null; then
-      # echo "Old commit $OLD_COMMIT_SHORT and new commit $NEW_COMMIT_SHORT are equivalent."
-      COUNT_SAME=$((COUNT_SAME + 1))
-    else
-      echo "[$CURRENT_COMMIT_NUMBER/$TOTAL_COMMITS] Difference found between old commit $OLD_COMMIT_SHORT and new commit $NEW_COMMIT_SHORT" >> $COMMIT_DIFF_LOG
-      COUNT_DIFF=$((COUNT_DIFF + 1))
-      set +e
-      diff -u <(echo "$OLD_FILES") <(echo "$NEW_FILES") > "$LOGS_DIR/commit-$CURRENT_COMMIT_NUMBER-$OLD_COMMIT_SHORT-$NEW_COMMIT_SHORT"
-      set -e
-    fi
-  done < "commit-map.txt"
-
-  echo "Summary:" >> $COMMIT_DIFF_LOG
-  echo "Equivalent commits: $COUNT_SAME" >> $COMMIT_DIFF_LOG
-  echo "Different commits: $COUNT_DIFF" >> $COMMIT_DIFF_LOG
-fi
-
-if [ ! -d $OUT ]; then
-  cp -r $SRC $OUT
-
-  cd $OUT
-
-  # remove all non-master branches
-  # git branch | grep -v "^  master$" | grep -v "\*" | xargs git branch -D
-
-  # echo "cleaning up refs"
-  # delete pull request refs since we can't alter them anyway (https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally#error-failed-to-push-some-refs)
-  # git for-each-ref --format='%(refname)' | grep '^refs/pull/' | xargs -I {} git update-ref -d {}
-
-  echo "importing new lfs files"
-  # import "almost" everything to lfs
-  BRANCHES=$(git for-each-ref --format='%(refname)' refs/heads/ | sed 's%refs/heads/%%g' | grep -v -f <(echo "${REWRITE_IGNORE_BRANCHES[*]}" | tr ' ' '\n') | tr '\n' ' ')
-  git lfs migrate import --include="*.dlc,*.onnx,*.svg,*.png,*.gif,*.ttf,*.wav,selfdrive/car/tests/test_models_segs.txt,system/hardware/tici/updater,selfdrive/ui/qt/spinner_larch64,selfdrive/ui/qt/text_larch64,third_party/**/*.a,third_party/**/*.so,third_party/**/*.so.*,third_party/**/*.dylib,third_party/acados/*/t_renderer,third_party/qt5/larch64/bin/lrelease,third_party/qt5/larch64/bin/lupdate,third_party/catch2/include/catch2/catch.hpp,*.apk,*.apkpatch,*.jar,*.pdf,*.jpg,*.mp3,*.thneed,*.tar.gz,*.npy,*.csv,*.a,*.so*,*.dylib,*.o,*.b64,selfdrive/hardware/tici/updater,selfdrive/boardd/tests/test_boardd,selfdrive/ui/qt/spinner_aarch64,installer/updater/updater,selfdrive/debug/profiling/simpleperf/**/*,selfdrive/hardware/eon/updater,selfdrive/ui/qt/text_aarch64,selfdrive/debug/profiling/pyflame/**/*,installer/installers/installer_openpilot,installer/installers/installer_dashcam,selfdrive/ui/text/text,selfdrive/ui/android/text/text,selfdrive/ui/spinner/spinner,selfdrive/visiond/visiond,selfdrive/loggerd/loggerd,selfdrive/sensord/sensord,selfdrive/sensord/gpsd,selfdrive/ui/android/spinner/spinner,selfdrive/ui/qt/spinner,selfdrive/ui/qt/text,_stringdefs.py,dfu-util-aarch64-linux,dfu-util-aarch64,dfu-util-x86_64-linux,dfu-util-x86_64,stb_image.h,clpeak3,clwaste,apk/**/*,external/**/*,phonelibs/**/*,third_party/boringssl/**/*,flask/**/*,panda/**/*,board/**/*,messaging/**/*,opendbc/**/*,tools/cabana/chartswidget.cc,third_party/nanovg/**/*,selfdrive/controls/lib/lateral_mpc/lib_mpc_export/**/*,selfdrive/ui/paint.cc,werkzeug/**/*,pyextra/**/*,third_party/android_hardware_libhardware/**/*,selfdrive/controls/lib/lead_mpc_lib/lib_mpc_export/**/*,selfdrive/locationd/laikad.py,selfdrive/locationd/test/test_laikad.py,tools/gpstest/test_laikad.py,selfdrive/locationd/laikad_helpers.py,tools/nui/**/*,jsonrpc/**/*,selfdrive/controls/lib/longitudinal_mpc/lib_mpc_export/**/*,selfdrive/controls/lib/lateral_mpc/mpc_export/**/*,selfdrive/camerad/cameras/camera_qcom.cc,selfdrive/manager.py,selfdrive/modeld/models/driving.cc,third_party/curl/**/*,selfdrive/modeld/thneed/debug/**/*,selfdrive/modeld/thneed/include/**/*,third_party/openmax/**/*,selfdrive/controls/lib/longitudinal_mpc/mpc_export/**/*,selfdrive/controls/lib/longitudinal_mpc_model/lib_mpc_export/**/*,Pipfile,Pipfile.lock,gunicorn/**/*,*.qm,jinja2/**/*,click/**/*,dbcs/**/*,websocket/**/*" $BRANCHES
-
-  echo "reflog and gc"
-  # this is needed after lfs import
-  git reflog expire --expire=now --all
-  git gc --prune=now --aggressive
-
-  # check the git-filter-repo analysis again - can be found in the repo root/filter-repo/analysis
-  echo "Analyzing with git-filter-repo..."
-  /tmp/git-filter-repo --force --analyze
-
-  echo "New size is $(du -sh .)"
-fi
-
-cd $OUT
-
-# fetch all lfs files from https://github.com/commaai/openpilot.git
-# some lfs files are missing on gitlab, but they can be found on github
-git config lfs.url https://github.com/commaai/openpilot.git/info/lfs
-git config lfs.pushurl ssh://git@github.com/commaai/openpilot.git
-git lfs fetch --all || true
-
-# also fetch all lfs files from https://gitlab.com/commaai/openpilot-lfs.git
-git config lfs.url https://gitlab.com/commaai/openpilot-lfs.git/info/lfs
-git config lfs.pushurl ssh://git@gitlab.com/commaai/openpilot-lfs.git
-git lfs fetch --all || true
-
-# final push - will also push lfs
-# TODO: switch to git@github.com:commaai/openpilot.git when ready
-# git push --mirror git@github.com:commaai/openpilot-tiny.git
-# using this instead to ignore refs/pull/* - since this is also what --mirror does - https://blog.plataformatec.com.br/2013/05/how-to-properly-mirror-a-git-repository/
-git push --prune git@github.com:commaai/openpilot-tiny.git +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/*

scripts/git_rewrite/rewrite.sh

@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
-cd $DIR
-
-git clone --bare https://github.com/commaai/openpilot
-cp -r openpilot.git openpilot_backup
-cd openpilot.git
-
-# backup old repo
-git push git@github.com:maxime-desroches/openpilot_archive.git +refs/heads/master:refs/heads/master
-git push git@github.com:maxime-desroches/openpilot_archive.git +refs/heads/*:refs/heads/*
-git push git@github.com:maxime-desroches/openpilot_archive.git +refs/tags/*:refs/tags/*
-git push --mirror git@github.com:maxime-desroches/openpilot_archive.git
-
-# ignore all release branches
-git for-each-ref --format='delete %(refname)' | grep 'dashcam3\|devel\|master-ci\|nightly\|release2\|release3\|release3-staging' | git update-ref --stdin
-
-# re-tag old releases on master
-declare -A TAGS=( ["f8cb04e4a8b032b72a909f68b808a50936184bee"]="v0.9.7" ["0b4d08fab8e35a264bc7383e878538f8083c33e5"]="v0.9.6" ["3b1e9017c560499786d8a0e46aaaeea65037acac"]="v0.9.5" ["fa310d9e2542cf497d92f007baec8fd751ffa99c"]="v0.9.4" ["8704c1ff952b5c85a44f50143bbd1a4f7b4887e2"]="v0.9.3" ["c7d3b28b93faa6c955fb24bc64031512ee985ee9"]="v0.9.2" ["89f68bf0cbf53a81b0553d3816fdbe522f941fa1"]="v0.9.1" ["58b84fb401a804967aa0dd5ee66fafa90194fd30"]="v0.9.0" ["f41dc62a12cc0f3cb8c5453c0caa0ba21e1bd01e"]="v0.8.16" ["5a7c2f90361e72e9c35e88abd2e11acdc4aba354"]="v0.8.15" ["71901c94dbbaa2f9f156a80c14cc7ea65219fc7c"]="v0.8.14" ["95da47079510afc91665263619e5939126da637c"]="v0.8.13" ["472177e2a8a1d002e56f9096326fd2dff62e54f9"]="v0.8.12" ["08078acbd0b4f7da469c7dff6159000e358974a9"]="v0.8.11" ["687925c775c375495f9827946138a724bde00b9d"]="v0.8.10" ["204e5a090735a059d69c29145a4cee49450da07e"]="v0.8.9" ["4be956f8861ecbb521ef9503a3c87b07c9d36721"]="v0.8.8" ["589f82c76627d634761a31a34b2488403556eb0b"]="v0.8.7" ["507cfc8910f74ddb8810039d68b880b426ff9ff9"]="v0.8.6" ["d47b00b45a866bef088f51d1ff31de5885ab04e9"]="v0.8.5" ["553e7d1cce314e7eb0587186b1764c3ff43bed62"]="v0.8.4" ["9896438d1511602a1ff87f7c4eb3c7172b30104a"]="v0.8.3" ["280192ed1443f112463417c2d815ea8ee2762fbd"]="v0.8.2" ["8039361567e4659eae2a084e6f39f34acadf4cac"]="v0.8.1" ["d56e04c0d960c8d3d4ab88b578dc508a2b4e07dc"]="v0.8" ["3d456e5d0fbf0c9887d0499dee812f2b029edf6d"]="v0.7.10" ["81763a18b5d0e379b749e090ecce36a91fca7c43"]="v0.7.9" ["9bc0b350fd273bbb2deb3dcaef0312944e4f6cfd"]="v0.7.8" ["ede5b632b58c55e4ff003f948efae07fe03c2280"]="v0.7.7" ["775acd11ba2e0a8c2f5a5655338718d796491b36"]="v0.7.6.1" ["302417b4cf0dcf00d45e4995b5410e543ad121d1"]="v0.7.5" ["12ff088b42221dd17d9d97decb1fc61a7cb0a861"]="v0.7.4" ["9563f7730252451fdcba9bc3d9fe36dab9c86a26"]="v0.7.3" ["8321cf283abbc2ca3fda7e0c7a069a77a492fe0c"]="v0.7.2" ["1e1de64a1e59476b7b3d3558b92149246d5c3292"]="v0.7.1" ["a2ae18d1dbd1e59c38ce22fa25ddffbd1d3084e3"]="v0.7" ["d4eb5a6eafdd4803d09e6f3963918216cca5a81f"]="v0.6.6" ["70d17cd69b80e7627dcad8fd5b6438f2309ac307"]="v0.6.5" ["58f376002e0c654fbc2de127765fa297cf694a33"]="v0.6.4" ["d5f9caa82d80cdcc7f1b7748f2cf3ccbf94f82a3"]="v0.6.3" ["095ef5f9f60fca1b269aabcc3cfd322b17b9e674"]="v0.6.2" ["cf5c4aeacb1703d0ffd35bdb5297d3494fee9a22"]="v0.6.1" ["60a20537c5f3fcc7f11946d81aebc8f90c08c117"]="v0.6" ["dd34ccfe288ebda8e2568cf550994ae890379f45"]="v0.5.13" ["3f9059fea886f1fa3b0c19a62a981d891dcc84eb"]="v0.5.12" ["2f92d577f995ff6ae1945ef6b89df3cb69b92999"]="v0.5.11" ["5a9d89ed42ddcd209d001a10d7eb828ef0e6d9de"]="v0.5.10" ["0207a970400ee28d3e366f2e8f5c551281accf02"]="v0.5.9" ["b967da5fc1f7a07e3561db072dd714d325e857b0"]="v0.5.8" ["210db686bb89f8696aa040e6e16de65424b808c9"]="v0.5.7" ["860a48765d1016ba226fb2c64aea35a45fe40e4a"]="v0.5.6" ["8f3539a27b28851153454eb737da9624cccaed2d"]="v0.5.5" ["a422246dc30bce11e970514f13f7c110f4470cc3"]="v0.5.4" ["285c52eb693265a0a530543e9ca0aeb593a2a55e"]="v0.5.3" ["0129a8a4ff8da5314e8e4d4d3336e89667ff6d54"]="v0.5.2" ["6f3d10a4c475c4c4509f0b370805419acd13912d"]="v0.5.1" ["de33bc46452b1046387ee2b3a03191b2c71135fb"]="v0.5" ["ae5cb7a0dab8b1bed9d52292f9b4e8e66a0f8ec9"]="v0.4.7" ["c6df34f55ba8c5a911b60d3f9eb20e3fa45f68c1"]="v0.4.6" ["37285038d3f91fa1b49159c4a35a8383168e644f"]="v0.4.5" ["9a9ff839a9b70cb2601d7696af743f5652395389"]="v0.4.4" ["28c0797d30175043bbfa31307b63aab4197cf996"]="v0.4.2" ["4474b9b3718653aeb0aee26422caefb90460cc0e"]="v0.4.1" ["da52d065a4c4f52d6017a537f3a80326f5af8bdc"]="v0.4.0.2" ["9d3963559ae7b15193057937ff3e72481899f40d"]="v0.3.5"  ["1b8c44b5067525a5d266b6e99799d8097da76a29"]="v0.3.4" ["5cf91d0496688fed4f2a6c7021349b1fc0e057a2"]="v0.3.3" ["7fe46f1e1df5dec08a940451ba0feefd5c039165"]="v0.3.2" ["41e3a0f699f5c39cb61a15c0eb7a4aa816d47c24"]="v0.3.1" ["c5d8aec28b5230d34ae4b677c2091cc3dec7e3e8"]="v0.3.0" ["693bcb0f83478f2651db6bac9be5ca5ad60d03f3"]="v0.2.9" ["95a349abcc050712c50d4d85a1c8a804eee7f6c2"]="v0.2.8" ["c6ba5dc5391d3ca6cda479bf1923b88ce45509a0"]="v0.2.7" ["6c3afeec0fb439070b2912978b8dbb659033b1d9"]="v0.2.6" ["29c58b45882ac79595356caf98580c1d2a626011"]="v0.2.5" ["ecc565aa3fdc4c7e719aadc000e1fdc4d80d4fe0"]="v0.2.4" ["adaa4ed350acda4067fc0b455ad15b54cdf4c768"]="v0.2.3" ["a64b9aa9b8cb5863c917b6926516291a63c02fe5"]="v0.2.2" ["17d9becd3c673091b22f09aa02559a9ed9230f50"]="v0.2.1" ["449b482cc3236ccf31829830b4f6a44b2dcc06c2"]="v0.2" ["e94a30bec07e719c5a7b037ca1f4db8312702cce"]="v0.1" )
-for tag in "${!TAGS[@]}"; do git tag -f "${TAGS[$tag]}" "$tag" ; done
-
-# get master root commit
-ROOT_COMMIT=$(git rev-list --max-parents=0 HEAD | tail -n 1)
-
-# link master and devel
-git replace --graft $ROOT_COMMIT v0.7.1
-git-filter-repo --prune-empty never --force --commit-callback 'h=commit.original_id.decode("utf-8");m=commit.message.decode("utf-8");commit.message=str.encode(m + "\n" + "old-commit-hash: " + h)'
-
-# delete replace refs
-git for-each-ref --format='delete %(refname)' refs/replace | git update-ref --stdin
-
-# validate
-tail -n +2 "filter-repo/commit-map" | tr ' ' '\n' | xargs -P $(nproc) -n 2 bash -c 'diff <(cd ../openpilot_backup && git ls-tree -r $0 | sha1sum) <(git ls-tree -r $1 | sha1sum) || exit 255'
-
-# cleanup
-git reflog expire --expire=now --all
-git gc --prune=now --aggressive
-
-# get all lfs files
-git config lfs.url https://github.com/commaai/openpilot.git/info/lfs
-git lfs fetch --all
-git config lfs.url https://gitlab.com/commaai/openpilot-lfs.git/info/lfs
-git lfs fetch --all
-
-# add new files to lfs
-git lfs migrate import --everything --include="*.dlc,*.onnx,*.svg,*.png,*.gif,*.ttf,*.wav,selfdrive/car/tests/test_models_segs.txt,system/hardware/tici/updater,selfdrive/ui/qt/spinner_larch64,selfdrive/ui/qt/text_larch64,third_party/**/*.a,third_party/**/*.so,third_party/**/*.so.*,third_party/**/*.dylib,third_party/acados/*/t_renderer,third_party/qt5/larch64/bin/lrelease,third_party/qt5/larch64/bin/lupdate,third_party/catch2/include/catch2/catch.hpp,*.apk,*.apkpatch,*.jar,*.pdf,*.jpg,*.mp3,*.thneed,*.tar.gz,*.npy,*.csv,*.a,*.so*,*.dylib,*.o,*.b64,selfdrive/hardware/tici/updater,selfdrive/boardd/tests/test_boardd,selfdrive/ui/qt/spinner_aarch64,installer/updater/updater,selfdrive/debug/profiling/simpleperf/**/*,selfdrive/hardware/eon/updater,selfdrive/ui/qt/text_aarch64,selfdrive/debug/profiling/pyflame/**/*,installer/installers/installer_openpilot,installer/installers/installer_dashcam,selfdrive/ui/text/text,selfdrive/ui/android/text/text,selfdrive/ui/spinner/spinner,selfdrive/visiond/visiond,selfdrive/loggerd/loggerd,selfdrive/sensord/sensord,selfdrive/sensord/gpsd,selfdrive/ui/android/spinner/spinner,selfdrive/ui/qt/spinner,selfdrive/ui/qt/text,_stringdefs.py,dfu-util-aarch64-linux,dfu-util-aarch64,dfu-util-x86_64-linux,dfu-util-x86_64,stb_image.h,clpeak3,clwaste,apk/**/*,external/**/*,phonelibs/**/*,third_party/boringssl/**/*,flask/**/*,panda/**/*,board/**/*,messaging/**/*,opendbc/**/*,tools/cabana/chartswidget.cc,third_party/nanovg/**/*,selfdrive/controls/lib/lateral_mpc/lib_mpc_export/**/*,selfdrive/ui/paint.cc,werkzeug/**/*,pyextra/**/*,third_party/android_hardware_libhardware/**/*,selfdrive/controls/lib/lead_mpc_lib/lib_mpc_export/**/*,selfdrive/locationd/laikad.py,selfdrive/locationd/test/test_laikad.py,tools/gpstest/test_laikad.py,selfdrive/locationd/laikad_helpers.py,tools/nui/**/*,jsonrpc/**/*,selfdrive/controls/lib/longitudinal_mpc/lib_mpc_export/**/*,selfdrive/controls/lib/lateral_mpc/mpc_export/**/*,selfdrive/camerad/cameras/camera_qcom.cc,selfdrive/manager.py,selfdrive/modeld/models/driving.cc,third_party/curl/**/*,selfdrive/modeld/thneed/debug/**/*,selfdrive/modeld/thneed/include/**/*,third_party/openmax/**/*,selfdrive/controls/lib/longitudinal_mpc/mpc_export/**/*,selfdrive/controls/lib/longitudinal_mpc_model/lib_mpc_export/**/*,Pipfile,Pipfile.lock,poetry.lock,gunicorn/**/*,*.qm,jinja2/**/*,click/**/*,dbcs/**/*,websocket/**/*"
-
-# set new lfs endpoint
-git config lfs.url https://gitlab.com/commaai/openpilot_rewrite_lfs.git/info/lfs
-git config lfs.pushurl ssh://git@gitlab.com/commaai/openpilot_rewrite_lfs.git
-
-# push all branch+tag (scary stuff...)
-git push -f --set-upstream git@github.com:maxime-desroches/tinypilot.git +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/*

scripts/git_rewrite/tag-commit-map.txt

@@ -1,82 +0,0 @@
-v0.1 e94a30bec07e719c5a7b037ca1f4db8312702cce
-v0.2 449b482cc3236ccf31829830b4f6a44b2dcc06c2
-v0.2.1 17d9becd3c673091b22f09aa02559a9ed9230f50
-v0.2.2 a64b9aa9b8cb5863c917b6926516291a63c02fe5
-v0.2.3 adaa4ed350acda4067fc0b455ad15b54cdf4c768
-v0.2.4 ecc565aa3fdc4c7e719aadc000e1fdc4d80d4fe0
-v0.2.5 29c58b45882ac79595356caf98580c1d2a626011
-v0.2.6 6c3afeec0fb439070b2912978b8dbb659033b1d9
-v0.2.7 c6ba5dc5391d3ca6cda479bf1923b88ce45509a0
-v0.2.8 95a349abcc050712c50d4d85a1c8a804eee7f6c2
-v0.2.9 693bcb0f83478f2651db6bac9be5ca5ad60d03f3
-v0.3.0 c5d8aec28b5230d34ae4b677c2091cc3dec7e3e8
-v0.3.1 41e3a0f699f5c39cb61a15c0eb7a4aa816d47c24
-v0.3.2 7fe46f1e1df5dec08a940451ba0feefd5c039165
-v0.3.3 5cf91d0496688fed4f2a6c7021349b1fc0e057a2
-v0.3.4 1b8c44b5067525a5d266b6e99799d8097da76a29
-v0.3.5 b111277f464cf66fa34b67819a83ea683e0f64df
-v0.4.0.2 da52d065a4c4f52d6017a537f3a80326f5af8bdc
-v0.4.1 4474b9b3718653aeb0aee26422caefb90460cc0e
-v0.4.2 28c0797d30175043bbfa31307b63aab4197cf996
-v0.4.4 9a9ff839a9b70cb2601d7696af743f5652395389
-v0.4.5 37285038d3f91fa1b49159c4a35a8383168e644f
-v0.4.6 c6df34f55ba8c5a911b60d3f9eb20e3fa45f68c1
-v0.4.7 ae5cb7a0dab8b1bed9d52292f9b4e8e66a0f8ec9
-v0.5 de33bc46452b1046387ee2b3a03191b2c71135fb
-v0.5.1 8f22f52235c48eada586795ac57edb22688e4d08
-v0.5.2 0129a8a4ff8da5314e8e4d4d3336e89667ff6d54
-v0.5.3 285c52eb693265a0a530543e9ca0aeb593a2a55e
-v0.5.4 a422246dc30bce11e970514f13f7c110f4470cc3
-v0.5.5 8f3539a27b28851153454eb737da9624cccaed2d
-v0.5.6 860a48765d1016ba226fb2c64aea35a45fe40e4a
-v0.5.7 9ce3045f139ee29bf0eea5ec59dfe7df9c3d2c51
-v0.5.8 2cee2e05ba0f3824fdbb8b957958800fa99071a1
-v0.5.9 ad145da3bcded0fe75306df02061d07a633963c3
-v0.5.10 ff4c1557d8358f158f4358788ff18ef93d2470ef
-v0.5.11 d1866845df423c6855e2b365ff230cf7d89a420b
-v0.5.12 f6e8ef27546e9a406724841e75f8df71cc4c2c97
-v0.5.13 dd34ccfe288ebda8e2568cf550994ae890379f45
-v0.6 60a20537c5f3fcc7f11946d81aebc8f90c08c117
-v0.6.1 cf5c4aeacb1703d0ffd35bdb5297d3494fee9a22
-v0.6.2 095ef5f9f60fca1b269aabcc3cfd322b17b9e674
-v0.6.3 d5f9caa82d80cdcc7f1b7748f2cf3ccbf94f82a3
-v0.6.4 58f376002e0c654fbc2de127765fa297cf694a33
-v0.6.5 70d17cd69b80e7627dcad8fd5b6438f2309ac307
-v0.6.6 d4eb5a6eafdd4803d09e6f3963918216cca5a81f
-v0.7 a2ae18d1dbd1e59c38ce22fa25ddffbd1d3084e3
-v0.7.1 1e1de64a1e59476b7b3d3558b92149246d5c3292
-v0.7.2 59bd58c940673b4c4a6a86f299022614bcf42b22
-v0.7.3 d7acd8b68f8131e0e714400cf124a3e228638643
-v0.7.4 e93649882c5e914eec4a8b8b593dc0587e497033
-v0.7.5 8abc0afe464626a461d2c7e192c912eeebeccc65
-v0.7.6 69aacd9d179fe6dd3110253a099c38b34cff7899
-v0.7.7 f1caed7299cdba5e45635d8377da6cc1e5fd7072
-v0.7.8 2189fe8741b635d8394d55dee28959425cfd5ad0
-v0.7.9 86dc54b836a973f132ed26db9f5a60b29f9b25b2
-v0.7.10 47a42ff432db8a2494e922ca5e767e58020f0446
-v0.7.11 f46ed718ba8d6bb4d42cd7b0f0150c406017c373
-v0.8 d56e04c0d960c8d3d4ab88b578dc508a2b4e07dc
-v0.8.1 cd6f26664cb8d32a13847d6648567c47c580e248
-v0.8.2 7cc0999aebfe63b6bb6dd83c1dff62c3915c4820
-v0.8.3 986500fe2f10870018f1fba1e5465476b8915977
-v0.8.4 f0d0b82b8d6f5f450952113e234d0a5a49e80c48
-v0.8.5 f5d9ddc6c2a2802a61e5ce590c6b6688bf736a69
-v0.8.6 75904ed7452c6cbfb2a70cd379a899d8a75b97c2
-v0.8.7 4f9e568019492126e236da85b5ca0a059f292900
-v0.8.8 a949a49d5efaaf2d881143d23e9fb5ff9e28e88c
-v0.8.9 a034926264cd1025c69d6ceb3fe444965f960b75
-v0.8.10 59accdd814398b884167c0f41dbf46dcccf0c29c
-v0.8.11 d630ec9092f039cb5e51c5dd6d92fc47b91407e4
-v0.8.12 57871c99031cf597ffa0d819057ac1401e129f32
-v0.8.13 e43e6e876513450d235124fcb711f1724ed9814c
-v0.8.14 71901c94dbbaa2f9f156a80c14cc7ea65219fc7c
-v0.8.15 5a7c2f90361e72e9c35e88abd2e11acdc4aba354
-v0.8.16 f41dc62a12cc0f3cb8c5453c0caa0ba21e1bd01e
-v0.9.0 58b84fb401a804967aa0dd5ee66fafa90194fd30
-v0.9.1 89f68bf0cbf53a81b0553d3816fdbe522f941fa1
-v0.9.2 c7d3b28b93faa6c955fb24bc64031512ee985ee9
-v0.9.3 8704c1ff952b5c85a44f50143bbd1a4f7b4887e2
-v0.9.4 fa310d9e2542cf497d92f007baec8fd751ffa99c
-v0.9.5 3b1e9017c560499786d8a0e46aaaeea65037acac
-v0.9.6 0b4d08fab8e35a264bc7383e878538f8083c33e5
-v0.9.7 f8cb04e4a8b032b72a909f68b808a50936184bee

scripts/launch_corolla.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 

scripts/lint/check_shebang_format.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-FAIL=0
-
-if grep '^#!.*python' $@ | grep -v '#!/usr/bin/env python3$'; then
-  echo -e "Invalid shebang! Must use '#!/usr/bin/env python3'\n"
-  FAIL=1
-fi
-
-if grep '^#!.*bash' $@ | grep -v '#!/usr/bin/env bash$'; then
-  echo -e "Invalid shebang! Must use '#!/usr/bin/env bash'"
-  FAIL=1
-fi
-
-exit $FAIL

scripts/lint/lint.sh

@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-UNDERLINE='\033[4m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/../../
-
-FAILED=0
-
-IGNORED_FILES="uv\.lock|docs\/CARS.md"
-IGNORED_DIRS="^third_party.*|^msgq.*|^msgq_repo.*|^opendbc.*|^opendbc_repo.*|^cereal.*|^panda.*|^rednose.*|^rednose_repo.*|^tinygrad.*|^tinygrad_repo.*|^teleoprtc.*|^teleoprtc_repo.*"
-
-function run() {
-  shopt -s extglob
-  case $1 in
-    $SKIP | $RUN ) return 0 ;;
-  esac
-
-  echo -en "$1"
-
-  for ((i=0; i<$((50 - ${#1})); i++)); do
-    echo -n "."
-  done
-
-  shift 1;
-  CMD="$@"
-
-  set +e
-  log="$((eval "$CMD" ) 2>&1)"
-
-  if [[ $? -eq 0 ]]; then
-    echo -e "[${GREEN}✔${NC}]"
-  else
-    echo -e "[${RED}✗${NC}]"
-    echo "$log"
-    FAILED=1
-  fi
-  set -e
-}
-
-function run_tests() {
-  ALL_FILES=$1
-  PYTHON_FILES=$2
-
-  run "ruff" ruff check $PYTHON_FILES --quiet
-  run "check_added_large_files" python3 -m pre_commit_hooks.check_added_large_files --enforce-all $ALL_FILES --maxkb=120
-  run "check_shebang_scripts_are_executable" python3 -m pre_commit_hooks.check_shebang_scripts_are_executable $ALL_FILES
-  run "check_shebang_format" $DIR/check_shebang_format.sh $ALL_FILES
-
-  if [[ -z "$FAST" ]]; then
-    run "mypy" mypy $PYTHON_FILES
-    run "codespell" codespell $ALL_FILES
-  fi
-
-  return $FAILED
-}
-
-function help() {
-  echo "A fast linter"
-  echo ""
-  echo -e "${BOLD}${UNDERLINE}Usage:${NC} op lint [TESTS] [OPTIONS]"
-  echo ""
-  echo -e "${BOLD}${UNDERLINE}Tests:${NC}"
-  echo -e "  ${BOLD}ruff${NC}"
-  echo -e "  ${BOLD}mypy${NC}"
-  echo -e "  ${BOLD}codespell${NC}"
-  echo -e "  ${BOLD}check_added_large_files${NC}"
-  echo -e "  ${BOLD}check_shebang_scripts_are_executable${NC}"
-  echo ""
-  echo -e "${BOLD}${UNDERLINE}Options:${NC}"
-  echo -e "  ${BOLD}-f, --fast${NC}"
-  echo "          Skip slow tests"
-  echo -e "  ${BOLD}-s, --skip${NC}"
-  echo "          Specify tests to skip separated by spaces"
-  echo ""
-  echo -e "${BOLD}${UNDERLINE}Examples:${NC}"
-  echo "  op lint mypy ruff"
-  echo "          Only run the mypy and ruff tests"
-  echo ""
-  echo "  op lint --skip mypy ruff"
-  echo "          Skip the mypy and ruff tests"
-  echo ""
-  echo "  op lint"
-  echo "          Run all the tests"
-}
-
-SKIP=""
-RUN=""
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    -f | --fast ) shift 1; FAST="1" ;;
-    -s | --skip ) shift 1; SKIP=" " ;;
-    -h | --help | -help | --h ) help; exit 0 ;;
-    * ) if [[ -n $SKIP ]]; then SKIP+="$1 "; else RUN+="$1 "; fi; shift 1 ;;
-  esac
-done
-
-RUN=$([ -z "$RUN" ] && echo "" || echo "!($(echo $RUN | sed 's/ /|/g'))")
-SKIP="@($(echo $SKIP | sed 's/ /|/g'))"
-
-GIT_FILES="$(git ls-files | sed -E "s/$IGNORED_FILES|$IGNORED_DIRS//g")"
-ALL_FILES=""
-for f in $GIT_FILES; do
-  if [[ -f $f ]]; then
-    ALL_FILES+="$f"$'\n'
-  fi
-done
-PYTHON_FILES=$(echo "$ALL_FILES" | grep --color=never '.py$' || true)
-
-run_tests "$ALL_FILES" "$PYTHON_FILES"