merge master

commaai · May 6, 2024 · 6c605dc · 6c605dc
2 parents 1cd0edb + aca0136
commit 6c605dc
Show file tree

Hide file tree

Showing 48 changed files with 434 additions and 389 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -8,6 +8,8 @@ RUN cd /tmp && \
     curl -L -o virtualgl.deb "https://downloads.sourceforge.net/project/virtualgl/3.1/virtualgl_3.1_$ARCH.deb" && \
     dpkg -i virtualgl.deb
 
+RUN usermod -aG video batman
+
 USER batman
 
 RUN cd $HOME && \

diff --git a/.github/ISSUE_TEMPLATE/pc_bug_report.yml b/.github/ISSUE_TEMPLATE/pc_bug_report.yml
@@ -24,7 +24,7 @@ body:
     id: os-version
     attributes:
       label: OS Version
-      placeholder: Ubuntu 20.04
+      placeholder: Ubuntu 24.04
     validations:
       required: true
 

diff --git a/.github/workflows/badges.yaml b/.github/workflows/badges.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   badges:
     name: create badges
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'commaai/openpilot'
     permissions:
       contents: write

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -20,7 +20,7 @@ env:
 jobs:
   docs:
     name: build docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/prebuilt.yaml b/.github/workflows/prebuilt.yaml
@@ -11,7 +11,7 @@ env:
 jobs:
   build_prebuilt:
     name: build prebuilt
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'commaai/openpilot'
     env:
       PUSH_IMAGE: true

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
       ImageOS: ubuntu20
     container:
       image: ghcr.io/commaai/openpilot-base:latest
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'commaai/openpilot'
     permissions:
       checks: read

diff --git a/.github/workflows/repo-maintenance.yaml b/.github/workflows/repo-maintenance.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   bump_submodules:
     name: bump_submodules
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/commaai/openpilot-base:latest
     if: github.repository == 'commaai/openpilot'
@@ -24,6 +24,7 @@ jobs:
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
       with:
+        author: Vehicle Researcher <[email protected]>
         token: ${{ secrets.ACTIONS_CREATE_PR_PAT }}
         commit-message: bump submodules
         title: '[bot] Bump submodules'
@@ -34,7 +35,7 @@ jobs:
         labels: bot
   package_updates:
     name: package_updates
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/commaai/openpilot-base:latest
     if: github.repository == 'commaai/openpilot'
@@ -51,6 +52,7 @@ jobs:
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
       with:
+        author: Vehicle Researcher <[email protected]>
         token: ${{ secrets.ACTIONS_CREATE_PR_PAT }}
         commit-message: Update Python packages and pre-commit hooks
         title: '[bot] Update Python packages and pre-commit hooks'

diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
@@ -26,7 +26,7 @@ env:
 jobs:
   build_release:
     name: build release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       STRIPPED_DIR: /tmp/releasepilot
     steps:
@@ -71,7 +71,7 @@ jobs:
            ((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-20.04' }}
+    runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-latest' }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -87,7 +87,7 @@ jobs:
     strategy:
       matrix:
         arch: ${{ fromJson( (github.repository == 'commaai/openpilot') && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
-    runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-20.04' }}
+    runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-latest' }}
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
     steps:
     - uses: actions/checkout@v4
@@ -104,7 +104,7 @@ jobs:
 
   docker_push_multiarch:
     name: docker push multiarch tag
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
     needs: [docker_push]
     steps:
@@ -123,7 +123,7 @@ jobs:
     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-20.04' }}
+                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -136,7 +136,7 @@ jobs:
 
   valgrind:
     name: valgrind
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:
@@ -156,7 +156,7 @@ jobs:
     name: unit tests
     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-20.04' }}
+                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -187,7 +187,7 @@ jobs:
     name: process replay
     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-20.04' }}
+                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -234,7 +234,7 @@ jobs:
 
   regen:
     name: regen
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-latest'
     steps:
     - uses: actions/checkout@v4
       with:
@@ -259,7 +259,7 @@ jobs:
 
   test_modeld:
     name: model tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:
@@ -294,7 +294,7 @@ jobs:
     name: cars
     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-20.04' }}
+                    (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
@@ -329,7 +329,7 @@ jobs:
 
   car_docs_diff:
     name: PR comments
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
@@ -383,7 +383,7 @@ jobs:
 
   create_ui_report:
     name: Create UI Report
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
@@ -22,7 +22,7 @@ env:
 jobs:
   plotjuggler:
     name: plotjuggler
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
     - uses: actions/checkout@v4
@@ -37,9 +37,9 @@ jobs:
       run: |
         ${{ env.RUN }} "pytest tools/plotjuggler/"
 
-  simulator:
-    name: simulator
-    runs-on: ubuntu-20.04
+  simulator_build:
+    name: simulator docker build
+    runs-on: ubuntu-latest
     if: github.repository == 'commaai/openpilot'
     timeout-minutes: 45
     steps:
@@ -56,6 +56,28 @@ jobs:
       run: |
         selfdrive/test/docker_build.sh sim
 
+  simulator_driving:
+    name: simulator driving
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - run: git lfs pull
+    - uses: ./.github/workflows/setup-with-retry
+    - name: Build base docker image
+      run: eval "$BUILD"
+    - name: Build openpilot
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc)"
+    - name: Run bridge test
+      run: |
+        ${{ env.RUN }} "export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' && \
+                        source selfdrive/test/setup_xvfb.sh && \
+                        source selfdrive/test/setup_vsound.sh && \
+                        CI=1 tools/sim/tests/test_metadrive_bridge.py"
+
   devcontainer:
     name: devcontainer
     runs-on: ubuntu-latest
@@ -85,7 +107,7 @@ jobs:
 
   notebooks:
     name: notebooks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: false && github.repository == 'commaai/openpilot'
     timeout-minutes: 45
     steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
         - -L bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints
         - --builtins clear,rare,informal,usage,code,names,en-GB_to_en-US
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.4.2
     hooks:
     -   id: ruff
         exclude: '^(third_party/)|(cereal/)|(panda/)|(rednose/)|(rednose_repo/)|(tinygrad/)|(tinygrad_repo/)|(teleoprtc/)|(teleoprtc_repo/)'

diff --git a/SConstruct b/SConstruct
@@ -193,6 +193,7 @@ env = Environment(
     "-Wno-c99-designator",
     "-Wno-reorder-init-list",
     "-Wno-error=unused-but-set-variable",
+    "-Wno-vla-cxx-extension",
   ] + cflags + ccflags,
 
   CPPPATH=cpppath + [

diff --git a/body b/body
diff --git a/cereal b/cereal
diff --git a/launch_env.sh b/launch_env.sh
@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1
 
 if [ -z "$AGNOS_VERSION" ]; then
-  export AGNOS_VERSION="9.7"
+  export AGNOS_VERSION="10"
 fi
 
 export STAGING_ROOT="/data/safe_staging"
diff --git a/opendbc b/opendbc
diff --git a/panda b/panda
+1 −1		.github/workflows/repo.yml
+3 −3		.github/workflows/tests.yml
+8 −11		Dockerfile
+1 −0		SConstruct
+192 −0		chrysler_cusw.dbc
+1 −1		vw_mqb_2010.dbc
+1 −1		.github/workflows/drivers.yaml
+1 −1		.github/workflows/repo.yml
+7 −10		.github/workflows/test.yaml
+2 −2		.pre-commit-config.yaml
+23 −49		Dockerfile
+1 −1		board/debug/README.md
+1 −1		board/drivers/bootkick.h
+1 −0		python/__init__.py
+1 −1		tests/som/test_bootkick.py