.clang-tidy

@@ -0,0 +1,19 @@
+---
+Checks: '
+bugprone-*,
+-bugprone-integer-division,
+-bugprone-narrowing-conversions,
+performance-*,
+clang-analyzer-*,
+misc-*,
+-misc-unused-parameters,
+modernize-*,
+-modernize-avoid-c-arrays,
+-modernize-deprecated-headers,
+-modernize-use-auto,
+-modernize-use-using,
+-modernize-use-nullptr,
+-modernize-use-trailing-return-type,
+'
+CheckOptions:
+...

.dir-locals.el

@@ -0,0 +1,3 @@
+((c++-mode (flycheck-gcc-language-standard . "c++11")
+           (flycheck-clang-language-standard . "c++11")
+           ))

.dockerignore

@@ -0,0 +1,40 @@
+**/.git
+.DS_Store
+*.dylib
+*.DSYM
+*.d
+*.pyc
+*.pyo
+.*.swp
+.*.swo
+.*.un~
+*.tmp
+*.o
+*.o-*
+*.os
+*.os-*
+*.so
+*.a
+
+notebooks
+phone
+massivemap
+neos
+installer
+chffr/app2
+chffr/backend/env
+selfdrive/nav
+selfdrive/baseui
+chffr/lib/vidindex/vidindex
+selfdrive/test/simulator2
+**/cache_data
+xx/chffr/lib/vidindex/vidindex
+xx/plus
+xx/community
+xx/projects
+!xx/projects/eon_testing_master
+!xx/projects/map3d
+xx/ops
+xx/junk
+tools/sim/carla
+tools/sim/*.tar.gz

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.py, *.pyx, *.pxd}]
+charset = utf-8
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,23 @@
+*.keras filter=lfs diff=lfs merge=lfs -text
+*.dlc filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.ipynb filter=nbstripout -diff
+external/ffmpeg/bin/ffmpeg_cuda filter=lfs diff=lfs merge=lfs -text
+models/segnet.keras filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/x86_64/lib/libacado_toolkit.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/x86_64/lib/libacado_toolkit_s.so.1.2.2beta filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/x86_64/lib/libacado_casadi.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/x86_64/lib/libacado_csparse.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/x86_64/lib/libacado_qpoases.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/aarch64/lib/libacado_toolkit.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/aarch64/lib/libacado_toolkit_s.so.1.2.2beta filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/aarch64/lib/libacado_casadi.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/aarch64/lib/libacado_csparse.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/acado/aarch64/lib/libacado_qpoases.a filter=lfs diff=lfs merge=lfs -text
+phonelibs/fastcv/aarch64/libfastcvopt.so filter=lfs diff=lfs merge=lfs -text
+phonelibs/fastcv/aarch64/libfastcvadsp_stub.so filter=lfs diff=lfs merge=lfs -text
+models/segnet2.keras filter=lfs diff=lfs merge=lfs -text
+phonelibs/zmq/aarch64-linux/lib/libzmq.a filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: For issues with running openpilot on your comma device
+title: ''
+labels: 'bug'
+assignees: ''
+---
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. -->
+
+**How to reproduce or log data**
+
+<!-- Steps to reproduce the behavior. -->
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Device/Version information (please complete the following information):**
+ - Device: [e.g. EON/EON Gold/comma two]
+ - Dongle ID: [e.g. 77611a1fac303767, can be found in Settings -> Device -> Dongle ID or my.comma.ai/useradmin]
+ - Route: [e.g. 77611a1fac303767|2020-05-11--16-37-07, can be found in my.comma.ai/useradmin]
+ - Timestamp: [When in the route the bug occurs (e.g. 4min 30s into the drive)]
+ - Version: [commit hash when on a non-release branch, or version number when on devel or release2 (e.g. 0.7.6)]
+ - Car make/model: [e.g. Toyota Prius 2016]
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/car_bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Car bug report
+about: For issues with a particular car or make
+title: ''
+labels: 'car bug'
+assignees: ''
+---
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. -->
+
+**How to reproduce or log data**
+
+<!-- Steps to reproduce the behavior. -->
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Device/Version information (please complete the following information):**
+ - Device: [e.g. EON/EON Gold/comma two]
+ - Dongle ID: [e.g. 77611a1fac303767, can be found in Settings -> Device -> Dongle ID or my.comma.ai/useradmin]
+ - Route: [e.g. 77611a1fac303767|2020-05-11--16-37-07, can be found in my.comma.ai/useradmin]
+ - Timestamp: [When in the route the bug occurs (e.g. 4min 30s into the drive)]
+ - Version: [commit hash when on a non-release branch, or version number when on devel or release2 (e.g. 0.7.6)]
+ - Car make/model: [e.g. Toyota Prius 2016]
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discussions
+    url: https://github.com/commaai/openpilot/discussions
+    about: For questions and 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/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,8 @@
+---
+name: Enhancement
+about: For openpilot enhancement suggestions
+title: ''
+labels: 'enhancement'
+assignees: ''
+---
+

.github/ISSUE_TEMPLATE/pc_bug_report.md

@@ -0,0 +1,25 @@
+---
+name: PC Bug report
+about: For issues with running openpilot on PC
+title: ''
+labels: 'PC'
+assignees: ''
+---
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. Add the `simulation` label if running in an environment like CARLA. -->
+
+**How to reproduce or log data**
+
+<!-- Steps to reproduce the behavior. -->
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->
+
+Operating system: [e.g. Ubuntu 16.04]

.github/PULL_REQUEST_TEMPLATE/bugfix.md

@@ -0,0 +1,15 @@
+---
+name: Bug fix
+about: For openpilot bug fixes
+title: ''
+labels: 'bugfix'
+assignees: ''
+---
+
+**Description**
+
+<!-- A description of the bug and the fix. Also link the issue if it exists. -->
+
+**Verification**
+
+<!-- Explain how you tested this bug fix. -->

.github/PULL_REQUEST_TEMPLATE/car_bugfix.md

@@ -0,0 +1,19 @@
+---
+name: Car Bug fix
+about: For vehicle/brand specifc bug fixes
+title: ''
+labels: 'car bug fix'
+assignees: ''
+---
+
+**Description**
+
+<!-- A description of the bug and the fix. Also link the issue if it exists. -->
+
+**Verification**
+
+<!-- Explain how you tested this bug fix. -->
+
+**Route**
+
+Route: [a route with the bug fix]

.github/PULL_REQUEST_TEMPLATE/car_port.md

@@ -0,0 +1,14 @@
+---
+name: Car port
+about: For new car ports
+title: ''
+labels: 'car port'
+assignees: ''
+---
+
+**Checklist**
+
+- [ ] added to README
+- [ ] test route added to [test_routes.py](../../selfdrive/test/test_routes.py)
+- [ ] route with openpilot:
+- [ ] route with stock system:

.github/PULL_REQUEST_TEMPLATE/fingerprint.md

@@ -0,0 +1,11 @@
+---
+name: Fingerprint
+about: For adding fingerprints to existing cars
+title: ''
+labels: 'fingerprint'
+assignees: ''
+---
+
+Discord username: []
+
+Route: []

.github/PULL_REQUEST_TEMPLATE/refactor.md

@@ -0,0 +1,15 @@
+---
+name: Refactor
+about: For code refactors
+title: ''
+labels: 'refactor'
+assignees: ''
+---
+
+**Description**
+
+<!-- A description of the refactor, including the goals it accomplishes. -->
+
+**Verification**
+
+<!-- Explain how you tested the refactor for regressions. -->

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '15:00'
+  open-pull-requests-limit: 10

.github/pull_request_template.md

@@ -0,0 +1,38 @@
+<!-- Please copy and paste the relevant template -->
+
+<!--- ***** Template: Car bug fix *****
+
+**Description** [](A description of the bug and the fix. Also link any relevant issues.)
+
+**Verification** [](Explain how you tested this bug fix.)
+
+**Route**
+Route: [a route with the bug fix]
+
+-->
+
+<!--- ***** Template: Bug fix *****
+
+**Description** [](A description of the bug and the fix. Also link any relevant issues.)
+
+**Verification** [](Explain how you tested this bug fix.)
+
+-->
+
+<!--- ***** Template: Car port *****
+
+**Checklist**
+- [ ] added to README
+- [ ] test route added to [test_routes.py](../../selfdrive/test/test_routes.py)
+- [ ] route with openpilot:
+- [ ] route with stock system:
+
+-->
+
+<!--- ***** Template: Refactor *****
+
+**Description** [](A description of the refactor, including the goals it accomplishes.)
+
+**Verification** [](Explain how you tested the refactor for regressions.)
+
+-->

.github/workflows/prebuilt.yaml

@@ -0,0 +1,42 @@
+name: prebuilt
+on:
+  schedule:
+    - cron: '0 * * * *'
+
+env:
+  BASE_IMAGE: openpilot-base
+  DOCKER_REGISTRY: ghcr.io/commaai
+
+  DOCKER_LOGIN: docker login ghcr.io -u adeebshihadeh -p ${{ secrets.CONTAINER_TOKEN }}
+  BUILD: |
+      docker pull $(grep -iohP '(?<=^from)\s+\S+' Dockerfile.openpilot_base) || true
+      docker pull $DOCKER_REGISTRY/$BASE_IMAGE:latest || true
+      docker build --cache-from $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $BASE_IMAGE:latest -f Dockerfile.openpilot_base .
+
+jobs:
+  build_prebuilt:
+    name: build prebuilt
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+    if: github.repository == 'commaai/openpilot'
+    env:
+      IMAGE_NAME: openpilot-prebuilt
+    steps:
+    - name: Wait for green check mark
+      uses: lewagon/wait-on-check-action@v0.2
+      with:
+        ref: master
+        wait-interval: 30
+        running-workflow-name: 'build prebuilt'
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: |
+        eval "$BUILD"
+        docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
+        docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f Dockerfile.openpilot .
+    - name: Push to container registry
+      run: |
+        $DOCKER_LOGIN
+        docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest

.github/workflows/selfdrive_tests.yaml

@@ -0,0 +1,293 @@
+name: selfdrive
+on:
+  push:
+    branches-ignore:
+      - 'testing-closet*'
+  pull_request:
+
+env:
+  BASE_IMAGE: openpilot-base
+  DOCKER_REGISTRY: ghcr.io/commaai
+
+  DOCKER_LOGIN: docker login ghcr.io -u adeebshihadeh -p ${{ secrets.CONTAINER_TOKEN }}
+  BUILD: |
+      docker pull $(grep -iohP '(?<=^from)\s+\S+' Dockerfile.openpilot_base) || true
+      docker pull $DOCKER_REGISTRY/$BASE_IMAGE:latest || true
+      docker build --cache-from $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $BASE_IMAGE:latest -f Dockerfile.openpilot_base .
+
+  RUN: docker run --shm-size 1G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e SCONS_CACHE=1 -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v /tmp/scons_cache:/tmp/scons_cache -v /tmp/comma_download_cache:/tmp/comma_download_cache $BASE_IMAGE /bin/sh -c
+  UNIT_TEST: coverage run --append -m unittest discover
+
+jobs:
+  # TODO: once actions/cache supports read only mode, use the cache for all jobs
+  build_release:
+    name: build release
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    env:
+      STRIPPED_DIR: tmppilot
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Cache dependencies
+      id: dependency-cache
+      uses: actions/cache@v2
+      with:
+        path: /tmp/scons_cache
+        key: scons-cache-${{ hashFiles('selfdrive/**') }}
+        restore-keys: scons-cache-
+    - name: Strip non-release files
+      run: |
+        mkdir $STRIPPED_DIR
+        cp -pR --parents $(cat release/files_common) $STRIPPED_DIR
+        cp Dockerfile.openpilot_base $STRIPPED_DIR
+
+        # need this to build on x86
+        cp -pR --parents phonelibs/libyuv phonelibs/snpe selfdrive/modeld/runners $STRIPPED_DIR
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Build openpilot and run checks
+      run: |
+          cd $STRIPPED_DIR
+          ${{ env.RUN }} "python selfdrive/manager/build.py && \
+                          python -m unittest discover selfdrive/car"
+    - name: Cleanup scons cache
+      run: |
+          cd $STRIPPED_DIR
+          ${{ env.RUN }} "scons -j$(nproc) && \
+                          rm -rf /tmp/scons_cache/* && \
+                          scons -j$(nproc) --cache-populate"
+
+  build_mac:
+    name: build macos
+    runs-on: macos-10.15
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Determine pre-existing Homebrew packages
+      if: steps.dependency-cache.outputs.cache-hit != 'true'
+      run: |
+        echo 'EXISTING_CELLAR<<EOF' >> $GITHUB_ENV
+        ls -1 /usr/local/Cellar >> $GITHUB_ENV
+        echo 'EOF' >> $GITHUB_ENV
+    - name: Cache dependencies
+      id: dependency-cache
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.pyenv
+          ~/Library/Caches/pip
+          ~/Library/Caches/pipenv
+          /usr/local/Cellar
+          ~/github_brew_cache_entries.txt
+        key: macos-cache-${{ hashFiles('tools/mac_setup.sh') }}
+    - name: Brew link restored dependencies
+      if: steps.dependency-cache.outputs.cache-hit == 'true'
+      run: |
+        while read pkg; do
+          brew link --force "$pkg" # `--force` for keg-only packages
+        done < ~/github_brew_cache_entries.txt
+    - name: Install dependencies
+      run: ./tools/mac_setup.sh
+    - name: Build openpilot
+      run: eval "$(pyenv init -)" && scons -j$(nproc)
+    - name: Remove pre-existing Homebrew packages for caching
+      if: steps.dependency-cache.outputs.cache-hit != 'true'
+      run: |
+        cd /usr/local/Cellar
+        new_cellar=$(ls -1)
+        comm -12 <(echo "$EXISTING_CELLAR") <(echo "$new_cellar") | while read pkg; do
+          if [[ $pkg != "zstd" ]]; then # caching step needs zstd
+            rm -rf "$pkg"
+          fi
+        done
+        comm -13 <(echo "$EXISTING_CELLAR") <(echo "$new_cellar") | tee ~/github_brew_cache_entries.txt
+
+  build_webcam:
+    name: build webcam
+    runs-on: ubuntu-20.04
+    timeout-minutes: 90
+    env:
+      IMAGE_NAME: openpilotwebcamci
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: |
+        eval "$BUILD"
+        docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
+        docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/webcam/Dockerfile .
+    - name: Build openpilot
+      run: docker run --shm-size 1G --rm -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot $DOCKER_REGISTRY/$IMAGE_NAME /bin/sh -c "cd /tmp/openpilot && USE_WEBCAM=1 scons -j$(nproc)"
+    - name: Push to container registry
+      if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
+      run: |
+        $DOCKER_LOGIN
+        docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest
+
+  docker_push:
+    name: docker push
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
+    needs: static_analysis # hack to ensure slow tests run first since this and static_analysis are fast
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Push to container registry
+      run: |
+        $DOCKER_LOGIN
+        docker push $DOCKER_REGISTRY/$BASE_IMAGE:latest
+
+  static_analysis:
+    name: static analysis
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: pre-commit
+      run: ${{ env.RUN }} "git init && git add -A && pre-commit run --all"
+
+  valgrind:
+    name: valgrind
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Cache dependencies
+      id: dependency-cache
+      uses: actions/cache@v2
+      with:
+        path: /tmp/comma_download_cache
+        key: ${{ hashFiles('.github/workflows/test.yaml', 'selfdrive/test/test_valgrind_replay.py') }}
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Run valgrind
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc) && \
+                        FILEREADER_CACHE=1 python selfdrive/test/test_valgrind_replay.py"
+    - name: Print logs
+      if: always()
+      run: cat selfdrive/test/valgrind_logs.txt
+
+  unit_tests:
+    name: unit tests
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Run unit tests
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc) --test && \
+                        coverage run selfdrive/test/test_fingerprints.py && \
+                        $UNIT_TEST common && \
+                        $UNIT_TEST opendbc/can && \
+                        $UNIT_TEST selfdrive/boardd && \
+                        $UNIT_TEST selfdrive/controls && \
+                        $UNIT_TEST selfdrive/monitoring && \
+                        $UNIT_TEST selfdrive/loggerd && \
+                        $UNIT_TEST selfdrive/car && \
+                        $UNIT_TEST selfdrive/locationd && \
+                        $UNIT_TEST selfdrive/athena && \
+                        $UNIT_TEST selfdrive/thermald && \
+                        $UNIT_TEST tools/lib/tests && \
+                        ./selfdrive/camerad/test/ae_gray_test"
+    - name: Upload coverage to Codecov
+      run: bash <(curl -s https://codecov.io/bash) -v -F unit_tests
+
+  process_replay:
+    name: process replay
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Cache dependencies
+      id: dependency-cache
+      uses: actions/cache@v2
+      with:
+        path: /tmp/comma_download_cache
+        key: ${{ hashFiles('.github/workflows/test.yaml', 'selfdrive/test/process_replay/test_processes.py') }}
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Run replay
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc) && \
+                        FILEREADER_CACHE=1 CI=1 coverage run selfdrive/test/process_replay/test_processes.py"
+    - name: Upload coverage to Codecov
+      run: bash <(curl -s https://codecov.io/bash) -v -F process_replay
+    - name: Print diff
+      if: always()
+      run: cat selfdrive/test/process_replay/diff.txt
+    - uses: actions/upload-artifact@v2
+      if: always()
+      continue-on-error: true
+      with:
+        name: process_replay_diff.txt
+        path: selfdrive/test/process_replay/diff.txt
+
+  test_longitudinal:
+    name: longitudinal
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Test longitudinal
+      run: |
+        ${{ env.RUN }} "mkdir -p selfdrive/test/out && \
+                        scons -j$(nproc) && \
+                        cd selfdrive/test/longitudinal_maneuvers && \
+                        ./test_longitudinal.py"
+    - uses: actions/upload-artifact@v2
+      if: always()
+      continue-on-error: true
+      with:
+        name: longitudinal
+        path: selfdrive/test/longitudinal_maneuvers/out/longitudinal/
+
+  test_car_models:
+    name: car models
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Cache dependencies
+      id: dependency-cache
+      uses: actions/cache@v2
+      with:
+        path: /tmp/comma_download_cache
+        key: ${{ hashFiles('.github/workflows/test.yaml', 'selfdrive/test/test_routes.py') }}
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Test car models
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc) && \
+                        FILEREADER_CACHE=1 coverage run --parallel-mode -m nose --processes=4 --process-timeout=60 \
+                                           selfdrive/test/test_models.py && \
+                        coverage combine"
+    - name: Upload coverage to Codecov
+      run: bash <(curl -s https://codecov.io/bash) -v -F test_car_models

.github/workflows/tools_tests.yaml

@@ -0,0 +1,58 @@
+name: tools
+on:
+  push:
+  pull_request:
+
+env:
+  BASE_IMAGE: openpilot-base
+  DOCKER_REGISTRY: ghcr.io/commaai
+  DOCKER_LOGIN: docker login ghcr.io -u adeebshihadeh -p ${{ secrets.CONTAINER_TOKEN }}
+
+  BUILD: |
+      docker pull $(grep -iohP '(?<=^from)\s+\S+' Dockerfile.openpilot_base) || true
+      docker pull $DOCKER_REGISTRY/$BASE_IMAGE:latest || true
+      docker build --cache-from $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $BASE_IMAGE:latest -f Dockerfile.openpilot_base .
+  RUN: docker run --shm-size 1G -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e \
+       GITHUB_REPOSITORY -e GITHUB_RUN_ID -v /tmp/comma_download_cache:/tmp/comma_download_cache $BASE_IMAGE /bin/sh -c
+
+jobs:
+  plotjuggler:
+    name: plotjuggler
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build Docker image
+      run: eval "$BUILD"
+    - name: Unit test
+      run: |
+        ${{ env.RUN }} "scons -j$(nproc) --directory=/tmp/openpilot/cereal && \
+                        apt-get update && \
+                        apt-get install -y libdw-dev libqt5svg5-dev libqt5x11extras5-dev && \
+                        cd /tmp/openpilot/tools/plotjuggler && \
+                        ./test_plotjuggler.py"
+
+  simulator:
+    name: simulator
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    env:
+      IMAGE_NAME: openpilot-sim
+    if: github.repository == 'commaai/openpilot'
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        lfs: true
+    - name: Build Docker image
+      run: |
+        eval "$BUILD"
+        docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
+        docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/sim/Dockerfile.sim .
+    - name: Push to container registry
+      if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
+      run: |
+        $DOCKER_LOGIN
+        docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest

.gitignore

@@ -10,6 +10,7 @@ venv/
 .vscode*
 model2.png
 a.out
+.hypothesis
 
 *.dylib
 *.DSYM
@@ -48,6 +49,7 @@ selfdrive/loggerd/bootlog
 selfdrive/sensord/_gpsd
 selfdrive/sensord/_sensord
 selfdrive/camerad/camerad
+selfdrive/camerad/test/ae_gray_test
 selfdrive/modeld/_modeld
 selfdrive/modeld/_dmonitoringmodeld
 /src/
@@ -58,8 +60,7 @@ notebooks
 xx
 hyperthneed
 panda_jungle
-apks
-openpilot-apks
+provisioning
 
 .coverage*
 coverage.xml
@@ -70,7 +71,7 @@ pandaextra
 flycheck_*
 
 cppcheck_report.txt
-comma.sh
+comma*.sh
 
 selfdrive/modeld/thneed/compile
 models/*.thneed

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "panda"]
+	path = panda
+	url = ../../RetroPilot/panda.git
+[submodule "opendbc"]
+	path = opendbc
+	url = ../../RetroPilot/opendbc.git
+[submodule "laika_repo"]
+	path = laika_repo
+	url = ../../RetroPilot/laika.git
+[submodule "cereal"]
+	path = cereal
+	url = ../../RetroPilot/cereal.git
+[submodule "rednose_repo"]
+	path = rednose_repo
+	url = ../../RetroPilot/rednose.git

.pre-commit-config.yaml

@@ -0,0 +1,47 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+    -   id: check-ast
+    -   id: check-json
+    -   id: check-xml
+    -   id: check-yaml
+    -   id: check-merge-conflict
+    -   id: check-symlinks
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.800
+    hooks:
+    -   id: mypy
+        exclude: '^(pyextra)|(cereal)|(rednose)|(panda)|(laika)|(opendbc)|(laika_repo)|(rednose_repo)/'
+        additional_dependencies: ['git+https://github.com/numpy/numpy-stubs']
+-   repo: https://github.com/PyCQA/flake8
+    rev: 3.8.4
+    hooks:
+    -   id: flake8
+        exclude: '^(pyextra)|(cereal)|(rednose)|(panda)|(laika)|(opendbc)|(laika_repo)|(rednose_repo)|(selfdrive/debug)/'
+        args:
+        - --select=F,E112,E113,E304,E501,E502,E701,E702,E703,E71,E72,E731,W191,W6
+        - --max-line-length=240
+        - --statistics
+-   repo: local
+    hooks:
+    -   id: pylint
+        name: pylint
+        entry: pylint
+        language: system
+        types: [python]
+        exclude: '^(pyextra)|(cereal)|(rednose)|(panda)|(laika)|(laika_repo)|(rednose_repo)/'
+-   repo: local
+    hooks:
+    -   id: cppcheck
+        name: cppcheck
+        entry: cppcheck
+        language: system
+        types: [c++]
+        exclude: '^(phonelibs)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
+        args:
+        - --error-exitcode=1
+        - --language=c++
+        - --quiet
+        - --force
+        - -j8

.pylintrc

@@ -0,0 +1,471 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=scipy cereal.messaging.messaging_pyx
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint.
+jobs=4
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=C,R,W0613,W0511,W0212,W0201,W0311,W0106,W0603,W0621,W0703,W1201,W1203,E1136
+
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio).You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=optparse.Values,sys.exit
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=capnp.* cereal.* pygame.* zmq.* setproctitle.* smbus2.* usb1.* serial.* cv2.* ft4222.*
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=flask setproctitle usb1 flask.ext.socketio smbus2 usb1.*
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging  or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='  '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,
+               dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[BASIC]
+
+# Naming style matching correct argument names
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style
+#argument-rgx=
+
+# Naming style matching correct attribute names
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Naming style matching correct class attribute names
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style
+#class-attribute-rgx=
+
+# Naming style matching correct class names
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-style
+#class-rgx=
+
+# Naming style matching correct constant names
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style
+#inlinevar-rgx=
+
+# Naming style matching correct method names
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style
+#method-rgx=
+
+# Naming style matching correct module names
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style
+#variable-rgx=
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in a if statement
+max-bool-expr=5
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+                  _fields,
+                  _replace,
+                  _source,
+                  _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,
+                   TERMIOS,
+                   Bastion,
+                   rexec
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception

.python-version

@@ -0,0 +1 @@
+3.8.5

Dockerfile.openpilot

@@ -0,0 +1,32 @@
+FROM ghcr.io/commaai/openpilot-base:latest
+
+ENV PYTHONUNBUFFERED 1
+
+ENV OPENPILOT_PATH /home/batman/openpilot/
+ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
+
+RUN mkdir -p ${OPENPILOT_PATH}
+WORKDIR ${OPENPILOT_PATH}
+
+COPY Pipfile Pipfile.lock $OPENPILOT_PATH
+RUN pip install --no-cache-dir pipenv==2020.8.13 && \
+    pipenv install --system --deploy --dev --clear && \
+    pip uninstall -y pipenv
+
+COPY SConstruct ${OPENPILOT_PATH}
+
+COPY ./pyextra ${OPENPILOT_PATH}/pyextra
+COPY ./phonelibs ${OPENPILOT_PATH}/phonelibs
+COPY ./site_scons ${OPENPILOT_PATH}/site_scons
+COPY ./laika ${OPENPILOT_PATH}/laika
+COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo
+COPY ./rednose ${OPENPILOT_PATH}/rednose
+COPY ./tools ${OPENPILOT_PATH}/tools
+COPY ./release ${OPENPILOT_PATH}/release
+COPY ./common ${OPENPILOT_PATH}/common
+COPY ./opendbc ${OPENPILOT_PATH}/opendbc
+COPY ./cereal ${OPENPILOT_PATH}/cereal
+COPY ./panda ${OPENPILOT_PATH}/panda
+COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
+
+RUN scons -j$(nproc)

Dockerfile.openpilot_base

@@ -0,0 +1,70 @@
+FROM ubuntu:20.04
+ENV PYTHONUNBUFFERED 1
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    autoconf \
+    build-essential \
+    bzip2 \
+    ca-certificates \
+    capnproto \
+    clang \
+    cmake \
+    cppcheck \
+    curl \
+    ffmpeg \
+    gcc-arm-none-eabi \
+    git \
+    iputils-ping \
+    libarchive-dev \
+    libbz2-dev \
+    libcapnp-dev \
+    libcurl4-openssl-dev \
+    libeigen3-dev \
+    libffi-dev \
+    libgles2-mesa-dev \
+    libglew-dev \
+    libglib2.0-0 \
+    liblzma-dev \
+    libomp-dev \
+    libopencv-dev \
+    libqt5sql5-sqlite \
+    libqt5svg5-dev \
+    libsqlite3-dev \
+    libssl-dev \
+    libsystemd-dev \
+    libusb-1.0-0-dev \
+    libzmq3-dev \
+    locales \
+    ocl-icd-libopencl1 \
+    ocl-icd-opencl-dev \
+    opencl-headers \
+    python-dev \
+    qml-module-qtquick2 \
+    qt5-default \
+    qtlocation5-dev \
+    qtmultimedia5-dev \
+    qtpositioning5-dev \
+    qtwebengine5-dev \
+    sudo \
+    valgrind \
+    wget \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
+
+COPY Pipfile Pipfile.lock /tmp/
+RUN pyenv install 3.8.5 && \
+    pyenv global 3.8.5 && \
+    pyenv rehash && \
+    pip install --no-cache-dir --upgrade pip==20.1.1 && \
+    pip install --no-cache-dir pipenv==2020.8.13 && \
+    cd /tmp && \
+    pipenv install --system --deploy --dev --clear && \
+    pip uninstall -y pipenv

Jenkinsfile

@@ -1,5 +1,5 @@
 def phone(String ip, String step_label, String cmd) {
-  withCredentials([file(credentialsId: 'id_rsa_public', variable: 'key_file')]) {
+  withCredentials([file(credentialsId: 'id_rsa', variable: 'key_file')]) {
     def ssh_cmd = """
 ssh -tt -o StrictHostKeyChecking=no -i ${key_file} -p 8022 'comma@${ip}' /usr/bin/bash <<'EOF'
 
@@ -11,6 +11,9 @@ export GIT_BRANCH=${env.GIT_BRANCH}
 export GIT_COMMIT=${env.GIT_COMMIT}
 
 source ~/.bash_profile
+if [ -f /TICI ]; then
+  source /etc/profile
+fi
 
 ln -snf ${env.TEST_DIR} /data/pythonpath
 
@@ -33,7 +36,7 @@ EOF"""
 
 def phone_steps(String device_type, steps) {
   lock(resource: "", label: device_type, inversePrecedence: true, variable: 'device_ip', quantity: 1) {
-    timeout(time: 60, unit: 'MINUTES') {
+    timeout(time: 90, unit: 'MINUTES') {
       phone(device_ip, "git checkout", readFile("selfdrive/test/setup_device_ci.sh"),)
       steps.each { item ->
         phone(device_ip, item[0], item[1])
@@ -49,7 +52,7 @@ pipeline {
     TEST_DIR = "/data/openpilot"
   }
   options {
-      timeout(time: 1, unit: 'HOURS')
+      timeout(time: 2, unit: 'HOURS')
   }
 
   stages {
@@ -80,7 +83,6 @@ pipeline {
         }
       }
 
-
       stages {
 
         /*
@@ -110,6 +112,10 @@ pipeline {
         stage('On-device Tests') {
           agent {
             docker {
+              /*
+              filename 'Dockerfile.ondevice_ci'
+              args "--privileged -v /dev:/dev --shm-size=1G --user=root"
+              */
               image 'python:3.7.3'
               args '--user=root'
             }
@@ -118,20 +124,13 @@ pipeline {
           stages {
             stage('parallel tests') {
               parallel {
-                stage('Devel Build') {
-                  environment {
-                    CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
-                  }
+                stage('Devel Tests') {
                   steps {
                     phone_steps("eon-build", [
-                      ["build", "SCONS_CACHE=1 scons -j4"],
-                      ["test athena", "nosetests -s selfdrive/athena/tests/test_athenad_old.py"],
-                      ["test manager", "python selfdrive/test/test_manager.py"],
+                      ["build devel", "cd release && SCONS_CACHE=1 DEVEL_TEST=1 ./build_devel.sh"],
+                      ["test manager", "python selfdrive/manager/test/test_manager.py"],
                       ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"],
-                      ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
                       ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
-                      ["test spinner build", "cd selfdrive/ui/spinner && make clean && make"],
-                      ["test text window build", "cd selfdrive/ui/text && make clean && make"],
                     ])
                   }
                 }
@@ -149,34 +148,87 @@ pipeline {
                   steps {
                     phone_steps("eon", [
                       ["build", "SCONS_CACHE=1 scons -j4"],
+                      ["test athena", "nosetests -s selfdrive/athena/tests/test_athenad_old.py"],
                       ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
                       ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
                       ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"],
                       ["test encoder", "python selfdrive/loggerd/tests/test_encoder.py"],
-                      ["test camerad", "python selfdrive/camerad/test/test_camerad.py"],
                       ["test logcatd", "python selfdrive/logcatd/tests/test_logcatd_android.py"],
                       //["test updater", "python installer/updater/test_updater.py"],
                     ])
                   }
                 }
 
+                /*
+                stage('Power Consumption Tests') {
+                  steps {
+                    lock(resource: "", label: "c2-zookeeper", inversePrecedence: true, variable: 'device_ip', quantity: 1) {
+                      timeout(time: 90, unit: 'MINUTES') {
+                        sh script: "/home/batman/tools/zookeeper/enable_and_wait.py $device_ip 120", label: "turn on device"
+                        phone(device_ip, "git checkout", readFile("selfdrive/test/setup_device_ci.sh"),)
+                        phone(device_ip, "build", "SCONS_CACHE=1 scons -j4 && sync")
+                        sh script: "/home/batman/tools/zookeeper/disable.py $device_ip", label: "turn off device"
+                        sh script: "/home/batman/tools/zookeeper/enable_and_wait.py $device_ip 120", label: "turn on device"
+                        sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 3", label: "idle power consumption after boot"
+                        sh script: "/home/batman/tools/zookeeper/ignition.py 1", label: "go onroad"
+                        sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 10", label: "onroad power consumption"
+                        sh script: "/home/batman/tools/zookeeper/ignition.py 0", label: "go offroad"
+                        sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 2", label: "idle power consumption offroad"
+                      }
+                    }
+                  }
+                }
+                */
+
                 stage('Tici Build') {
                   environment {
                     R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}"
                   }
                   steps {
                     phone_steps("tici", [
-                      ["build", "SCONS_CACHE=1 scons -j16"],
+                      ["build", "SCONS_CACHE=1 scons -j8"],
                       ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"],
                       ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python selfdrive/loggerd/tests/test_encoder.py"],
-                      ["test camerad", "python selfdrive/camerad/test/test_camerad.py"],
+                      ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"],
                       //["build release3-staging", "cd release && PUSH=${env.R3_PUSH} ./build_release3.sh"],
                     ])
                   }
                 }
 
+                stage('camerad') {
+                  steps {
+                    phone_steps("eon-party", [
+                      ["build", "SCONS_CACHE=1 scons -j8"],
+                      ["test camerad", "python selfdrive/camerad/test/test_camerad.py"],
+                      // ["test exposure", "python selfdrive/camerad/test/test_exposure.py"],
+                    ])
+                  }
+                }
+
+                stage('Tici camerad') {
+                  steps {
+                    phone_steps("tici-party", [
+                      ["build", "SCONS_CACHE=1 scons -j8"],
+                      ["test camerad", "python selfdrive/camerad/test/test_camerad.py"],
+                      // ["test exposure", "python selfdrive/camerad/test/test_exposure.py"],
+                    ])
+                  }
+                }
+
               }
             }
+
+            stage('Push master-ci') {
+              when {
+                branch 'master'
+              }
+              steps {
+                phone_steps("eon-build", [
+                  ["push devel", "cd release && CI_PUSH='master-ci' ./build_devel.sh"],
+                ])
+              }
+            }
+
           }
 
           post {

Pipfile

@@ -0,0 +1,119 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+opencv-python= "*"
+ipython = "*"
+networkx = "~=2.3"
+azure-core = "*"
+azure-common = "*"
+azure-nspkg = "~=3.0"
+azure-storage-blob = "~=2.1"
+azure-storage-common = "~=2.1"
+azure-storage-nspkg = "~=3.1"
+boto = "*"
+"boto3" = "*"
+control = "*"
+datadog = "*"
+elasticsearch = "*"
+gunicorn = "*"
+"h5py" = "*"
+hexdump = "*"
+imageio = "*"
+ipykernel = "*"
+joblib = "*"
+json-logging-py = "*"
+jupyter = "*"
+"mpld3" = "*"
+msgpack-python = "*"
+numpy = "*"
+osmium = "*"
+pycurl = "*"
+git-pylint-commit-hook = "*"
+pymongo = "*"
+"pynmea2" = "*"
+python-logstash = "*"
+redis = "*"
+"s2sphere" = "*"
+"subprocess32" = "*"
+tenacity = "*"
+keras_applications = "*"
+PyMySQL = "~=0.9"
+Werkzeug = "*"
+"backports.lzma" = "*"
+Flask-Cors = "*"
+Flask-SocketIO = "*"
+"GeoAlchemy2" = "*"
+Pygments = "*"
+reverse_geocoder = "*"
+Shapely = "*"
+SQLAlchemy = "*"
+scipy = "*"
+fastcluster = "*"
+simplejson = "*"
+seaborn = "*"
+pyproj = "*"
+mock = "*"
+matplotlib = "*"
+dictdiffer = "*"
+aenum = "*"
+coverage = "*"
+azure-cli-core = "*"
+paramiko = "*"
+aiohttp = "*"
+lru-dict = "*"
+scikit-image = "*"
+pygame = "==2.0.0.dev8"
+pprofile = "*"
+pyprof2calltree = "*"
+pre-commit = "*"
+mypy = "*"
+parameterized = "*"
+ft4222 = "*"
+hypothesis = "*"
+
+[packages]
+atomicwrites = "*"
+cffi = "*"
+crcmod = "*"
+hexdump = "*"
+libusb1 = "*"
+numpy = "*"
+psutil = "*"
+pycapnp = "==1.0.0"
+cryptography = "*"
+python-dateutil = "*"
+pyzmq = "*"
+requests = "*"
+setproctitle = "*"
+six = "*"
+smbus2 = "*"
+sympy = "!=1.6.1"
+tqdm = "*"
+Cython = "*"
+PyYAML = "*"
+websocket_client = "*"
+urllib3 = "*"
+gunicorn = "*"
+utm = "*"
+json-rpc = "*"
+Flask = "*"
+nose = "*"
+flake8 = "*"
+pylint = "*"
+pillow = "*"
+scons = "*"
+cysignals = "*"
+pycryptodome = "*"
+"Jinja2" = "*"
+PyJWT = "*"
+pyserial = "*"
+onnx = "*"
+onnxruntime = "*"
+timezonefinder = "*"
+sentry-sdk = "*"
+
+[requires]
+python_version = "3.8"

README.md

@@ -66,7 +66,7 @@ Supported Cars
 | ----------| ------------------------------| ------------------| -----------------| -------------------| ------------------|
 | Acura     | ILX 2016-19                   | AcuraWatch Plus   | openpilot        | 25mph<sup>1</sup>  | 25mph             |
 | Acura     | RDX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Acura     | RDX 2020                      | All               | Stock            | 0mph               | 3mph              |
+| Acura     | RDX 2019-21                   | All               | Stock            | 0mph               | 3mph              |
 | Honda     | Accord 2018-20                | All               | Stock            | 0mph               | 3mph              |
 | Honda     | Accord Hybrid 2018-20         | All               | Stock            | 0mph               | 3mph              |
 | Honda     | Civic Hatchback 2017-21       | Honda Sensing     | Stock            | 0mph               | 12mph             |
@@ -82,22 +82,22 @@ Supported Cars
 | Honda     | Odyssey 2018-20               | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 0mph              |
 | Honda     | Passport 2019                 | All               | openpilot        | 25mph<sup>1</sup>  | 12mph             |
 | Honda     | Pilot 2016-19                 | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Ridgeline 2017-20             | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
+| Honda     | Ridgeline 2017-21             | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
 | Hyundai   | Palisade 2020-21              | All               | Stock            | 0mph               | 0mph              |
 | Hyundai   | Sonata 2020-21                | All               | Stock            | 0mph               | 0mph              |
 | Lexus     | CT Hybrid 2017-18             | LSS               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Lexus     | ES 2019-20                    | All               | openpilot        | 0mph               | 0mph              |
-| Lexus     | ES Hybrid 2018                | LSS               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Lexus     | ES Hybrid 2019                | All               | openpilot        | 0mph               | 0mph              |
+| Lexus     | ES 2019-21                    | All               | openpilot        | 0mph               | 0mph              |
+| Lexus     | ES Hybrid 2017-18             | LSS               | Stock<sup>3</sup>| 0mph               | 0mph              |
+| Lexus     | ES Hybrid 2019-21             | All               | openpilot        | 0mph               | 0mph              |
 | Lexus     | IS 2017-2019                  | All               | Stock            | 22mph              | 0mph              |
-| Lexus     | IS Hybrid 2017                | All               | Stock            | 0mph               | 0mph              |
 | Lexus     | NX 2018                       | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
+| Lexus     | NX 2020                       | All               | openpilot        | 0mph               | 0mph              |
 | Lexus     | NX Hybrid 2018                | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
 | Lexus     | RX 2016-18                    | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
 | Lexus     | RX 2020-21                    | All               | openpilot        | 0mph               | 0mph              |
 | Lexus     | RX Hybrid 2016-19             | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
 | Lexus     | RX Hybrid 2020                | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Avalon 2016-18, 2021      | TSS-P             | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
+| Toyota    | Avalon 2016-21                | TSS-P             | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
 | Toyota    | Camry 2018-20                 | All               | Stock            | 0mph<sup>4</sup>   | 0mph              |
 | Toyota    | Camry 2021                    | All               | openpilot        | 0mph               | 0mph              |
 | Toyota    | Camry Hybrid 2018-20          | All               | Stock            | 0mph<sup>4</sup>   | 0mph              |
@@ -112,6 +112,7 @@ Supported Cars
 | Toyota    | Highlander 2020-21            | All               | openpilot        | 0mph               | 0mph              |
 | Toyota    | Highlander Hybrid 2017-19     | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
 | Toyota    | Highlander Hybrid 2020-21     | All               | openpilot        | 0mph               | 0mph              |
+| Toyota    | Mirai 2021	                  | All               | openpilot        | 0mph               | 0mph              |
 | Toyota    | Prius 2016-20                 | TSS-P             | Stock<sup>3</sup>| 0mph               | 0mph              |
 | Toyota    | Prius 2021                    | All               | openpilot        | 0mph               | 0mph              |
 | Toyota    | Prius Prime 2017-20           | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
@@ -132,7 +133,8 @@ Community Maintained Cars and Features
 
 | Make      | Model (US Market Reference)   | Supported Package | ACC              | No ACC accel below | No ALC below |
 | ----------| ------------------------------| ------------------| -----------------| -------------------| -------------|
-| Audi      | A3 2015, 2017                 | Prestige          | Stock            | 0mph               | 0mph         |
+| Audi      | A3 2014-17                    | Prestige          | Stock            | 0mph               | 0mph         |
+| Audi      | A3 Sportback e-tron 2017-18   | Prestige          | Stock            | 0mph               | 0mph         |
 | Buick     | Regal 2018<sup>1</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
 | Cadillac  | ATS 2018<sup>1</sup>          | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
 | Chevrolet | Malibu 2017<sup>1</sup>       | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
@@ -157,30 +159,48 @@ Community Maintained Cars and Features
 | Hyundai   | Veloster 2019                 | SCC + LKAS        | Stock            | 5mph               | 0mph         |
 | Jeep      | Grand Cherokee 2016-18        | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
 | Jeep      | Grand Cherokee 2019-20        | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Kia       | Forte 2018-19, 2021           | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Kia       | Forte 2018-2021               | SCC + LKAS        | Stock            | 0mph               | 0mph         |
 | Kia       | Niro EV 2020                  | SCC + LKAS        | Stock            | 0mph               | 0mph         |
 | Kia       | Optima 2017                   | SCC + LKAS        | Stock            | 0mph               | 32mph        |
 | Kia       | Optima 2019                   | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Kia       | Sorento 2018                  | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Kia       | Seltos 2021                   | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Kia       | Sorento 2018-19               | SCC + LKAS        | Stock            | 0mph               | 0mph         |
 | Kia       | Stinger 2018                  | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Kia       | Ceed 2019                     | SCC + LKAS        | Stock            | 0mph               | 0mph         |
 | Nissan    | Altima 2020                   | ProPILOT          | Stock            | 0mph               | 0mph         |
 | Nissan    | Leaf 2018-20                  | ProPILOT          | Stock            | 0mph               | 0mph         |
-| Nissan    | Rogue 2018-19                 | ProPILOT          | Stock            | 0mph               | 0mph         |
+| Nissan    | Rogue 2018-20                 | ProPILOT          | Stock            | 0mph               | 0mph         |
 | Nissan    | X-Trail 2017                  | ProPILOT          | Stock            | 0mph               | 0mph         |
+| SEAT      | Ateca 2018                    | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Škoda     | Kodiaq 2018                   | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Škoda     | Scala 2020                    | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Škoda     | Superb 2015-18                | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Subaru    | Ascent 2019                   | EyeSight          | Stock            | 0mph               | 0mph         |
 | Subaru    | Crosstrek 2018-19             | EyeSight          | Stock            | 0mph               | 0mph         |
-| Subaru    | Forester 2019-20              | EyeSight          | Stock            | 0mph               | 0mph         |
+| Subaru    | Forester 2019-21              | EyeSight          | Stock            | 0mph               | 0mph         |
 | Subaru    | Impreza 2017-19               | EyeSight          | Stock            | 0mph               | 0mph         |
+| Volkswagen| Atlas 2018-19                 | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| e-Golf 2014, 2019-20          | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Volkswagen| Golf 2015-19                  | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Golf Alltrack 2017-18         | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Golf GTE 2016                 | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Golf GTI 2018-19              | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Golf R 2016-19                | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Golf SportsVan 2016           | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Jetta 2018-20                 | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Jetta GLI 2021                | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Passat 2016-17<sup>2</sup>    | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| Tiguan 2020                   | Driver Assistance | Stock            | 0mph               | 0mph         |
 
 <sup>1</sup>Requires an [OBD-II car harness](https://comma.ai/shop/products/comma-car-harness) and [community built ASCM harness](https://github.com/commaai/openpilot/wiki/GM#hardware). ***NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).*** <br />
-
-Although it's not upstream, there's a community of people getting openpilot to run on Tesla's [here](https://tinkla.us/)
+<sup>2</sup>Only includes the MQB Passat sold outside of North America. The NMS Passat made in Chattanooga TN is not yet supported.
 
 Community Maintained Cars and Features are not verified by comma to meet our [safety model](SAFETY.md). Be extra cautious using them. They are only available after enabling the toggle in `Settings->Developer->Enable Community Features`.
 
 To promote a car from community maintained, it must meet a few requirements. We must own one from the brand, we must sell the harness for it, has full ISO26262 in both panda and openpilot, there must be a path forward for longitudinal control, it must have AEB still enabled, and it must support fingerprinting 2.0
 
+Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/).
+
 Installation Instructions
 ------
 
@@ -310,10 +330,9 @@ And [follow us on Twitter](https://twitter.com/comma_ai).
 Directory Structure
 ------
     .
-    ├── apk                 # The apk files used for the UI
     ├── cereal              # The messaging spec and libs used for all logs
     ├── common              # Library like functionality we've developed here
-    ├── installer/updater   # Manages auto-updates of openpilot
+    ├── installer/updater   # Manages auto-updates of NEOS
     ├── opendbc             # Files showing how to interpret data from cars
     ├── panda               # Code used to communicate on CAN
     ├── phonelibs           # Libraries used on NEOS devices

RELEASES.md

@@ -1,3 +1,30 @@
+Version 0.8.5 (2021-XX-XX)
+========================
+
+Version 0.8.4 (2021-05-17)
+========================
+ * Delay controls start until system is ready
+ * Fuzzy car identification, enabled with Community Features toggle
+ * Localizer optimized for increased precision and less CPU usage
+ * Retuned lateral control to be more aggressive when model is confident
+ * Toyota Mirai 2021 support
+ * Lexus NX 300 2020 support thanks to goesreallyfast!
+ * Volkswagen Atlas 2018-19 support thanks to jyoung8607!
+
+Version 0.8.3 (2021-04-01)
+========================
+ * New model
+   * Trained on new diverse dataset from 2000+ users from 30+ countries
+   * Trained with improved segnet from the comma-pencil community project
+   * 🥬 Dramatically improved end-to-end lateral performance 🥬
+ * Toggle added to disable the use of lanelines
+ * NEOS update: update packages and support for new UI
+ * New offroad UI based on Qt
+ * Default SSH key only used for setup
+ * Kia Ceed 2019 support thanks to ZanZaD13!
+ * Kia Seltos 2021 support thanks to speedking456!
+ * Added support for many Volkswagen and Škoda models thanks to jyoung8607!
+
 Version 0.8.2 (2021-02-26)
 ========================
  * Use model points directly in MPC (no more polyfits), making lateral planning more accurate

SConstruct

@@ -13,6 +13,10 @@ AddOption('--test',
           action='store_true',
           help='build test files')
 
+AddOption('--kaitai',
+          action='store_true',
+          help='Regenerate kaitai struct parsers')
+
 AddOption('--asan',
           action='store_true',
           help='turn on ASAN')
@@ -79,6 +83,9 @@ if arch == "aarch64" or arch == "larch64":
       "#phonelibs/libyuv/larch64/lib",
       "/usr/lib/aarch64-linux-gnu"
     ]
+    cpppath += [
+      "#selfdrive/camerad/include",
+    ]
     cflags = ["-DQCOM2", "-mcpu=cortex-a57"]
     cxxflags = ["-DQCOM2", "-mcpu=cortex-a57"]
     rpath = ["/usr/local/lib"]
@@ -101,21 +108,27 @@ else:
   cpppath = []
 
   if arch == "Darwin":
+    yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
     libpath = [
-      "#phonelibs/libyuv/mac/lib",
-      "#cereal",
-      "#selfdrive/common",
+      f"#phonelibs/libyuv/{yuv_dir}/lib",
       "/usr/local/lib",
+      "/opt/homebrew/lib",
       "/usr/local/opt/openssl/lib",
+      "/opt/homebrew/opt/openssl/lib",
       "/System/Library/Frameworks/OpenGL.framework/Libraries",
     ]
     cflags += ["-DGL_SILENCE_DEPRECATION"]
     cxxflags += ["-DGL_SILENCE_DEPRECATION"]
-    cpppath += ["/usr/local/opt/openssl/include"]
+    cpppath += [
+      "/opt/homebrew/include",
+      "/usr/local/opt/openssl/include",
+      "/opt/homebrew/opt/openssl/include"
+    ]
   else:
     libpath = [
       "#phonelibs/snpe/x86_64-linux-clang",
       "#phonelibs/libyuv/x64/lib",
+      "#phonelibs/mapbox-gl-native-qt/x86_64",
       "#cereal",
       "#selfdrive/common",
       "/usr/lib",
@@ -141,6 +154,10 @@ else:
   ccflags = []
   ldflags = []
 
+# no --as-needed on mac linker
+if arch != "Darwin":
+  ldflags += ["-Wl,--as-needed"]
+
 # change pythonpath to this
 lenv["PYTHONPATH"] = Dir("#").path
 
@@ -162,7 +179,6 @@ env = Environment(
 
   CPPPATH=cpppath + [
     "#",
-    "#selfdrive",
     "#phonelibs/catch2/include",
     "#phonelibs/bzip2",
     "#phonelibs/libyuv/include",
@@ -175,16 +191,10 @@ env = Environment(
     "#phonelibs/android_system_core/include",
     "#phonelibs/linux/include",
     "#phonelibs/snpe/include",
+    "#phonelibs/mapbox-gl-native-qt/include",
     "#phonelibs/nanovg",
     "#phonelibs/qrcode",
-    "#selfdrive/boardd",
-    "#selfdrive/common",
-    "#selfdrive/camerad",
-    "#selfdrive/camerad/include",
-    "#selfdrive/loggerd/include",
-    "#selfdrive/modeld",
-    "#selfdrive/sensord",
-    "#selfdrive/ui",
+    "#phonelibs",
     "#cereal",
     "#cereal/messaging",
     "#cereal/visionipc",
@@ -263,66 +273,74 @@ else:
 Export('envCython')
 
 # Qt build environment
-qt_env = None
-if arch in ["x86_64", "Darwin", "larch64"]:
-  qt_env = env.Clone()
+qt_env = env.Clone()
+qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "Multimedia", "Quick", "Qml", "QuickWidgets", "Location", "Positioning"]
+if arch != "aarch64":
+  qt_modules += ["DBus"]
 
-  qt_modules = ["Widgets", "Gui", "Core", "DBus", "Multimedia", "Network", "Concurrent", "WebEngine", "WebEngineWidgets"]
-
-  qt_libs = []
-  if arch == "Darwin":
-    qt_env['QTDIR'] = "/usr/local/opt/qt"
-    QT_BASE = "/usr/local/opt/qt/"
-    qt_dirs = [
-      QT_BASE + "include/",
-    ]
-    qt_dirs += [f"{QT_BASE}include/Qt{m}" for m in qt_modules]
-    qt_env["LINKFLAGS"] += ["-F" + QT_BASE + "lib"]
-    qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"]
+qt_libs = []
+if arch == "Darwin":
+  if real_arch == "arm64":
+    qt_env['QTDIR'] = "/opt/homebrew/opt/qt@5"
   else:
-    qt_env['QTDIR'] = "/usr"
-    qt_dirs = [
-      f"/usr/include/{real_arch}-linux-gnu/qt5",
-      f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui",
-      f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui",
-    ]
-    qt_dirs += [f"/usr/include/{real_arch}-linux-gnu/qt5/Qt{m}" for m in qt_modules]
-
-    qt_libs = [f"Qt5{m}" for m in qt_modules]
-    if arch == "larch64":
-      qt_libs += ["GLESv2", "wayland-client"]
-    elif arch != "Darwin":
-      qt_libs += ["GL"]
-
-  qt_env.Tool('qt')
-  qt_env['CPPPATH'] += qt_dirs + ["#selfdrive/ui/qt/"]
-  qt_flags = [
-    "-D_REENTRANT",
-    "-DQT_NO_DEBUG",
-    "-DQT_WIDGETS_LIB",
-    "-DQT_GUI_LIB",
-    "-DQT_CORE_LIB"
+    qt_env['QTDIR'] = "/usr/local/opt/qt@5"
+  qt_dirs = [
+    os.path.join(qt_env['QTDIR'], "include"),
   ]
-  qt_env['CXXFLAGS'] += qt_flags
-  qt_env['LIBPATH'] += ['#selfdrive/ui']
-  qt_env['LIBS'] = qt_libs
+  qt_dirs += [f"{qt_env['QTDIR']}/include/Qt{m}" for m in qt_modules]
+  qt_env["LINKFLAGS"] += ["-F" + os.path.join(qt_env['QTDIR'], "lib")]
+  qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"]
+elif arch == "aarch64":
+  qt_env['QTDIR'] = "/system/comma/usr"
+  qt_dirs = [
+    f"/system/comma/usr/include/qt",
+  ]
+  qt_dirs += [f"/system/comma/usr/include/qt/Qt{m}" for m in qt_modules]
 
-  if GetOption("clazy"):
-    checks = [
-      "level0",
-      "level1",
-      "no-range-loop",
-      "no-non-pod-global-static",
-    ]
-    qt_env['CXX'] = 'clazy'
-    qt_env['ENV']['CLAZY_IGNORE_DIRS'] = qt_dirs[0]
-    qt_env['ENV']['CLAZY_CHECKS'] = ','.join(checks)
-Export('qt_env')
+  qt_libs = [f"Qt5{m}" for m in qt_modules]
+  qt_libs += ['EGL', 'GLESv3', 'c++_shared']
+else:
+  qt_env['QTDIR'] = "/usr"
+  qt_dirs = [
+    f"/usr/include/{real_arch}-linux-gnu/qt5",
+    f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui",
+  ]
+  qt_dirs += [f"/usr/include/{real_arch}-linux-gnu/qt5/Qt{m}" for m in qt_modules]
 
+  qt_libs = [f"Qt5{m}" for m in qt_modules]
+  if arch == "larch64":
+    qt_libs += ["GLESv2", "wayland-client"]
+  elif arch != "Darwin":
+    qt_libs += ["GL"]
 
-# still needed for apks
-zmq = 'zmq'
-Export('env', 'arch', 'real_arch', 'zmq', 'SHARED', 'USE_WEBCAM', 'QCOM_REPLAY')
+qt_env.Tool('qt')
+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"
+]
+qt_env['CXXFLAGS'] += qt_flags
+qt_env['LIBPATH'] += ['#selfdrive/ui']
+qt_env['LIBS'] = qt_libs
+
+if GetOption("clazy"):
+  checks = [
+    "level0",
+    "level1",
+    "no-range-loop",
+    "no-non-pod-global-static",
+  ]
+  qt_env['CXX'] = 'clazy'
+  qt_env['ENV']['CLAZY_IGNORE_DIRS'] = qt_dirs[0]
+  qt_env['ENV']['CLAZY_CHECKS'] = ','.join(checks)
+
+Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM', 'QCOM_REPLAY')
 
 # cereal and messaging are shared with the system
 SConscript(['cereal/SConscript'])
@@ -347,10 +365,33 @@ else:
 
 Export('common', 'gpucommon', 'visionipc')
 
+# Build rednose library and ekf models
+
+rednose_config = {
+  'generated_folder': '#selfdrive/locationd/models/generated',
+  'to_build': {
+    'live': ('#selfdrive/locationd/models/live_kf.py', True, ['live_kf_constants.h']),
+    'car': ('#selfdrive/locationd/models/car_kf.py', True, []),
+  },
+}
+
+if arch != "aarch64":
+  rednose_config['to_build'].update({
+    'gnss': ('#selfdrive/locationd/models/gnss_kf.py', True, []),
+    'loc_4': ('#selfdrive/locationd/models/loc_kf.py', True, []),
+    'pos_computer_4': ('#rednose/helpers/lst_sq_computer.py', False, []),
+    'pos_computer_5': ('#rednose/helpers/lst_sq_computer.py', False, []),
+    'feature_handler_5': ('#rednose/helpers/feature_handler.py', False, []),
+    'lane': ('#xx/pipeline/lib/ekf/lane_kf.py', True, []),
+  })
+
+Export('rednose_config')
+SConscript(['rednose/SConscript'])
 
 # Build openpilot
 
 SConscript(['cereal/SConscript'])
+SConscript(['panda/board/SConscript'])
 SConscript(['opendbc/can/SConscript'])
 
 SConscript(['phonelibs/SConscript'])
@@ -374,17 +415,12 @@ SConscript(['selfdrive/clocksd/SConscript'])
 SConscript(['selfdrive/loggerd/SConscript'])
 
 SConscript(['selfdrive/locationd/SConscript'])
-SConscript(['selfdrive/locationd/models/SConscript'])
 SConscript(['selfdrive/sensord/SConscript'])
 SConscript(['selfdrive/ui/SConscript'])
 
 if arch != "Darwin":
   SConscript(['selfdrive/logcatd/SConscript'])
 
-if real_arch == "x86_64":
-  SConscript(['tools/nui/SConscript'])
-  SConscript(['tools/lib/index_log/SConscript'])
-
 external_sconscript = GetOption('external_sconscript')
 if external_sconscript:
   SConscript([external_sconscript])

cereal

@@ -0,0 +1 @@
+Subproject commit 7c3a2f87196f312529dae9d0ba05d6a449b14482

cereal/.gitignore

@@ -1,21 +0,0 @@
-gen
-node_modules
-package-lock.json
-*.tmp
-*.pyc
-__pycache__
-.*.swp
-.*.swo
-*.os
-*.o
-*.a
-
-test_runner
-
-libmessaging.*
-libmessaging_shared.*
-services.h
-.sconsign.dblite
-libcereal_shared.*
-.mypy_cache/
-catch2/

cereal/SConscript

@@ -1,82 +0,0 @@
-Import('env', 'envCython', 'arch', 'zmq', 'QCOM_REPLAY')
-
-import shutil
-
-cereal_dir = Dir('.')
-gen_dir = Dir('gen')
-messaging_dir = Dir('messaging')
-
-# Build cereal
-
-schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp']
-env.Command(["gen/c/include/c++.capnp.h", "gen/c/include/java.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/")
-
-if shutil.which('capnpc-java'):
-  env.Command(['gen/java/Car.java', 'gen/java/Log.java'],
-              schema_files,
-              f"capnpc $SOURCES --src-prefix={cereal_dir.path} -o java:{gen_dir.path}/java/")
-
-# TODO: remove non shared cereal and messaging
-cereal_objects = env.SharedObject([f'gen/cpp/{s}.c++' for s in schema_files])
-
-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')
-
-messaging_objects = env.SharedObject([
-  'messaging/messaging.cc',
-  'messaging/impl_zmq.cc',
-  'messaging/impl_msgq.cc',
-  'messaging/msgq.cc',
-  'messaging/socketmaster.cc',
-])
-
-messaging_lib = env.Library('messaging', messaging_objects)
-Depends('messaging/impl_zmq.cc', services_h)
-
-# note, this rebuilds the deps shared, zmq is statically linked to make APK happy
-# TODO: get APK to load system zmq to remove the static link
-if arch == "aarch64":
-  zmq_static = FindFile("libzmq.a", "/usr/lib")
-  shared_lib_shared_lib = [zmq_static, 'm', 'stdc++', "gnustl_shared", "kj", "capnp"]
-  env.SharedLibrary('messaging_shared', messaging_objects, LIBS=shared_lib_shared_lib)
-
-env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq'])
-Depends('messaging/bridge.cc', services_h)
-
-envCython.Program('messaging/messaging_pyx.so', 'messaging/messaging_pyx.pyx', LIBS=envCython["LIBS"]+[messaging_lib, "zmq"])
-
-
-# Build Vision IPC
-vipc_sources = [
-  'visionipc/ipc.cc',
-  'visionipc/visionipc_server.cc',
-  'visionipc/visionipc_client.cc',
-  'visionipc/visionbuf.cc',
-]
-
-if arch in ["aarch64", "larch64"] and (not QCOM_REPLAY):
-  vipc_sources += ['visionipc/visionbuf_ion.cc']
-else:
-  vipc_sources += ['visionipc/visionbuf_cl.cc']
-
-vipc_objects = env.SharedObject(vipc_sources)
-vipc = env.Library('visionipc', vipc_objects)
-
-
-libs = envCython["LIBS"]+["OpenCL", "zmq", vipc, messaging_lib]
-if arch == "Darwin":
-  del libs[libs.index('OpenCL')]
-  envCython['FRAMEWORKS'] += ['OpenCL']
-envCython.Program('visionipc/visionipc_pyx.so', 'visionipc/visionipc_pyx.pyx', LIBS=libs)
-
-
-if GetOption('test'):
-  env.Program('messaging/test_runner', ['messaging/test_runner.cc', 'messaging/msgq_tests.cc'], LIBS=[messaging_lib])
-  env.Program('visionipc/test_runner', ['visionipc/test_runner.cc', 'visionipc/visionipc_tests.cc'], LIBS=[vipc, messaging_lib, 'zmq', 'pthread', 'OpenCL'])

cereal/__init__.py

@@ -1,9 +0,0 @@
-# pylint: skip-file
-import os
-import capnp
-
-CEREAL_PATH = os.path.dirname(os.path.abspath(__file__))
-capnp.remove_import_hook()
-
-log = capnp.load(os.path.join(CEREAL_PATH, "log.capnp"))
-car = capnp.load(os.path.join(CEREAL_PATH, "car.capnp"))

cereal/car.capnp

@@ -1,554 +0,0 @@
-using Cxx = import "./include/c++.capnp";
-$Cxx.namespace("cereal");
-
-using Java = import "./include/java.capnp";
-$Java.package("ai.comma.openpilot.cereal");
-$Java.outerClassname("Car");
-
-@0x8e2af1e708af8b8d;
-
-# ******* events causing controls state machine transition *******
-
-struct CarEvent @0x9b1657f34caf3ad3 {
-  name @0 :EventName;
-
-  # event types
-  enable @1 :Bool;
-  noEntry @2 :Bool;
-  warning @3 :Bool;   # alerts presented only when  enabled or soft disabling
-  userDisable @4 :Bool;
-  softDisable @5 :Bool;
-  immediateDisable @6 :Bool;
-  preEnable @7 :Bool;
-  permanent @8 :Bool; # alerts presented regardless of openpilot state
-
-  enum EventName @0xbaa8c5d505f727de {
-    canError @0;
-    steerUnavailable @1;
-    brakeUnavailable @2;
-    wrongGear @4;
-    doorOpen @5;
-    seatbeltNotLatched @6;
-    espDisabled @7;
-    wrongCarMode @8;
-    steerTempUnavailable @9;
-    reverseGear @10;
-    buttonCancel @11;
-    buttonEnable @12;
-    pedalPressed @13;
-    cruiseDisabled @14;
-    speedTooLow @17;
-    outOfSpace @18;
-    overheat @19;
-    calibrationIncomplete @20;
-    calibrationInvalid @21;
-    controlsMismatch @22;
-    pcmEnable @23;
-    pcmDisable @24;
-    noTarget @25;
-    radarFault @26;
-    brakeHold @28;
-    parkBrake @29;
-    manualRestart @30;
-    lowSpeedLockout @31;
-    plannerError @32;
-    debugAlert @34;
-    steerTempUnavailableMute @35;
-    resumeRequired @36;
-    preDriverDistracted @37;
-    promptDriverDistracted @38;
-    driverDistracted @39;
-    preDriverUnresponsive @43;
-    promptDriverUnresponsive @44;
-    driverUnresponsive @45;
-    belowSteerSpeed @46;
-    lowBattery @48;
-    vehicleModelInvalid @50;
-    controlsFailed @51;
-    sensorDataInvalid @52;
-    commIssue @53;
-    tooDistracted @54;
-    posenetInvalid @55;
-    soundsUnavailable @56;
-    preLaneChangeLeft @57;
-    preLaneChangeRight @58;
-    laneChange @59;
-    communityFeatureDisallowed @62;
-    lowMemory @63;
-    stockAeb @64;
-    ldw @65;
-    carUnrecognized @66;
-    driverMonitorLowAcc @68;
-    invalidLkasSetting @69;
-    speedTooHigh @70;
-    laneChangeBlocked @71;
-    relayMalfunction @72;
-    gasPressed @73;
-    stockFcw @74;
-    startup @75;
-    startupNoCar @76;
-    startupNoControl @77;
-    startupMaster @78;
-    fcw @79;
-    steerSaturated @80;
-    belowEngageSpeed @84;
-    noGps @85;
-    wrongCruiseMode @87;
-    modeldLagging @89;
-    deviceFalling @90;
-    fanMalfunction @91;
-    cameraMalfunction @92;
-    gpsMalfunction @94;
-    startupOneplus @82;
-    processNotRunning @95;
-
-    radarCanErrorDEPRECATED @15;
-    radarCommIssueDEPRECATED @67;
-    gasUnavailableDEPRECATED @3;
-    dataNeededDEPRECATED @16;
-    modelCommIssueDEPRECATED @27;
-    ipasOverrideDEPRECATED @33;
-    geofenceDEPRECATED @40;
-    driverMonitorOnDEPRECATED @41;
-    driverMonitorOffDEPRECATED @42;
-    calibrationProgressDEPRECATED @47;
-    invalidGiraffeHondaDEPRECATED @49;
-    invalidGiraffeToyotaDEPRECATED @60;
-    internetConnectivityNeededDEPRECATED @61;
-    whitePandaUnsupportedDEPRECATED @81;
-    commIssueWarningDEPRECATED @83;
-    focusRecoverActiveDEPRECATED @86;
-    neosUpdateRequiredDEPRECATED @88;
-    modelLagWarningDEPRECATED @93;
-  }
-}
-
-# ******* main car state @ 100hz *******
-# all speeds in m/s
-
-struct CarState {
-  events @13 :List(CarEvent);
-
-  # car speed
-  vEgo @1 :Float32;         # best estimate of speed
-  aEgo @16 :Float32;        # best estimate of acceleration
-  vEgoRaw @17 :Float32;     # unfiltered speed from CAN sensors
-  yawRate @22 :Float32;     # best estimate of yaw rate
-  standstill @18 :Bool;
-  wheelSpeeds @2 :WheelSpeeds;
-
-  # gas pedal, 0.0-1.0
-  gas @3 :Float32;        # this is user + computer
-  gasPressed @4 :Bool;    # this is user pedal only
-
-  # brake pedal, 0.0-1.0
-  brake @5 :Float32;      # this is user pedal only
-  brakePressed @6 :Bool;  # this is user pedal only
-  brakeLights @19 :Bool;
-
-  # steering wheel
-  steeringAngleDeg @7 :Float32;
-  steeringRateDeg @15 :Float32;
-  steeringTorque @8 :Float32;      # TODO: standardize units
-  steeringTorqueEps @27 :Float32;  # TODO: standardize units
-  steeringPressed @9 :Bool;        # if the user is using the steering wheel
-  steeringRateLimited @29 :Bool;   # if the torque is limited by the rate limiter
-  steerWarning @35 :Bool;          # temporary steer unavailble
-  steerError @36 :Bool;            # permanent steer error
-  stockAeb @30 :Bool;
-  stockFcw @31 :Bool;
-  espDisabled @32 :Bool;
-
-  # cruise state
-  cruiseState @10 :CruiseState;
-
-  # gear
-  gearShifter @14 :GearShifter;
-
-  # button presses
-  buttonEvents @11 :List(ButtonEvent);
-  leftBlinker @20 :Bool;
-  rightBlinker @21 :Bool;
-  genericToggle @23 :Bool;
-
-  # lock info
-  doorOpen @24 :Bool;
-  seatbeltUnlatched @25 :Bool;
-  canValid @26 :Bool;
-
-  # clutch (manual transmission only)
-  clutchPressed @28 :Bool;
-
-  # which packets this state came from
-  canMonoTimes @12: List(UInt64);
-
-  # blindspot sensors
-  leftBlindspot @33 :Bool; # Is there something blocking the left lane change
-  rightBlindspot @34 :Bool; # Is there something blocking the right lane change
-
-  struct WheelSpeeds {
-    # optional wheel speeds
-    fl @0 :Float32;
-    fr @1 :Float32;
-    rl @2 :Float32;
-    rr @3 :Float32;
-  }
-
-  struct CruiseState {
-    enabled @0 :Bool;
-    speed @1 :Float32;
-    available @2 :Bool;
-    speedOffset @3 :Float32;
-    standstill @4 :Bool;
-    nonAdaptive @5 :Bool;
-  }
-
-  enum GearShifter {
-    unknown @0;
-    park @1;
-    drive @2;
-    neutral @3;
-    reverse @4;
-    sport @5;
-    low @6;
-    brake @7;
-    eco @8;
-    manumatic @9;
-  }
-
-  # send on change
-  struct ButtonEvent {
-    pressed @0 :Bool;
-    type @1 :Type;
-
-    enum Type {
-      unknown @0;
-      leftBlinker @1;
-      rightBlinker @2;
-      accelCruise @3;
-      decelCruise @4;
-      cancel @5;
-      altButton1 @6;
-      altButton2 @7;
-      altButton3 @8;
-      setCruise @9;
-      resumeCruise @10;
-      gapAdjustCruise @11;
-    }
-  }
-
-  errorsDEPRECATED @0 :List(CarEvent.EventName);
-}
-
-# ******* radar state @ 20hz *******
-
-struct RadarData @0x888ad6581cf0aacb {
-  errors @0 :List(Error);
-  points @1 :List(RadarPoint);
-
-  # which packets this state came from
-  canMonoTimes @2 :List(UInt64);
-
-  enum Error {
-    canError @0;
-    fault @1;
-    wrongConfig @2;
-  }
-
-  # similar to LiveTracks
-  # is one timestamp valid for all? I think so
-  struct RadarPoint {
-    trackId @0 :UInt64;  # no trackId reuse
-
-    # these 3 are the minimum required
-    dRel @1 :Float32; # m from the front bumper of the car
-    yRel @2 :Float32; # m
-    vRel @3 :Float32; # m/s
-
-    # these are optional and valid if they are not NaN
-    aRel @4 :Float32; # m/s^2
-    yvRel @5 :Float32; # m/s
-
-    # some radars flag measurements VS estimates
-    measured @6 :Bool;
-  }
-}
-
-# ******* car controls @ 100hz *******
-
-struct CarControl {
-  # must be true for any actuator commands to work
-  enabled @0 :Bool;
-  active @7 :Bool;
-
-  actuators @6 :Actuators;
-
-  cruiseControl @4 :CruiseControl;
-  hudControl @5 :HUDControl;
-
-  struct Actuators {
-    # range from 0.0 - 1.0
-    gas @0: Float32;
-    brake @1: Float32;
-    # range from -1.0 - 1.0
-    steer @2: Float32;
-    steeringAngleDeg @3: Float32;
-  }
-
-  struct CruiseControl {
-    cancel @0: Bool;
-    override @1: Bool;
-    speedOverride @2: Float32;
-    accelOverride @3: Float32;
-  }
-
-  struct HUDControl {
-    speedVisible @0: Bool;
-    setSpeed @1: Float32;
-    lanesVisible @2: Bool;
-    leadVisible @3: Bool;
-    visualAlert @4: VisualAlert;
-    audibleAlert @5: AudibleAlert;
-    rightLaneVisible @6: Bool;
-    leftLaneVisible @7: Bool;
-    rightLaneDepart @8: Bool;
-    leftLaneDepart @9: Bool;
-
-    enum VisualAlert {
-      # these are the choices from the Honda
-      # map as good as you can for your car
-      none @0;
-      fcw @1;
-      steerRequired @2;
-      brakePressed @3;
-      wrongGear @4;
-      seatbeltUnbuckled @5;
-      speedTooHigh @6;
-      ldw @7;
-    }
-
-    enum AudibleAlert {
-      none @0;
-      chimeEngage @1;
-      chimeDisengage @2;
-      chimeError @3;
-      chimeWarning1 @4;
-      chimeWarning2 @5;
-      chimeWarningRepeat @6;
-      chimePrompt @7;
-      chimeWarning2Repeat @8;
-    }
-  }
-
-  gasDEPRECATED @1 :Float32;
-  brakeDEPRECATED @2 :Float32;
-  steeringTorqueDEPRECATED @3 :Float32;
-}
-
-# ****** car param ******
-
-struct CarParams {
-  carName @0 :Text;
-  carFingerprint @1 :Text;
-
-  enableGasInterceptor @2 :Bool;
-  enableCruise @3 :Bool;
-  enableCamera @4 :Bool;
-  enableDsu @5 :Bool; # driving support unit
-  enableApgs @6 :Bool; # advanced parking guidance system
-
-  minEnableSpeed @7 :Float32;
-  minSteerSpeed @8 :Float32;
-  maxSteeringAngleDeg @54 :Float32;
-  safetyModel @9 :SafetyModel;
-  safetyModelPassive @42 :SafetyModel = silent;
-  safetyParam @10 :Int16;
-
-  steerMaxBP @11 :List(Float32);
-  steerMaxV @12 :List(Float32);
-  gasMaxBP @13 :List(Float32);
-  gasMaxV @14 :List(Float32);
-  brakeMaxBP @15 :List(Float32);
-  brakeMaxV @16 :List(Float32);
-
-  # things about the car in the manual
-  mass @17 :Float32;             # [kg] running weight
-  wheelbase @18 :Float32;        # [m] distance from rear to front axle
-  centerToFront @19 :Float32;   # [m] GC distance to front axle
-  steerRatio @20 :Float32;       # [] ratio between front wheels and steering wheel angles
-  steerRatioRear @21 :Float32;  # [] rear steering ratio wrt front steering (usually 0)
-
-  # things we can derive
-  rotationalInertia @22 :Float32;    # [kg*m2] body rotational inertia
-  tireStiffnessFront @23 :Float32;   # [N/rad] front tire coeff of stiff
-  tireStiffnessRear @24 :Float32;    # [N/rad] rear tire coeff of stiff
-
-  longitudinalTuning @25 :LongitudinalPIDTuning;
-  lateralParams @48 :LateralParams;
-  lateralTuning :union {
-    pid @26 :LateralPIDTuning;
-    indi @27 :LateralINDITuning;
-    lqr @40 :LateralLQRTuning;
-  }
-
-  steerLimitAlert @28 :Bool;
-  steerLimitTimer @47 :Float32;  # time before steerLimitAlert is issued
-
-  vEgoStopping @29 :Float32; # Speed at which the car goes into stopping state
-  directAccelControl @30 :Bool; # Does the car have direct accel control or just gas/brake
-  stoppingControl @31 :Bool; # Does the car allows full control even at lows speeds when stopping
-  startAccel @32 :Float32; # Required acceleraton to overcome creep braking
-  steerRateCost @33 :Float32; # Lateral MPC cost on steering rate
-  steerControlType @34 :SteerControlType;
-  radarOffCan @35 :Bool; # True when radar objects aren't visible on CAN
-  minSpeedCan @51 :Float32; # Minimum vehicle speed from CAN (below this value drops to 0)
-  stoppingBrakeRate @52 :Float32; # brake_travel/s while trying to stop
-  startingBrakeRate @53 :Float32; # brake_travel/s while releasing on restart
-
-  steerActuatorDelay @36 :Float32; # Steering wheel actuator delay in seconds
-  openpilotLongitudinalControl @37 :Bool; # is openpilot doing the longitudinal control?
-  carVin @38 :Text; # VIN number queried during fingerprinting
-  dashcamOnly @41: Bool;
-  transmissionType @43 :TransmissionType;
-  carFw @44 :List(CarFw);
-  radarTimeStep @45: Float32 = 0.05;  # time delta between radar updates, 20Hz is very standard
-  communityFeature @46: Bool;  # true if a community maintained feature is detected
-  fingerprintSource @49: FingerprintSource;
-  networkLocation @50 :NetworkLocation;  # Where Panda/C2 is integrated into the car's CAN network
-
-  struct LateralParams {
-    torqueBP @0 :List(Int32);
-    torqueV @1 :List(Int32);
-  }
-
-  struct LateralPIDTuning {
-    kpBP @0 :List(Float32);
-    kpV @1 :List(Float32);
-    kiBP @2 :List(Float32);
-    kiV @3 :List(Float32);
-    kf @4 :Float32;
-  }
-
-  struct LongitudinalPIDTuning {
-    kpBP @0 :List(Float32);
-    kpV @1 :List(Float32);
-    kiBP @2 :List(Float32);
-    kiV @3 :List(Float32);
-    deadzoneBP @4 :List(Float32);
-    deadzoneV @5 :List(Float32);
-  }
-
-  struct LateralINDITuning {
-    outerLoopGainBP @4 :List(Float32);
-    outerLoopGainV @5 :List(Float32);
-    innerLoopGainBP @6 :List(Float32);
-    innerLoopGainV @7 :List(Float32);
-    timeConstantBP @8 :List(Float32);
-    timeConstantV @9 :List(Float32);
-    actuatorEffectivenessBP @10 :List(Float32);
-    actuatorEffectivenessV @11 :List(Float32);
-
-    outerLoopGainDEPRECATED @0 :Float32;
-    innerLoopGainDEPRECATED @1 :Float32;
-    timeConstantDEPRECATED @2 :Float32;
-    actuatorEffectivenessDEPRECATED @3 :Float32;
-  }
-
-  struct LateralLQRTuning {
-    scale @0 :Float32;
-    ki @1 :Float32;
-    dcGain @2 :Float32;
-
-    # State space system
-    a @3 :List(Float32);
-    b @4 :List(Float32);
-    c @5 :List(Float32);
-
-    k @6 :List(Float32);  # LQR gain
-    l @7 :List(Float32);  # Kalman gain
-  }
-
-  enum SafetyModel {
-    silent @0;
-    hondaNidec @1;
-    toyota @2;
-    elm327 @3;
-    gm @4;
-    hondaBoschGiraffe @5;
-    ford @6;
-    cadillac @7;
-    hyundai @8;
-    chrysler @9;
-    tesla @10;
-    subaru @11;
-    gmPassive @12;
-    mazda @13;
-    nissan @14;
-    volkswagen @15;
-    toyotaIpas @16;
-    allOutput @17;
-    gmAscm @18;
-    noOutput @19;  # like silent but without silent CAN TXs
-    hondaBoschHarness @20;
-    volkswagenPq @21;
-    subaruLegacy @22;  # pre-Global platform
-    hyundaiLegacy @23;
-    hyundaiCommunity @24;
-  }
-
-  enum SteerControlType {
-    torque @0;
-    angle @1;
-  }
-
-  enum TransmissionType {
-    unknown @0;
-    automatic @1;  # Traditional auto, including DSG
-    manual @2;  # True "stick shift" only
-    direct @3;  # Electric vehicle or other direct drive
-  }
-
-  struct CarFw {
-    ecu @0 :Ecu;
-    fwVersion @1 :Data;
-    address @2: UInt32;
-    subAddress @3: UInt8;
-  }
-
-  enum Ecu {
-    eps @0;
-    esp @1;
-    fwdRadar @2;
-    fwdCamera @3;
-    engine @4;
-    unknown @5;
-    transmission @8; # Transmission Control Module
-    srs @9; # airbag
-    gateway @10; # can gateway
-    hud @11; # heads up display
-    combinationMeter @12; # instrument cluster
-
-    # Toyota only
-    dsu @6;
-    apgs @7;
-
-    # Honda only
-    vsa @13; # Vehicle Stability Assist
-    programmedFuelInjection @14;
-    electricBrakeBooster @15;
-    shiftByWire @16;
-  }
-
-  enum FingerprintSource {
-    can @0;
-    fw @1;
-    fixed @2;
-  }
-
-  enum NetworkLocation {
-    fwdCamera @0;  # Standard/default integration at LKAS camera
-    gateway @1;    # Integration at vehicle's CAN gateway
-  }
-
-  isPandaBlackDEPRECATED @39: Bool;
-}

cereal/include/c++.capnp

@@ -1,26 +0,0 @@
-# Copyright (c) 2013-2014 Sandstorm Development Group, Inc. and contributors
-# Licensed under the MIT License:
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-@0xbdf87d7bb8304e81;
-$namespace("capnp::annotations");
-
-annotation namespace(file): Text;
-annotation name(field, enumerant, struct, enum, interface, method, param, group, union): Text;

cereal/include/java.capnp

@@ -1,28 +0,0 @@
-# Copyright (c) 2013-2015 Sandstorm Development Group, Inc. and contributors
-# Licensed under the MIT License:
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-@0xc5f1af96651f70ea;
-
-annotation package @0x9ee4c8f803b3b596 (file) : Text;
-# Name of the package, such as "org.example.foo", in which the generated code will reside.
-
-annotation outerClassname @0x9b066bb4881f7cd3 (file) : Text;
-# Name of the outer class that will wrap the generated code.

cereal/legacy.capnp

@@ -1,850 +0,0 @@
-using Cxx = import "./include/c++.capnp";
-$Cxx.namespace("cereal");
-
-using Java = import "./include/java.capnp";
-$Java.package("ai.comma.openpilot.cereal");
-$Java.outerClassname("Legacy");
-
-@0x80ef1ec4889c2a63;
-
-# legacy.capnp: a home for deprecated structs
-
-struct LogRotate @0x9811e1f38f62f2d1 {
-  segmentNum @0 :Int32;
-  path @1 :Text;
-}
-
-struct LiveUI @0xc08240f996aefced {
-  rearViewCam @0 :Bool;
-  alertText1 @1 :Text;
-  alertText2 @2 :Text;
-  awarenessStatus @3 :Float32;
-}
-
-struct OrbslamCorrection @0x8afd33dc9b35e1aa {
-  correctionMonoTime @0 :UInt64;
-  prePositionECEF @1 :List(Float64);
-  postPositionECEF @2 :List(Float64);
-  prePoseQuatECEF @3 :List(Float32);
-  postPoseQuatECEF @4 :List(Float32);
-  numInliers @5 :UInt32;
-}
-
-struct EthernetPacket @0xa99a9d5b33cf5859 {
-  pkt @0 :Data;
-  ts @1 :Float32;
-}
-
-struct CellInfo @0xcff7566681c277ce {
-  timestamp @0 :UInt64;
-  repr @1 :Text; # android toString() for now
-}
-
-struct WifiScan @0xd4df5a192382ba0b {
-  bssid @0 :Text;
-  ssid @1 :Text;
-  capabilities @2 :Text;
-  frequency @3 :Int32;
-  level @4 :Int32;
-  timestamp @5 :Int64;
-
-  centerFreq0 @6 :Int32;
-  centerFreq1 @7 :Int32;
-  channelWidth @8 :ChannelWidth;
-  operatorFriendlyName @9 :Text;
-  venueName @10 :Text;
-  is80211mcResponder @11 :Bool;
-  passpoint @12 :Bool;
-
-  distanceCm @13 :Int32;
-  distanceSdCm @14 :Int32;
-
-  enum ChannelWidth @0xcb6a279f015f6b51 {
-    w20Mhz @0;
-    w40Mhz @1;
-    w80Mhz @2;
-    w160Mhz @3;
-    w80Plus80Mhz @4;
-  }
-}
-
-struct LiveEventData @0x94b7baa90c5c321e {
-  name @0 :Text;
-  value @1 :Int32;
-}
-
-struct ModelData @0xb8aad62cffef28a9 {
-  frameId @0 :UInt32;
-  frameAge @12 :UInt32;
-  frameDropPerc @13 :Float32;
-  timestampEof @9 :UInt64;
-  modelExecutionTime @14 :Float32;
-  gpuExecutionTime @16 :Float32;
-  rawPred @15 :Data;
-
-  path @1 :PathData;
-  leftLane @2 :PathData;
-  rightLane @3 :PathData;
-  lead @4 :LeadData;
-  freePath @6 :List(Float32);
-
-  settings @5 :ModelSettings;
-  leadFuture @7 :LeadData;
-  speed @8 :List(Float32);
-  meta @10 :MetaData;
-  longitudinal @11 :LongitudinalData;
-
-  struct PathData @0x8817eeea389e9f08 {
-    points @0 :List(Float32);
-    prob @1 :Float32;
-    std @2 :Float32;
-    stds @3 :List(Float32);
-    poly @4 :List(Float32);
-    validLen @5 :Float32;
-  }
-
-  struct LeadData @0xd1c9bef96d26fa91 {
-    dist @0 :Float32;
-    prob @1 :Float32;
-    std @2 :Float32;
-    relVel @3 :Float32;
-    relVelStd @4 :Float32;
-    relY @5 :Float32;
-    relYStd @6 :Float32;
-    relA @7 :Float32;
-    relAStd @8 :Float32;
-  }
-
-  struct ModelSettings @0xa26e3710efd3e914 {
-    bigBoxX @0 :UInt16;
-    bigBoxY @1 :UInt16;
-    bigBoxWidth @2 :UInt16;
-    bigBoxHeight @3 :UInt16;
-    boxProjection @4 :List(Float32);
-    yuvCorrection @5 :List(Float32);
-    inputTransform @6 :List(Float32);
-  }
-
-  struct MetaData @0x9744f25fb60f2bf8 {
-    engagedProb @0 :Float32;
-    desirePrediction @1 :List(Float32);
-    brakeDisengageProb @2 :Float32;
-    gasDisengageProb @3 :Float32;
-    steerOverrideProb @4 :Float32;
-    desireState @5 :List(Float32);
-  }
-
-  struct LongitudinalData @0xf98f999c6a071122 {
-    distances @2 :List(Float32);
-    speeds @0 :List(Float32);
-    accelerations @1 :List(Float32);
-  }
-}
-
-struct ECEFPoint @0xc25bbbd524983447 {
-  x @0 :Float64;
-  y @1 :Float64;
-  z @2 :Float64;
-}
-
-struct ECEFPointDEPRECATED @0xe10e21168db0c7f7 {
-  x @0 :Float32;
-  y @1 :Float32;
-  z @2 :Float32;
-}
-
-struct GPSPlannerPoints @0xab54c59699f8f9f3 {
-  curPosDEPRECATED @0 :ECEFPointDEPRECATED;
-  pointsDEPRECATED @1 :List(ECEFPointDEPRECATED);
-  curPos @6 :ECEFPoint;
-  points @7 :List(ECEFPoint);
-  valid @2 :Bool;
-  trackName @3 :Text;
-  speedLimit @4 :Float32;
-  accelTarget @5 :Float32;
-}
-
-struct GPSPlannerPlan @0xf5ad1d90cdc1dd6b {
-  valid @0 :Bool;
-  poly @1 :List(Float32);
-  trackName @2 :Text;
-  speed @3 :Float32;
-  acceleration @4 :Float32;
-  pointsDEPRECATED @5 :List(ECEFPointDEPRECATED);
-  points @6 :List(ECEFPoint);
-  xLookahead @7 :Float32;
-}
-
-struct UiNavigationEvent @0x90c8426c3eaddd3b {
-  type @0: Type;
-  status @1: Status;
-  distanceTo @2: Float32;
-  endRoadPointDEPRECATED @3: ECEFPointDEPRECATED;
-  endRoadPoint @4: ECEFPoint;
-
-  enum Type @0xe8db07dcf8fcea05 {
-    none @0;
-    laneChangeLeft @1;
-    laneChangeRight @2;
-    mergeLeft @3;
-    mergeRight @4;
-    turnLeft @5;
-    turnRight @6;
-  }
-
-  enum Status @0xb9aa88c75ef99a1f {
-    none @0;
-    passive @1;
-    approaching @2;
-    active @3;
-  }
-}
-
-struct LiveLocationData @0xb99b2bc7a57e8128 {
-  status @0 :UInt8;
-
-  # 3D fix
-  lat @1 :Float64;
-  lon @2 :Float64;
-  alt @3 :Float32;     # m
-
-  # speed
-  speed @4 :Float32;   # m/s
-
-  # NED velocity components
-  vNED @5 :List(Float32);
-
-  # roll, pitch, heading (x,y,z)
-  roll @6 :Float32;     # WRT to center of earth?
-  pitch @7 :Float32;    # WRT to center of earth?
-  heading @8 :Float32;  # WRT to north?
-
-  # what are these?
-  wanderAngle @9 :Float32;
-  trackAngle @10 :Float32;
-
-  # car frame -- https://upload.wikimedia.org/wikipedia/commons/f/f5/RPY_angles_of_cars.png
-
-  # gyro, in car frame, deg/s
-  gyro @11 :List(Float32);
-
-  # accel, in car frame, m/s^2
-  accel @12 :List(Float32);
-
-  accuracy @13 :Accuracy;
-
-  source @14 :SensorSource;
-  # if we are fixing a location in the past
-  fixMonoTime @15 :UInt64;
-
-  gpsWeek @16 :Int32;
-  timeOfWeek @17 :Float64;
-
-  positionECEF @18 :List(Float64);
-  poseQuatECEF @19 :List(Float32);
-  pitchCalibration @20 :Float32;
-  yawCalibration @21 :Float32;
-  imuFrame @22 :List(Float32);
-
-  struct Accuracy @0x943dc4625473b03f {
-    pNEDError @0 :List(Float32);
-    vNEDError @1 :List(Float32);
-    rollError @2 :Float32;
-    pitchError @3 :Float32;
-    headingError @4 :Float32;
-    ellipsoidSemiMajorError @5 :Float32;
-    ellipsoidSemiMinorError @6 :Float32;
-    ellipsoidOrientationError @7 :Float32;
-  }
-
-  enum SensorSource @0xc871d3cc252af657 {
-    applanix @0;
-    kalman @1;
-    orbslam @2;
-    timing @3;
-    dummy @4;
-  }
-}
-
-struct OrbOdometry @0xd7700859ed1f5b76 {
-  # timing first
-  startMonoTime @0 :UInt64;
-  endMonoTime @1 :UInt64;
-
-  # fundamental matrix and error
-  f @2: List(Float64);
-  err @3: Float64;
-
-  # number of inlier points
-  inliers @4: Int32;
-
-  # for debug only
-  # indexed by endMonoTime features
-  # value is startMonoTime feature match
-  # -1 if no match
-  matches @5: List(Int16);
-}
-
-struct OrbFeatures @0xcd60164a8a0159ef {
-  timestampEof @0 :UInt64;
-  # transposed arrays of normalized image coordinates
-  # len(xs) == len(ys) == len(descriptors) * 32
-  xs @1 :List(Float32);
-  ys @2 :List(Float32);
-  descriptors @3 :Data;
-  octaves @4 :List(Int8);
-
-  # match index to last OrbFeatures
-  # -1 if no match
-  timestampLastEof @5 :UInt64;
-  matches @6: List(Int16);
-}
-
-struct OrbFeaturesSummary @0xd500d30c5803fa4f {
-  timestampEof @0 :UInt64;
-  timestampLastEof @1 :UInt64;
-
-  featureCount @2 :UInt16;
-  matchCount @3 :UInt16;
-  computeNs @4 :UInt64;
-}
-
-struct OrbKeyFrame @0xc8233c0345e27e24 {
-  # this is a globally unique id for the KeyFrame
-  id @0: UInt64;
-
-  # this is the location of the KeyFrame
-  pos @1: ECEFPoint;
-
-  # these are the features in the world
-  # len(dpos) == len(descriptors) * 32
-  dpos @2 :List(ECEFPoint);
-  descriptors @3 :Data;
-}
-
-struct KalmanOdometry @0x92e21bb7ea38793a {
-  trans @0 :List(Float32); # m/s in device frame
-  rot @1 :List(Float32); # rad/s in device frame
-  transStd @2 :List(Float32); # std m/s in device frame
-  rotStd @3 :List(Float32); # std rad/s in device frame
-}
-
-struct OrbObservation @0x9b326d4e436afec7 {
-  observationMonoTime @0 :UInt64;
-  normalizedCoordinates @1 :List(Float32);
-  locationECEF @2 :List(Float64);
-  matchDistance @3: UInt32;
-}
-
-struct CalibrationFeatures @0x8fdfadb254ea867a {
-  frameId @0 :UInt32;
-
-  p0 @1 :List(Float32);
-  p1 @2 :List(Float32);
-  status @3 :List(Int8);
-}
-
-struct NavStatus @0xbd8822120928120c {
-  isNavigating @0 :Bool;
-  currentAddress @1 :Address;
-
-  struct Address @0xce7cd672cacc7814 {
-    title @0 :Text;
-    lat @1 :Float64;
-    lng @2 :Float64;
-    house @3 :Text;
-    address @4 :Text;
-    street @5 :Text;
-    city @6 :Text;
-    state @7 :Text;
-    country @8 :Text;
-  }
-}
-
-struct NavUpdate @0xdb98be6565516acb {
-  isNavigating @0 :Bool;
-  curSegment @1 :Int32;
-  segments @2 :List(Segment);
-
-  struct LatLng @0x9eaef9187cadbb9b {
-    lat @0 :Float64;
-    lng @1 :Float64;
-  }
-
-  struct Segment @0xa5b39b4fc4d7da3f {
-    from @0 :LatLng;
-    to @1 :LatLng;
-    updateTime @2 :Int32;
-    distance @3 :Int32;
-    crossTime @4 :Int32;
-    exitNo @5 :Int32;
-    instruction @6 :Instruction;
-
-    parts @7 :List(LatLng);
-
-    enum Instruction @0xc5417a637451246f {
-      turnLeft @0;
-      turnRight @1;
-      keepLeft @2;
-      keepRight @3;
-      straight @4;
-      roundaboutExitNumber @5;
-      roundaboutExit @6;
-      roundaboutTurnLeft @7;
-      unkn8 @8;
-      roundaboutStraight @9;
-      unkn10 @10;
-      roundaboutTurnRight @11;
-      unkn12 @12;
-      roundaboutUturn @13;
-      unkn14 @14;
-      arrive @15;
-      exitLeft @16;
-      exitRight @17;
-      unkn18 @18;
-      uturn @19;
-      # ...
-    }
-  }
-}
-
-struct TrafficEvent @0xacfa74a094e62626 {
-  type @0 :Type;
-  distance @1 :Float32;
-  action @2 :Action;
-  resuming @3 :Bool;
-
-  enum Type @0xd85d75253435bf4b {
-    stopSign @0;
-    lightRed @1;
-    lightYellow @2;
-    lightGreen @3;
-    stopLight @4;
-  }
-
-  enum Action @0xa6f6ce72165ccb49 {
-    none @0;
-    yield @1;
-    stop @2;
-    resumeReady @3;
-  }
-
-}
-
-
-struct AndroidGnss @0xdfdf30d03fc485bd {
-  union {
-    measurements @0 :Measurements;
-    navigationMessage @1 :NavigationMessage;
-  }
-
-  struct Measurements @0xa20710d4f428d6cd {
-    clock @0 :Clock;
-    measurements @1 :List(Measurement);
-
-    struct Clock @0xa0e27b453a38f450 {
-      timeNanos @0 :Int64;
-      hardwareClockDiscontinuityCount @1 :Int32;
-
-      hasTimeUncertaintyNanos @2 :Bool;
-      timeUncertaintyNanos @3 :Float64;
-
-      hasLeapSecond @4 :Bool;
-      leapSecond @5 :Int32;
-
-      hasFullBiasNanos @6 :Bool;
-      fullBiasNanos @7 :Int64;
-
-      hasBiasNanos @8 :Bool;
-      biasNanos @9 :Float64;
-
-      hasBiasUncertaintyNanos @10 :Bool;
-      biasUncertaintyNanos @11 :Float64;
-
-      hasDriftNanosPerSecond @12 :Bool;
-      driftNanosPerSecond @13 :Float64;
-
-      hasDriftUncertaintyNanosPerSecond @14 :Bool;
-      driftUncertaintyNanosPerSecond @15 :Float64;
-    }
-
-    struct Measurement @0xd949bf717d77614d {
-      svId @0 :Int32;
-      constellation @1 :Constellation;
-
-      timeOffsetNanos @2 :Float64;
-      state @3 :Int32;
-      receivedSvTimeNanos @4 :Int64;
-      receivedSvTimeUncertaintyNanos @5 :Int64;
-      cn0DbHz @6 :Float64;
-      pseudorangeRateMetersPerSecond @7 :Float64;
-      pseudorangeRateUncertaintyMetersPerSecond @8 :Float64;
-      accumulatedDeltaRangeState @9 :Int32;
-      accumulatedDeltaRangeMeters @10 :Float64;
-      accumulatedDeltaRangeUncertaintyMeters @11 :Float64;
-
-      hasCarrierFrequencyHz @12 :Bool;
-      carrierFrequencyHz @13 :Float32;
-      hasCarrierCycles @14 :Bool;
-      carrierCycles @15 :Int64;
-      hasCarrierPhase @16 :Bool;
-      carrierPhase @17 :Float64;
-      hasCarrierPhaseUncertainty @18 :Bool;
-      carrierPhaseUncertainty @19 :Float64;
-      hasSnrInDb @20 :Bool;
-      snrInDb @21 :Float64;
-
-      multipathIndicator @22 :MultipathIndicator;
-
-      enum Constellation @0x9ef1f3ff0deb5ffb {
-        unknown @0;
-        gps @1;
-        sbas @2;
-        glonass @3;
-        qzss @4;
-        beidou @5;
-        galileo @6;
-      }
-
-      enum State @0xcbb9490adce12d72 {
-        unknown @0;
-        codeLock @1;
-        bitSync @2;
-        subframeSync @3;
-        towDecoded @4;
-        msecAmbiguous @5;
-        symbolSync @6;
-        gloStringSync @7;
-        gloTodDecoded @8;
-        bdsD2BitSync @9;
-        bdsD2SubframeSync @10;
-        galE1bcCodeLock @11;
-        galE1c2ndCodeLock @12;
-        galE1bPageSync @13;
-        sbasSync @14;
-      }
-
-      enum MultipathIndicator @0xc04e7b6231d4caa8 {
-        unknown @0;
-        detected @1;
-        notDetected @2;
-      }
-    }
-  }
-
-  struct NavigationMessage @0xe2517b083095fd4e {
-    type @0 :Int32;
-    svId @1 :Int32;
-    messageId @2 :Int32;
-    submessageId @3 :Int32;
-    data @4 :Data;
-    status @5 :Status;
-
-    enum Status @0xec1ff7996b35366f {
-      unknown @0;
-      parityPassed @1;
-      parityRebuilt @2;
-    }
-  }
-}
-
-struct QcomGnss @0xde94674b07ae51c1 {
-  logTs @0 :UInt64;
-  union {
-    measurementReport @1 :MeasurementReport;
-    clockReport @2 :ClockReport;
-    drMeasurementReport @3 :DrMeasurementReport;
-    drSvPoly @4 :DrSvPolyReport;
-    rawLog @5 :Data;
-  }
-
-  enum MeasurementSource @0xd71a12b6faada7ee {
-    gps @0;
-    glonass @1;
-    beidou @2;
-  }
-
-  enum SVObservationState @0xe81e829a0d6c83e9 {
-    idle @0;
-    search @1;
-    searchVerify @2;
-    bitEdge @3;
-    trackVerify @4;
-    track @5;
-    restart @6;
-    dpo @7;
-    glo10msBe @8;
-    glo10msAt @9;
-  }
-
-  struct MeasurementStatus @0xe501010e1bcae83b {
-    subMillisecondIsValid @0 :Bool;
-    subBitTimeIsKnown @1 :Bool;
-    satelliteTimeIsKnown @2 :Bool;
-    bitEdgeConfirmedFromSignal @3 :Bool;
-    measuredVelocity @4 :Bool;
-    fineOrCoarseVelocity @5 :Bool;
-    lockPointValid @6 :Bool;
-    lockPointPositive @7 :Bool;
-    lastUpdateFromDifference @8 :Bool;
-    lastUpdateFromVelocityDifference @9 :Bool;
-    strongIndicationOfCrossCorelation @10 :Bool;
-    tentativeMeasurement @11 :Bool;
-    measurementNotUsable @12 :Bool;
-    sirCheckIsNeeded @13 :Bool;
-    probationMode @14 :Bool;
-
-    glonassMeanderBitEdgeValid @15 :Bool;
-    glonassTimeMarkValid @16 :Bool;
-
-    gpsRoundRobinRxDiversity @17 :Bool;
-    gpsRxDiversity @18 :Bool;
-    gpsLowBandwidthRxDiversityCombined @19 :Bool;
-    gpsHighBandwidthNu4 @20 :Bool;
-    gpsHighBandwidthNu8 @21 :Bool;
-    gpsHighBandwidthUniform @22 :Bool;
-    multipathIndicator @23 :Bool;
-
-    imdJammingIndicator @24 :Bool;
-    lteB13TxJammingIndicator @25 :Bool;
-    freshMeasurementIndicator @26 :Bool;
-
-    multipathEstimateIsValid @27 :Bool;
-    directionIsValid @28 :Bool;
-  }
-
-  struct MeasurementReport @0xf580d7d86b7b8692 {
-    source @0 :MeasurementSource;
-
-    fCount @1 :UInt32;
-
-    gpsWeek @2 :UInt16;
-    glonassCycleNumber @3 :UInt8;
-    glonassNumberOfDays @4 :UInt16;
-
-    milliseconds @5 :UInt32;
-    timeBias @6 :Float32;
-    clockTimeUncertainty @7 :Float32;
-    clockFrequencyBias @8 :Float32;
-    clockFrequencyUncertainty @9 :Float32;
-
-    sv @10 :List(SV);
-
-    struct SV @0xf10c595ae7bb2c27 {
-      svId @0 :UInt8;
-      observationState @2 :SVObservationState;
-      observations @3 :UInt8;
-      goodObservations @4 :UInt8;
-      gpsParityErrorCount @5 :UInt16;
-      glonassFrequencyIndex @1 :Int8;
-      glonassHemmingErrorCount @6 :UInt8;
-      filterStages @7 :UInt8;
-      carrierNoise @8 :UInt16;
-      latency @9 :Int16;
-      predetectInterval @10 :UInt8;
-      postdetections @11 :UInt16;
-
-      unfilteredMeasurementIntegral @12 :UInt32;
-      unfilteredMeasurementFraction @13 :Float32;
-      unfilteredTimeUncertainty @14 :Float32;
-      unfilteredSpeed @15 :Float32;
-      unfilteredSpeedUncertainty @16 :Float32;
-      measurementStatus @17 :MeasurementStatus;
-      multipathEstimate @18 :UInt32;
-      azimuth @19 :Float32;
-      elevation @20 :Float32;
-      carrierPhaseCyclesIntegral @21 :Int32;
-      carrierPhaseCyclesFraction @22 :UInt16;
-      fineSpeed @23 :Float32;
-      fineSpeedUncertainty @24 :Float32;
-      cycleSlipCount @25 :UInt8;
-    }
-
-  }
-
-  struct ClockReport @0xca965e4add8f4f0b {
-    hasFCount @0 :Bool;
-    fCount @1 :UInt32;
-
-    hasGpsWeek @2 :Bool;
-    gpsWeek @3 :UInt16;
-    hasGpsMilliseconds @4 :Bool;
-    gpsMilliseconds @5 :UInt32;
-    gpsTimeBias @6 :Float32;
-    gpsClockTimeUncertainty @7 :Float32;
-    gpsClockSource @8 :UInt8;
-
-    hasGlonassYear @9 :Bool;
-    glonassYear @10 :UInt8;
-    hasGlonassDay @11 :Bool;
-    glonassDay @12 :UInt16;
-    hasGlonassMilliseconds @13 :Bool;
-    glonassMilliseconds @14 :UInt32;
-    glonassTimeBias @15 :Float32;
-    glonassClockTimeUncertainty @16 :Float32;
-    glonassClockSource @17 :UInt8;
-
-    bdsWeek @18 :UInt16;
-    bdsMilliseconds @19 :UInt32;
-    bdsTimeBias @20 :Float32;
-    bdsClockTimeUncertainty @21 :Float32;
-    bdsClockSource @22 :UInt8;
-
-    galWeek @23 :UInt16;
-    galMilliseconds @24 :UInt32;
-    galTimeBias @25 :Float32;
-    galClockTimeUncertainty @26 :Float32;
-    galClockSource @27 :UInt8;
-
-    clockFrequencyBias @28 :Float32;
-    clockFrequencyUncertainty @29 :Float32;
-    frequencySource @30 :UInt8;
-    gpsLeapSeconds @31 :UInt8;
-    gpsLeapSecondsUncertainty @32 :UInt8;
-    gpsLeapSecondsSource @33 :UInt8;
-
-    gpsToGlonassTimeBiasMilliseconds @34 :Float32;
-    gpsToGlonassTimeBiasMillisecondsUncertainty @35 :Float32;
-    gpsToBdsTimeBiasMilliseconds @36 :Float32;
-    gpsToBdsTimeBiasMillisecondsUncertainty @37 :Float32;
-    bdsToGloTimeBiasMilliseconds @38 :Float32;
-    bdsToGloTimeBiasMillisecondsUncertainty @39 :Float32;
-    gpsToGalTimeBiasMilliseconds @40 :Float32;
-    gpsToGalTimeBiasMillisecondsUncertainty @41 :Float32;
-    galToGloTimeBiasMilliseconds @42 :Float32;
-    galToGloTimeBiasMillisecondsUncertainty @43 :Float32;
-    galToBdsTimeBiasMilliseconds @44 :Float32;
-    galToBdsTimeBiasMillisecondsUncertainty @45 :Float32;
-
-    hasRtcTime @46 :Bool;
-    systemRtcTime @47 :UInt32;
-    fCountOffset @48 :UInt32;
-    lpmRtcCount @49 :UInt32;
-    clockResets @50 :UInt32;
-  }
-
-  struct DrMeasurementReport @0x8053c39445c6c75c {
-
-    reason @0 :UInt8;
-    seqNum @1 :UInt8;
-    seqMax @2 :UInt8;
-    rfLoss @3 :UInt16;
-
-    systemRtcValid @4 :Bool;
-    fCount @5 :UInt32;
-    clockResets @6 :UInt32;
-    systemRtcTime @7 :UInt64;
-
-    gpsLeapSeconds @8 :UInt8;
-    gpsLeapSecondsUncertainty @9 :UInt8;
-    gpsToGlonassTimeBiasMilliseconds @10 :Float32;
-    gpsToGlonassTimeBiasMillisecondsUncertainty @11 :Float32;
-
-    gpsWeek @12 :UInt16;
-    gpsMilliseconds @13 :UInt32;
-    gpsTimeBiasMs @14 :UInt32;
-    gpsClockTimeUncertaintyMs @15 :UInt32;
-    gpsClockSource @16 :UInt8;
-
-    glonassClockSource @17 :UInt8;
-    glonassYear @18 :UInt8;
-    glonassDay @19 :UInt16;
-    glonassMilliseconds @20 :UInt32;
-    glonassTimeBias @21 :Float32;
-    glonassClockTimeUncertainty @22 :Float32;
-
-    clockFrequencyBias @23 :Float32;
-    clockFrequencyUncertainty @24 :Float32;
-    frequencySource @25 :UInt8;
-
-    source @26 :MeasurementSource;
-
-    sv @27 :List(SV);
-
-    struct SV @0xf08b81df8cbf459c {
-      svId @0 :UInt8;
-      glonassFrequencyIndex @1 :Int8;
-      observationState @2 :SVObservationState;
-      observations @3 :UInt8;
-      goodObservations @4 :UInt8;
-      filterStages @5 :UInt8;
-      predetectInterval @6 :UInt8;
-      cycleSlipCount @7 :UInt8;
-      postdetections @8 :UInt16;
-
-      measurementStatus @9 :MeasurementStatus;
-
-      carrierNoise @10 :UInt16;
-      rfLoss @11 :UInt16;
-      latency @12 :Int16;
-
-      filteredMeasurementFraction @13 :Float32;
-      filteredMeasurementIntegral @14 :UInt32;
-      filteredTimeUncertainty @15 :Float32;
-      filteredSpeed @16 :Float32;
-      filteredSpeedUncertainty @17 :Float32;
-
-      unfilteredMeasurementFraction @18 :Float32;
-      unfilteredMeasurementIntegral @19 :UInt32;
-      unfilteredTimeUncertainty @20 :Float32;
-      unfilteredSpeed @21 :Float32;
-      unfilteredSpeedUncertainty @22 :Float32;
-
-      multipathEstimate @23 :UInt32;
-      azimuth @24 :Float32;
-      elevation @25 :Float32;
-      dopplerAcceleration @26 :Float32;
-      fineSpeed @27 :Float32;
-      fineSpeedUncertainty @28 :Float32;
-
-      carrierPhase @29 :Float64;
-      fCount @30 :UInt32;
-
-      parityErrorCount @31 :UInt16;
-      goodParity @32 :Bool;
-    }
-  }
-
-  struct DrSvPolyReport @0xb1fb80811a673270 {
-    svId @0 :UInt16;
-    frequencyIndex @1 :Int8;
-
-    hasPosition @2 :Bool;
-    hasIono @3 :Bool;
-    hasTropo @4 :Bool;
-    hasElevation @5 :Bool;
-    polyFromXtra @6 :Bool;
-    hasSbasIono @7 :Bool;
-
-    iode @8 :UInt16;
-    t0 @9 :Float64;
-    xyz0 @10 :List(Float64);
-    xyzN @11 :List(Float64);
-    other @12 :List(Float32);
-
-    positionUncertainty @13 :Float32;
-    ionoDelay @14 :Float32;
-    ionoDot @15 :Float32;
-    sbasIonoDelay @16 :Float32;
-    sbasIonoDot @17 :Float32;
-    tropoDelay @18 :Float32;
-    elevation @19 :Float32;
-    elevationDot @20 :Float32;
-    elevationUncertainty @21 :Float32;
-    velocityCoeff @22 :List(Float64);
-  }
-}
-
-struct LidarPts @0xe3d6685d4e9d8f7a {
-  r @0 :List(UInt16);        # uint16   m*500.0
-  theta @1 :List(UInt16);    # uint16 deg*100.0
-  reflect @2 :List(UInt8);   # uint8      0-255
-
-  # For storing out of file.
-  idx @3 :UInt64;
-
-  # For storing in file
-  pkt @4 :Data;
-}
-
-

cereal/messaging/.gitignore

@@ -1,10 +0,0 @@
-demo
-bridge
-test_runner
-*.o
-*.os
-*.d
-*.a
-*.so
-messaging_pyx.cpp
-build/

cereal/messaging/__init__.py

@@ -1,225 +0,0 @@
-# must be build with scons
-from .messaging_pyx import Context, Poller, SubSocket, PubSocket  # pylint: disable=no-name-in-module, import-error
-from .messaging_pyx import MultiplePublishersError, MessagingError  # pylint: disable=no-name-in-module, import-error
-import capnp
-
-from typing import Optional, List, Union
-
-from cereal import log
-from cereal.services import service_list
-
-assert MultiplePublishersError
-assert MessagingError
-
-# sec_since_boot is faster, but allow to run standalone too
-try:
-  from common.realtime import sec_since_boot
-except ImportError:
-  import time
-  sec_since_boot = time.time
-  print("Warning, using python time.time() instead of faster sec_since_boot")
-
-context = Context()
-
-def new_message(service: Optional[str] = None, size: Optional[int] = None) -> capnp.lib.capnp._DynamicStructBuilder:
-  dat = log.Event.new_message()
-  dat.logMonoTime = int(sec_since_boot() * 1e9)
-  dat.valid = True
-  if service is not None:
-    if size is None:
-      dat.init(service)
-    else:
-      dat.init(service, size)
-  return dat
-
-def pub_sock(endpoint: str) -> PubSocket:
-  sock = PubSocket()
-  sock.connect(context, endpoint)
-  return sock
-
-def sub_sock(endpoint: str, poller: Optional[Poller] = None, addr: str = "127.0.0.1",
-             conflate: bool = False, timeout: Optional[int] = None) -> SubSocket:
-  sock = SubSocket()
-  sock.connect(context, endpoint, addr.encode('utf8'), conflate)
-
-  if timeout is not None:
-    sock.setTimeout(timeout)
-
-  if poller is not None:
-    poller.registerSocket(sock)
-  return sock
-
-
-def drain_sock_raw(sock: SubSocket, wait_for_one: bool = False) -> List[bytes]:
-  """Receive all message currently available on the queue"""
-  ret: List[bytes] = []
-  while 1:
-    if wait_for_one and len(ret) == 0:
-      dat = sock.receive()
-    else:
-      dat = sock.receive(non_blocking=True)
-
-    if dat is None:
-      break
-
-    ret.append(dat)
-
-  return ret
-
-def drain_sock(sock: SubSocket, wait_for_one: bool = False) -> List[capnp.lib.capnp._DynamicStructReader]:
-  """Receive all message currently available on the queue"""
-  ret: List[capnp.lib.capnp._DynamicStructReader] = []
-  while 1:
-    if wait_for_one and len(ret) == 0:
-      dat = sock.receive()
-    else:
-      dat = sock.receive(non_blocking=True)
-
-    if dat is None:  # Timeout hit
-      break
-
-    dat = log.Event.from_bytes(dat)
-    ret.append(dat)
-
-  return ret
-
-
-# TODO: print when we drop packets?
-def recv_sock(sock: SubSocket, wait: bool = False) -> Union[None, capnp.lib.capnp._DynamicStructReader]:
-  """Same as drain sock, but only returns latest message. Consider using conflate instead."""
-  dat = None
-
-  while 1:
-    if wait and dat is None:
-      rcv = sock.receive()
-    else:
-      rcv = sock.receive(non_blocking=True)
-
-    if rcv is None:  # Timeout hit
-      break
-
-    dat = rcv
-
-  if dat is not None:
-    dat = log.Event.from_bytes(dat)
-
-  return dat
-
-def recv_one(sock: SubSocket) -> Union[None, capnp.lib.capnp._DynamicStructReader]:
-  dat = sock.receive()
-  if dat is not None:
-    dat = log.Event.from_bytes(dat)
-  return dat
-
-def recv_one_or_none(sock: SubSocket) -> Union[None, capnp.lib.capnp._DynamicStructReader]:
-  dat = sock.receive(non_blocking=True)
-  if dat is not None:
-    dat = log.Event.from_bytes(dat)
-  return dat
-
-def recv_one_retry(sock: SubSocket) -> capnp.lib.capnp._DynamicStructReader:
-  """Keep receiving until we get a message"""
-  while True:
-    dat = sock.receive()
-    if dat is not None:
-      return log.Event.from_bytes(dat)
-
-class SubMaster():
-  def __init__(self, services: List[str], poll: Optional[List[str]] = None,
-               ignore_alive: Optional[List[str]] = None, addr:str ="127.0.0.1"):
-    self.frame = -1
-    self.updated = {s: False for s in services}
-    self.rcv_time = {s: 0. for s in services}
-    self.rcv_frame = {s: 0 for s in services}
-    self.alive = {s: False for s in services}
-    self.sock = {}
-    self.freq = {}
-    self.data = {}
-    self.valid = {}
-    self.logMonoTime = {}
-
-    self.poller = Poller()
-    self.non_polled_services = [s for s in services if poll is not None and
-                                len(poll) and s not in poll]
-
-    if ignore_alive is not None:
-      self.ignore_alive = ignore_alive
-    else:
-      self.ignore_alive = []
-
-    for s in services:
-      if addr is not None:
-        p = self.poller if s not in self.non_polled_services else None
-        self.sock[s] = sub_sock(s, poller=p, addr=addr, conflate=True)
-      self.freq[s] = service_list[s].frequency
-
-      try:
-        data = new_message(s)
-      except capnp.lib.capnp.KjException:  # pylint: disable=c-extension-no-member
-        data = new_message(s, 0) # lists
-
-      self.data[s] = getattr(data, s)
-      self.logMonoTime[s] = 0
-      self.valid[s] = data.valid
-
-  def __getitem__(self, s: str) -> capnp.lib.capnp._DynamicStructReader:
-    return self.data[s]
-
-  def update(self, timeout: int = 1000) -> None:
-    msgs = []
-    for sock in self.poller.poll(timeout):
-      msgs.append(recv_one_or_none(sock))
-
-    # non-blocking receive for non-polled sockets
-    for s in self.non_polled_services:
-      msgs.append(recv_one_or_none(self.sock[s]))
-    self.update_msgs(sec_since_boot(), msgs)
-
-  def update_msgs(self, cur_time: float, msgs: List[capnp.lib.capnp._DynamicStructReader]) -> None:
-    self.frame += 1
-    self.updated = dict.fromkeys(self.updated, False)
-    for msg in msgs:
-      if msg is None:
-        continue
-
-      s = msg.which()
-      self.updated[s] = True
-      self.rcv_time[s] = cur_time
-      self.rcv_frame[s] = self.frame
-      self.data[s] = getattr(msg, s)
-      self.logMonoTime[s] = msg.logMonoTime
-      self.valid[s] = msg.valid
-
-    for s in self.data:
-      # arbitrary small number to avoid float comparison. If freq is 0, we can skip the check
-      if self.freq[s] > 1e-5:
-        # alive if delay is within 10x the expected frequency
-        self.alive[s] = (cur_time - self.rcv_time[s]) < (10. / self.freq[s])
-      else:
-        self.alive[s] = True
-
-  def all_alive(self, service_list=None) -> bool:
-    if service_list is None:  # check all
-      service_list = self.alive.keys()
-    return all(self.alive[s] for s in service_list if s not in self.ignore_alive)
-
-  def all_valid(self, service_list=None) -> bool:
-    if service_list is None:  # check all
-      service_list = self.valid.keys()
-    return all(self.valid[s] for s in service_list)
-
-  def all_alive_and_valid(self, service_list=None) -> bool:
-    if service_list is None:  # check all
-      service_list = self.alive.keys()
-    return self.all_alive(service_list=service_list) and self.all_valid(service_list=service_list)
-
-class PubMaster():
-  def __init__(self, services: List[str]):
-    self.sock = {}
-    for s in services:
-      self.sock[s] = pub_sock(s)
-
-  def send(self, s: str, dat: Union[bytes, capnp.lib.capnp._DynamicStructBuilder]) -> None:
-    if not isinstance(dat, bytes):
-      dat = dat.to_bytes()
-    self.sock[s].send(dat)

cereal/messaging/bridge.cc

@@ -1,64 +0,0 @@
-#include <iostream>
-#include <string>
-#include <cassert>
-#include <csignal>
-#include <map>
-
-typedef void (*sighandler_t)(int sig);
-
-#include "services.h"
-
-#include "impl_msgq.hpp"
-#include "impl_zmq.hpp"
-
-void sigpipe_handler(int sig) {
-  assert(sig == SIGPIPE);
-  std::cout << "SIGPIPE received" << std::endl;
-}
-
-static std::vector<std::string> get_services() {
-  std::vector<std::string> name_list;
-
-  for (const auto& it : services) {
-    std::string name = it.name;
-    if (name == "plusFrame" || name == "uiLayoutState") continue;
-    name_list.push_back(name);
-  }
-
-  return name_list;
-}
-
-
-int main(void){
-  signal(SIGPIPE, (sighandler_t)sigpipe_handler);
-
-  auto endpoints = get_services();
-
-  std::map<SubSocket*, PubSocket*> sub2pub;
-
-  Context *zmq_context = new ZMQContext();
-  Context *msgq_context = new MSGQContext();
-  Poller *poller = new MSGQPoller();
-
-  for (auto endpoint: endpoints){
-    SubSocket * msgq_sock = new MSGQSubSocket();
-    msgq_sock->connect(msgq_context, endpoint, "127.0.0.1", false);
-    poller->registerSocket(msgq_sock);
-
-    PubSocket * zmq_sock = new ZMQPubSocket();
-    zmq_sock->connect(zmq_context, endpoint);
-
-    sub2pub[msgq_sock] = zmq_sock;
-  }
-
-
-  while (true){
-    for (auto sub_sock : poller->poll(100)){
-      Message * msg = sub_sock->receive();
-      if (msg == NULL) continue;
-      sub2pub[sub_sock]->sendMessage(msg);
-      delete msg;
-    }
-  }
-  return 0;
-}

cereal/messaging/impl_msgq.cc

@@ -1,226 +0,0 @@
-#include <cassert>
-#include <cstring>
-#include <iostream>
-#include <cstdlib>
-#include <csignal>
-#include <cerrno>
-
-#include "services.h"
-#include "impl_msgq.hpp"
-
-
-volatile sig_atomic_t msgq_do_exit = 0;
-
-void sig_handler(int signal) {
-  assert(signal == SIGINT || signal == SIGTERM);
-  msgq_do_exit = 1;
-}
-
-static bool service_exists(std::string path){
-  for (const auto& it : services) {
-    if (it.name == path) {
-      return true;
-    }
-  }
-  return false;
-}
-
-static size_t get_size(std::string endpoint){
-  size_t sz = DEFAULT_SEGMENT_SIZE;
-
-  if (endpoint == "roadCameraState" || endpoint == "driverCameraState" || endpoint == "wideRoadCameraState"){
-    sz *= 10;
-  }
-
-  return sz;
-}
-
-
-MSGQContext::MSGQContext() {
-}
-
-MSGQContext::~MSGQContext() {
-}
-
-void MSGQMessage::init(size_t sz) {
-  size = sz;
-  data = new char[size];
-}
-
-void MSGQMessage::init(char * d, size_t sz) {
-  size = sz;
-  data = new char[size];
-  memcpy(data, d, size);
-}
-
-void MSGQMessage::takeOwnership(char * d, size_t sz) {
-  size = sz;
-  data = d;
-}
-
-void MSGQMessage::close() {
-  if (size > 0){
-    delete[] data;
-  }
-  size = 0;
-}
-
-MSGQMessage::~MSGQMessage() {
-  this->close();
-}
-
-int MSGQSubSocket::connect(Context *context, std::string endpoint, std::string address, bool conflate, bool check_endpoint){
-  assert(context);
-  assert(address == "127.0.0.1");
-
-  if (check_endpoint && !service_exists(std::string(endpoint))){
-    std::cout << "Warning, " << std::string(endpoint) << " is not in service list." << std::endl;
-  }
-
-  q = new msgq_queue_t;
-  int r = msgq_new_queue(q, endpoint.c_str(), get_size(endpoint));
-  if (r != 0){
-    return r;
-  }
-
-  msgq_init_subscriber(q);
-
-  if (conflate){
-    q->read_conflate = true;
-  }
-
-  timeout = -1;
-
-  return 0;
-}
-
-
-Message * MSGQSubSocket::receive(bool non_blocking){
-  msgq_do_exit = 0;
-
-  void (*prev_handler_sigint)(int);
-  void (*prev_handler_sigterm)(int);
-  if (!non_blocking){
-    prev_handler_sigint = std::signal(SIGINT, sig_handler);
-    prev_handler_sigterm = std::signal(SIGTERM, sig_handler);
-  }
-
-  msgq_msg_t msg;
-
-  MSGQMessage *r = NULL;
-
-  int rc = msgq_msg_recv(&msg, q);
-
-  // Hack to implement blocking read with a poller. Don't use this
-  while (!non_blocking && rc == 0 && msgq_do_exit == 0){
-    msgq_pollitem_t items[1];
-    items[0].q = q;
-
-    int t = (timeout != -1) ? timeout : 100;
-
-    int n = msgq_poll(items, 1, t);
-    rc = msgq_msg_recv(&msg, q);
-
-    // The poll indicated a message was ready, but the receive failed. Try again
-    if (n == 1 && rc == 0){
-      continue;
-    }
-
-    if (timeout != -1){
-      break;
-    }
-  }
-
-
-  if (!non_blocking){
-    std::signal(SIGINT, prev_handler_sigint);
-    std::signal(SIGTERM, prev_handler_sigterm);
-  }
-
-  errno = msgq_do_exit ? EINTR : 0;
-
-  if (rc > 0){
-    if (msgq_do_exit){
-      msgq_msg_close(&msg); // Free unused message on exit
-    } else {
-      r = new MSGQMessage;
-      r->takeOwnership(msg.data, msg.size);
-    }
-  }
-
-  return (Message*)r;
-}
-
-void MSGQSubSocket::setTimeout(int t){
-  timeout = t;
-}
-
-MSGQSubSocket::~MSGQSubSocket(){
-  if (q != NULL){
-    msgq_close_queue(q);
-    delete q;
-  }
-}
-
-int MSGQPubSocket::connect(Context *context, std::string endpoint, bool check_endpoint){
-  assert(context);
-
-  if (check_endpoint && !service_exists(std::string(endpoint))){
-    std::cout << "Warning, " << std::string(endpoint) << " is not in service list." << std::endl;
-  }
-
-  q = new msgq_queue_t;
-  int r = msgq_new_queue(q, endpoint.c_str(), get_size(endpoint));
-  if (r != 0){
-    return r;
-  }
-
-  msgq_init_publisher(q);
-
-  return 0;
-}
-
-int MSGQPubSocket::sendMessage(Message *message){
-  msgq_msg_t msg;
-  msg.data = message->getData();
-  msg.size = message->getSize();
-
-  return msgq_msg_send(&msg, q);
-}
-
-int MSGQPubSocket::send(char *data, size_t size){
-  msgq_msg_t msg;
-  msg.data = data;
-  msg.size = size;
-
-  return msgq_msg_send(&msg, q);
-}
-
-MSGQPubSocket::~MSGQPubSocket(){
-  if (q != NULL){
-    msgq_close_queue(q);
-    delete q;
-  }
-}
-
-
-void MSGQPoller::registerSocket(SubSocket * socket){
-  assert(num_polls + 1 < MAX_POLLERS);
-  polls[num_polls].q = (msgq_queue_t*)socket->getRawSocket();
-
-  sockets.push_back(socket);
-  num_polls++;
-}
-
-std::vector<SubSocket*> MSGQPoller::poll(int timeout){
-  std::vector<SubSocket*> r;
-
-  msgq_poll(polls, num_polls, timeout);
-  for (size_t i = 0; i < num_polls; i++){
-    if (polls[i].revents){
-      r.push_back(sockets[i]);
-    }
-  }
-
-  return r;
-}

cereal/messaging/impl_msgq.hpp

@@ -1,64 +0,0 @@
-#pragma once
-#include "messaging.hpp"
-#include "msgq.hpp"
-#include <zmq.h>
-#include <string>
-
-#define MAX_POLLERS 128
-
-class MSGQContext : public Context {
-private:
-  void * context = NULL;
-public:
-  MSGQContext();
-  void * getRawContext() {return context;}
-  ~MSGQContext();
-};
-
-class MSGQMessage : public Message {
-private:
-  char * data;
-  size_t size;
-public:
-  void init(size_t size);
-  void init(char *data, size_t size);
-  void takeOwnership(char *data, size_t size);
-  size_t getSize(){return size;}
-  char * getData(){return data;}
-  void close();
-  ~MSGQMessage();
-};
-
-class MSGQSubSocket : public SubSocket {
-private:
-  msgq_queue_t * q = NULL;
-  int timeout;
-public:
-  int connect(Context *context, std::string endpoint, std::string address, bool conflate=false, bool check_endpoint=true);
-  void setTimeout(int timeout);
-  void * getRawSocket() {return (void*)q;}
-  Message *receive(bool non_blocking=false);
-  ~MSGQSubSocket();
-};
-
-class MSGQPubSocket : public PubSocket {
-private:
-  msgq_queue_t * q = NULL;
-public:
-  int connect(Context *context, std::string endpoint, bool check_endpoint=true);
-  int sendMessage(Message *message);
-  int send(char *data, size_t size);
-  ~MSGQPubSocket();
-};
-
-class MSGQPoller : public Poller {
-private:
-  std::vector<SubSocket*> sockets;
-  msgq_pollitem_t polls[MAX_POLLERS];
-  size_t num_polls = 0;
-
-public:
-  void registerSocket(SubSocket *socket);
-  std::vector<SubSocket*> poll(int timeout);
-  ~MSGQPoller(){};
-};

cereal/messaging/impl_zmq.cc

@@ -1,163 +0,0 @@
-#include <cassert>
-#include <cstring>
-#include <iostream>
-#include <cstdlib>
-#include <cerrno>
-
-#include <zmq.h>
-
-#include "services.h"
-#include "impl_zmq.hpp"
-
-static int get_port(std::string endpoint) {
-  int port = -1;
-  for (const auto& it : services) {
-    std::string name = it.name;
-    if (name == endpoint) {
-      port = it.port;
-      break;
-    }
-  }
-
-  assert(port >= 0);
-  return port;
-}
-
-ZMQContext::ZMQContext() {
-  context = zmq_ctx_new();
-}
-
-ZMQContext::~ZMQContext() {
-  zmq_ctx_term(context);
-}
-
-void ZMQMessage::init(size_t sz) {
-  size = sz;
-  data = new char[size];
-}
-
-void ZMQMessage::init(char * d, size_t sz) {
-  size = sz;
-  data = new char[size];
-  memcpy(data, d, size);
-}
-
-void ZMQMessage::close() {
-  if (size > 0){
-    delete[] data;
-  }
-  size = 0;
-}
-
-ZMQMessage::~ZMQMessage() {
-  this->close();
-}
-
-
-int ZMQSubSocket::connect(Context *context, std::string endpoint, std::string address, bool conflate, bool check_endpoint){
-  sock = zmq_socket(context->getRawContext(), ZMQ_SUB);
-  if (sock == NULL){
-    return -1;
-  }
-
-  zmq_setsockopt(sock, ZMQ_SUBSCRIBE, "", 0);
-
-  if (conflate){
-    int arg = 1;
-    zmq_setsockopt(sock, ZMQ_CONFLATE, &arg, sizeof(int));
-  }
-
-  int reconnect_ivl = 500;
-  zmq_setsockopt(sock, ZMQ_RECONNECT_IVL_MAX, &reconnect_ivl, sizeof(reconnect_ivl));
-
-  full_endpoint = "tcp://" + address + ":";
-  if (check_endpoint){
-    full_endpoint += std::to_string(get_port(endpoint));
-  } else {
-    full_endpoint += endpoint;
-  }
-
-  return zmq_connect(sock, full_endpoint.c_str());
-}
-
-
-Message * ZMQSubSocket::receive(bool non_blocking){
-  zmq_msg_t msg;
-  assert(zmq_msg_init(&msg) == 0);
-
-  int flags = non_blocking ? ZMQ_DONTWAIT : 0;
-  int rc = zmq_msg_recv(&msg, sock, flags);
-  Message *r = NULL;
-
-  if (rc >= 0){
-    // Make a copy to ensure the data is aligned
-    r = new ZMQMessage;
-    r->init((char*)zmq_msg_data(&msg), zmq_msg_size(&msg));
-  }
-
-  zmq_msg_close(&msg);
-  return r;
-}
-
-void ZMQSubSocket::setTimeout(int timeout){
-  zmq_setsockopt(sock, ZMQ_RCVTIMEO, &timeout, sizeof(int));
-}
-
-ZMQSubSocket::~ZMQSubSocket(){
-  zmq_close(sock);
-}
-
-int ZMQPubSocket::connect(Context *context, std::string endpoint, bool check_endpoint){
-  sock = zmq_socket(context->getRawContext(), ZMQ_PUB);
-  if (sock == NULL){
-    return -1;
-  }
-
-  full_endpoint = "tcp://*:";
-  if (check_endpoint){
-    full_endpoint += std::to_string(get_port(endpoint));
-  } else {
-    full_endpoint += endpoint;
-  }
-
-  return zmq_bind(sock, full_endpoint.c_str());
-}
-
-int ZMQPubSocket::sendMessage(Message *message){
-  return zmq_send(sock, message->getData(), message->getSize(), ZMQ_DONTWAIT);
-}
-
-int ZMQPubSocket::send(char *data, size_t size){
-  return zmq_send(sock, data, size, ZMQ_DONTWAIT);
-}
-
-ZMQPubSocket::~ZMQPubSocket(){
-  zmq_close(sock);
-}
-
-
-void ZMQPoller::registerSocket(SubSocket * socket){
-  assert(num_polls + 1 < MAX_POLLERS);
-  polls[num_polls].socket = socket->getRawSocket();
-  polls[num_polls].events = ZMQ_POLLIN;
-
-  sockets.push_back(socket);
-  num_polls++;
-}
-
-std::vector<SubSocket*> ZMQPoller::poll(int timeout){
-  std::vector<SubSocket*> r;
-
-  int rc = zmq_poll(polls, num_polls, timeout);
-  if (rc < 0){
-    return r;
-  }
-
-  for (size_t i = 0; i < num_polls; i++){
-    if (polls[i].revents){
-      r.push_back(sockets[i]);
-    }
-  }
-
-  return r;
-}

cereal/messaging/impl_zmq.hpp

@@ -1,63 +0,0 @@
-#pragma once
-#include "messaging.hpp"
-#include <zmq.h>
-#include <string>
-
-#define MAX_POLLERS 128
-
-class ZMQContext : public Context {
-private:
-  void * context = NULL;
-public:
-  ZMQContext();
-  void * getRawContext() {return context;}
-  ~ZMQContext();
-};
-
-class ZMQMessage : public Message {
-private:
-  char * data;
-  size_t size;
-public:
-  void init(size_t size);
-  void init(char *data, size_t size);
-  size_t getSize(){return size;}
-  char * getData(){return data;}
-  void close();
-  ~ZMQMessage();
-};
-
-class ZMQSubSocket : public SubSocket {
-private:
-  void * sock;
-  std::string full_endpoint;
-public:
-  int connect(Context *context, std::string endpoint, std::string address, bool conflate=false, bool check_endpoint=true);
-  void setTimeout(int timeout);
-  void * getRawSocket() {return sock;}
-  Message *receive(bool non_blocking=false);
-  ~ZMQSubSocket();
-};
-
-class ZMQPubSocket : public PubSocket {
-private:
-  void * sock;
-  std::string full_endpoint;
-public:
-  int connect(Context *context, std::string endpoint, bool check_endpoint=true);
-  int sendMessage(Message *message);
-  int send(char *data, size_t size);
-  ~ZMQPubSocket();
-};
-
-class ZMQPoller : public Poller {
-private:
-  std::vector<SubSocket*> sockets;
-  zmq_pollitem_t polls[MAX_POLLERS];
-  size_t num_polls = 0;
-
-public:
-  void registerSocket(SubSocket *socket);
-  std::vector<SubSocket*> poll(int timeout);
-  ~ZMQPoller(){};
-};

cereal/messaging/messaging.cc

@@ -1,103 +0,0 @@
-#include "messaging.hpp"
-#include "impl_zmq.hpp"
-#include "impl_msgq.hpp"
-
-#ifdef __APPLE__
-const bool MUST_USE_ZMQ = true;
-#else
-const bool MUST_USE_ZMQ = false;
-#endif
-
-bool messaging_use_zmq(){
-  return std::getenv("ZMQ") || MUST_USE_ZMQ;
-}
-
-Context * Context::create(){
-  Context * c;
-  if (messaging_use_zmq()){
-    c = new ZMQContext();
-  } else {
-    c = new MSGQContext();
-  }
-  return c;
-}
-
-SubSocket * SubSocket::create(){
-  SubSocket * s;
-  if (messaging_use_zmq()){
-    s = new ZMQSubSocket();
-  } else {
-    s = new MSGQSubSocket();
-  }
-  return s;
-}
-
-SubSocket * SubSocket::create(Context * context, std::string endpoint, std::string address, bool conflate, bool check_endpoint){
-  SubSocket *s = SubSocket::create();
-  int r = s->connect(context, endpoint, address, conflate, check_endpoint);
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-PubSocket * PubSocket::create(){
-  PubSocket * s;
-  if (messaging_use_zmq()){
-    s = new ZMQPubSocket();
-  } else {
-    s = new MSGQPubSocket();
-  }
-  return s;
-}
-
-PubSocket * PubSocket::create(Context * context, std::string endpoint, bool check_endpoint){
-  PubSocket *s = PubSocket::create();
-  int r = s->connect(context, endpoint, check_endpoint);
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-Poller * Poller::create(){
-  Poller * p;
-  if (messaging_use_zmq()){
-    p = new ZMQPoller();
-  } else {
-    p = new MSGQPoller();
-  }
-  return p;
-}
-
-Poller * Poller::create(std::vector<SubSocket*> sockets){
-  Poller * p = Poller::create();
-
-  for (auto s : sockets){
-    p->registerSocket(s);
-  }
-  return p;
-}
-
-extern "C" Context * messaging_context_create() {
-  return Context::create();
-}
-
-extern "C" SubSocket * messaging_subsocket_create(Context* context, const char* endpoint) {
-  return SubSocket::create(context, std::string(endpoint));
-}
-
-extern "C" PubSocket * messaging_pubsocket_create(Context* context, const char* endpoint) {
-  return PubSocket::create(context, std::string(endpoint));
-}
-
-extern "C" Poller * messaging_poller_create(SubSocket** sockets, int size) {
-  std::vector<SubSocket*> socketsVec(sockets, sockets + size);
-  return Poller::create(socketsVec);
-}

cereal/messaging/messaging.hpp

@@ -1,122 +0,0 @@
-#pragma once
-#include <cstddef>
-#include <map>
-#include <string>
-#include <vector>
-#include <capnp/serialize.h>
-#include "../gen/cpp/log.capnp.h"
-
-#ifdef __APPLE__
-#define CLOCK_BOOTTIME CLOCK_MONOTONIC
-#endif
-
-#define MSG_MULTIPLE_PUBLISHERS 100
-
-bool messaging_use_zmq();
-
-class Context {
-public:
-  virtual void * getRawContext() = 0;
-  static Context * create();
-  virtual ~Context(){};
-};
-
-class Message {
-public:
-  virtual void init(size_t size) = 0;
-  virtual void init(char * data, size_t size) = 0;
-  virtual void close() = 0;
-  virtual size_t getSize() = 0;
-  virtual char * getData() = 0;
-  virtual ~Message(){};
-};
-
-
-class SubSocket {
-public:
-  virtual int connect(Context *context, std::string endpoint, std::string address, bool conflate=false, bool check_endpoint=true) = 0;
-  virtual void setTimeout(int timeout) = 0;
-  virtual Message *receive(bool non_blocking=false) = 0;
-  virtual void * getRawSocket() = 0;
-  static SubSocket * create();
-  static SubSocket * create(Context * context, std::string endpoint, std::string address="127.0.0.1", bool conflate=false, bool check_endpoint=true);
-  virtual ~SubSocket(){};
-};
-
-class PubSocket {
-public:
-  virtual int connect(Context *context, std::string endpoint, bool check_endpoint=true) = 0;
-  virtual int sendMessage(Message *message) = 0;
-  virtual int send(char *data, size_t size) = 0;
-  static PubSocket * create();
-  static PubSocket * create(Context * context, std::string endpoint, bool check_endpoint=true);
-  static PubSocket * create(Context * context, std::string endpoint, int port, bool check_endpoint=true);
-  virtual ~PubSocket(){};
-};
-
-class Poller {
-public:
-  virtual void registerSocket(SubSocket *socket) = 0;
-  virtual std::vector<SubSocket*> poll(int timeout) = 0;
-  static Poller * create();
-  static Poller * create(std::vector<SubSocket*> sockets);
-  virtual ~Poller(){};
-};
-
-class SubMaster {
-public:
-  SubMaster(const std::initializer_list<const char *> &service_list,
-            const char *address = nullptr, const std::initializer_list<const char *> &ignore_alive = {});
-  int update(int timeout = 1000);
-  inline bool allAlive(const std::initializer_list<const char *> &service_list = {}) { return all_(service_list, false, true); }
-  inline bool allValid(const std::initializer_list<const char *> &service_list = {}) { return all_(service_list, true, false); }
-  inline bool allAliveAndValid(const std::initializer_list<const char *> &service_list = {}) { return all_(service_list, true, true); }
-  void drain();
-  ~SubMaster();
-
-  uint64_t frame = 0;
-  bool updated(const char *name) const;
-  uint64_t rcv_frame(const char *name) const;
-  cereal::Event::Reader &operator[](const char *name);
-
-private:
-  bool all_(const std::initializer_list<const char *> &service_list, bool valid, bool alive);
-  Poller *poller_ = nullptr;
-  struct SubMessage;
-  std::map<SubSocket *, SubMessage *> messages_;
-  std::map<std::string, SubMessage *> services_;
-};
-
-class MessageBuilder : public capnp::MallocMessageBuilder {
-public:
-  MessageBuilder() = default;
-
-  cereal::Event::Builder initEvent(bool valid = true) {
-    cereal::Event::Builder event = initRoot<cereal::Event>();
-    struct timespec t;
-    clock_gettime(CLOCK_BOOTTIME, &t);
-    uint64_t current_time = t.tv_sec * 1000000000ULL + t.tv_nsec;
-    event.setLogMonoTime(current_time);
-    event.setValid(valid);
-    return event;
-  }
-
-  kj::ArrayPtr<capnp::byte> toBytes() {
-    heapArray_ = capnp::messageToFlatArray(*this);
-    return heapArray_.asBytes();
-  }
-
-private:
-  kj::Array<capnp::word> heapArray_;
-};
-
-class PubMaster {
-public:
-  PubMaster(const std::initializer_list<const char *> &service_list);
-  inline int send(const char *name, capnp::byte *data, size_t size) { return sockets_.at(name)->send((char *)data, size); }
-  int send(const char *name, MessageBuilder &msg);
-  ~PubMaster();
-
-private:
-  std::map<std::string, PubSocket *> sockets_;
-};

cereal/messaging/messaging.pxd

@@ -1,39 +0,0 @@
-# distutils: language = c++
-#cython: language_level=3
-
-from libcpp.string cimport string
-from libcpp.vector cimport vector
-from libcpp cimport bool
-
-
-cdef extern from "messaging.hpp":
-  cdef cppclass Context:
-    @staticmethod
-    Context * create()
-
-  cdef cppclass Message:
-    void init(size_t)
-    void init(char *, size_t)
-    void close()
-    size_t getSize()
-    char *getData()
-
-  cdef cppclass SubSocket:
-    @staticmethod
-    SubSocket * create()
-    int connect(Context *, string, string, bool)
-    Message * receive(bool)
-    void setTimeout(int)
-
-  cdef cppclass PubSocket:
-    @staticmethod
-    PubSocket * create()
-    int connect(Context *, string)
-    int sendMessage(Message *)
-    int send(char *, size_t)
-
-  cdef cppclass Poller:
-    @staticmethod
-    Poller * create()
-    void registerSocket(SubSocket *)
-    vector[SubSocket*] poll(int) nogil

cereal/messaging/messaging_pyx.pyx

@@ -1,151 +0,0 @@
-# distutils: language = c++
-# cython: c_string_encoding=ascii, language_level=3
-
-import sys
-from libcpp.string cimport string
-from libcpp cimport bool
-from libc cimport errno
-
-
-from .messaging cimport Context as cppContext
-from .messaging cimport SubSocket as cppSubSocket
-from .messaging cimport PubSocket as cppPubSocket
-from .messaging cimport Poller as cppPoller
-from .messaging cimport Message as cppMessage
-
-
-class MessagingError(Exception):
-  pass
-
-
-class MultiplePublishersError(MessagingError):
-  pass
-
-
-cdef class Context:
-  cdef cppContext * context
-
-  def __cinit__(self):
-    self.context = cppContext.create()
-
-  def term(self):
-    del self.context
-    self.context = NULL
-
-  def __dealloc__(self):
-    pass
-    # Deleting the context will hang if sockets are still active
-    # TODO: Figure out a way to make sure the context is closed last
-    # del self.context
-
-
-cdef class Poller:
-  cdef cppPoller * poller
-  cdef list sub_sockets
-
-  def __cinit__(self):
-    self.sub_sockets = []
-    self.poller = cppPoller.create()
-
-  def __dealloc__(self):
-    del self.poller
-
-  def registerSocket(self, SubSocket socket):
-    self.sub_sockets.append(socket)
-    self.poller.registerSocket(socket.socket)
-
-  def poll(self, timeout):
-    sockets = []
-    cdef int t = timeout
-
-    with nogil:
-      result = self.poller.poll(t)
-
-    for s in result:
-      socket = SubSocket()
-      socket.setPtr(s)
-      sockets.append(socket)
-
-    return sockets
-
-cdef class SubSocket:
-  cdef cppSubSocket * socket
-  cdef bool is_owner
-
-  def __cinit__(self):
-    self.socket = cppSubSocket.create()
-    self.is_owner = True
-
-    if self.socket == NULL:
-      raise MessagingError
-
-  def __dealloc__(self):
-    if self.is_owner:
-      del self.socket
-
-  cdef setPtr(self, cppSubSocket * ptr):
-    if self.is_owner:
-      del self.socket
-
-    self.is_owner = False
-    self.socket = ptr
-
-  def connect(self, Context context, string endpoint, string address=b"127.0.0.1", bool conflate=False):
-    r = self.socket.connect(context.context, endpoint, address, conflate)
-
-    if r != 0:
-      if errno.errno == errno.EADDRINUSE:
-        raise MultiplePublishersError
-      else:
-        raise MessagingError
-
-  def setTimeout(self, int timeout):
-    self.socket.setTimeout(timeout)
-
-  def receive(self, bool non_blocking=False):
-    msg = self.socket.receive(non_blocking)
-
-    if msg == NULL:
-      # If a blocking read returns no message check errno if SIGINT was caught in the C++ code
-      if errno.errno == errno.EINTR:
-        print("SIGINT received, exiting")
-        sys.exit(1)
-
-      return None
-    else:
-      sz = msg.getSize()
-      m = msg.getData()[:sz]
-      del msg
-
-      return m
-
-
-cdef class PubSocket:
-  cdef cppPubSocket * socket
-
-  def __cinit__(self):
-    self.socket = cppPubSocket.create()
-    if self.socket == NULL:
-      raise MessagingError
-
-  def __dealloc__(self):
-    del self.socket
-
-  def connect(self, Context context, string endpoint):
-    r = self.socket.connect(context.context, endpoint)
-
-    if r != 0:
-      if errno.errno == errno.EADDRINUSE:
-        raise MultiplePublishersError
-      else:
-        raise MessagingError
-
-  def send(self, bytes data):
-    length = len(data)
-    r = self.socket.send(<char*>data, length)
-
-    if r != length:
-      if errno.errno == errno.EADDRINUSE:
-        raise MultiplePublishersError
-      else:
-        raise MessagingError

cereal/messaging/msgq.cc

@@ -1,454 +0,0 @@
-#include <iostream>
-#include <cassert>
-#include <cerrno>
-#include <cmath>
-#include <cstring>
-#include <cstdint>
-#include <chrono>
-#include <algorithm>
-#include <cstdlib>
-#include <csignal>
-#include <random>
-
-#include <poll.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <stdio.h>
-
-#include "msgq.hpp"
-
-void sigusr2_handler(int signal) {
-  assert(signal == SIGUSR2);
-}
-
-uint64_t msgq_get_uid(void){
-  std::random_device rd("/dev/urandom");
-  std::uniform_int_distribution<uint64_t> distribution(0,std::numeric_limits<uint32_t>::max());
-
-  #ifdef __APPLE__
-    // TODO: this doesn't work
-    uint64_t uid = distribution(rd) << 32 | getpid();
-  #else
-    uint64_t uid = distribution(rd) << 32 | syscall(SYS_gettid);
-  #endif
-
-  return uid;
-}
-
-int msgq_msg_init_size(msgq_msg_t * msg, size_t size){
-  msg->size = size;
-  msg->data = new(std::nothrow) char[size];
-
-  return (msg->data == NULL) ? -1 : 0;
-}
-
-
-int msgq_msg_init_data(msgq_msg_t * msg, char * data, size_t size) {
-  int r = msgq_msg_init_size(msg, size);
-
-  if (r == 0)
-    memcpy(msg->data, data, size);
-
-  return r;
-}
-
-int msgq_msg_close(msgq_msg_t * msg){
-  if (msg->size > 0)
-    delete[] msg->data;
-
-  msg->size = 0;
-
-  return 0;
-}
-
-void msgq_reset_reader(msgq_queue_t * q){
-  int id = q->reader_id;
-  q->read_valids[id]->store(true);
-  q->read_pointers[id]->store(*q->write_pointer);
-}
-
-void msgq_wait_for_subscriber(msgq_queue_t *q){
-  while (*q->num_readers == 0){
-    ;
-  }
-
-  return;
-}
-
-
-int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size){
-  assert(size < 0xFFFFFFFF); // Buffer must be smaller than 2^32 bytes
-  std::signal(SIGUSR2, sigusr2_handler);
-
-  const char * prefix = "/dev/shm/";
-  char * full_path = new char[strlen(path) + strlen(prefix) + 1];
-  strcpy(full_path, prefix);
-  strcat(full_path, path);
-
-  auto fd = open(full_path, O_RDWR | O_CREAT, 0777);
-  if (fd < 0) {
-    std::cout << "Warning, could not open: " << full_path << std::endl;
-    delete[] full_path;
-    return -1;
-  }
-  delete[] full_path;
-
-  int rc = ftruncate(fd, size + sizeof(msgq_header_t));
-  if (rc < 0){
-    close(fd);
-    return -1;
-  }
-  char * mem = (char*)mmap(NULL, size + sizeof(msgq_header_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-  close(fd);
-
-  if (mem == NULL){
-    return -1;
-  }
-  q->mmap_p = mem;
-
-  msgq_header_t *header = (msgq_header_t *)mem;
-
-  // Setup pointers to header segment
-  q->num_readers = reinterpret_cast<std::atomic<uint64_t>*>(&header->num_readers);
-  q->write_pointer = reinterpret_cast<std::atomic<uint64_t>*>(&header->write_pointer);
-  q->write_uid = reinterpret_cast<std::atomic<uint64_t>*>(&header->write_uid);
-
-  for (size_t i = 0; i < NUM_READERS; i++){
-    q->read_pointers[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_pointers[i]);
-    q->read_valids[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_valids[i]);
-    q->read_uids[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_uids[i]);
-  }
-
-  q->data = mem + sizeof(msgq_header_t);
-  q->size = size;
-  q->reader_id = -1;
-
-  q->endpoint = path;
-  q->read_conflate = false;
-
-  return 0;
-}
-
-void msgq_close_queue(msgq_queue_t *q){
-  if (q->mmap_p != NULL){
-    munmap(q->mmap_p, q->size + sizeof(msgq_header_t));
-  }
-}
-
-
-void msgq_init_publisher(msgq_queue_t * q) {
-  //std::cout << "Starting publisher" << std::endl;
-  uint64_t uid = msgq_get_uid();
-
-  *q->write_uid = uid;
-  *q->num_readers = 0;
-
-  for (size_t i = 0; i < NUM_READERS; i++){
-    *q->read_valids[i] = false;
-    *q->read_uids[i] = 0;
-  }
-
-  q->write_uid_local = uid;
-}
-
-static void thread_signal(uint32_t tid) {
-  #ifndef SYS_tkill
-    // TODO: this won't work for multithreaded programs
-    kill(tid, SIGUSR2);
-  #else
-    syscall(SYS_tkill, tid, SIGUSR2);
-  #endif
-}
-
-void msgq_init_subscriber(msgq_queue_t * q) {
-  assert(q != NULL);
-  assert(q->num_readers != NULL);
-
-  uint64_t uid = msgq_get_uid();
-
-  // Get reader id
-  while (true){
-    uint64_t cur_num_readers = *q->num_readers;
-    uint64_t new_num_readers = cur_num_readers + 1;
-
-    // No more slots available. Reset all subscribers to kick out inactive ones
-    if (new_num_readers > NUM_READERS){
-      std::cout << "Warning, evicting all subscribers!" << std::endl;
-      *q->num_readers = 0;
-
-      for (size_t i = 0; i < NUM_READERS; i++){
-        *q->read_valids[i] = false;
-
-        uint64_t old_uid = *q->read_uids[i];
-        *q->read_uids[i] = 0;
-
-        // Wake up reader in case they are in a poll
-        thread_signal(old_uid & 0xFFFFFFFF);
-      }
-
-      continue;
-    }
-
-    // Use atomic compare and swap to handle race condition
-    // where two subscribers start at the same time
-    if (std::atomic_compare_exchange_strong(q->num_readers,
-                                            &cur_num_readers,
-                                            new_num_readers)){
-      q->reader_id = cur_num_readers;
-      q->read_uid_local = uid;
-
-      // We start with read_valid = false,
-      // on the first read the read pointer will be synchronized with the write pointer
-      *q->read_valids[cur_num_readers] = false;
-      *q->read_pointers[cur_num_readers] = 0;
-      *q->read_uids[cur_num_readers] = uid;
-      break;
-    }
-  }
-
-  //std::cout << "New subscriber id: " << q->reader_id << " uid: " << q->read_uid_local << " " << q->endpoint << std::endl;
-  msgq_reset_reader(q);
-}
-
-int msgq_msg_send(msgq_msg_t * msg, msgq_queue_t *q){
-  // Die if we are no longer the active publisher
-  if (q->write_uid_local != *q->write_uid){
-    std::cout << "Killing old publisher: " << q->endpoint << std::endl;
-    errno = EADDRINUSE;
-    return -1;
-  }
-
-  uint64_t total_msg_size = ALIGN(msg->size + sizeof(int64_t));
-
-  // We need to fit at least three messages in the queue,
-  // then we can always safely access the last message
-  assert(3 * total_msg_size <= q->size);
-
-  uint64_t num_readers = *q->num_readers;
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  char *p = q->data + write_pointer; // add base offset
-
-  // Check remaining space
-  // Always leave space for a wraparound tag for the next message, including alignment
-  int64_t remaining_space = q->size - write_pointer - total_msg_size - sizeof(int64_t);
-  if (remaining_space <= 0){
-    // Write -1 size tag indicating wraparound
-    *(int64_t*)p = -1;
-
-    // Invalidate all readers that are beyond the write pointer
-    // TODO: should we handle the case where a new reader shows up while this is running?
-    for (uint64_t i = 0; i < num_readers; i++){
-      uint64_t read_pointer = *q->read_pointers[i];
-      uint64_t read_cycles = read_pointer >> 32;
-      read_pointer &= 0xFFFFFFFF;
-
-      if ((read_pointer > write_pointer) && (read_cycles != write_cycles)) {
-        *q->read_valids[i] = false;
-      }
-    }
-
-    // Update global and local copies of write pointer and write_cycles
-    write_pointer = 0;
-    write_cycles = write_cycles + 1;
-    PACK64(*q->write_pointer, write_cycles, write_pointer);
-
-    // Set actual pointer to the beginning of the data segment
-    p = q->data;
-  }
-
-  // Invalidate readers that are in the area that will be written
-  uint64_t start = write_pointer;
-  uint64_t end = ALIGN(start + sizeof(int64_t) + msg->size);
-
-  for (uint64_t i = 0; i < num_readers; i++){
-    uint32_t read_cycles, read_pointer;
-    UNPACK64(read_cycles, read_pointer, *q->read_pointers[i]);
-
-    if ((read_pointer >= start) && (read_pointer < end) && (read_cycles != write_cycles)) {
-      *q->read_valids[i] = false;
-    }
-  }
-
-
-  // Write size tag
-  std::atomic<int64_t> *size_p = reinterpret_cast<std::atomic<int64_t>*>(p);
-  *size_p = msg->size;
-
-  // Copy data
-  memcpy(p + sizeof(int64_t), msg->data, msg->size);
-  __sync_synchronize();
-
-  // Update write pointer
-  uint32_t new_ptr = ALIGN(write_pointer + msg->size + sizeof(int64_t));
-  PACK64(*q->write_pointer, write_cycles, new_ptr);
-
-  // Notify readers
-  for (uint64_t i = 0; i < num_readers; i++){
-    uint64_t reader_uid = *q->read_uids[i];
-    thread_signal(reader_uid & 0xFFFFFFFF);
-  }
-
-  return msg->size;
-}
-
-
-int msgq_msg_ready(msgq_queue_t * q){
- start:
-  int id = q->reader_id;
-  assert(id >= 0); // Make sure subscriber is initialized
-
-  if (q->read_uid_local != *q->read_uids[id]){
-    std::cout << q->endpoint << ": Reader was evicted, reconnecting" << std::endl;
-    msgq_init_subscriber(q);
-    goto start;
-  }
-
-  // Check valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  uint32_t read_cycles, read_pointer;
-  UNPACK64(read_cycles, read_pointer, *q->read_pointers[id]);
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  // Check if new message is available
-  return (read_pointer != write_pointer);
-}
-
-int msgq_msg_recv(msgq_msg_t * msg, msgq_queue_t * q){
- start:
-  int id = q->reader_id;
-  assert(id >= 0); // Make sure subscriber is initialized
-
-  if (q->read_uid_local != *q->read_uids[id]){
-    std::cout << q->endpoint << ": Reader was evicted, reconnecting" << std::endl;
-    msgq_init_subscriber(q);
-    goto start;
-  }
-
-  // Check valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  uint32_t read_cycles, read_pointer;
-  UNPACK64(read_cycles, read_pointer, *q->read_pointers[id]);
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  char * p = q->data + read_pointer;
-
-  // Check if new message is available
-  if (read_pointer == write_pointer) {
-    msg->size = 0;
-    return 0;
-  }
-
-  // Read potential message size
-  std::atomic<int64_t> *size_p = reinterpret_cast<std::atomic<int64_t>*>(p);
-  std::int64_t size = *size_p;
-
-  // Check if the size that was read is valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  // If size is -1 the buffer was full, and we need to wrap around
-  if (size == -1){
-    read_cycles++;
-    PACK64(*q->read_pointers[id], read_cycles, 0);
-    goto start;
-  }
-
-  // crashing is better than passing garbage data to the consumer
-  // the size will have weird value if it was overwritten by data accidentally
-  assert((uint64_t)size < q->size);
-  assert(size > 0);
-
-  uint32_t new_read_pointer = ALIGN(read_pointer + sizeof(std::int64_t) + size);
-
-  // If conflate is true, check if this is the latest message, else start over
-  if (q->read_conflate){
-    if (new_read_pointer != write_pointer){
-      // Update read pointer
-      PACK64(*q->read_pointers[id], read_cycles, new_read_pointer);
-      goto start;
-    }
-  }
-
-  // Copy message
-  if (msgq_msg_init_size(msg, size) < 0)
-    return -1;
-
-  __sync_synchronize();
-  memcpy(msg->data, p + sizeof(int64_t), size);
-  __sync_synchronize();
-
-  // Update read pointer
-  PACK64(*q->read_pointers[id], read_cycles, new_read_pointer);
-
-  // Check if the actual data that was copied is valid
-  if (!*q->read_valids[id]){
-    msgq_msg_close(msg);
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-
-  return msg->size;
-}
-
-
-
-int msgq_poll(msgq_pollitem_t * items, size_t nitems, int timeout){
-  int num = 0;
-
-  // Check if messages ready
-  for (size_t i = 0; i < nitems; i++) {
-    items[i].revents = msgq_msg_ready(items[i].q);
-    if (items[i].revents) num++;
-  }
-
-  int ms = (timeout == -1) ? 100 : timeout;
-  struct timespec ts;
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000 * 1000;
-
-
-  while (num == 0) {
-    int ret;
-
-    ret = nanosleep(&ts, &ts);
-
-    // Check if messages ready
-    for (size_t i = 0; i < nitems; i++) {
-      if (items[i].revents == 0 && msgq_msg_ready(items[i].q)){
-        num += 1;
-        items[i].revents = 1;
-      }
-    }
-
-    // exit if we had a timeout and the sleep finished
-    if (timeout != -1 && ret == 0){
-      break;
-    }
-  }
-
-  return num;
-}

cereal/messaging/msgq.hpp

@@ -1,66 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <atomic>
-
-#define DEFAULT_SEGMENT_SIZE (10 * 1024 * 1024)
-#define NUM_READERS 8
-#define ALIGN(n) ((n + (8 - 1)) & -8)
-
-#define UNPACK64(higher, lower, input) do {uint64_t tmp = input; higher = tmp >> 32; lower = tmp & 0xFFFFFFFF;} while (0)
-#define PACK64(output, higher, lower) output = ((uint64_t)higher << 32 ) | ((uint64_t)lower & 0xFFFFFFFF)
-
-struct  msgq_header_t {
-  uint64_t num_readers;
-  uint64_t write_pointer;
-  uint64_t write_uid;
-  uint64_t read_pointers[NUM_READERS];
-  uint64_t read_valids[NUM_READERS];
-  uint64_t read_uids[NUM_READERS];
-};
-
-struct msgq_queue_t {
-  std::atomic<uint64_t> *num_readers;
-  std::atomic<uint64_t> *write_pointer;
-  std::atomic<uint64_t> *write_uid;
-  std::atomic<uint64_t> *read_pointers[NUM_READERS];
-  std::atomic<uint64_t> *read_valids[NUM_READERS];
-  std::atomic<uint64_t> *read_uids[NUM_READERS];
-  char * mmap_p;
-  char * data;
-  size_t size;
-  int reader_id;
-  uint64_t read_uid_local;
-  uint64_t write_uid_local;
-
-  bool read_conflate;
-  std::string endpoint;
-};
-
-struct msgq_msg_t {
-  size_t size;
-  char * data;
-};
-
-struct msgq_pollitem_t {
-  msgq_queue_t *q;
-  int revents;
-};
-
-void msgq_wait_for_subscriber(msgq_queue_t *q);
-void msgq_reset_reader(msgq_queue_t *q);
-
-int msgq_msg_init_size(msgq_msg_t *msg, size_t size);
-int msgq_msg_init_data(msgq_msg_t *msg, char * data, size_t size);
-int msgq_msg_close(msgq_msg_t *msg);
-
-int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size);
-void msgq_close_queue(msgq_queue_t *q);
-void msgq_init_publisher(msgq_queue_t * q);
-void msgq_init_subscriber(msgq_queue_t * q);
-
-int msgq_msg_send(msgq_msg_t *msg, msgq_queue_t *q);
-int msgq_msg_recv(msgq_msg_t *msg, msgq_queue_t *q);
-int msgq_msg_ready(msgq_queue_t * q);
-int msgq_poll(msgq_pollitem_t * items, size_t nitems, int timeout);

cereal/messaging/socketmaster.cc

@@ -1,170 +0,0 @@
-#include <assert.h>
-#include <time.h>
-#include "messaging.hpp"
-#include "services.h"
-
-static inline uint64_t nanos_since_boot() {
-  struct timespec t;
-  clock_gettime(CLOCK_BOOTTIME, &t);
-  return t.tv_sec * 1000000000ULL + t.tv_nsec;
-}
-
-static const service *get_service(const char *name) {
-  for (const auto &it : services) {
-    if (strcmp(it.name, name) == 0) return &it;
-  }
-  return nullptr;
-}
-
-static inline bool inList(const std::initializer_list<const char *> &list, const char *value) {
-  for (auto &v : list) {
-    if (strcmp(value, v) == 0) return true;
-  }
-  return false;
-}
-
-class MessageContext {
-public:
-  MessageContext() { ctx_ = Context::create(); }
-  ~MessageContext() { delete ctx_; }
-  Context *ctx_;
-};
-MessageContext ctx;
-
-struct SubMaster::SubMessage {
-  std::string name;
-  SubSocket *socket = nullptr;
-  int freq = 0;
-  bool updated = false, alive = false, valid = false, ignore_alive;
-  uint64_t rcv_time = 0, rcv_frame = 0;
-  void *allocated_msg_reader = nullptr;
-  capnp::FlatArrayMessageReader *msg_reader = nullptr;
-  kj::Array<capnp::word> buf;
-  cereal::Event::Reader event;
-};
-
-SubMaster::SubMaster(const std::initializer_list<const char *> &service_list, const char *address,
-                     const std::initializer_list<const char *> &ignore_alive) {
-  poller_ = Poller::create();
-  for (auto name : service_list) {
-    const service *serv = get_service(name);
-    assert(serv != nullptr);
-    SubSocket *socket = SubSocket::create(ctx.ctx_, name, address ? address : "127.0.0.1", true);
-    assert(socket != 0);
-    poller_->registerSocket(socket);
-    SubMessage *m = new SubMessage{
-      .socket = socket,
-      .freq = serv->frequency,
-      .ignore_alive = inList(ignore_alive, name),
-      .allocated_msg_reader = malloc(sizeof(capnp::FlatArrayMessageReader)),
-      .buf = kj::heapArray<capnp::word>(1024)};
-    messages_[socket] = m;
-    services_[name] = m;
-  }
-}
-
-int SubMaster::update(int timeout) {
-  if (++frame == UINT64_MAX) frame = 1;
-  for (auto &kv : messages_) kv.second->updated = false;
-
-  int updated = 0;
-  auto sockets = poller_->poll(timeout);
-  uint64_t current_time = nanos_since_boot();
-  for (auto s : sockets) {
-    Message *msg = s->receive(true);
-    if (msg == nullptr) continue;
-
-    SubMessage *m = messages_.at(s);
-    const size_t size = (msg->getSize() / sizeof(capnp::word)) + 1;
-    if (m->buf.size() < size) {
-      m->buf = kj::heapArray<capnp::word>(size);
-    }
-    memcpy(m->buf.begin(), msg->getData(), msg->getSize());
-    delete msg;
-
-    if (m->msg_reader) {
-      m->msg_reader->~FlatArrayMessageReader();
-    }
-    m->msg_reader = new (m->allocated_msg_reader) capnp::FlatArrayMessageReader(kj::ArrayPtr<capnp::word>(m->buf.begin(), size));
-    m->event = m->msg_reader->getRoot<cereal::Event>();
-    m->updated = true;
-    m->rcv_time = current_time;
-    m->rcv_frame = frame;
-    m->valid = m->event.getValid();
-
-    ++updated;
-  }
-
-  for (auto &kv : messages_) {
-    SubMessage *m = kv.second;
-    m->alive = (m->freq <= (1e-5) || ((current_time - m->rcv_time) * (1e-9)) < (10.0 / m->freq));
-  }
-  return updated;
-}
-
-bool SubMaster::all_(const std::initializer_list<const char *> &service_list, bool valid, bool alive) {
-  int found = 0;
-  for (auto &kv : messages_) {
-    SubMessage *m = kv.second;
-    if (service_list.size() == 0 || inList(service_list, m->name.c_str())) {
-      found += (!valid || m->valid) && (!alive || (m->alive && !m->ignore_alive));
-    }
-  }
-  return service_list.size() == 0 ? found == messages_.size() : found == service_list.size();
-}
-
-void SubMaster::drain() {
-  while (true) {
-    auto polls = poller_->poll(0);
-    if (polls.size() == 0)
-      break;
-
-    for (auto sock : polls) {
-      Message *msg = sock->receive(true);
-      delete msg;
-    }
-  }
-}
-
-bool SubMaster::updated(const char *name) const {
-  return services_.at(name)->updated;
-}
-
-uint64_t SubMaster::rcv_frame(const char *name) const {
-  return services_.at(name)->rcv_frame;
-}
-
-cereal::Event::Reader &SubMaster::operator[](const char *name) {
-  return services_.at(name)->event;
-};
-
-SubMaster::~SubMaster() {
-  delete poller_;
-  for (auto &kv : messages_) {
-    SubMessage *m = kv.second;
-    if (m->msg_reader) {
-      m->msg_reader->~FlatArrayMessageReader();
-    }
-    free(m->allocated_msg_reader);
-    delete m->socket;
-    delete m;
-  }
-}
-
-PubMaster::PubMaster(const std::initializer_list<const char *> &service_list) {
-  for (auto name : service_list) {
-    assert(get_service(name) != nullptr);
-    PubSocket *socket = PubSocket::create(ctx.ctx_, name);
-    assert(socket);
-    sockets_[name] = socket;
-  }
-}
-
-int PubMaster::send(const char *name, MessageBuilder &msg) {
-  auto bytes = msg.toBytes();
-  return send(name, bytes.begin(), bytes.size());
-}
-
-PubMaster::~PubMaster() {
-  for (auto s : sockets_) delete s.second;
-}

cereal/services.py

@@ -1,84 +0,0 @@
-#!/usr/bin/env python3
-import os
-from typing import Optional
-
-EON = os.path.isfile('/EON')
-
-class Service:
-  def __init__(self, port: int, should_log: bool, frequency: float, decimation: Optional[int] = None):
-    self.port = port
-    self.should_log = should_log
-    self.frequency = frequency
-    self.decimation = decimation
-
-service_list = {
-  "roadCameraState": Service(8002, True, 20., 1),
-  "sensorEvents": Service(8003, True, 100., 100),
-  "gpsNMEA": Service(8004, True, 9.),
-  "deviceState": Service(8005, True, 2., 1),
-  "can": Service(8006, True, 100.),
-  "controlsState": Service(8007, True, 100., 100),
-  "features": Service(8010, True, 0.),
-  "pandaState": Service(8011, True, 2., 1),
-  "radarState": Service(8012, True, 20., 5),
-  "roadEncodeIdx": Service(8015, True, 20., 1),
-  "liveTracks": Service(8016, True, 20.),
-  "sendcan": Service(8017, True, 100.),
-  "logMessage": Service(8018, True, 0.),
-  "liveCalibration": Service(8019, True, 4., 4),
-  "androidLog": Service(8020, True, 0., 1),
-  "carState": Service(8021, True, 100., 10),
-  "carControl": Service(8023, True, 100., 10),
-  "longitudinalPlan": Service(8024, True, 20., 2),
-  "liveLocation": Service(8025, True, 0., 1),
-  "gpsLocation": Service(8026, True, 1., 1),
-  "procLog": Service(8031, True, 0.5),
-  "gpsLocationExternal": Service(8032, True, 10., 1),
-  "ubloxGnss": Service(8033, True, 10.),
-  "clocks": Service(8034, True, 1., 1),
-  "liveMpc": Service(8035, False, 20.),
-  "liveLongitudinalMpc": Service(8036, False, 20.),
-  "ubloxRaw": Service(8042, True, 20.),
-  "liveLocationKalman": Service(8054, True, 20., 2),
-  "uiLayoutState": Service(8060, True, 0.),
-  "liveParameters": Service(8064, True, 20., 2),
-  "cameraOdometry": Service(8066, True, 20., 5),
-  "lateralPlan": Service(8067, True, 20., 2),
-  "thumbnail": Service(8069, True, 0.2, 1),
-  "carEvents": Service(8070, True, 1., 1),
-  "carParams": Service(8071, True, 0.02, 1),
-  "driverCameraState": Service(8072, True, 10. if EON else 20., 1),
-  "driverEncodeIdx": Service(8061, True, 10. if EON else 20., 1),
-  "driverState": Service(8063, True, 10. if EON else 20., 1),
-  "driverMonitoringState": Service(8073, True, 10. if EON else 20., 1),
-  "offroadLayout": Service(8074, False, 0.),
-  "wideRoadEncodeIdx": Service(8075, True, 20., 1),
-  "wideRoadCameraState": Service(8076, True, 20., 1),
-  "modelV2": Service(8077, True, 20., 20),
-  "managerState": Service(8078, True, 2., 1),
-
-  "testModel": Service(8040, False, 0.),
-  "testLiveLocation": Service(8045, False, 0.),
-  "testJoystick": Service(8056, False, 0.),
-}
-
-
-def build_header():
-  h = ""
-  h += "/* THIS IS AN AUTOGENERATED FILE, PLEASE EDIT services.py */\n"
-  h += "#ifndef __SERVICES_H\n"
-  h += "#define __SERVICES_H\n"
-  h += "struct service { char name[0x100]; int port; bool should_log; int frequency; int decimation; };\n"
-  h += "static struct service services[] = {\n"
-  for k, v in service_list.items():
-    should_log = "true" if v.should_log else "false"
-    decimation = -1 if v.decimation is None else v.decimation
-    h += '  { .name = "%s", .port = %d, .should_log = %s, .frequency = %d, .decimation = %d },\n' % \
-         (k, v.port, should_log, v.frequency, decimation)
-  h += "};\n"
-  h += "#endif\n"
-  return h
-
-
-if __name__ == "__main__":
-  print(build_header())

cereal/visionipc/.gitignore

@@ -1,2 +0,0 @@
-visionipc_pyx.cpp
-*.so

cereal/visionipc/ipc.cc

@@ -1,121 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#ifdef __APPLE__
-#define getsocket() socket(AF_UNIX, SOCK_STREAM, 0)
-#else
-#define getsocket() socket(AF_UNIX, SOCK_SEQPACKET, 0)
-#endif
-
-#include "ipc.h"
-
-int ipc_connect(const char* socket_path) {
-  int err;
-
-  int sock = getsocket();
-
-  if (sock < 0) return -1;
-  struct sockaddr_un addr = {
-    .sun_family = AF_UNIX,
-  };
-  snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
-  err = connect(sock, (struct sockaddr*)&addr, sizeof(addr));
-  if (err != 0) {
-    close(sock);
-    return -1;
-  }
-
-  return sock;
-}
-
-int ipc_bind(const char* socket_path) {
-  int err;
-
-  unlink(socket_path);
-
-  int sock = getsocket();
-
-  struct sockaddr_un addr = {
-    .sun_family = AF_UNIX,
-  };
-  snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
-  err = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
-  assert(err == 0);
-
-  err = listen(sock, 3);
-  assert(err == 0);
-
-  return sock;
-}
-
-
-int ipc_sendrecv_with_fds(bool send, int fd, void *buf, size_t buf_size, int* fds, int num_fds,
-                          int *out_num_fds) {
-  char control_buf[CMSG_SPACE(sizeof(int) * num_fds)];
-  memset(control_buf, 0, CMSG_SPACE(sizeof(int) * num_fds));
-
-  struct iovec iov = {
-    .iov_base = buf,
-    .iov_len = buf_size,
-  };
-  struct msghdr msg = {
-    .msg_iov = &iov,
-    .msg_iovlen = 1,
-  };
-
-  if (num_fds > 0) {
-    assert(fds);
-
-    msg.msg_control = control_buf;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int) * num_fds);
-  }
-
-  if (send) {
-    if (num_fds) {
-      struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-      assert(cmsg);
-      cmsg->cmsg_level = SOL_SOCKET;
-      cmsg->cmsg_type = SCM_RIGHTS;
-      cmsg->cmsg_len = CMSG_LEN(sizeof(int) * num_fds);
-      memcpy(CMSG_DATA(cmsg), fds, sizeof(int) * num_fds);
-    }
-    return sendmsg(fd, &msg, 0);
-  } else {
-    int r = recvmsg(fd, &msg, 0);
-    if (r < 0) return r;
-
-    int recv_fds = 0;
-    if (msg.msg_controllen > 0) {
-      struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-      assert(cmsg);
-      assert(cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS);
-      recv_fds = (cmsg->cmsg_len - CMSG_LEN(0));
-      assert(recv_fds > 0 && (recv_fds % sizeof(int)) == 0);
-      recv_fds /= sizeof(int);
-
-      assert(fds && recv_fds <= num_fds);
-      memcpy(fds, CMSG_DATA(cmsg), sizeof(int) * recv_fds);
-    }
-
-    if (msg.msg_flags) {
-      for (int i=0; i<recv_fds; i++) {
-        close(fds[i]);
-      }
-      return -1;
-    }
-
-    if (fds) {
-      assert(out_num_fds);
-      *out_num_fds = recv_fds;
-    }
-    return r;
-  }
-}

cereal/visionipc/ipc.h

@@ -1,7 +0,0 @@
-#pragma once
-#include <cstddef>
-
-int ipc_connect(const char* socket_path);
-int ipc_bind(const char* socket_path);
-int ipc_sendrecv_with_fds(bool send, int fd, void *buf, size_t buf_size, int* fds, int num_fds,
-                          int *out_num_fds);

cereal/visionipc/test_runner.cc

@@ -1,2 +0,0 @@
-#define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"

cereal/visionipc/visionbuf.cc

@@ -1,40 +0,0 @@
-#include "visionbuf.h"
-
-#define ALIGN(x, align) (((x) + (align)-1) & ~((align)-1))
-
-#ifdef QCOM
-// from libadreno_utils.so
-extern "C" void compute_aligned_width_and_height(int width,
-                                                 int height,
-                                                 int bpp,
-                                                 int tile_mode,
-                                                 int raster_mode,
-                                                 int padding_threshold,
-                                                 int *aligned_w,
-                                                 int *aligned_h);
-#endif
-
-void visionbuf_compute_aligned_width_and_height(int width, int height, int *aligned_w, int *aligned_h) {
-#if defined(QCOM) && !defined(QCOM_REPLAY)
-  compute_aligned_width_and_height(ALIGN(width, 32), ALIGN(height, 32), 3, 0, 0, 512, aligned_w, aligned_h);
-#else
-  *aligned_w = width; *aligned_h = height;
-#endif
-}
-
-void VisionBuf::init_rgb(size_t width, size_t height, size_t stride) {
-  this->rgb = true;
-  this->width = width;
-  this->height = height;
-  this->stride = stride;
-}
-
-void VisionBuf::init_yuv(size_t width, size_t height){
-  this->rgb = false;
-  this->width = width;
-  this->height = height;
-
-  this->y = (uint8_t *)this->addr;
-  this->u = this->y + (width * height);
-  this->v = this->u + (width / 2 * height / 2);
-}

cereal/visionipc/visionbuf.h

@@ -1,63 +0,0 @@
-#pragma once
-#include "visionipc.h"
-
-#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#ifdef __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif
-
-#define VISIONBUF_SYNC_FROM_DEVICE 0
-#define VISIONBUF_SYNC_TO_DEVICE 1
-
-enum VisionStreamType {
-  VISION_STREAM_RGB_BACK,
-  VISION_STREAM_RGB_FRONT,
-  VISION_STREAM_RGB_WIDE,
-  VISION_STREAM_YUV_BACK,
-  VISION_STREAM_YUV_FRONT,
-  VISION_STREAM_YUV_WIDE,
-  VISION_STREAM_MAX,
-};
-
-class VisionBuf {
- public:
-  size_t len = 0;
-  size_t mmap_len = 0;
-  void * addr = nullptr;
-  int fd = 0;
-
-  bool rgb = false;
-  size_t width = 0;
-  size_t height = 0;
-  size_t stride = 0;
-
-  // YUV
-  uint8_t * y = nullptr;
-  uint8_t * u = nullptr;
-  uint8_t * v = nullptr;
-
-  // Visionipc
-  uint64_t server_id = 0;
-  size_t idx = 0;
-  VisionStreamType type;
-
-  // OpenCL
-  cl_mem buf_cl = nullptr;
-  cl_command_queue copy_q = nullptr;
-
-  // ion
-  int handle = 0;
-  bool owner = false;
-
-  void allocate(size_t len);
-  void import();
-  void init_cl(cl_device_id device_id, cl_context ctx);
-  void init_rgb(size_t width, size_t height, size_t stride);
-  void init_yuv(size_t width, size_t height);
-  void sync(int dir);
-  void free();
-};
-
-void visionbuf_compute_aligned_width_and_height(int width, int height, int *aligned_w, int *aligned_h);

cereal/visionipc/visionbuf_cl.cc

@@ -1,86 +0,0 @@
-#include "visionbuf.h"
-
-#include <atomic>
-#include <stdio.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-
-std::atomic<int> offset = 0;
-
-static void *malloc_with_fd(size_t len, int *fd) {
-  char full_path[0x100];
-
-#ifdef __APPLE__
-  snprintf(full_path, sizeof(full_path)-1, "/tmp/visionbuf_%d_%d", getpid(), offset++);
-#else
-  snprintf(full_path, sizeof(full_path)-1, "/dev/shm/visionbuf_%d_%d", getpid(), offset++);
-#endif
-
-  *fd = open(full_path, O_RDWR | O_CREAT, 0777);
-  assert(*fd >= 0);
-
-  unlink(full_path);
-
-  ftruncate(*fd, len);
-  void *addr = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, *fd, 0);
-  assert(addr != MAP_FAILED);
-
-  return addr;
-}
-
-void VisionBuf::allocate(size_t len) {
-  int fd;
-  void *addr = malloc_with_fd(len, &fd);
-
-  this->len = len;
-  this->mmap_len = len;
-  this->addr = addr;
-  this->fd = fd;
-}
-
-void VisionBuf::init_cl(cl_device_id device_id, cl_context ctx){
-  int err;
-
-  this->copy_q = clCreateCommandQueue(ctx, device_id, 0, &err);
-  assert(err == 0);
-
-  this->buf_cl = clCreateBuffer(ctx, CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR, this->len, this->addr, &err);
-  assert(err == 0);
-}
-
-
-void VisionBuf::import(){
-  assert(this->fd >= 0);
-  this->addr = mmap(NULL, this->mmap_len, PROT_READ | PROT_WRITE, MAP_SHARED, this->fd, 0);
-  assert(this->addr != MAP_FAILED);
-}
-
-
-void VisionBuf::sync(int dir) {
-  int err = 0;
-  if (!this->buf_cl) return;
-
-  if (dir == VISIONBUF_SYNC_FROM_DEVICE) {
-    err = clEnqueueReadBuffer(this->copy_q, this->buf_cl, CL_FALSE, 0, this->len, this->addr, 0, NULL, NULL);
-  } else {
-    err = clEnqueueWriteBuffer(this->copy_q, this->buf_cl, CL_FALSE, 0, this->len, this->addr, 0, NULL, NULL);
-  }
-  assert(err == 0);
-  clFinish(this->copy_q);
-}
-
-void VisionBuf::free() {
-  if (this->buf_cl){
-    int err = clReleaseMemObject(this->buf_cl);
-    assert(err == 0);
-
-    clReleaseCommandQueue(this->copy_q);
-  }
-
-  munmap(this->addr, this->len);
-  close(this->fd);
-}

cereal/visionipc/visionbuf_ion.cc

@@ -1,148 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <linux/ion.h>
-#include <CL/cl_ext.h>
-
-#include <msm_ion.h>
-
-#include "visionbuf.h"
-
-
-// just hard-code these for convenience
-// size_t device_page_size = 0;
-// clGetDeviceInfo(device_id, CL_DEVICE_PAGE_SIZE_QCOM,
-//                 sizeof(device_page_size), &device_page_size,
-//                 NULL);
-
-// size_t padding_cl = 0;
-// clGetDeviceInfo(device_id, CL_DEVICE_EXT_MEM_PADDING_IN_BYTES_QCOM,
-//                 sizeof(padding_cl), &padding_cl,
-//                 NULL);
-#define DEVICE_PAGE_SIZE_CL 4096
-#define PADDING_CL 0
-
-static int ion_fd = -1;
-static void ion_init() {
-  if (ion_fd == -1) {
-    ion_fd = open("/dev/ion", O_RDWR | O_NONBLOCK);
-  }
-}
-
-void VisionBuf::allocate(size_t len) {
-  int err;
-
-  ion_init();
-
-  struct ion_allocation_data ion_alloc = {0};
-  ion_alloc.len = len + PADDING_CL;
-  ion_alloc.align = 4096;
-  ion_alloc.heap_id_mask = 1 << ION_IOMMU_HEAP_ID;
-  ion_alloc.flags = ION_FLAG_CACHED;
-
-  err = ioctl(ion_fd, ION_IOC_ALLOC, &ion_alloc);
-  assert(err == 0);
-
-  struct ion_fd_data ion_fd_data = {0};
-  ion_fd_data.handle = ion_alloc.handle;
-  err = ioctl(ion_fd, ION_IOC_SHARE, &ion_fd_data);
-  assert(err == 0);
-
-  void *addr = mmap(NULL, ion_alloc.len,
-                    PROT_READ | PROT_WRITE,
-                    MAP_SHARED, ion_fd_data.fd, 0);
-  assert(addr != MAP_FAILED);
-
-  memset(addr, 0, ion_alloc.len);
-
-  this->owner = true;
-  this->len = len;
-  this->mmap_len = ion_alloc.len;
-  this->addr = addr;
-  this->handle = ion_alloc.handle;
-  this->fd = ion_fd_data.fd;
-}
-
-void VisionBuf::import(){
-  int err;
-  assert(this->fd >= 0);
-
-  ion_init();
-
-  // Get handle
-  struct ion_fd_data fd_data = {0};
-  fd_data.fd = this->fd;
-  err = ioctl(ion_fd, ION_IOC_IMPORT, &fd_data);
-  assert(err == 0);
-
-  this->owner = false;
-  this->handle = fd_data.handle;
-  this->addr = mmap(NULL, this->mmap_len, PROT_READ | PROT_WRITE, MAP_SHARED, this->fd, 0);
-  assert(this->addr != MAP_FAILED);
-}
-
-void VisionBuf::init_cl(cl_device_id device_id, cl_context ctx) {
-  int err;
-
-  assert(((uintptr_t)this->addr % DEVICE_PAGE_SIZE_CL) == 0);
-
-  cl_mem_ion_host_ptr ion_cl = {0};
-  ion_cl.ext_host_ptr.allocation_type = CL_MEM_ION_HOST_PTR_QCOM;
-  ion_cl.ext_host_ptr.host_cache_policy = CL_MEM_HOST_UNCACHED_QCOM;
-  ion_cl.ion_filedesc = this->fd;
-  ion_cl.ion_hostptr = this->addr;
-
-  this->buf_cl = clCreateBuffer(ctx,
-                              CL_MEM_USE_HOST_PTR | CL_MEM_EXT_HOST_PTR_QCOM,
-                              this->len, &ion_cl, &err);
-  assert(err == 0);
-}
-
-
-void VisionBuf::sync(int dir) {
-  int err;
-
-  struct ion_flush_data flush_data = {0};
-  flush_data.handle = this->handle;
-  flush_data.vaddr = this->addr;
-  flush_data.offset = 0;
-  flush_data.length = this->len;
-
-  // ION_IOC_INV_CACHES ~= DMA_FROM_DEVICE
-  // ION_IOC_CLEAN_CACHES ~= DMA_TO_DEVICE
-  // ION_IOC_CLEAN_INV_CACHES ~= DMA_BIDIRECTIONAL
-
-  struct ion_custom_data custom_data = {0};
-
-   assert(dir == VISIONBUF_SYNC_FROM_DEVICE || dir == VISIONBUF_SYNC_TO_DEVICE);
-   custom_data.cmd = (dir == VISIONBUF_SYNC_FROM_DEVICE) ?
-     ION_IOC_INV_CACHES : ION_IOC_CLEAN_CACHES;
-
-  custom_data.arg = (unsigned long)&flush_data;
-  err = ioctl(ion_fd, ION_IOC_CUSTOM, &custom_data);
-  assert(err == 0);
-}
-
-void VisionBuf::free() {
-  if (this->buf_cl){
-    int err = clReleaseMemObject(this->buf_cl);
-    assert(err == 0);
-  }
-
-  munmap(this->addr, this->mmap_len);
-  close(this->fd);
-
-  // Free the ION buffer if we also shared it
-  if (this->owner){
-    struct ion_handle_data handle_data = {.handle = this->handle};
-    int ret = ioctl(ion_fd, ION_IOC_FREE, &handle_data);
-    assert(ret == 0);
-  }
-}

cereal/visionipc/visionipc.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <cstddef>
-
-constexpr int VISIONIPC_MAX_FDS = 64;
-
-struct VisionIpcBufExtra {
-  uint32_t frame_id;
-  uint64_t timestamp_sof;
-  uint64_t timestamp_eof;
-};
-
-struct VisionIpcPacket {
-  uint64_t server_id;
-  size_t idx;
-  struct VisionIpcBufExtra extra;
-};

cereal/visionipc/visionipc.pxd

@@ -1,29 +0,0 @@
-# distutils: language = c++
-#cython: language_level=3
-
-from libcpp.string cimport string
-from libcpp.vector cimport vector
-from libc.stdint cimport uint32_t, uint64_t
-from libcpp cimport bool
-
-cdef extern from "visionbuf.h":
-  cdef enum VisionStreamType:
-    pass
-
-  cdef cppclass VisionBuf:
-    void * addr
-    size_t len
-
-cdef extern from "visionipc.h":
-  struct VisionIpcBufExtra:
-    uint32_t frame_id
-    uint64_t timestamp_sof
-    uint64_t timestamp_eof
-
-cdef extern from "visionipc_server.h":
-  cdef cppclass VisionIpcServer:
-    VisionIpcServer(string, void*, void*)
-    void create_buffers(VisionStreamType, size_t, bool, size_t, size_t)
-    VisionBuf * get_buffer(VisionStreamType)
-    void send(VisionBuf *, VisionIpcBufExtra *, bool)
-    void start_listener()

cereal/visionipc/visionipc_client.cc

@@ -1,119 +0,0 @@
-#include <chrono>
-#include <cassert>
-#include <iostream>
-#include <thread>
-
-#include "ipc.h"
-#include "visionipc_client.h"
-#include "visionipc_server.h"
-
-VisionIpcClient::VisionIpcClient(std::string name, VisionStreamType type, bool conflate, cl_device_id device_id, cl_context ctx) : name(name), type(type), device_id(device_id), ctx(ctx) {
-  msg_ctx = Context::create();
-  sock = SubSocket::create(msg_ctx, get_endpoint_name(name, type), "127.0.0.1", conflate, false);
-
-  poller = Poller::create();
-  poller->registerSocket(sock);
-}
-
-// Connect is not thread safe. Do not use the buffers while calling connect
-bool VisionIpcClient::connect(bool blocking){
-  connected = false;
-
-  // Cleanup old buffers on reconnect
-  for (size_t i = 0; i < num_buffers; i++){
-    buffers[i].free();
-  }
-  num_buffers = 0;
-
-  // Connect to server socket and ask for all FDs of type
-  std::string path = "/tmp/visionipc_" + name;
-
-  int socket_fd = -1;
-  while (socket_fd < 0) {
-    socket_fd = ipc_connect(path.c_str());
-
-    if (socket_fd < 0) {
-      if (blocking){
-        std::cout << "VisionIpcClient connecting" << std::endl;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-      } else {
-        return false;
-      }
-    }
-  }
-
-  // Send stream type to server to request FDs
-  int r = ipc_sendrecv_with_fds(true, socket_fd, &type, sizeof(type), nullptr, 0, nullptr);
-  assert(r == sizeof(type));
-
-  // Get FDs
-  int fds[VISIONIPC_MAX_FDS];
-  VisionBuf bufs[VISIONIPC_MAX_FDS];
-  r = ipc_sendrecv_with_fds(false, socket_fd, &bufs, sizeof(bufs), fds, VISIONIPC_MAX_FDS, &num_buffers);
-
-  assert(num_buffers > 0);
-  assert(r == sizeof(VisionBuf) * num_buffers);
-
-  // Import buffers
-  for (size_t i = 0; i < num_buffers; i++){
-    buffers[i] = bufs[i];
-    buffers[i].fd = fds[i];
-    buffers[i].import();
-    if (buffers[i].rgb) {
-      buffers[i].init_rgb(buffers[i].width, buffers[i].height, buffers[i].stride);
-    } else {
-      buffers[i].init_yuv(buffers[i].width, buffers[i].height);
-    }
-
-    if (device_id) buffers[i].init_cl(device_id, ctx);
-  }
-
-  connected = true;
-  return true;
-}
-
-VisionBuf * VisionIpcClient::recv(VisionIpcBufExtra * extra, const int timeout_ms){
-  auto p = poller->poll(timeout_ms);
-
-  if (!p.size()){
-    return nullptr;
-  }
-
-  Message * r = sock->receive(true);
-  if (r == nullptr){
-    return nullptr;
-  }
-
-  // Get buffer
-  assert(r->getSize() == sizeof(VisionIpcPacket));
-  VisionIpcPacket *packet = (VisionIpcPacket*)r->getData();
-
-  assert(packet->idx < num_buffers);
-  VisionBuf * buf = &buffers[packet->idx];
-
-  if (buf->server_id != packet->server_id){
-    connected = false;
-    delete r;
-    return nullptr;
-  }
-
-  if (extra) {
-    *extra = packet->extra;
-  }
-
-  buf->sync(VISIONBUF_SYNC_TO_DEVICE);
-  delete r;
-  return buf;
-}
-
-
-
-VisionIpcClient::~VisionIpcClient(){
-  for (size_t i = 0; i < num_buffers; i++){
-    buffers[i].free();
-  }
-
-  delete sock;
-  delete poller;
-  delete msg_ctx;
-}

cereal/visionipc/visionipc_client.h

@@ -1,32 +0,0 @@
-#pragma once
-#include <vector>
-#include <string>
-#include <unistd.h>
-
-#include "messaging.hpp"
-#include "visionipc.h"
-#include "visionbuf.h"
-
-class VisionIpcClient {
-private:
-  std::string name;
-  Context * msg_ctx;
-  SubSocket * sock;
-  Poller * poller;
-
-  VisionStreamType type;
-
-  cl_device_id device_id = nullptr;
-  cl_context ctx = nullptr;
-
-  void init_msgq(bool conflate);
-
-public:
-  bool connected = false;
-  int num_buffers = 0;
-  VisionBuf buffers[VISIONIPC_MAX_FDS];
-  VisionIpcClient(std::string name, VisionStreamType type, bool conflate, cl_device_id device_id=nullptr, cl_context ctx=nullptr);
-  ~VisionIpcClient();
-  VisionBuf * recv(VisionIpcBufExtra * extra=nullptr, const int timeout_ms=100);
-  bool connect(bool blocking=true);
-};

cereal/visionipc/visionipc_pyx.pyx

@@ -1,49 +0,0 @@
-# distutils: language = c++
-# cython: c_string_encoding=ascii, language_level=3
-
-import sys
-from libcpp.string cimport string
-from libcpp cimport bool
-from libc.string cimport memcpy
-from libc.stdint cimport uint32_t, uint64_t
-
-from .visionipc cimport VisionIpcServer as cppVisionIpcServer
-from .visionipc cimport VisionBuf as cppVisionBuf
-from .visionipc cimport VisionIpcBufExtra
-
-cpdef enum VisionStreamType:
-  VISION_STREAM_RGB_BACK
-  VISION_STREAM_RGB_FRONT
-  VISION_STREAM_RGB_WIDE
-  VISION_STREAM_YUV_BACK
-  VISION_STREAM_YUV_FRONT
-  VISION_STREAM_YUV_WIDE
-
-cdef class VisionIpcServer:
-  cdef cppVisionIpcServer * server
-
-  def __init__(self, string name):
-    self.server = new cppVisionIpcServer(name, NULL, NULL)
-
-  def create_buffers(self,  VisionStreamType tp, size_t num_buffers, bool rgb, size_t width, size_t height):
-    self.server.create_buffers(tp, num_buffers, rgb, width, height)
-
-  def send(self, VisionStreamType tp, bytes data, uint32_t frame_id=0, uint64_t timestamp_sof=0, uint64_t timestamp_eof=0):
-    cdef cppVisionBuf * buf = self.server.get_buffer(tp)
-
-    # Populate buffer
-    assert buf.len == len(data)
-    memcpy(buf.addr, <char*>data, len(data))
-
-    cdef VisionIpcBufExtra extra
-    extra.frame_id = frame_id
-    extra.timestamp_sof = timestamp_sof
-    extra.timestamp_eof = timestamp_eof
-
-    self.server.send(buf, &extra, False)
-
-  def start_listener(self):
-    self.server.start_listener()
-
-  def __dealloc__(self):
-    del self.server

cereal/visionipc/visionipc_server.cc

@@ -1,179 +0,0 @@
-#include <iostream>
-#include <chrono>
-#include <cassert>
-#include <random>
-
-#include <poll.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include "messaging.hpp"
-#include "ipc.h"
-#include "visionipc_server.h"
-
-std::string get_endpoint_name(std::string name, VisionStreamType type){
-  if (messaging_use_zmq()){
-    assert(name == "camerad");
-    return std::to_string(9000 + static_cast<int>(type));
-  } else {
-    return "visionipc_" + name + "_" + std::to_string(type);
-  }
-}
-
-VisionIpcServer::VisionIpcServer(std::string name, cl_device_id device_id, cl_context ctx) : name(name), device_id(device_id), ctx(ctx) {
-  msg_ctx = Context::create();
-
-  std::random_device rd("/dev/urandom");
-  std::uniform_int_distribution<uint64_t> distribution(0,std::numeric_limits<uint64_t>::max());
-  server_id = distribution(rd);
-}
-
-void VisionIpcServer::create_buffers(VisionStreamType type, size_t num_buffers, bool rgb, size_t width, size_t height){
-  // TODO: assert that this type is not created yet
-  assert(num_buffers < VISIONIPC_MAX_FDS);
-  int aligned_w = 0, aligned_h = 0;
-
-  size_t size = 0;
-  size_t stride = 0; // Only used for RGB
-
-  if (rgb) {
-    visionbuf_compute_aligned_width_and_height(width, height, &aligned_w, &aligned_h);
-    size = (size_t)aligned_w * (size_t)aligned_h * 3;
-    stride = aligned_w * 3;
-  } else {
-    size = width * height * 3 / 2;
-  }
-
-
-  // Create map + alloc requested buffers
-  for (size_t i = 0; i < num_buffers; i++){
-    VisionBuf* buf = new VisionBuf();
-    buf->allocate(size);
-    buf->idx = i;
-    buf->type = type;
-
-    if (device_id) buf->init_cl(device_id, ctx);
-
-    rgb ? buf->init_rgb(width, height, stride) : buf->init_yuv(width, height);
-
-    buffers[type].push_back(buf);
-  }
-
-  cur_idx[type] = 0;
-
-  // Create msgq publisher for each of the `name` + type combos
-  // TODO: compute port number directly if using zmq
-  sockets[type] = PubSocket::create(msg_ctx, get_endpoint_name(name, type), false);
-}
-
-
-void VisionIpcServer::start_listener(){
-  listener_thread = std::thread(&VisionIpcServer::listener, this);
-}
-
-
-void VisionIpcServer::listener(){
-  std::cout << "Starting listener for: " << name << std::endl;
-
-  std::string path = "/tmp/visionipc_" + name;
-  int sock = ipc_bind(path.c_str());
-  assert(sock >= 0);
-
-  while (!should_exit){
-    // Wait for incoming connection
-    struct pollfd polls[1] = {{0}};
-    polls[0].fd = sock;
-    polls[0].events = POLLIN;
-
-    int ret = poll(polls, 1, 100);
-    if (ret < 0) {
-      if (errno == EINTR || errno == EAGAIN) continue;
-      std::cout << "poll failed, stopping listener" << std::endl;
-      break;
-    }
-
-    if (should_exit) break;
-    if (!polls[0].revents) {
-      continue;
-    }
-
-    // Handle incoming request
-    int fd = accept(sock, NULL, NULL);
-    assert(fd >= 0);
-
-    VisionStreamType type = VisionStreamType::VISION_STREAM_MAX;
-    int r = ipc_sendrecv_with_fds(false, fd, &type, sizeof(type), nullptr, 0, nullptr);
-    assert(r == sizeof(type));
-    if (buffers.count(type) <= 0) {
-      std::cout << "got request for invalid buffer type: " << type << std::endl;
-      close(fd);
-      continue;
-    }
-
-    int fds[VISIONIPC_MAX_FDS];
-    int num_fds = buffers[type].size();
-    VisionBuf bufs[VISIONIPC_MAX_FDS];
-
-    for (int i = 0; i < num_fds; i++){
-      fds[i] = buffers[type][i]->fd;
-      bufs[i] = *buffers[type][i];
-
-      // Remove some private openCL/ion metadata
-      bufs[i].buf_cl = 0;
-      bufs[i].copy_q = 0;
-      bufs[i].handle = 0;
-      bufs[i].owner = false;
-
-      bufs[i].server_id = server_id;
-    }
-
-    r = ipc_sendrecv_with_fds(true, fd, &bufs, sizeof(VisionBuf) * num_fds, fds, num_fds, nullptr);
-
-    close(fd);
-  }
-
-  std::cout << "Stopping listener for: " << name << std::endl;
-  close(sock);
-}
-
-
-
-VisionBuf * VisionIpcServer::get_buffer(VisionStreamType type){
-  // Do we want to keep track if the buffer has been sent out yet and warn user?
-  assert(buffers.count(type));
-  auto b = buffers[type];
-  return b[cur_idx[type]++ % b.size()];
-}
-
-void VisionIpcServer::send(VisionBuf * buf, VisionIpcBufExtra * extra, bool sync){
-  if (sync) buf->sync(VISIONBUF_SYNC_FROM_DEVICE);
-  assert(buffers.count(buf->type));
-  assert(buf->idx < buffers[buf->type].size());
-
-  // Send over correct msgq socket
-  VisionIpcPacket packet = {0};
-  packet.server_id = server_id;
-  packet.idx = buf->idx;
-  packet.extra = *extra;
-
-  sockets[buf->type]->send((char*)&packet, sizeof(packet));
-}
-
-VisionIpcServer::~VisionIpcServer(){
-  should_exit = true;
-  listener_thread.join();
-
-  // VisionBuf cleanup
-  for( auto const& [type, buf] : buffers ) {
-    for (VisionBuf* b : buf){
-      b->free();
-      delete b;
-    }
-  }
-
-  // Messaging cleanup
-  for( auto const& [type, sock] : sockets ) {
-    delete sock;
-  }
-  delete msg_ctx;
-}

cereal/visionipc/visionipc_server.h

@@ -1,42 +0,0 @@
-#pragma once
-#include <vector>
-#include <string>
-#include <thread>
-#include <atomic>
-#include <map>
-
-#include "messaging.hpp"
-#include "visionipc.h"
-#include "visionbuf.h"
-
-std::string get_endpoint_name(std::string name, VisionStreamType type);
-
-class VisionIpcServer {
- private:
-  cl_device_id device_id = nullptr;
-  cl_context ctx = nullptr;
-  uint64_t server_id;
-
-  std::atomic<bool> should_exit = false;
-  std::string name;
-  std::thread listener_thread;
-
-  std::map<VisionStreamType, std::atomic<size_t> > cur_idx;
-  std::map<VisionStreamType, std::vector<VisionBuf*> > buffers;
-  std::map<VisionStreamType, std::map<VisionBuf*, size_t> > idxs;
-
-  Context * msg_ctx;
-  std::map<VisionStreamType, PubSocket*> sockets;
-
-  void listener(void);
-
- public:
-  VisionIpcServer(std::string name, cl_device_id device_id=nullptr, cl_context ctx=nullptr);
-  ~VisionIpcServer();
-
-  VisionBuf * get_buffer(VisionStreamType type);
-
-  void create_buffers(VisionStreamType type, size_t num_buffers, bool rgb, size_t width, size_t height);
-  void send(VisionBuf * buf, VisionIpcBufExtra * extra, bool sync=true);
-  void start_listener();
-};

cereal/visionipc/visionipc_tests.cc

@@ -1,135 +0,0 @@
-#include <thread>
-#include <chrono>
-
-#include "catch2/catch.hpp"
-#include "visionipc_server.h"
-#include "visionipc_client.h"
-
-static void zmq_sleep(int milliseconds=1000){
-  if (messaging_use_zmq()){
-    std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
-  }
-}
-
-TEST_CASE("Connecting"){
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, 1, false, 100, 100);
-  server.start_listener();
-
-  VisionIpcClient client = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, false);
-  REQUIRE(client.connect());
-
-  REQUIRE(client.connected);
-}
-
-TEST_CASE("Check buffers"){
-  size_t width = 100, height = 200, num_buffers = 5;
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, num_buffers, false, width, height);
-  server.start_listener();
-
-  VisionIpcClient client = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, false);
-  REQUIRE(client.connect());
-
-  REQUIRE(client.buffers[0].width == width);
-  REQUIRE(client.buffers[0].height == height);
-  REQUIRE(client.buffers[0].len);
-  REQUIRE(client.num_buffers == num_buffers);
-}
-
-TEST_CASE("Check yuv/rgb"){
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, 1, false, 100, 100);
-  server.create_buffers(VISION_STREAM_RGB_BACK, 1, true, 100, 100);
-  server.start_listener();
-
-  VisionIpcClient client_yuv = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, false);
-  VisionIpcClient client_rgb = VisionIpcClient("camerad", VISION_STREAM_RGB_BACK, false);
-  client_yuv.connect();
-  client_rgb.connect();
-
-  REQUIRE(client_rgb.buffers[0].rgb == true);
-  REQUIRE(client_yuv.buffers[0].rgb == false);
-}
-
-TEST_CASE("Send single buffer"){
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, 1, true, 100, 100);
-  server.start_listener();
-
-  VisionIpcClient client = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, false);
-  REQUIRE(client.connect());
-  zmq_sleep();
-
-  VisionBuf * buf = server.get_buffer(VISION_STREAM_YUV_BACK);
-  REQUIRE(buf != nullptr);
-
-  *((uint64_t*)buf->addr) = 1234;
-
-  VisionIpcBufExtra extra = {0};
-  extra.frame_id = 1337;
-
-  server.send(buf, &extra);
-
-  VisionIpcBufExtra extra_recv = {0};
-  VisionBuf * recv_buf = client.recv(&extra_recv);
-  REQUIRE(recv_buf != nullptr);
-  REQUIRE(*(uint64_t*)recv_buf->addr == 1234);
-  REQUIRE(extra_recv.frame_id == extra.frame_id);
-}
-
-
-TEST_CASE("Test no conflate"){
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, 1, true, 100, 100);
-  server.start_listener();
-
-  VisionIpcClient client = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, false);
-  REQUIRE(client.connect());
-  zmq_sleep();
-
-  VisionBuf * buf = server.get_buffer(VISION_STREAM_YUV_BACK);
-  REQUIRE(buf != nullptr);
-
-  VisionIpcBufExtra extra = {0};
-  extra.frame_id = 1;
-  server.send(buf, &extra);
-  extra.frame_id = 2;
-  server.send(buf, &extra);
-
-  VisionIpcBufExtra extra_recv = {0};
-  VisionBuf * recv_buf = client.recv(&extra_recv);
-  REQUIRE(recv_buf != nullptr);
-  REQUIRE(extra_recv.frame_id == 1);
-
-  recv_buf = client.recv(&extra_recv);
-  REQUIRE(recv_buf != nullptr);
-  REQUIRE(extra_recv.frame_id == 2);
-}
-
-TEST_CASE("Test conflate"){
-  VisionIpcServer server("camerad");
-  server.create_buffers(VISION_STREAM_YUV_BACK, 1, true, 100, 100);
-  server.start_listener();
-
-  VisionIpcClient client = VisionIpcClient("camerad", VISION_STREAM_YUV_BACK, true);
-  REQUIRE(client.connect());
-  zmq_sleep();
-
-  VisionBuf * buf = server.get_buffer(VISION_STREAM_YUV_BACK);
-  REQUIRE(buf != nullptr);
-
-  VisionIpcBufExtra extra = {0};
-  extra.frame_id = 1;
-  server.send(buf, &extra);
-  extra.frame_id = 2;
-  server.send(buf, &extra);
-
-  VisionIpcBufExtra extra_recv = {0};
-  VisionBuf * recv_buf = client.recv(&extra_recv);
-  REQUIRE(recv_buf != nullptr);
-  REQUIRE(extra_recv.frame_id == 2);
-
-  recv_buf = client.recv(&extra_recv);
-  REQUIRE(recv_buf == nullptr);
-}

codecov.yml

@@ -0,0 +1,8 @@
+comment: false
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch: off
+

common/SConscript

@@ -1,4 +1,4 @@
-Import('envCython')
+Import('envCython', 'common')
 
 envCython.Program('clock.so', 'clock.pyx')
-envCython.Program('params_pyx.so', 'params_pyx.pyx')
+envCython.Program('params_pyx.so', 'params_pyx.pyx', LIBS=envCython['LIBS'] + [common, 'zmq'])

common/dict_helpers.py

@@ -0,0 +1,9 @@
+# remove all keys that end in DEPRECATED
+def strip_deprecated_keys(d):
+  for k in list(d.keys()):
+    if isinstance(k, str):
+      if k.endswith('DEPRECATED'):
+        d.pop(k)
+      elif isinstance(d[k], dict):
+        strip_deprecated_keys(d[k])
+  return d

common/lazy_property.py

@@ -0,0 +1,12 @@
+class lazy_property():
+  """Defines a property whose value will be computed only once and as needed.
+
+     This can only be used on instance methods.
+  """
+  def __init__(self, func):
+    self._func = func
+
+  def __get__(self, obj_self, cls):
+    value = self._func(obj_self)
+    setattr(obj_self, self._func.__name__, value)
+    return value

common/logging_extra.py

@@ -3,6 +3,7 @@ import os
 import sys
 import copy
 import json
+import uuid
 import socket
 import logging
 import traceback
@@ -62,8 +63,48 @@ class SwagFormatter(logging.Formatter):
     return record_dict
 
   def format(self, record):
+    if self.swaglogger is None:
+      raise Exception("must set swaglogger before calling format()")
     return json_robust_dumps(self.format_dict(record))
 
+class SwagLogFileFormatter(SwagFormatter):
+  def fix_kv(self, k, v):
+    # append type to names to preserve legacy naming in logs
+    # avoids overlapping key namespaces with different types
+    # e.g. log.info() creates 'msg' -> 'msg$s'
+    #      log.event() creates 'msg.health.logMonoTime' -> 'msg.health.logMonoTime$i'
+    #      because overlapping namespace 'msg' caused problems
+    if isinstance(v, (str, bytes)):
+      k += "$s"
+    elif isinstance(v, float):
+      k += "$f"
+    elif isinstance(v, bool):
+      k += "$b"
+    elif isinstance(v, int):
+      k += "$i"
+    elif isinstance(v, dict):
+      nv = {}
+      for ik, iv in v.items():
+        ik, iv = self.fix_kv(ik, iv)
+        nv[ik] = iv
+      v = nv
+    elif isinstance(v, list):
+      k += "$a"
+    return k, v
+
+  def format(self, record):
+    if isinstance(record, str):
+      v = json.loads(record)
+    else:
+      v = self.format_dict(record)
+
+    mk, mv = self.fix_kv('msg', v['msg'])
+    del v['msg']
+    v[mk] = mv
+    v['id'] = uuid.uuid4().hex
+
+    return json_robust_dumps(v)
+
 class SwagErrorFilter(logging.Filter):
   def filter(self, record):
     return record.levelno < logging.ERROR
@@ -117,6 +158,8 @@ class SwagLogger(logging.Logger):
     evt.update(kwargs)
     if 'error' in kwargs:
       self.error(evt)
+    if 'debug' in kwargs:
+      self.debug(evt)
     else:
       self.info(evt)
 

common/numpy_helpers.py

@@ -0,0 +1,22 @@
+import numpy as np
+
+
+def deep_interp_np(x, xp, fp, axis=None):
+  if axis is not None:
+    fp = fp.swapaxes(0,axis)
+  x = np.atleast_1d(x)
+  xp = np.array(xp)
+  if len(xp) < 2:
+    return np.repeat(fp, len(x), axis=0)
+  if min(np.diff(xp)) < 0:
+    raise RuntimeError('Bad x array for interpolation')
+  j = np.searchsorted(xp, x) - 1
+  j = np.clip(j, 0, len(xp)-2)
+  d = np.divide(x - xp[j], xp[j + 1] - xp[j], out=np.ones_like(x, dtype=np.float64), where=xp[j + 1] - xp[j] != 0)
+  vals_interp = (fp[j].T*(1 - d)).T + (fp[j + 1].T*d).T
+  if axis is not None:
+    vals_interp = vals_interp.swapaxes(0,axis)
+  if len(vals_interp) == 1:
+    return vals_interp[0]
+  else:
+    return vals_interp

common/params.py

@@ -1,5 +1,6 @@
-from common.params_pyx import Params, UnknownKeyName, put_nonblocking # pylint: disable=no-name-in-module, import-error
+from common.params_pyx import Params, ParamKeyType, UnknownKeyName, put_nonblocking # pylint: disable=no-name-in-module, import-error
 assert Params
+assert ParamKeyType
 assert UnknownKeyName
 assert put_nonblocking
 

common/params_pxd.pxd

@@ -8,9 +8,20 @@ cdef extern from "selfdrive/common/util.cc":
   pass
 
 cdef extern from "selfdrive/common/params.h":
+  cpdef enum ParamKeyType:
+    PERSISTENT
+    CLEAR_ON_MANAGER_START
+    CLEAR_ON_PANDA_DISCONNECT
+    CLEAR_ON_IGNITION
+    ALL
+
   cdef cppclass Params:
     Params(bool)
     Params(string)
     string get(string, bool) nogil
-    int delete_db_value(string)
-    int write_db_value(string, string)
+    bool getBool(string)
+    int remove(string)
+    int put(string, string)
+    int putBool(string, bool)
+    bool checkKey(string)
+    void clearAll(ParamKeyType)

common/params_pyx.pyx

@@ -2,82 +2,19 @@
 # cython: language_level = 3
 from libcpp cimport bool
 from libcpp.string cimport string
-from common.params_pxd cimport Params as c_Params
+from common.params_pxd cimport Params as c_Params, ParamKeyType as c_ParamKeyType
 
 import os
 import threading
 from common.basedir import BASEDIR
 
-cdef enum TxType:
-  PERSISTENT = 1
-  CLEAR_ON_MANAGER_START = 2
-  CLEAR_ON_PANDA_DISCONNECT = 3
 
-keys = {
-  b"AccessToken": [TxType.CLEAR_ON_MANAGER_START],
-  b"AthenadPid": [TxType.PERSISTENT],
-  b"CalibrationParams": [TxType.PERSISTENT],
-  b"CarBatteryCapacity": [TxType.PERSISTENT],
-  b"CarParams": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"CarParamsCache": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"CarVin": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"CommunityFeaturesToggle": [TxType.PERSISTENT],
-  b"CompletedTrainingVersion": [TxType.PERSISTENT],
-  b"DisablePowerDown": [TxType.PERSISTENT],
-  b"DisableUpdates": [TxType.PERSISTENT],
-  b"DoUninstall": [TxType.CLEAR_ON_MANAGER_START],
-  b"DongleId": [TxType.PERSISTENT],
-  b"GitBranch": [TxType.PERSISTENT],
-  b"GitCommit": [TxType.PERSISTENT],
-  b"GitRemote": [TxType.PERSISTENT],
-  b"GithubSshKeys": [TxType.PERSISTENT],
-  b"HardwareSerial": [TxType.PERSISTENT],
-  b"HasAcceptedTerms": [TxType.PERSISTENT],
-  b"HasCompletedSetup": [TxType.PERSISTENT],
-  b"IsDriverViewEnabled": [TxType.CLEAR_ON_MANAGER_START],
-  b"IMEI": [TxType.PERSISTENT],
-  b"IsLdwEnabled": [TxType.PERSISTENT],
-  b"IsMetric": [TxType.PERSISTENT],
-  b"IsOffroad": [TxType.CLEAR_ON_MANAGER_START],
-  b"IsRHD": [TxType.PERSISTENT],
-  b"IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
-  b"IsUpdateAvailable": [TxType.CLEAR_ON_MANAGER_START],
-  b"IsUploadRawEnabled": [TxType.PERSISTENT],
-  b"LastAthenaPingTime": [TxType.PERSISTENT],
-  b"LastGPSPosition": [TxType.PERSISTENT],
-  b"LastUpdateException": [TxType.PERSISTENT],
-  b"LastUpdateTime": [TxType.PERSISTENT],
-  b"LiveParameters": [TxType.PERSISTENT],
-  b"OpenpilotEnabledToggle": [TxType.PERSISTENT],
-  b"LaneChangeEnabled": [TxType.PERSISTENT],
-  b"PandaFirmware": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"PandaFirmwareHex": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"PandaDongleId": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"Passive": [TxType.PERSISTENT],
-  b"RecordFront": [TxType.PERSISTENT],
-  b"ReleaseNotes": [TxType.PERSISTENT],
-  b"ShouldDoUpdate": [TxType.CLEAR_ON_MANAGER_START],
-  b"SubscriberInfo": [TxType.PERSISTENT],
-  b"SshEnabled": [TxType.PERSISTENT],
-  b"TermsVersion": [TxType.PERSISTENT],
-  b"Timezone": [TxType.PERSISTENT],
-  b"TrainingVersion": [TxType.PERSISTENT],
-  b"UpdateAvailable": [TxType.CLEAR_ON_MANAGER_START],
-  b"UpdateFailedCount": [TxType.CLEAR_ON_MANAGER_START],
-  b"Version": [TxType.PERSISTENT],
-  b"VisionRadarToggle": [TxType.PERSISTENT],
-  b"Offroad_ChargeDisabled": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"Offroad_ConnectivityNeeded": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_ConnectivityNeededPrompt": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_TemperatureTooHigh": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_PandaFirmwareMismatch": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  b"Offroad_InvalidTime": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_NeosUpdate": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_UpdateFailed": [TxType.CLEAR_ON_MANAGER_START],
-  b"Offroad_HardwareUnsupported": [TxType.CLEAR_ON_MANAGER_START],
-  b"ForcePowerDown": [TxType.CLEAR_ON_MANAGER_START],
-}
+cdef class ParamKeyType:
+  PERSISTENT = c_ParamKeyType.PERSISTENT
+  CLEAR_ON_MANAGER_START = c_ParamKeyType.CLEAR_ON_MANAGER_START
+  CLEAR_ON_PANDA_DISCONNECT = c_ParamKeyType.CLEAR_ON_PANDA_DISCONNECT
+  CLEAR_ON_IGNITION = c_ParamKeyType.CLEAR_ON_IGNITION
+  ALL = c_ParamKeyType.ALL
 
 def ensure_bytes(v):
   if isinstance(v, str):
@@ -102,23 +39,21 @@ cdef class Params:
     del self.p
 
   def clear_all(self, tx_type=None):
-    for key in keys:
-      if tx_type is None or tx_type in keys[key]:
-        self.delete(key)
+    if tx_type is None:
+      tx_type = ParamKeyType.ALL
 
-  def manager_start(self):
-    self.clear_all(TxType.CLEAR_ON_MANAGER_START)
+    self.p.clearAll(tx_type)
 
-  def panda_disconnect(self):
-    self.clear_all(TxType.CLEAR_ON_PANDA_DISCONNECT)
-
-  def get(self, key, block=False, encoding=None):
+  def check_key(self, key):
     key = ensure_bytes(key)
 
-    if key not in keys:
+    if not self.p.checkKey(key):
       raise UnknownKeyName(key)
 
-    cdef string k = key
+    return key
+
+  def get(self, key, block=False, encoding=None):
+    cdef string k = self.check_key(key)
     cdef bool b = block
 
     cdef string val
@@ -138,6 +73,10 @@ cdef class Params:
     else:
       return val
 
+  def get_bool(self, key):
+    cdef string k = self.check_key(key)
+    return self.p.getBool(k)
+
   def put(self, key, dat):
     """
     Warning: This function blocks until the param is written to disk!
@@ -145,23 +84,24 @@ cdef class Params:
     Use the put_nonblocking helper function in time sensitive code, but
     in general try to avoid writing params as much as possible.
     """
-    key = ensure_bytes(key)
+    cdef string k = self.check_key(key)
     dat = ensure_bytes(dat)
+    self.p.put(k, dat)
 
-    if key not in keys:
-      raise UnknownKeyName(key)
-
-    self.p.write_db_value(key, dat)
+  def put_bool(self, key, val):
+    cdef string k = self.check_key(key)
+    self.p.putBool(k, val)
 
   def delete(self, key):
-    key = ensure_bytes(key)
-    self.p.delete_db_value(key)
+    cdef string k = self.check_key(key)
+    self.p.remove(k)
 
 
 def put_nonblocking(key, val, d=None):
   def f(key, val):
     params = Params(d)
-    params.put(key, val)
+    cdef string k = ensure_bytes(key)
+    params.put(k, val)
 
   t = threading.Thread(target=f, args=(key, val))
   t.start()

common/spinner.py

@@ -25,7 +25,7 @@ class Spinner():
         pass
 
   def update_progress(self, cur: int, total: int):
-    self.update(str(int(100 * cur / total)))
+    self.update(str(round(100 * cur / total)))
 
   def close(self):
     if self.spinner_proc is not None:

common/string_helpers.py

@@ -0,0 +1,6 @@
+def replace_right(s, old, new, occurrence):
+  # replace_right('1232425', '2', ' ', 1) -> '12324 5'
+  # replace_right('1232425', '2', ' ', 2) -> '123 4 5'
+
+  split = s.rsplit(old, occurrence)
+  return new.join(split)

common/tests/test_file_helpers.py

@@ -0,0 +1,28 @@
+import os
+import unittest
+from uuid import uuid4
+
+from common.file_helpers import atomic_write_on_fs_tmp
+from common.file_helpers import atomic_write_in_dir
+
+
+class TestFileHelpers(unittest.TestCase):
+  def run_atomic_write_func(self, atomic_write_func):
+    path = "/tmp/tmp{}".format(uuid4())
+    with atomic_write_func(path) as f:
+      f.write("test")
+
+    with open(path) as f:
+      self.assertEqual(f.read(), "test")
+    self.assertEqual(os.stat(path).st_mode & 0o777, 0o644)
+    os.remove(path)
+
+  def test_atomic_write_on_fs_tmp(self):
+    self.run_atomic_write_func(atomic_write_on_fs_tmp)
+
+  def test_atomic_write_in_dir(self):
+    self.run_atomic_write_func(atomic_write_in_dir)
+
+
+if __name__ == "__main__":
+  unittest.main()

common/tests/test_numpy_fast.py

@@ -0,0 +1,26 @@
+import numpy as np
+import unittest
+
+from common.numpy_fast import interp
+
+
+class InterpTest(unittest.TestCase):
+  def test_correctness_controls(self):
+    _A_CRUISE_MIN_BP = np.asarray([0., 5., 10., 20., 40.])
+    _A_CRUISE_MIN_V = np.asarray([-1.0, -.8, -.67, -.5, -.30])
+    v_ego_arr = [-1, -1e-12, 0, 4, 5, 6, 7, 10, 11, 15.2, 20, 21, 39,
+                 39.999999, 40, 41]
+
+    expected = np.interp(v_ego_arr, _A_CRUISE_MIN_BP, _A_CRUISE_MIN_V)
+    actual = interp(v_ego_arr, _A_CRUISE_MIN_BP, _A_CRUISE_MIN_V)
+
+    np.testing.assert_equal(actual, expected)
+
+    for v_ego in v_ego_arr:
+      expected = np.interp(v_ego, _A_CRUISE_MIN_BP, _A_CRUISE_MIN_V)
+      actual = interp(v_ego, _A_CRUISE_MIN_BP, _A_CRUISE_MIN_V)
+      np.testing.assert_equal(actual, expected)
+
+
+if __name__ == "__main__":
+  unittest.main()

common/tests/test_params.py

@@ -0,0 +1,116 @@
+import os
+import threading
+import time
+import tempfile
+import shutil
+import stat
+import unittest
+
+from common.params import Params, ParamKeyType, UnknownKeyName, put_nonblocking
+
+class TestParams(unittest.TestCase):
+  def setUp(self):
+    self.tmpdir = tempfile.mkdtemp()
+    print("using", self.tmpdir)
+    self.params = Params(self.tmpdir)
+
+  def tearDown(self):
+    shutil.rmtree(self.tmpdir)
+
+  def test_params_put_and_get(self):
+    self.params.put("DongleId", "cb38263377b873ee")
+    assert self.params.get("DongleId") == b"cb38263377b873ee"
+
+  def test_persist_params_put_and_get(self):
+    p = Params(persistent_params=True)
+    p.put("DongleId", "cb38263377b873ee")
+    assert p.get("DongleId") == b"cb38263377b873ee"
+
+  def test_params_non_ascii(self):
+    st = b"\xe1\x90\xff"
+    self.params.put("CarParams", st)
+    assert self.params.get("CarParams") == st
+
+  def test_params_get_cleared_panda_disconnect(self):
+    self.params.put("CarParams", "test")
+    self.params.put("DongleId", "cb38263377b873ee")
+    assert self.params.get("CarParams") == b"test"
+    self.params.clear_all(ParamKeyType.CLEAR_ON_PANDA_DISCONNECT)
+    assert self.params.get("CarParams") is None
+    assert self.params.get("DongleId") is not None
+
+  def test_params_get_cleared_manager_start(self):
+    self.params.put("CarParams", "test")
+    self.params.put("DongleId", "cb38263377b873ee")
+    assert self.params.get("CarParams") == b"test"
+    self.params.clear_all(ParamKeyType.CLEAR_ON_MANAGER_START)
+    assert self.params.get("CarParams") is None
+    assert self.params.get("DongleId") is not None
+
+  def test_params_two_things(self):
+    self.params.put("DongleId", "bob")
+    self.params.put("AthenadPid", "123")
+    assert self.params.get("DongleId") == b"bob"
+    assert self.params.get("AthenadPid") == b"123"
+
+  def test_params_get_block(self):
+    def _delayed_writer():
+      time.sleep(0.1)
+      self.params.put("CarParams", "test")
+    threading.Thread(target=_delayed_writer).start()
+    assert self.params.get("CarParams") is None
+    assert self.params.get("CarParams", True) == b"test"
+
+  def test_params_unknown_key_fails(self):
+    with self.assertRaises(UnknownKeyName):
+      self.params.get("swag")
+
+    with self.assertRaises(UnknownKeyName):
+      self.params.get_bool("swag")
+
+    with self.assertRaises(UnknownKeyName):
+      self.params.put("swag", "abc")
+
+    with self.assertRaises(UnknownKeyName):
+      self.params.put_bool("swag", True)
+
+  def test_params_permissions(self):
+    permissions = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH | stat.S_IWOTH
+
+    self.params.put("DongleId", "cb38263377b873ee")
+    st_mode = os.stat(f"{self.tmpdir}/d/DongleId").st_mode
+    assert (st_mode & permissions) == permissions
+
+  def test_delete_not_there(self):
+    assert self.params.get("CarParams") is None
+    self.params.delete("CarParams")
+    assert self.params.get("CarParams") is None
+
+  def test_get_bool(self):
+    self.params.delete("IsMetric")
+    self.assertFalse(self.params.get_bool("IsMetric"))
+
+    self.params.put_bool("IsMetric", True)
+    self.assertTrue(self.params.get_bool("IsMetric"))
+
+    self.params.put_bool("IsMetric", False)
+    self.assertFalse(self.params.get_bool("IsMetric"))
+
+    self.params.put("IsMetric", "1")
+    self.assertTrue(self.params.get_bool("IsMetric"))
+
+    self.params.put("IsMetric", "0")
+    self.assertFalse(self.params.get_bool("IsMetric"))
+
+  def test_put_non_blocking_with_get_block(self):
+    q = Params(self.tmpdir)
+    def _delayed_writer():
+      time.sleep(0.1)
+      put_nonblocking("CarParams", "test", self.tmpdir)
+    threading.Thread(target=_delayed_writer).start()
+    assert q.get("CarParams") is None
+    assert q.get("CarParams", True) == b"test"
+
+
+if __name__ == "__main__":
+  unittest.main()

common/tests/test_xattr.py

@@ -0,0 +1,47 @@
+import os
+import tempfile
+import shutil
+import unittest
+
+from common.xattr import getxattr, setxattr, listxattr, removexattr
+
+class TestParams(unittest.TestCase):
+  USER_TEST='user.test'
+  def setUp(self):
+    self.tmpdir = tempfile.mkdtemp()
+    self.tmpfn = os.path.join(self.tmpdir, 'test.txt')
+    open(self.tmpfn, 'w').close()
+    #print("using", self.tmpfn)
+
+  def tearDown(self):
+    shutil.rmtree(self.tmpdir)
+
+  def test_getxattr_none(self):
+    a = getxattr(self.tmpfn, TestParams.USER_TEST)
+    assert a is None
+
+  def test_listxattr_none(self):
+    l = listxattr(self.tmpfn)
+    assert l == []
+
+  def test_setxattr(self):
+    setxattr(self.tmpfn, TestParams.USER_TEST, b'123')
+    a = getxattr(self.tmpfn, TestParams.USER_TEST)
+    assert a == b'123'
+
+  def test_listxattr(self):
+    setxattr(self.tmpfn, 'user.test1', b'123')
+    setxattr(self.tmpfn, 'user.test2', b'123')
+    l = listxattr(self.tmpfn)
+    assert l == ['user.test1', 'user.test2']
+
+  def test_removexattr(self):
+    setxattr(self.tmpfn, TestParams.USER_TEST, b'123')
+    a = getxattr(self.tmpfn, TestParams.USER_TEST)
+    assert a == b'123'
+    removexattr(self.tmpfn, TestParams.USER_TEST)
+    a = getxattr(self.tmpfn, TestParams.USER_TEST)
+    assert a is None
+
+if __name__ == "__main__":
+  unittest.main()

common/transformations/.gitignore

@@ -0,0 +1,2 @@
+transformations
+transformations.cpp

common/transformations/README.md

@@ -0,0 +1,70 @@
+
+Reference Frames
+------
+Many reference frames are used throughout. This
+folder contains all helper functions needed to
+transform between them. Generally this is done
+by generating a rotation matrix and multiplying.
+
+
+| Name | [x, y, z] | Units | Notes |
+| :-------------: |:-------------:| :-----:| :----: |
+| Geodetic | [Latitude, Longitude, Altitude] | geodetic coordinates | Sometimes used as [lon, lat, alt], avoid this frame. |
+| ECEF | [x, y, z] | meters | We use **ITRF14 (IGS14)**, NOT NAD83. <br> This is the global Mesh3D frame. |
+| NED | [North, East, Down] | meters | Relative to earth's surface, useful for vizualizing. |
+| Device | [Forward, Right, Down] | meters | This is the Mesh3D local frame. <br> Relative to camera, **not imu.** <br> ![img](http://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/RPY_angles_of_airplanes.png/440px-RPY_angles_of_airplanes.png)|
+| Calibrated | [Forward, Right, Down] | meters | This is the frame the model outputs are in. <br> More details below. <br>|
+| Car | [Forward, Right, Down] | meters | This is useful for estimating position of points on the road. <br> More details below. <br>|
+| View | [Right, Down, Forward] | meters | Like device frame, but according to camera conventions. |
+| Camera | [u, v, focal] | pixels | Like view frame, but 2d on the camera image.|
+| Normalized Camera | [u / focal, v / focal, 1] | / | |
+| Model | [u, v, focal] | pixels | The sampled rectangle of the full camera frame the model uses. |
+| Normalized Model | [u / focal, v / focal, 1] | / | |
+
+
+
+
+Orientation Conventations
+------
+Quaternions, rotation matrices and euler angles are three
+equivalent representations of orientation and all three are
+used throughout the code base.
+
+For euler angles the preferred convention is [roll, pitch, yaw]
+which corresponds to rotations around the [x, y, z] axes. All
+euler angles should always be in radians or radians/s unless
+for plotting or display purposes. For quaternions the hamilton
+notations is preferred which is [q<sub>w</sub>, q<sub>x</sub>, q<sub>y</sub>, q<sub>z</sub>]. All quaternions
+should always be normalized with a strictly positive q<sub>w</sub>. **These
+quaternions are a unique representation of orientation whereas euler angles
+or rotation matrices are not.**
+
+To rotate from one frame into another with euler angles the
+convention is to rotate around roll, then pitch and then yaw,
+while rotating around the rotated axes, not the original axes.
+
+
+Car frame
+------
+Device frame is aligned with the road-facing camera used by openpilot. However, when controlling the vehicle it is helpful to think in a reference frame aligned with the vehicle. These two reference frames can be different.
+
+The orientation of car frame is defined to be aligned with the car's direction of travel and the road plane when the vehicle is driving on a flat road and not turning. The origin of car frame is defined to be directly below device frame (in car frame), such that it is on the road plane. The position and orientation of this frame is not necessarily always aligned with the direction of travel or the road plane due to suspension movements and other effects.
+
+
+Calibrated frame
+------
+It is helpful for openpilot's driving model to take in images that look similar when mounted differently in different cars. To achieve this we "calibrate" the images by transforming it into calibrated frame. Calibrated frame is defined to be aligned with car frame in pitch and yaw, and aligned with device frame in roll. It also has the same origin as device frame.
+
+
+Example
+------
+To transform global Mesh3D positions and orientations (positions_ecef, quats_ecef) into the local frame described by the
+first position and orientation from Mesh3D one would do:
+```
+ecef_from_local = rot_from_quat(quats_ecef[0])
+local_from_ecef = ecef_from_local.T
+positions_local = np.einsum('ij,kj->ki', local_from_ecef, postions_ecef - positions_ecef[0])
+rotations_global = rot_from_quat(quats_ecef)
+rotations_local = np.einsum('ij,kjl->kil', local_from_ecef, rotations_global)
+eulers_local = euler_from_rot(rotations_local)
+```

common/transformations/coordinates.cc

@@ -6,8 +6,6 @@
 
 #include "coordinates.hpp"
 
-#define DEG2RAD(x) ((x) * M_PI / 180.0)
-#define RAD2DEG(x) ((x) * 180.0 / M_PI)
 
 
 double a = 6378137; // lgtm [cpp/short-global-name]

common/transformations/coordinates.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#define DEG2RAD(x) ((x) * M_PI / 180.0)
+#define RAD2DEG(x) ((x) * 180.0 / M_PI)
+
 struct ECEF {
   double x, y, z;
   Eigen::Vector3d to_vector(){
@@ -9,6 +12,9 @@ struct ECEF {
 
 struct NED {
   double n, e, d;
+  Eigen::Vector3d to_vector(){
+    return Eigen::Vector3d(n, e, d);
+  }
 };
 
 struct Geodetic {

common/transformations/orientation.cc

@@ -30,7 +30,8 @@ Eigen::Vector3d quat2euler(Eigen::Quaterniond quat){
   // Eigen::Vector3d euler = quat.toRotationMatrix().eulerAngles(2, 1, 0);
   // return {euler(2), euler(1), euler(0)};
   double gamma = atan2(2 * (quat.w() * quat.x() + quat.y() * quat.z()), 1 - 2 * (quat.x()*quat.x() + quat.y()*quat.y()));
-  double theta = asin(2 * (quat.w() * quat.y() - quat.z() * quat.x()));
+  double asin_arg_clipped = std::clamp(2 * (quat.w() * quat.y() - quat.z() * quat.x()), -1.0, 1.0);
+  double theta = asin(asin_arg_clipped);
   double psi = atan2(2 * (quat.w() * quat.z() + quat.x() * quat.y()), 1 - 2 * (quat.y()*quat.y() + quat.z()*quat.z()));
   return {gamma, theta, psi};
 }

common/transformations/tests/test_coordinates.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import unittest
+
+import common.transformations.coordinates as coord
+
+geodetic_positions = np.array([[37.7610403, -122.4778699, 115],
+                                 [27.4840915, -68.5867592, 2380],
+                                 [32.4916858, -113.652821, -6],
+                                 [15.1392514, 103.6976037, 24],
+                                 [24.2302229, 44.2835412, 1650]])
+
+ecef_positions = np.array([[-2711076.55270557, -4259167.14692758,  3884579.87669935],
+                          [ 2068042.69652729, -5273435.40316622,  2927004.89190746],
+                          [-2160412.60461669, -4932588.89873832,  3406542.29652851],
+                          [-1458247.92550567,  5983060.87496612,  1654984.6099885 ],
+                          [ 4167239.10867871,  4064301.90363223,  2602234.6065749 ]])
+
+ecef_positions_offset = np.array([[-2711004.46961115, -4259099.33540613,  3884605.16002147],
+                                  [ 2068074.30639499, -5273413.78835412,  2927012.48741131],
+                                  [-2160344.53748176, -4932586.20092211,  3406636.2962545 ],
+                                  [-1458211.98517094,  5983151.11161276,  1655077.02698447],
+                                  [ 4167271.20055269,  4064398.22619263,  2602238.95265847]])
+
+
+ned_offsets = np.array([[78.722153649976391, 24.396208657446344, 60.343017506838436],
+                       [10.699003365155221, 37.319278617604269, 4.1084100025050407],
+                       [95.282646251726959, 61.266689955574428, -25.376506058505054],
+                       [68.535769283630003, -56.285970011848889, -100.54840137956515],
+                       [-33.066609321880179, 46.549821994306861, -84.062540548335591]])
+
+ecef_init_batch = np.array([2068042.69652729, -5273435.40316622,  2927004.89190746])
+ecef_positions_offset_batch = np.array([[ 2068089.41454771, -5273434.46829148,  2927074.04783672],
+                                        [ 2068103.31628647, -5273393.92275431,  2927102.08725987],
+                                        [ 2068108.49939636, -5273359.27047121,  2927045.07091581],
+                                        [ 2068075.12395611, -5273381.69432566,  2927041.08207992],
+                                        [ 2068060.72033399, -5273430.6061505,  2927094.54928305]])
+
+ned_offsets_batch = np.array([[  53.88103168,   43.83445935,  -46.27488057],
+                              [  93.83378995,   71.57943024,  -30.23113187],
+                              [  57.26725796,   89.05602684,   23.02265814],
+                              [  49.71775195,   49.79767572,   17.15351015],
+                              [  78.56272609,   18.53100158,  -43.25290759]])
+
+
+class TestNED(unittest.TestCase):
+  def test_small_distances(self):
+    start_geodetic = np.array([33.8042184, -117.888593, 0.0])
+    local_coord = coord.LocalCoord.from_geodetic(start_geodetic)
+
+    start_ned = local_coord.geodetic2ned(start_geodetic)
+    np.testing.assert_array_equal(start_ned, np.zeros(3,))
+
+    west_geodetic = start_geodetic + [0, -0.0005, 0]
+    west_ned = local_coord.geodetic2ned(west_geodetic)
+    self.assertLess(np.abs(west_ned[0]), 1e-3)
+    self.assertLess(west_ned[1], 0)
+
+    southwest_geodetic = start_geodetic + [-0.0005, -0.002, 0]
+    southwest_ned = local_coord.geodetic2ned(southwest_geodetic)
+    self.assertLess(southwest_ned[0], 0)
+    self.assertLess(southwest_ned[1], 0)
+
+  def test_ecef_geodetic(self):
+    # testing single
+    np.testing.assert_allclose(ecef_positions[0], coord.geodetic2ecef(geodetic_positions[0]), rtol=1e-9)
+    np.testing.assert_allclose(geodetic_positions[0, :2], coord.ecef2geodetic(ecef_positions[0])[:2], rtol=1e-9)
+    np.testing.assert_allclose(geodetic_positions[0, 2], coord.ecef2geodetic(ecef_positions[0])[2], rtol=1e-9, atol=1e-4)
+
+    np.testing.assert_allclose(geodetic_positions[:, :2], coord.ecef2geodetic(ecef_positions)[:, :2], rtol=1e-9)
+    np.testing.assert_allclose(geodetic_positions[:, 2], coord.ecef2geodetic(ecef_positions)[:, 2], rtol=1e-9, atol=1e-4)
+    np.testing.assert_allclose(ecef_positions, coord.geodetic2ecef(geodetic_positions), rtol=1e-9)
+
+
+  def test_ned(self):
+    for ecef_pos in ecef_positions:
+      converter = coord.LocalCoord.from_ecef(ecef_pos)
+      ecef_pos_moved = ecef_pos + [25, -25, 25]
+      ecef_pos_moved_double_converted = converter.ned2ecef(converter.ecef2ned(ecef_pos_moved))
+      np.testing.assert_allclose(ecef_pos_moved, ecef_pos_moved_double_converted, rtol=1e-9)
+
+    for geo_pos in geodetic_positions:
+      converter = coord.LocalCoord.from_geodetic(geo_pos)
+      geo_pos_moved = geo_pos + np.array([0, 0, 10])
+      geo_pos_double_converted_moved = converter.ned2geodetic(converter.geodetic2ned(geo_pos) + np.array([0, 0, -10]))
+      np.testing.assert_allclose(geo_pos_moved[:2], geo_pos_double_converted_moved[:2], rtol=1e-9, atol=1e-6)
+      np.testing.assert_allclose(geo_pos_moved[2], geo_pos_double_converted_moved[2], rtol=1e-9, atol=1e-4)
+
+  def test_ned_saved_results(self):
+    for i, ecef_pos in enumerate(ecef_positions):
+      converter = coord.LocalCoord.from_ecef(ecef_pos)
+      np.testing.assert_allclose(converter.ned2ecef(ned_offsets[i]),
+                                 ecef_positions_offset[i],
+                                 rtol=1e-9, atol=1e-4)
+      np.testing.assert_allclose(converter.ecef2ned(ecef_positions_offset[i]),
+                                 ned_offsets[i],
+                                 rtol=1e-9, atol=1e-4)
+
+  def test_ned_batch(self):
+    converter = coord.LocalCoord.from_ecef(ecef_init_batch)
+    np.testing.assert_allclose(converter.ecef2ned(ecef_positions_offset_batch),
+                                                           ned_offsets_batch,
+                                                           rtol=1e-9, atol=1e-7)
+    np.testing.assert_allclose(converter.ned2ecef(ned_offsets_batch),
+                                                           ecef_positions_offset_batch,
+                                                           rtol=1e-9, atol=1e-7)
+if __name__ == "__main__":
+  unittest.main()

common/transformations/tests/test_orientation.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import unittest
+
+from common.transformations.orientation import euler2quat, quat2euler, euler2rot, rot2euler, \
+                                               rot2quat, quat2rot, \
+                                               ned_euler_from_ecef
+
+eulers = np.array([[ 1.46520501,  2.78688383,  2.92780854],
+       [ 4.86909526,  3.60618161,  4.30648981],
+       [ 3.72175965,  2.68763705,  5.43895988],
+       [ 5.92306687,  5.69573614,  0.81100357],
+       [ 0.67838374,  5.02402037,  2.47106426]])
+
+quats = np.array([[ 0.66855182, -0.71500939,  0.19539353,  0.06017818],
+       [ 0.43163717,  0.70013301,  0.28209145,  0.49389021],
+       [ 0.44121991, -0.08252646,  0.34257534,  0.82532207],
+       [ 0.88578382, -0.04515356, -0.32936046,  0.32383617],
+       [ 0.06578165,  0.61282835,  0.07126891,  0.78424163]])
+
+ecef_positions = np.array([[-2711076.55270557, -4259167.14692758,  3884579.87669935],
+                          [ 2068042.69652729, -5273435.40316622,  2927004.89190746],
+                          [-2160412.60461669, -4932588.89873832,  3406542.29652851],
+                          [-1458247.92550567,  5983060.87496612,  1654984.6099885 ],
+                          [ 4167239.10867871,  4064301.90363223,  2602234.6065749 ]])
+
+ned_eulers = np.array([[ 0.46806039, -0.4881889 ,  1.65697808],
+                    [-2.14525969, -0.36533066,  0.73813479],
+                    [-1.39523364, -0.58540761, -1.77376356],
+                    [-1.84220435,  0.61828016, -1.03310421],
+                    [ 2.50450101,  0.36304151,  0.33136365]])
+
+
+class TestOrientation(unittest.TestCase):
+  def test_quat_euler(self):
+    for i, eul in enumerate(eulers):
+      np.testing.assert_allclose(quats[i], euler2quat(eul), rtol=1e-7)
+      np.testing.assert_allclose(quats[i], euler2quat(quat2euler(quats[i])), rtol=1e-6)
+    for i, eul in enumerate(eulers):
+      np.testing.assert_allclose(quats[i], euler2quat(list(eul)), rtol=1e-7)
+      np.testing.assert_allclose(quats[i], euler2quat(quat2euler(list(quats[i]))), rtol=1e-6)
+    np.testing.assert_allclose(quats, euler2quat(eulers), rtol=1e-7)
+    np.testing.assert_allclose(quats, euler2quat(quat2euler(quats)), rtol=1e-6)
+
+  def test_rot_euler(self):
+    for eul in eulers:
+      np.testing.assert_allclose(euler2quat(eul), euler2quat(rot2euler(euler2rot(eul))), rtol=1e-7)
+    for eul in eulers:
+      np.testing.assert_allclose(euler2quat(eul), euler2quat(rot2euler(euler2rot(list(eul)))), rtol=1e-7)
+    np.testing.assert_allclose(euler2quat(eulers), euler2quat(rot2euler(euler2rot(eulers))), rtol=1e-7)
+
+  def test_rot_quat(self):
+    for quat in quats:
+      np.testing.assert_allclose(quat, rot2quat(quat2rot(quat)), rtol=1e-7)
+    for quat in quats:
+      np.testing.assert_allclose(quat, rot2quat(quat2rot(list(quat))), rtol=1e-7)
+    np.testing.assert_allclose(quats, rot2quat(quat2rot(quats)), rtol=1e-7)
+
+  def test_euler_ned(self):
+    for i in range(len(eulers)):
+      np.testing.assert_allclose(ned_eulers[i], ned_euler_from_ecef(ecef_positions[i], eulers[i]), rtol=1e-7)
+      #np.testing.assert_allclose(eulers[i], ecef_euler_from_ned(ecef_positions[i], ned_eulers[i]), rtol=1e-7)
+    # np.testing.assert_allclose(ned_eulers, ned_euler_from_ecef(ecef_positions, eulers), rtol=1e-7)
+
+
+if __name__ == "__main__":
+  unittest.main()

common/window.py

@@ -0,0 +1,54 @@
+import sys
+import pygame  # pylint: disable=import-error
+import cv2  # pylint: disable=import-error
+
+class Window():
+  def __init__(self, w, h, caption="window", double=False, halve=False):
+    self.w = w
+    self.h = h
+    pygame.display.init()
+    pygame.display.set_caption(caption)
+    self.double = double
+    self.halve = halve
+    if self.double:
+      self.screen = pygame.display.set_mode((w*2, h*2))
+    elif self.halve:
+      self.screen = pygame.display.set_mode((w//2, h//2))
+    else:
+      self.screen = pygame.display.set_mode((w, h))
+
+  def draw(self, out):
+    pygame.event.pump()
+    if self.double:
+      out2 = cv2.resize(out, (self.w*2, self.h*2))
+      pygame.surfarray.blit_array(self.screen, out2.swapaxes(0, 1))
+    elif self.halve:
+      out2 = cv2.resize(out, (self.w//2, self.h//2))
+      pygame.surfarray.blit_array(self.screen, out2.swapaxes(0, 1))
+    else:
+      pygame.surfarray.blit_array(self.screen, out.swapaxes(0, 1))
+    pygame.display.flip()
+
+  def getkey(self):
+    while 1:
+      event = pygame.event.wait()
+      if event.type == pygame.QUIT:
+        pygame.quit()
+        sys.exit()
+      if event.type == pygame.KEYDOWN:
+        return event.key
+
+  def getclick(self):
+    for event in pygame.event.get():
+      if event.type == pygame.MOUSEBUTTONDOWN:
+        mx, my = pygame.mouse.get_pos()
+        return mx, my
+
+if __name__ == "__main__":
+  import numpy as np
+  win = Window(200, 200, double=True)
+  img = np.zeros((200, 200, 3), np.uint8)
+  while 1:
+    print("draw")
+    img += 1
+    win.draw(img)

external/bin/ffmpeg

@@ -0,0 +1 @@
+../ffmpeg/bin/ffmpeg

external/bin/ffprobe

@@ -0,0 +1 @@
+../ffmpeg/bin/ffprobe