Revert dPoly computation to 0.6.3 behavior (#809 )

* Revert dPoly computation to 0.6.3 behavior * update test reference
Driver monitoring fix when face is visible briefly during nighttime (#806 )
2026-08-24 17:53:43 +08:00 · 2019-09-13 17:01:54 -07:00 · 2019-09-10 17:35:40 -07:00 · 2019-09-09 23:03:02 +00:00 · 2019-09-09 23:00:24 +00:00 · 2019-09-09 23:00:24 +00:00
3638 changed files with 142151 additions and 926607 deletions
@@ -1,3 +0,0 @@
-((c++-mode (flycheck-gcc-language-standard . "c++11")
-           (flycheck-clang-language-standard . "c++11")
-           ))
@@ -1,24 +0,0 @@
-.git
-.DS_Store
-notebooks
-phone
-massivemap
-neos
-installer
-chffr/app2
-chffr/backend/env
-selfdrive/nav
-selfdrive/baseui
-chffr/lib/vidindex/vidindex
-chffr/lib/index_log/index_log
-selfdrive/test/simulator2
-**/cache_data
-xx/chffr/lib/index_log/index_log
-xx/chffr/lib/vidindex/vidindex
-xx/plus
-xx/community
-xx/projects
-!xx/projects/eon_testing_master
-!xx/projects/map3d
-xx/ops
-xx/junk
@@ -1,11 +0,0 @@
-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
@@ -1,27 +0,0 @@
-*.keras filter=lfs diff=lfs merge=lfs -text
-*.dlc filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.apk 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
-external/zmq/lib/libzmq.a filter=lfs diff=lfs merge=lfs -text
-external/zmq/lib/libczmq.a filter=lfs diff=lfs merge=lfs -text
-phonelibs/acado/x64/lib/libacado_toolkit.a filter=lfs diff=lfs merge=lfs -text
-phonelibs/acado/x64/lib/libacado_toolkit_s.so.1.2.2beta filter=lfs diff=lfs merge=lfs -text
-phonelibs/acado/x64/lib/libacado_casadi.a filter=lfs diff=lfs merge=lfs -text
-phonelibs/acado/x64/lib/libacado_csparse.a filter=lfs diff=lfs merge=lfs -text
-phonelibs/acado/x64/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
-external/mac/MP4Box filter=lfs diff=lfs merge=lfs -text
-models/segnet2.keras filter=lfs diff=lfs merge=lfs -text
-external/opencl/*.deb filter=lfs diff=lfs merge=lfs -text
-phonelibs/zmq/aarch64-linux/lib/libzmq.a filter=lfs diff=lfs merge=lfs -text
-external/azcopy/azcopy filter=lfs diff=lfs merge=lfs -text
@@ -1,25 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve openpilot
-title: ''
-labels: ''
-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, or a explorer/cabana link to the exact drive and timestamp of when the bug occurred.
-
-**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]
- - Version: [e.g. 0.6.4], or commit hash when on devel
- - Car make/model [e.g. Toyota Prius 2016]
-
-**Additional context**
-Add any other context about the problem here.
@@ -1,125 +0,0 @@
-name: Openpilot Tests
-on: [push, pull_request]
-
-env:
-  RUN: docker run --shm-size 1G --rm tmppilot /bin/sh -c
-  LOAD: docker load -i tmppilot.tar.gz/tmppilot.tar.gz
-  UNIT_TEST: cd /tmp/openpilot && python -m unittest discover
-
-jobs:
-  build:
-    name: build
-    runs-on: ubuntu-16.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Checkout submodules
-      run: |
-        git submodule update --init
-    - run: |
-        docker pull $(grep -ioP '(?<=^from)\s+\S+' Dockerfile.openpilot) || true
-        docker pull docker.io/commaai/openpilot:latest || true
-
-        docker build --cache-from docker.io/commaai/openpilot:latest -t tmppilot -f Dockerfile.openpilot .
-        docker save tmppilot:latest | gzip > tmppilot.tar.gz
-    - uses: actions/upload-artifact@v1
-      with:
-        name: tmppilot.tar.gz
-        path: tmppilot.tar.gz
-
-  linter:
-    name: linter
-    runs-on: ubuntu-16.04
-    needs: build
-    steps:
-      - uses: actions/download-artifact@v1
-        with:
-          name: tmppilot.tar.gz
-      - name: Load image
-        run: $LOAD
-      - name: flake8
-        run: $RUN "cd /tmp/openpilot/ && ./flake8_openpilot.sh"
-      - name: pylint
-        run: $RUN "cd /tmp/openpilot/ && ./pylint_openpilot.sh"
-
-  unit_tests:
-    name: unit tests
-    runs-on: ubuntu-16.04
-    needs: build
-    steps:
-      - uses: actions/download-artifact@v1
-        with:
-          name: tmppilot.tar.gz
-      - name: Load image
-        run: $LOAD
-      - name: Run unit tests
-        run: |
-          $RUN cd /tmp/openpilot/selfdrive/test/test_fingerprints.py
-          $RUN "$UNIT_TEST common"
-          $RUN "$UNIT_TEST opendbc/can"
-          $RUN "$UNIT_TEST selfdrive/boardd"
-          $RUN "$UNIT_TEST selfdrive/controls"
-          $RUN "$UNIT_TEST selfdrive/loggerd"
-          $RUN "$UNIT_TEST selfdrive/car"
-          $RUN "$UNIT_TEST selfdrive/locationd"
-          $RUN "$UNIT_TEST selfdrive/athena"
-
-  process_replay:
-    name: process replay
-    runs-on: ubuntu-16.04
-    needs: build
-    timeout-minutes: 30
-    steps:
-      - uses: actions/download-artifact@v1
-        with:
-          name: tmppilot.tar.gz
-      - name: Load image
-        run: $LOAD
-      - name: Run replay
-        run: |
-          CONTAINER_NAME="tmppilot_${GITHUB_SHA}"
-          docker run --shm-size 1G --name ${CONTAINER_NAME} tmppilot /bin/sh -c "cd /tmp/openpilot/selfdrive/test/process_replay && CI=1 ./test_processes.py"
-          docker cp $CONTAINER_NAME:/tmp/openpilot/selfdrive/test/process_replay/diff.txt diff.txt
-          docker rm $CONTAINER_NAME
-      - uses: actions/upload-artifact@v1
-        if: always()
-        with:
-          name: process_replay_diff.txt
-          path: diff.txt
-
-  test_longitudinal:
-    name: longitudinal
-    runs-on: ubuntu-16.04
-    needs: build
-    timeout-minutes: 30
-    steps:
-      - uses: actions/download-artifact@v1
-        with:
-          name: tmppilot.tar.gz
-      - name: Load image
-        run: $LOAD
-      - name: Test longitudinal
-        run: |
-          CONTAINER_NAME="tmppilot_${GITHUB_SHA}"
-          docker run --shm-size 1G --name ${CONTAINER_NAME} tmppilot /bin/sh -c "cd /tmp/openpilot/selfdrive/test/longitudinal_maneuvers && OPTEST=1 ./test_longitudinal.py"
-          mkdir out
-          docker cp $CONTAINER_NAME:/tmp/openpilot/selfdrive/test/longitudinal_maneuvers/out/longitudinal/ out/
-          docker rm $CONTAINER_NAME
-      - uses: actions/upload-artifact@v1
-        if: always()
-        with:
-          name: longitudinal
-          path: out
-
-  test_car_models:
-    name: test car models
-    runs-on: ubuntu-16.04
-    needs: build
-    timeout-minutes: 30
-    steps:
-      - uses: actions/download-artifact@v1
-        with:
-          name: tmppilot.tar.gz
-      - name: Load image
-        run: $LOAD
-      - name: Test car models
-        run: $RUN "mkdir -p /data/params && cd /tmp/openpilot/selfdrive/test/ && ./test_car_models.py"
@@ -3,14 +3,10 @@ venv/
 .tags
 .ipynb_checkpoints
 .idea
-.overlay_init
-.overlay_consistent
 .sconsign.dblite
-.vscode
 model2.png
 a.out

-*.dylib
 *.DSYM
 *.d
 *.pyc
@@ -18,9 +14,7 @@ a.out
 .*.swp
 .*.swo
 .*.un~
-*.tmp
 *.o
-*.os
 *.so
 *.a
 *.clb
@@ -30,30 +24,21 @@ a.out
 config.json
 clcache

-persist
 board/obj/
 selfdrive/boardd/boardd
 selfdrive/logcatd/logcatd
 selfdrive/mapd/default_speeds_by_region.json
 selfdrive/proclogd/proclogd
-selfdrive/ui/_ui
-selfdrive/test/longitudinal_maneuvers/out
+selfdrive/ui/ui
+selfdrive/test/tests/plant/out
 selfdrive/visiond/visiond
 selfdrive/loggerd/loggerd
-selfdrive/sensord/_gpsd
-selfdrive/sensord/_sensord
-selfdrive/camerad/camerad
-selfdrive/modeld/_modeld
-selfdrive/modeld/_dmonitoringmodeld
+selfdrive/sensord/gpsd
+selfdrive/sensord/sensord
 /src/

 one
 openpilot
 notebooks
 xx
-panda_jungle
-
-.coverage*
-htmlcov
-pandaextra

@@ -1,16 +0,0 @@
-[submodule "panda"]
-	path = panda
-	url = ../../commaai/panda.git
-[submodule "opendbc"]
-	path = opendbc
-	url = ../../commaai/opendbc.git
-[submodule "laika_repo"]
-	path = laika_repo
-	url = ../../commaai/laika.git
-[submodule "apks"]
-	path = apks
-	url = ../../commaai/openpilot-apks.git
-[submodule "cereal"]
-	path = cereal
-	url = ../../commaai/cereal.git
-
@@ -0,0 +1,7 @@
+sudo: required
+
+services:
+  - docker
+
+script:
+  - ./run_docker_tests.sh
@@ -29,12 +29,3 @@ Code is automatically check for style by travis as part of the automated tests.
 We've released a [Model Port guide](https://medium.com/@comma_ai/openpilot-port-guide-for-toyota-models-e5467f4b5fe6) for porting to Toyota/Lexus models.

 If you port openpilot to a substantially new car brand, see this more generic [Brand Port guide](https://medium.com/@comma_ai/how-to-write-a-car-port-for-openpilot-7ce0785eda84). You might also be eligible for a bounty. See our bounties at [comma.ai/bounties.html](https://comma.ai/bounties.html)
-
-## Pull Requests
-
-Pull requests should be against the master branch. Before running master on in-car hardware, you'll need to run
-```
-git submodule init
-git submodule update
-```
-in order to pull down the submodules, such as `panda` and `opendbc`.
@@ -6,72 +6,44 @@ RUN apt-get update && apt-get install -y \
    build-essential \
    bzip2 \
    clang \
-    cmake \
-    curl \
-    ffmpeg \
    git \
    libarchive-dev \
-    libbz2-dev \
-    libcurl4-openssl-dev \
-    libeigen3-dev \
+    libavcodec-dev \
+    libavdevice-dev \
+    libavfilter-dev \
+    libavresample-dev \
+    libavutil-dev \
    libffi-dev \
-    libglew-dev \
-    libgles2-mesa-dev \
-    libglfw3-dev \
    libglib2.0-0 \
-    liblzma-dev \
-    libmysqlclient-dev \
-    libomp-dev \
-    libopencv-dev \
    libssl-dev \
-    libsqlite3-dev \
+    libswscale-dev \
    libtool \
-    libusb-1.0-0-dev \
+    libusb-1.0-0 \
    libzmq5-dev \
-    locales \
    ocl-icd-libopencl1 \
    ocl-icd-opencl-dev \
    opencl-headers \
-    python-dev \
+    pkg-config \
    python-pip \
-    screen \
-    sudo \
-    vim \
    wget

+COPY phonelibs/install_capnp.sh /tmp/install_capnp.sh
+RUN /tmp/install_capnp.sh

-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}"
-RUN pyenv install 3.7.3
-RUN pyenv global 3.7.3
-RUN pyenv rehash
-
+RUN pip install --upgrade pip==18.0
 RUN pip install pipenv==2018.11.26

 COPY Pipfile /tmp/
 COPY Pipfile.lock /tmp/
+RUN cd /tmp && pipenv install --deploy --system

-RUN python --version
-RUN cd /tmp && pipenv install --system --deploy
+ENV PYTHONPATH /tmp/openpilot:$PYTHONPATH

-# Install subset of dev dependencies needed for CI
-RUN pip install matplotlib==3.1.1 dictdiffer==0.8.0 fastcluster==1.1.25 aenum==2.2.1 scipy==1.3.1 lru-dict==1.1.6 tenacity==5.1.1 azure-common==1.1.23 azure-nspkg==3.0.2 azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-storage-nspkg==3.1.0 pycurl==7.43.0.3
+RUN git clone --branch v0.6.2 https://github.com/commaai/openpilot-tools.git /tmp/openpilot/tools
+RUN pip install -r /tmp/openpilot/tools/requirements.txt
+RUN pip install fastcluster==1.1.20 scipy==0.19.1 dictdiffer==0.8.0 azure-batch==4.1.3 azure-common==1.1.16 azure-nspkg==3.0.0 azure-storage-blob==1.3.1 azure-storage-common==1.3.0 azure-storage-nspkg==3.0.0

-ENV PATH="/tmp/openpilot/external/bin:${PATH}"
-ENV PYTHONPATH /tmp/openpilot:${PYTHONPATH}
-
-RUN mkdir -p /tmp/openpilot
-COPY ./flake8_openpilot.sh /tmp/openpilot/
-COPY ./pylint_openpilot.sh /tmp/openpilot/
-COPY ./.pylintrc /tmp/openpilot/
-
-COPY ./release /tmp/openpilot/release
+COPY ./.pylintrc /tmp/openpilot/.pylintrc
 COPY ./common /tmp/openpilot/common
 COPY ./cereal /tmp/openpilot/cereal
 COPY ./opendbc /tmp/openpilot/opendbc
@@ -79,10 +51,7 @@ COPY ./selfdrive /tmp/openpilot/selfdrive
 COPY ./phonelibs /tmp/openpilot/phonelibs
 COPY ./pyextra /tmp/openpilot/pyextra
 COPY ./panda /tmp/openpilot/panda
-COPY ./external /tmp/openpilot/external
-COPY ./tools /tmp/openpilot/tools
-
-COPY SConstruct /tmp/openpilot/SConstruct

 RUN mkdir -p /tmp/openpilot/selfdrive/test/out
-RUN cd /tmp/openpilot && scons -j$(nproc)
+RUN make -C /tmp/openpilot/selfdrive/controls/lib/longitudinal_mpc clean
+RUN make -C /tmp/openpilot/selfdrive/controls/lib/lateral_mpc clean
@@ -1,23 +0,0 @@
-pipeline {
-  agent {
-    docker {
-      image 'python:3.7.3'
-      args '--user=root'
-    }
-
-  }
-  stages {
-    stage('EON Build/Test') {
-      steps {
-        lock(resource: "", label: 'eon', inversePrecedence: true, variable: 'eon_name', quantity: 1){
-          timeout(time: 30, unit: 'MINUTES') {
-            dir(path: 'release') {
-              sh 'pip install paramiko'
-              sh 'python remote_build.py'
-            }
-          }
-        }
-      }
-    }
-  }
-}
@@ -0,0 +1,9 @@
+
+code_dir := $(shell pwd)
+
+# TODO: Add a global build system
+
+.PHONY: all
+all:
+	cd selfdrive && PYTHONPATH=$(code_dir) PREPAREONLY=1 ./manager.py
+
@@ -4,85 +4,103 @@ url = "https://pypi.org/simple"
 verify_ssl = true

 [dev-packages]
-opencv-python= "==3.4.2.17"
-PyQt5 = "*"
-ipython = "*"
-networkx = "==2.3"
-azure-core = "==1.1.1"
-azure-common = "==1.1.24"
-azure-nspkg = "==3.0.2"
-azure-storage-blob = "==2.1.0"
-azure-storage-common = "==2.1.0"
-azure-storage-nspkg = "==3.1.0"
+ipython = "<6.0"
+aenum = "*"
+azure-batch = "==4.1.3"
+azure-common = "==1.1.16"
+azure-nspkg = "==3.0.1"
+azure-storage-blob = "==1.3.1"
+azure-storage-common = "==1.3.0"
+azure-storage-nspkg = "==3.0.0"
+bincopy = "*"
+bleach = "==1.5.0"
 boto = "*"
 "boto3" = "*"
+celery = "*"
 control = "*"
 datadog = "*"
+decorator = "*"
 dlib = "*"
+dominate = "*"
 elasticsearch = "*"
+entium = "==0.1.4"
+fasteners = "*"
 future = "*"
 futures = "*"
+gevent = "*"
 pycocotools = {git = "https://github.com/cocodataset/cocoapi.git",subdirectory = "PythonAPI"}
 gunicorn = "*"
 "h5py" = "*"
 hexdump = "*"
-"html5lib" = "*"
+"html5lib" = "==0.9999999"
 imageio = "*"
-ipykernel = "*"
+intervaltree = "*"
+ipykernel = "<5.0"
 joblib = "*"
 json-logging-py = "*"
 jupyter = "*"
 libarchive = "*"
 lru-dict = "*"
+lxml = "*"
+matplotlib = "==2.2.3"
 "mpld3" = "*"
 msgpack-python = "*"
 nbstripout = "*"
-numpy = "*"
-osmium = "*"
-pbr = "*"
+nose-parameterized = "*"
+numpy = "==1.14.5"
+osmium = "==2.15.0"
+pbr = "==5.1.3"
 percache = "*"
 pprofile = "*"
+psutil = "*"
 pycurl = "*"
-git-pylint-commit-hook = "*"
+git-pylint-commit-hook = "==2.5.1"
 pymongo = "*"
 "pynmea2" = "*"
-pypolyline = "*"
+pypolyline = "==0.1.17"
+pysendfile = "*"
 python-logstash = "*"
+pyvcd = "*"
 redis = "*"
+redlock = "*"
 "s2sphere" = "*"
 scikit-image = "*"
 "subprocess32" = "*"
+supervisor = "*"
 tenacity = "*"
-tensorflow-gpu = "==2.0"
+tensorflow-gpu = "==1.13.0rc0"
+"transforms3d" = "*"
+utm = "*"
+"v4l2" = "*"
+visdom = "*"
 PyJWT = "==1.4.1"
 PyMySQL = "==0.9.2"
+Theano = "*"
 Werkzeug = "*"
 "backports.lzma" = "*"
 Flask-Cors = "*"
 Flask-SocketIO = "*"
 "GeoAlchemy2" = "*"
+Keras = ">=2.1.6"
+keras-maskrcnn = "*"
+keras-retinanet = "*"
 Pygments = "*"
 PyNaCl = "*"
 "PySDL2" = "*"
 reverse_geocoder = "*"
 Shapely = "*"
-SQLAlchemy = "*"
+SQLAlchemy = "==1.2.7"
+uWSGI = "*"
 scipy = "*"
-fastcluster = "*"
+fastcluster = "==1.1.25"
 backports-abc = "*"
 pygame = "*"
 simplejson = "*"
 python-logstash-async = "*"
+pandas = "*"
 seaborn = "*"
+tensorflow-estimator = "==1.10.12"
 pyproj = "*"
-mock = "*"
-matplotlib = "*"
-dictdiffer = "*"
-aenum = "*"
-coverage = "*"
-azure-cli-core = "*"
-paramiko = "*"
-aiohttp = "*"

 [packages]
 overpy = {git = "https://github.com/commaai/python-overpy.git",ref = "f86529af402d4642e1faeb146671c40284007323"}
@@ -108,7 +126,7 @@ tqdm = "*"
 Cython = "*"
 PyYAML = "*"
 websocket_client = "*"
-Logentries = {git = "https://github.com/commaai/le_python.git",ref = "feaeacb48f7f4bdb02c0a8fc092326d4e101b7f2"}
+Logentries = {git = "https://github.com/commaai/le_python.git",ref = "5eef8f5be5929d33973e1b10e686fa0cdcd6792f"}
 urllib3 = "*"
 chardet = "*"
 idna = "*"
@@ -119,12 +137,9 @@ Flask = "*"
 PyJWT = "*"
 "Jinja2" = "*"
 nose = "*"
-flake8 = "*"
+pyflakes = "*"
 pylint = "*"
 pycryptodome = "*"
-pillow = "*"
-scons = "*"
-cysignals = "*"

 [requires]
-python_version = "3.7.3"
+python_version = "2.7"
@@ -1,280 +1,179 @@
-[![](https://i.imgur.com/UelUjKAh.png)](#)
+[![](https://i.imgur.com/UetIFyH.jpg)](#)
+
+Welcome to openpilot
+======
+
+[openpilot](http://github.com/commaai/openpilot) is an open source driving agent. Currently, it performs the functions of Adaptive Cruise Control (ACC) and Lane Keeping Assist System (LKAS) for selected Honda, Toyota, Acura, Lexus, Chevrolet, Hyundai, Kia. It's about on par with Tesla Autopilot and GM Super Cruise, and better than [all other manufacturers](http://www.thedrive.com/tech/5707/the-war-for-autonomous-driving-part-iii-us-vs-germany-vs-japan).
+
+The openpilot codebase has been written to be concise and to enable rapid prototyping. We look forward to your contributions - improving real vehicle automation has never been easier.

 Table of Contents
 =======================

-* [What is openpilot?](#what-is-openpilot)
-* [Integration with Stock Features](#integration-with-stock-features)
-* [Supported Hardware](#supported-hardware)
+* [Community](#community)
+* [Hardware](#hardware)
 * [Supported Cars](#supported-cars)
-* [Community Maintained Cars and Features](#community-maintained-cars-and-features)
-* [Installation Instructions](#installation-instructions)
-* [Limitations of openpilot ALC and LDW](#limitations-of-openpilot-alc-and-ldw)
-* [Limitations of openpilot ACC and FCW](#limitations-of-openpilot-acc-and-fcw)
-* [Limitations of openpilot DM](#limitations-of-openpilot-dm)
-* [User Data and comma Account](#user-data-and-comma-account)
-* [Safety and Testing](#safety-and-testing)
+* [Community Maintained Cars](#community-maintained-cars)
+* [In Progress Cars](#in-progress-cars)
+* [How can I add support for my car?](#how-can-i-add-support-for-my-car)
+* [Directory structure](#directory-structure)
+* [User Data / chffr Account / Crash Reporting](#user-data--chffr-account--crash-reporting)
 * [Testing on PC](#testing-on-pc)
-* [Community and Contributing](#community-and-contributing)
-* [Directory Structure](#directory-structure)
+* [Contributing](#contributing)
 * [Licensing](#licensing)

 ---

-What is openpilot?
+Community
 ------

-[openpilot](http://github.com/commaai/openpilot) is an open source driver assistance system. Currently, openpilot performs the functions of Adaptive Cruise Control (ACC), Automated Lane Centering (ALC), Forward Collision Warning (FCW) and Lane Departure Warning (LDW) for a growing variety of supported [car makes, models and model years](#supported-cars). In addition, while openpilot is engaged, a camera based Driver Monitoring (DM) feature alerts distracted and asleep drivers.
+openpilot is developed by [comma.ai](https://comma.ai/) and users like you.
+
+We have a [Twitter you should follow](https://twitter.com/comma_ai).
+
+Also, we have a several thousand people community on [Discord](https://discord.comma.ai).

 <table>
  <tr>
-    <td><a href="https://www.youtube.com/watch?v=mgAbfr42oI8" title="YouTube" rel="noopener"><img src="https://i.imgur.com/kAtT6Ei.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=394rJKeh76k" title="YouTube" rel="noopener"><img src="https://i.imgur.com/lTt8cS2.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=1iNOc3cq8cs" title="YouTube" rel="noopener"><img src="https://i.imgur.com/ANnuSpe.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=Vr6NgrB-zHw" title="YouTube" rel="noopener"><img src="https://i.imgur.com/Qypanuq.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=ICOIin4p70w" title="YouTube" rel="noopener"><img src="https://i.imgur.com/gBTo7yB.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=1zCtj3ckGFo" title="YouTube" rel="noopener"><img src="https://i.imgur.com/gNhhcep.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=Qd2mjkBIRx0" title="YouTube" rel="noopener"><img src="https://i.imgur.com/tFnSexp.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=ju12vlBm59E" title="YouTube" rel="noopener"><img src="https://i.imgur.com/3BKiJVy.png"></a></td>
  </tr>
  <tr>
-    <td><a href="https://www.youtube.com/watch?v=Ug41KIKF0oo" title="YouTube" rel="noopener"><img src="https://i.imgur.com/3caZ7xM.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=NVR_CdG1FRg" title="YouTube" rel="noopener"><img src="https://i.imgur.com/bAZOwql.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=tkEvIdzdfUE" title="YouTube" rel="noopener"><img src="https://i.imgur.com/EFINEzG.png"></a></td>
-    <td><a href="https://www.youtube.com/watch?v=_P-N1ewNne4" title="YouTube" rel="noopener"><img src="https://i.imgur.com/gAyAq22.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=Z5VY5FzgNt4" title="YouTube" rel="noopener"><img src="https://i.imgur.com/3I9XOK2.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=blnhZC7OmMg" title="YouTube" rel="noopener"><img src="https://i.imgur.com/f9IgX6s.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=iRkz7FuJsA8" title="YouTube" rel="noopener"><img src="https://i.imgur.com/Vo5Zvmn.png"></a></td>
+    <td><a href="https://www.youtube.com/watch?v=IHjEqAKDqjM" title="YouTube" rel="noopener"><img src="https://i.imgur.com/V9Zd81n.png"></a></td>
  </tr>
 </table>

-Integration with Stock Features
+Hardware
 ------

-In all supported cars:
-* Stock Lane Keep Assist (LKA) and stock ALC are replaced by openpilot ALC, which only functions when openpilot is engaged by the user.
-* Stock LDW is replaced by openpilot LDW.
+At the moment openpilot supports the [EON Dashcam DevKit](https://comma.ai/shop/products/eon-dashcam-devkit). A [panda](https://shop.comma.ai/products/panda-obd-ii-dongle) and a [giraffe](https://comma.ai/shop/products/giraffe/) are recommended tools to interface the EON with the car. We'd like to support other platforms as well.

-Additionally, on specific supported cars (see ACC column in [supported cars](#supported-cars)):
-* Stock ACC is replaced by openpilot ACC.
-* openpilot FCW operates in addition to stock FCW.
-
-openpilot should preserve all other vehicle's stock features, including, but are not limited to: FCW, Automatic Emergency Braking (AEB), auto high-beam, blind spot warning, and side collision warning.
-
-Supported Hardware
------
-
-At the moment, openpilot supports the [EON DevKit](https://comma.ai/shop/products/eon-dashcam-devkit) and the [comma two](https://comma.ai/shop/products/comma-two-devkit). A [car harness](https://comma.ai/shop/products/car-harness) is recommended to connect the EON or comma two to the car. In the future, we'd like to support other platforms as well, like gaming PCs.
+Install openpilot on a neo device by entering ``https://openpilot.comma.ai`` during NEOS setup.

 Supported Cars
 ------

-| Make      | Model (US Market Reference)   | Supported Package | ACC              | No ACC accel below | No ALC below |
-| ----------| ------------------------------| ------------------| -----------------| -------------------| -------------|
-| Acura     | ILX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>5</sup>  | 25mph        |
-| Acura     | RDX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Chrysler  | Pacifica 2017-18              | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Chrysler  | Pacifica Hybrid 2017-18       | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Chrysler  | Pacifica Hybrid 2019-20       | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Honda     | Accord 2018-19                | All               | Stock            | 0mph               | 3mph         |
-| Honda     | Accord Hybrid 2018-19         | All               | Stock            | 0mph               | 3mph         |
-| Honda     | Civic Hatchback 2017-19       | Honda Sensing     | Stock            | 0mph               | 12mph        |
-| Honda     | Civic Sedan/Coupe 2016-18     | Honda Sensing     | openpilot        | 0mph               | 12mph        |
-| Honda     | Civic Sedan/Coupe 2019        | Honda Sensing     | Stock            | 0mph               | 2mph         |
-| Honda     | CR-V 2015-16                  | Touring           | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Honda     | CR-V 2017-19                  | Honda Sensing     | Stock            | 0mph               | 12mph        |
-| Honda     | CR-V Hybrid 2017-2019         | Honda Sensing     | Stock            | 0mph               | 12mph        |
-| Honda     | Fit 2018-19                   | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Honda     | Odyssey 2018-20               | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 0mph         |
-| Honda     | Passport 2019                 | All               | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Honda     | Pilot 2016-18                 | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Honda     | Pilot 2019                    | All               | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Honda     | Ridgeline 2017-19             | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
-| Hyundai   | Elantra 2017-19<sup>1</sup>   | SCC + LKAS        | Stock            | 19mph              | 34mph        |
-| Hyundai   | Genesis 2018<sup>1</sup>      | All               | Stock            | 19mph              | 34mph        |
-| Hyundai   | Santa Fe 2019<sup>1</sup>     | All               | Stock            | 0mph               | 0mph         |
-| Jeep      | Grand Cherokee 2016-18        | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Jeep      | Grand Cherokee 2019           | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Kia       | Optima 2019<sup>1</sup>       | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Kia       | Sorento 2018<sup>1</sup>      | All               | Stock            | 0mph               | 0mph         |
-| Kia       | Stinger 2018<sup>1</sup>      | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Lexus     | CT Hybrid 2017-18             | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Lexus     | ES 2019                       | All               | openpilot        | 0mph               | 0mph         |
-| Lexus     | ES Hybrid 2019                | All               | openpilot        | 0mph               | 0mph         |
-| Lexus     | IS 2017-2019                  | All               | Stock            | 22mph              | 0mph         |
-| Lexus     | IS Hybrid 2017                | All               | Stock            | 0mph               | 0mph         |
-| Lexus     | RX 2016-17                    | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Lexus     | RX 2020                       | All               | openpilot        | 0mph               | 0mph         |
-| Lexus     | RX Hybrid 2016-19             | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Subaru    | Crosstrek 2018-19             | EyeSight          | Stock            | 0mph               | 0mph         |
-| Subaru    | Impreza 2019-20               | EyeSight          | Stock            | 0mph               | 0mph         |
-| Toyota    | Avalon 2016                   | TSS-P             | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
-| Toyota    | Avalon 2017-18                | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
-| Toyota    | Camry 2018-19                 | All               | Stock            | 0mph<sup>2</sup>   | 0mph         |
-| Toyota    | Camry Hybrid 2018-19          | All               | Stock            | 0mph<sup>2</sup>   | 0mph         |
-| Toyota    | C-HR 2017-19                  | All               | Stock            | 0mph               | 0mph         |
-| Toyota    | C-HR Hybrid 2017-19           | All               | Stock            | 0mph               | 0mph         |
-| Toyota    | Corolla 2017-19               | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
-| Toyota    | Corolla 2020                  | All               | openpilot        | 0mph               | 0mph         |
-| Toyota    | Corolla Hatchback 2019-20     | All               | openpilot        | 0mph               | 0mph         |
-| Toyota    | Corolla Hybrid 2020           | All               | openpilot        | 0mph               | 0mph         |
-| Toyota    | Highlander 2017-19            | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Highlander Hybrid 2017-19     | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Prius 2016                    | TSS-P             | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Prius 2017-19                 | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Prius Prime 2017-20           | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Rav4 2016                     | TSS-P             | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
-| Toyota    | Rav4 2017-18                  | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
-| Toyota    | Rav4 2019                     | All               | openpilot        | 0mph               | 0mph         |
-| Toyota    | Rav4 Hybrid 2016              | TSS-P             | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Rav4 Hybrid 2017-18           | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Toyota    | Rav4 Hybrid 2019-20           | All               | openpilot        | 0mph               | 0mph         |
-| Toyota    | Sienna 2018                   | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Volkswagen| Golf 2016-19<sup>3</sup>      | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Make                 | Model (US Market Reference)| Supported Package    | Lateral | Longitudinal   | No Accel Below   | No Steer Below | Giraffe           |
+| ---------------------| ---------------------------| ---------------------| --------| ---------------| -----------------| ---------------|-------------------|
+| Acura                | ILX 2016-18                | AcuraWatch Plus      | Yes     | Yes            | 25mph<sup>1</sup>| 25mph          | Nidec             |
+| Acura                | RDX 2016-18                | AcuraWatch Plus      | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Nidec             |
+| Buick<sup>3</sup>    | Regal 2018                 | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Chevrolet<sup>3</sup>| Malibu 2017                | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Chevrolet<sup>3</sup>| Volt 2017-18               | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Cadillac<sup>3</sup> | ATS 2018                   | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Chrysler             | Pacifica 2017-18           | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | FCA               |
+| Chrysler             | Pacifica Hybrid 2017-18    | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | FCA               |
+| Chrysler             | Pacifica Hybrid 2019       | Adaptive Cruise      | Yes     | Stock          | 0mph             | 39mph          | FCA               |
+| GMC<sup>3</sup>      | Acadia Denali 2018         | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Holden<sup>3</sup>   | Astra 2017                 | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
+| Honda                | Accord 2018-19             | All                  | Yes     | Stock          | 0mph             | 3mph           | Bosch             |
+| Honda                | Accord Hybrid 2018-19      | All                  | Yes     | Stock          | 0mph             | 3mph           | Bosch             |
+| Honda                | Civic Sedan/Coupe 2016-18  | Honda Sensing        | Yes     | Yes            | 0mph             | 12mph          | Nidec             |
+| Honda                | Civic Sedan/Coupe 2019     | Honda Sensing        | Yes     | Stock          | 0mph             | 2mph           | Bosch             |
+| Honda                | Civic Hatchback 2017-19    | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          | Bosch             |
+| Honda                | CR-V 2015-16               | Touring              | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Nidec             |
+| Honda                | CR-V 2017-19               | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          | Bosch             |
+| Honda                | CR-V Hybrid 2017-2019      | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          | Bosch             |
+| Honda                | Odyssey 2018-19            | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 0mph           | Inverted Nidec    |
+| Honda                | Passport 2019              | All                  | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Inverted Nidec    |
+| Honda                | Pilot 2016-18              | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Nidec             |
+| Honda                | Pilot 2019                 | All                  | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Inverted Nidec    |
+| Honda                | Ridgeline 2017-19          | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          | Nidec             |
+| Hyundai              | Santa Fe 2019              | All                  | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
+| Hyundai              | Elantra 2017-19            | SCC + LKAS           | Yes     | Stock          | 19mph            | 34mph          | Custom<sup>6</sup>|
+| Hyundai              | Genesis 2018               | All                  | Yes     | Stock          | 19mph            | 34mph          | Custom<sup>6</sup>|
+| Jeep                 | Grand Cherokee 2016-18     | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | FCA               |
+| Jeep                 | Grand Cherokee 2019        | Adaptive Cruise      | Yes     | Stock          | 0mph             | 39mph          | FCA               |
+| Kia                  | Optima 2019                | SCC + LKAS           | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
+| Kia                  | Sorento 2018               | All                  | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
+| Kia                  | Stinger 2018               | SCC + LKAS           | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
+| Lexus                | ES Hybrid 2019             | All                  | Yes     | Yes            | 0mph             | 0mph           | Toyota            |
+| Lexus                | RX Hybrid 2016-19          | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Lexus                | IS 2017-2019               | All                  | Yes     | Stock          | 22mph            | 0mph           | Toyota            |
+| Lexus                | IS Hybrid 2017             | All                  | Yes     | Stock          | 0mph             | 0mph           | Toyota            |
+| Subaru               | Crosstrek 2018             | EyeSight             | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>4</sup>|
+| Subaru               | Impreza 2019               | EyeSight             | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>4</sup>|
+| Toyota               | Avalon 2016                | TSS-P                | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           | Toyota            |
+| Toyota               | Avalon 2017-18             | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           | Toyota            |
+| Toyota               | Camry 2018-19              | All                  | Yes     | Stock          | 0mph<sup>5</sup> | 0mph           | Toyota            |
+| Toyota               | Camry Hybrid 2018-19       | All                  | Yes     | Stock          | 0mph<sup>5</sup> | 0mph           | Toyota            |
+| Toyota               | C-HR 2017-19               | All                  | Yes     | Stock          | 0mph             | 0mph           | Toyota            |
+| Toyota               | C-HR Hybrid 2017-19        | All                  | Yes     | Stock          | 0mph             | 0mph           | Toyota            |
+| Toyota               | Corolla 2017-19            | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           | Toyota            |
+| Toyota               | Corolla 2020               | All                  | Yes     | Yes            | 0mph             | 0mph           | Toyota            |
+| Toyota               | Corolla Hatchback 2019     | All                  | Yes     | Yes            | 0mph             | 0mph           | Toyota            |
+| Toyota               | Highlander 2017-19         | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Highlander Hybrid 2017-19  | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Prius 2016                 | TSS-P                | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Prius 2017-19              | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Prius Prime 2017-19        | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Rav4 2016                  | TSS-P                | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           | Toyota            |
+| Toyota               | Rav4 2017-18               | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           | Toyota            |
+| Toyota               | Rav4 2019                  | All                  | Yes     | Yes            | 0mph             | 0mph           | Toyota            |
+| Toyota               | Rav4 Hybrid 2016           | TSS-P                | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Rav4 Hybrid 2017-18        | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |
+| Toyota               | Sienna 2018                | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |

-<sup>1</sup>Requires a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle) and open sourced [Hyundai giraffe](https://github.com/commaai/neo/tree/master/giraffe/hyundai), designed for the 2019 Sante Fe; pinout may differ for other Hyundai and Kia models. <br />
-<sup>2</sup>28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control. <br />
-<sup>3</sup>Requires a [custom connector](https://community.comma.ai/wiki/index.php/Volkswagen#Integration_at_R242_Camera) for the [car harness](https://comma.ai/shop/products/car-harness) <br />
+<sup>1</sup>[Comma Pedal](https://community.comma.ai/wiki/index.php/Comma_Pedal) is used to provide stop-and-go capability to some of the openpilot-supported cars that don't currently support stop-and-go. Here is how to [build a Comma Pedal](https://medium.com/@jfrux/comma-pedal-building-with-macrofab-6328bea791e8). ***NOTE: The Comma Pedal is not officially supported by [comma.ai](https://comma.ai).*** <br />
+<sup>2</sup>When disconnecting the Driver Support Unit (DSU), otherwise longitudinal control is stock ACC. For DSU locations, see [Toyota Wiki page](https://community.comma.ai/wiki/index.php/Toyota). ***NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).*** <br />
+<sup>3</sup>[GM installation guide](https://zoneos.com/volt/). ***NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).*** <br />
+<sup>4</sup>Subaru Giraffe is DIY. <br />
+<sup>5</sup>28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control. <br />
+<sup>6</sup>Open sourced [Hyundai Giraffe](https://github.com/commaai/neo/tree/master/giraffe/hyundai) is designed for the 2019 Sante Fe; pinout may differ for other Hyundais. <br />
+<sup>7</sup>Community built Giraffe, find more information [here](https://zoneos.com/shop/). <br />

-Community Maintained Cars and Features
+Community Maintained Cars
 ------

-| Make      | Model (US Market Reference)   | Supported Package | ACC              | No ACC accel below | No ALC below |
-| ----------| ------------------------------| ------------------| -----------------| -------------------| -------------|
-| Buick     | Regal 2018<sup>6</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Cadillac  | ATS 2018<sup>6</sup>          | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chevrolet | Malibu 2017<sup>6</sup>       | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chevrolet | Volt 2017-18<sup>6</sup>      | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| GMC       | Acadia Denali 2018<sup>6</sup>| Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Holden    | Astra 2017<sup>6</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| Make                 | Model                    | Supported Package    | Lateral | Longitudinal   | No Accel Below   | No Steer Below | Giraffe           |
+| ---------------------| -------------------------| ---------------------| --------| ---------------| -----------------| ---------------|-------------------|
+| Tesla                | Model S 2012-13          | All                  | Yes     | Not yet        | Not applicable   | 0mph           | Custom<sup>8</sup>|

-<sup>4</sup>When disconnecting the Driver Support Unit (DSU), openpilot ACC will replace stock ACC. For DSU locations, see [Toyota Wiki page](https://community.comma.ai/wiki/index.php/Toyota). ***NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).*** <br />
-<sup>5</sup>[Comma Pedal](https://community.comma.ai/wiki/index.php/Comma_Pedal) is used to provide stop-and-go capability to some of the openpilot-supported cars that don't currently support stop-and-go. Here is how to [build a Comma Pedal](https://medium.com/@jfrux/comma-pedal-building-with-macrofab-6328bea791e8). ***NOTE: The Comma Pedal is not officially supported by [comma](https://comma.ai).*** <br />
-<sup>6</sup>Requires a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle) and [community built giraffe](https://zoneos.com/volt/). ***NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).*** <br />
+[[Tesla Model S Pull Request]](https://github.com/commaai/openpilot/pull/246) <br />
+<sup>8</sup>Community built Giraffe, find more information here [Community Tesla Giraffe](https://github.com/jeankalud/neo/tree/tesla_giraffe/giraffe/tesla) <br />

-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`.
+Community Maintained Cars are not confirmed by comma.ai to meet our [safety model](https://github.com/commaai/openpilot/blob/devel/SAFETY.md). Be extra cautious using them.

-Installation Instructions
+In Progress Cars
+------
+- All TSS-P Toyota with Steering Assist and LSS-P Lexus with Steering Assist or Lane Keep Assist.
+- All Hyundai with SmartSense.
+- All Kia with SCC and LKAS.
+- All Chrysler, Jeep, Fiat with Adaptive Cruise Control and LaneSense.
+- All Subaru with EyeSight.
+
+How can I add support for my car?
 ------

-Install openpilot on a EON by entering ``https://openpilot.comma.ai`` during the installer setup.
+If your car has adaptive cruise control and lane keep assist, you are in luck. Using a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle/) and [cabana](https://community.comma.ai/cabana/), you can understand how to make your car drive by wire.

-Follow this [video instructions](https://youtu.be/3nlkomHathI) to properly mount the EON on the windshield. Note: openpilot features an automatic pose calibration routine and openpilot performance should not be affected by small pitch and yaw misalignments caused by imprecise EON mounting.
+We've written guides for [Brand](https://medium.com/@comma_ai/how-to-write-a-car-port-for-openpilot-7ce0785eda84) and [Model](https://medium.com/@comma_ai/openpilot-port-guide-for-toyota-models-e5467f4b5fe6) ports. These guides might help you after you have the basics figured out.

-Before placing the device on your windshield, check the state and local laws and ordinances where you drive. Some state laws prohibit or restrict the placement of objects on the windshield of a motor vehicle.
+- BMW, Audi, Volvo, and Mercedes all use [FlexRay](https://en.wikipedia.org/wiki/FlexRay) and can be supported after [FlexRay support](https://github.com/commaai/openpilot/pull/463) is merged.
+- We put time into a Ford port, but the steering has a 10 second cutout limitation that makes it unusable.
+- The 2016-2017 Honda Accord uses a custom signaling protocol for steering that's unlikely to ever be upstreamed.

-You will be able to engage openpilot after reviewing the onboarding screens and finishing the calibration procedure.
-
-Limitations of openpilot ALC and LDW
------
-
-openpilot ALC and openpilot LDW do not automatically drive the vehicle or reduce the amount of attention that must be paid to operate your vehicle. The driver must always keep control of the steering wheel and be ready to correct the openpilot ALC action at all times.
-
-While changing lanes, openpilot is not capable of looking next to you or checking your blind spot. Only nudge the wheel to initiate a lane change after you have confirmed it's safe to do so.
-
-Many factors can impact the performance of openpilot ALC and openpilot LDW, causing them to be unable to function as intended. These include, but are not limited to:
-
-* Poor visibility (heavy rain, snow, fog, etc.) or weather conditions that may interfere with sensor operation.
-* The road facing camera is obstructed, covered or damaged by mud, ice, snow, etc.
-* Obstruction caused by applying excessive paint or adhesive products (such as wraps, stickers, rubber coating, etc.) onto the vehicle.
-* The EON is mounted incorrectly.
-* When in sharp curves, like on-off ramps, intersections etc...; openpilot is designed to be limited in the amount of steering torque it can produce.
-* In the presence of restricted lanes or construction zones.
-* When driving on highly banked roads or in presence of strong cross-wind.
-* Extremely hot or cold temperatures.
-* Bright light (due to oncoming headlights, direct sunlight, etc.).
-* Driving on hills, narrow, or winding roads.
-
-The list above does not represent an exhaustive list of situations that may interfere with proper operation of openpilot components. It is the driver's responsibility to be in control of the vehicle at all times.
-
-Limitations of openpilot ACC and FCW
------
-
-openpilot ACC and openpilot FCW are not systems that allow careless or inattentive driving. It is still necessary for the driver to pay close attention to the vehicle’s surroundings and to be ready to re-take control of the gas and the brake at all times.
-
-Many factors can impact the performance of openpilot ACC and openpilot FCW, causing them to be unable to function as intended. These include, but are not limited to:
-
-* Poor visibility (heavy rain, snow, fog, etc.) or weather conditions that may interfere with sensor operation.
-* The road facing camera or radar are obstructed, covered, or damaged by mud, ice, snow, etc.
-* Obstruction caused by applying excessive paint or adhesive products (such as wraps, stickers, rubber coating, etc.) onto the vehicle.
-* The EON is mounted incorrectly.
-* Approaching a toll booth, a bridge or a large metal plate.
-* When driving on roads with pedestrians, cyclists, etc...
-* In presence of traffic signs or stop lights, which are not detected by openpilot at this time.
-* When the posted speed limit is below the user selected set speed. openpilot does not detect speed limits at this time.
-* In presence of vehicles in the same lane that are not moving.
-* When abrupt braking maneuvers are required. openpilot is designed to be limited in the amount of deceleration and acceleration that it can produce.
-* When surrounding vehicles perform close cut-ins from neighbor lanes.
-* Driving on hills, narrow, or winding roads.
-* Extremely hot or cold temperatures.
-* Bright light (due to oncoming headlights, direct sunlight, etc.).
-* Interference from other equipment that generates radar waves.
-
-The list above does not represent an exhaustive list of situations that may interfere with proper operation of openpilot components. It is the driver's responsibility to be in control of the vehicle at all times.
-
-Limitations of openpilot DM
------
-
-openpilot DM should not be considered an exact measurements of the status of alertness of the driver.
-
-Many factors can impact the performance of openpilot DM, causing it to be unable to function as intended. These include, but are not limited to:
-
-* Low light conditions, such as driving at night or in dark tunnels.
-* Bright light (due to oncoming headlights, direct sunlight, etc.).
-* The driver face is partially or completely outside field of view of the driver facing camera.
-* Right hand driving vehicles.
-* The driver facing camera is obstructed, covered, or damaged.
-
-The list above does not represent an exhaustive list of situations that may interfere with proper operation of openpilot components. A driver should not rely on openpilot DM to assess their level of attention.
-
-User Data and comma Account
------
-
-By default, openpilot uploads the driving data to our servers. You can also access your data by pairing with the comma connect app ([iOS](https://apps.apple.com/us/app/comma-connect/id1456551889), [Android](https://play.google.com/store/apps/details?id=ai.comma.connect&hl=en_US)). We use your data to train better models and improve openpilot for everyone.
-
-openpilot is open source software: the user is free to disable data collection if they wish to do so.
-
-openpilot logs the road facing camera, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
-The driver facing camera is only logged if you explicitly opt-in in settings. The microphone is not recorded.
-
-By using openpilot, you agree to [our Privacy Policy](https://my.comma.ai/privacy). You understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma for the use of this data.
-
-Safety and Testing
----
-
-* openpilot observes ISO26262 guidelines, see [SAFETY.md](SAFETY.md) for more detail.
-* openpilot has software in the loop [tests](run_docker_tests.sh) that run on every commit.
-* The safety model code lives in panda and is written in C, see [code rigor](https://github.com/commaai/panda#code-rigor) for more details.
-* panda has software in the loop [safety tests](https://github.com/commaai/panda/tree/master/tests/safety).
-* Internally, we have a hardware in the loop Jenkins test suite that builds and unit tests the various processes.
-* panda has additional hardware in the loop [tests](https://github.com/commaai/panda/blob/master/Jenkinsfile).
-* We run the latest openpilot in a testing closet containing 10 EONs continuously replaying routes.
-
-Testing on PC
------
-
-Check out the tools directory in master: lots of tools you can use to replay driving data, test and develop openpilot from your pc.
-
-Community and Contributing
------
-
-openpilot is developed by [comma](https://comma.ai/) and by users like you. We welcome both pull requests and issues on [GitHub](http://github.com/commaai/openpilot). Bug fixes and new car ports are encouraged.
-
-You can add support for your car by following guides we have written for [Brand](https://medium.com/@comma_ai/how-to-write-a-car-port-for-openpilot-7ce0785eda84) and [Model](https://medium.com/@comma_ai/openpilot-port-guide-for-toyota-models-e5467f4b5fe6) ports. Generally, a car with adaptive cruise control and lane keep assist is a good candidate. [Join our Discord](https://discord.comma.ai) to discuss car ports: most car makes have a dedicated channel.
-
-Want to get paid to work on openpilot? [comma is hiring](https://comma.ai/jobs/). We also have a [bounty program](https://comma.ai/bounties.html).
-
-And [follow us on Twitter](https://twitter.com/comma_ai).
-
-Directory Structure
+Directory structure
 ------
    .
    ├── apk                 # The apk files used for the UI
-    ├── cereal              # The messaging spec and libs used for all logs on EON
+    ├── cereal              # The messaging spec used for all logs on EON
    ├── common              # Library like functionality we've developed here
    ├── installer/updater   # Manages auto-updates of openpilot
    ├── opendbc             # Files showing how to interpret data from cars
-    ├── panda               # Code used to communicate on CAN
+    ├── panda               # Code used to communicate on CAN and LIN
    ├── phonelibs           # Libraries used on EON
    ├── pyextra             # Libraries used on EON
    └── selfdrive           # Code needed to drive the car
        ├── assets          # Fonts and images for UI
        ├── athena          # Allows communication with the app
        ├── boardd          # Daemon to talk to the board
-        ├── camerad         # Driver to capture images from the camera sensors
+        ├── can             # Helpers for parsing CAN messages
        ├── car             # Car specific code to read states and control actuators
        ├── common          # Shared C/C++ code for the daemons
        ├── controls        # Perception, planning and controls
@@ -282,20 +181,54 @@ Directory Structure
        ├── locationd       # Soon to be home of precise location
        ├── logcatd         # Android logcat as a service
        ├── loggerd         # Logger and uploader of car data
-        ├── modeld          # Driving and monitoring model runners
        ├── proclogd        # Logs information from proc
        ├── sensord         # IMU / GPS interface code
-        ├── tests           # Unit tests, system tests and a car simulator
-        └── ui              # The UI
+        ├── test            # Car simulator running code through virtual maneuvers
+        ├── ui              # The UI
+        └── visiond         # Vision pipeline

-To understand how the services interact, see `cereal/service_list.yaml`.
+To understand how the services interact, see `selfdrive/service_list.yaml`
+
+User Data / chffr Account / Crash Reporting
+------
+
+By default, openpilot creates an account and includes a client for chffr, our dashcam app. We use your data to train better models and improve openpilot for everyone.
+
+It's open source software, so you are free to disable it if you wish.
+
+It logs the road facing camera, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
+The user facing camera is only logged if you explicitly opt-in in settings.
+It does not log the microphone.
+
+By using it, you agree to [our privacy policy](https://community.comma.ai/privacy.html). You understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma.ai. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma.ai for the use of this data.
+
+Testing on PC
+------
+
+Check out [openpilot-tools](https://github.com/commaai/openpilot-tools): lots of tools you can use to replay driving data, test and develop openpilot from your pc.
+
+Also, within openpilot there is a rudimentary infrastructure to run a basic simulation and generate a report of openpilot's behavior in different longitudinal control scenarios.
+
+```bash
+# Requires working docker
+./run_docker_tests.sh
+```
+
+Contributing
+------
+
+We welcome both pull requests and issues on [github](http://github.com/commaai/openpilot). Bug fixes and new car ports encouraged.
+
+We also have a [bounty program](https://comma.ai/bounties.html).
+
+Want to get paid to work on openpilot? [comma.ai is hiring](https://comma.ai/jobs/)

 Licensing
 ------

 openpilot is released under the MIT license. Some parts of the software are released under other licenses as specified.

-Any user of this software shall indemnify and hold harmless comma.ai, Inc. and its directors, officers, employees, agents, stockholders, affiliates, subcontractors and customers from and against all allegations, claims, actions, suits, demands, damages, liabilities, obligations, losses, settlements, judgments, costs and expenses (including without limitation attorneys’ fees and costs) which arise out of, relate to or result from any use of this software by user.
+Any user of this software shall indemnify and hold harmless Comma.ai, Inc. and its directors, officers, employees, agents, stockholders, affiliates, subcontractors and customers from and against all allegations, claims, actions, suits, demands, damages, liabilities, obligations, losses, settlements, judgments, costs and expenses (including without limitation attorneys’ fees and costs) which arise out of, relate to or result from any use of this software by user.

 **THIS IS ALPHA QUALITY SOFTWARE FOR RESEARCH PURPOSES ONLY. THIS IS NOT A PRODUCT.
 YOU ARE RESPONSIBLE FOR COMPLYING WITH LOCAL LAWS AND REGULATIONS.
@@ -0,0 +1,36 @@
+Welcome to chffrplus
+======
+
+[chffrplus](https://github.com/commaai/chffrplus) is an open source dashcam.
+
+This is the shipping reference software for the comma EON Dashcam DevKit. It keeps many of the niceities of [openpilot](https://github.com/commaai/openpilot), like high quality sensors, great camera, and good autostart and stop. Though unlike openpilot, it cannot control your car. chffrplus can interface with your car through a [panda](https://shop.comma.ai/products/panda-obd-ii-dongle), but just like our dashcam app [chffr](https://getchffr.com/), it is read only.
+
+It integrates with the rest of the comma ecosystem, so you can view your drives on the [chffr](https://getchffr.com/) app for Android or iOS, and reverse engineer your car with [cabana](https://community.comma.ai/cabana/?demo=1).
+
+
+Hardware
+------
+
+Right now chffrplus supports the [EON Dashcam DevKit](https://shop.comma.ai/products/eon-dashcam-devkit) for hardware to run on.
+
+Install chffrplus on a EON device by entering ``https://chffrplus.comma.ai`` during NEOS setup.
+
+
+User Data / chffr Account / Crash Reporting
+------
+
+By default chffrplus creates an account and includes a client for chffr, our dashcam app.
+
+It's open source software, so you are free to disable it if you wish. 
+
+It logs the road facing camera, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
+It does not log the user facing camera or the microphone.
+
+By using it, you agree to [our privacy policy](https://beta.comma.ai/privacy.html). You understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma.ai. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma.ai for the use of this data.
+
+
+Licensing
+------
+
+chffrplus is released under the MIT license.
+
@@ -1,63 +1,3 @@
-Version 0.7.2 (2020-02-07)
-========================
- * ECU firmware version based fingerprinting for Honda & Toyota
- * New driving model: improved path prediction during turns and lane changes and better lead speed tracking
- * Improve driver monitoring under extreme lighting and add low accuracy alert
- * Support for 2019 Rav4 Hybrid thanks to illumiN8i!
- * Support for 2016, 2017 and 2020 Lexus RX thanks to illumiN8i!
- * Support for 2020 Chrysler Pacifica Hybrid thanks to adhintz!
-
-Version 0.7.1 (2020-01-20)
-========================
- * comma two support!
- * Lane Change Assist above 45 mph!
- * Replace zmq with custom messaging library, msgq!
- * Supercombo model: calibration and driving models are combined for better lead estimate
- * More robust updater thanks to jyoung8607! Requires NEOS update
- * Improve low speed ACC tuning
-
-Version 0.7 (2019-12-13)
-========================
- * Move to SCons build system!
- * Add Lane Departure Warning (LDW) for all supported vehicles!
- * NEOS update: increase wifi speed thanks to jyoung8607!
- * Adaptive driver monitoring based on scene
- * New driving model trained end-to-end: improve lane lines and lead detection
- * Smarter torque limit alerts for all cars
- * Improve GM longitudinal control: proper computations for 15Hz radar
- * Move GM port, Toyota with DSU removed, comma pedal in community features; toggle switch required
- * Remove upload over cellular toggle: only upload qlog and qcamera files if not on wifi
- * Refactor Panda code towards ISO26262 and SIL2 compliancy
- * Forward stock FCW for Honda Nidec
- * Volkswagen port now standard: comma Harness intercepts stock camera
-
-Version 0.6.6 (2019-11-05)
-========================
- * Volkswagen support thanks to jyoung8607!
- * Toyota Corolla Hybrid with TSS 2.0 support thanks to u8511049!
- * Lexus ES with TSS 2.0 support thanks to energee!
- * Fix GM ignition detection and lock safety mode not required anymore
- * Log panda firmware and dongle ID thanks to martinl!
- * New driving model: improve path prediction and lead detection
- * New driver monitoring model, 4x smaller and running on DSP
- * Display an alert and don't start openpilot if panda has wrong firmware
- * Fix bug preventing EON from terminating processes after a drive
- * Remove support for Toyota giraffe without the 120Ohm resistor
-
-Version 0.6.5 (2019-10-07)
-========================
- * NEOS update: upgrade to Python3 and new installer!
- * comma Harness support!
- * New driving model: improve path prediction
- * New driver monitoring model: more accurate face and eye detection
- * Redesign offroad screen to display updates and alerts
- * Increase maximum allowed acceleration
- * Prevent car 12V battery drain by cutting off EON charge after 3 days of no drive
- * Lexus CT Hybrid support thanks to thomaspich!
- * Louder chime for critical alerts
- * Add toggle to switch to dashcam mode
- * Fix "invalid vehicle params" error on DSU-less Toyota
-
 Version 0.6.4 (2019-09-08)
 ========================
 * Forward stock AEB for Honda Nidec
@@ -108,7 +48,7 @@ Version 0.6 (2019-07-01)
 * Panda safety code is MISRA compliant and ships with a signed version on release2
 * New NEOS is 500MB smaller and has a reproducible usr/pipenv
 * Lexus ES Hybrid support thanks to wocsor!
- * Improve tuning for supported Toyota with TSS 2.0
+ * Improve tuning for supported Toyota with TSS2
 * Various other stability improvements

 Version 0.5.13 (2019-05-31)
@@ -1,26 +1,16 @@
 openpilot Safety
 ======

-openpilot is an Adaptive Cruise Control (ACC) and Automated Lane Centering (ALC) system. 
-Like other ACC and ALC systems, openpilot is a failsafe passive system and it requires the
-driver to be alert and to pay attention at all times.
+openpilot is an Adaptive Cruise Control (ACC) and Lane Keeping Assist (LKA) system. 
+Like other ACC and LKA systems, openpilot requires the driver to be alert and to 
+pay attention at all times. We repeat, **driver alertness is necessary, but not 
+sufficient, for openpilot to be used safely**.

 In order to enforce driver alertness, openpilot includes a driver monitoring feature
 that alerts the driver when distracted.

 However, even with an attentive driver, we must make further efforts for the system to be
-safe. We repeat, **driver alertness is necessary, but not sufficient, for openpilot to be
-used safely** and openpilot is provided with no warranty of fitness for any purpose.
-
-openpilot is developed in good faith to be compliant with FMVSS requirements and to follow
-industry standards of safety for Level 2 Driver Assistance Systems. In particular, we observe
-ISO26262 guidelines, including those from [pertinent documents](https://www.nhtsa.gov/sites/nhtsa.dot.gov/files/documents/13498a_812_573_alcsystemreport.pdf)
-released by NHTSA. In addition, we impose strict coding guidelines (like [MISRA C : 2012](https://www.misra.org.uk/MISRAHome/MISRAC2012/tabid/196/Default.aspx))
-on parts of openpilot that are safety relevant. We also perform software-in-the-loop,
-hardware-in-the-loop and in-vehicle tests before each software release.
-
-Following Hazard and Risk Analysis and FMEA, at a very high level, we have designed openpilot
-ensuring two main safety requirements.
+safe. We have designed openpilot with two other safety considerations.

 1. The driver must always be capable to immediately retake manual control of the vehicle, 
   by stepping on either pedal or by pressing the cancel button.
@@ -28,7 +18,134 @@ ensuring two main safety requirements.
   react. This means that while the system is engaged, the actuators are constrained
   to operate within reasonable limits.

-For vehicle specific implementation of the safety concept, refer to `panda/board/safety/`.
+Following are details of the car specific safety implementations:
+
+Honda/Acura
+------
+
+  - While the system is engaged, gas, brake and steer commands are subject to the same limits used by
+    the stock system.
+
+  - Without an interceptor, the gas is controlled by the Powertrain Control Module (PCM). 
+    The PCM limits acceleration to what is reasonable for a cruise control system.  With an
+    interceptor, the gas is clipped to 60%.
+
+  - The brake is controlled by the 0x1FA CAN message. This message allows full
+    braking, although the panda firmware and openpilot clip it to 1/4th of the max.
+    This is approximately 0.3g of braking.
+
+  - Steering is controlled by the 0xE4 CAN message. The Electronic Power Steering (EPS) 
+    controller in the car limits the torque to a very small amount, so regardless of the 
+    message, the controller cannot jerk the wheel.
+
+  - Brake and gas pedal pressed signals are contained in the 0x17C CAN message. A rising edge of
+    either signals triggers a disengagement, which is enforced by the panda firmware and by openpilot. The
+    white led on the panda signifies if the panda is allowing control messages.
+
+  - Honda CAN uses both a counter and a checksum to ensure integrity and prevent
+    replay of the same message.
+
+Toyota/Lexus
+------
+
+  - While the system is engaged, gas, brake and steer commands are subject to the same limits used by
+    the stock system.
+
+  - With the stock Driving Support Unit (DSU) connected (or in DSU-less models like Camry and C-HR),
+    the acceleration is controlled by the stock system and is subject to the stock adaptive cruise
+    control limits. Without the stock DSU connected, the acceleration command is controlled by the
+    0x343 CAN message and its value is limited between .3g of deceleration and .15g of acceleration
+    by the panda firmware and by openpilot. The acceleration command is ignored by the Engine Control
+    Module (ECM) while the cruise control system is disengaged.
+
+  - Steering torque is controlled through the 0x2E4 CAN message and it's limited by the panda firmware and by
+    openpilot to a value between -1500 and 1500. In addition, the vehicle EPS unit will not respond to
+    commands outside these limits.  A steering torque rate limit is enforced by the panda firmware and by
+    openpilot, so that the commanded steering torque must rise from 0 to max value no faster than
+    1.5s. Commanded steering torque is limited by the panda firmware and by openpilot to be no more than 350
+    units above the actual EPS generated motor torque to ensure limited differences between
+    commanded and actual torques.
+
+  - Brake and gas pedal pressed signals are contained in the 0x224 and 0x1D2 CAN messages,
+    respectively. A rising edge of either signals triggers a disengagement, which is enforced by the
+    panda firmware and by openpilot. Additionally, the cruise control system disengages on the rising edge of
+    the brake pedal pressed signal.
+
+  - The cruise control system state is contained in the 0x1D2 message. No control messages are
+    allowed if the cruise control system is not active. This is enforced by openpilot and the
+    panda firmware. The white led on the panda signifies if the panda is allowing control messages.
+
+GM/Chevrolet
+------
+
+  - While the system is engaged, gas, brake and steer commands are subject to the same limits used by
+    the stock system.
+
+  - The gas and regen are controlled by the 0x2CB message and it's limited by the panda firmware and by
+    openpilot to a value between 1404 and 3072. the minimum value correspond to a mild decel due to regen,
+    while 3072 correspond to approximately 0.18g of acceleration from stop.
+
+  - The friction brakes are controlled by the 0x315 message and its value is limited by the panda firmware
+    and openpilot to 350. This is approximately 0.3g of braking.
+
+  - Steering torque is controlled through the 0x180 CAN message and it's limited by the panda firmware and by
+    openpilot to a value between -300 and 300. In addition, the vehicle EPS unit will fault for
+    commands outside these limits.  A steering torque rate limit is enforced by the panda firmware and by
+    openpilot, so that the commanded steering torque must rise from 0 to max value no faster than
+    0.75s. Commanded steering torque is gradually limited by the panda firmware and by openpilot if the driver's
+    torque exceeds 12 units in the opposite dicrection to ensure limited applied torque against the
+    driver's will.
+
+  - Brake pedal and gas pedal potentiometer signals are contained in the 0xF1 and 0x1A1 CAN messages,
+    respectively. A rising edge of either signals triggers a disengagement, which is enforced by the
+    panda firmware and by openpilot. Additionally, the cruise control system disengages on the rising edge of
+    the brake pedal pressed signal. The regen paddle pressed signal is in the 0xBD message. When the
+    regen paddle is pressed, a disengagement is enforced by both the firmware and by openpilot.
+
+  - GM CAN uses both a counter and a checksum to ensure integrity and prevent
+    replay of the same message.
+
+Hyundai/Kia (Lateral only)
+------
+
+  - While the system is engaged, steer commands are subject to the same limits used by
+    the stock system.
+
+  - Steering torque is controlled through the 0x340 CAN message and it's limited by the panda firmware and by
+    openpilot to a value between -255 and 255. In addition, the vehicle EPS unit will fault for
+    commands outside the values of -409 and 409. A steering torque rate limit is enforced by the panda firmware and by
+    openpilot, so that the commanded steering torque must rise from 0 to max value no faster than
+    0.85s. Commanded steering torque is gradually limited by the panda firmware and by openpilot if the driver's
+    torque exceeds 50 units in the opposite dicrection to ensure limited applied torque against the
+    driver's will.
+
+Chrysler/Jeep/Fiat (Lateral only)
+------
+
+  - While the system is engaged, steer commands are subject to the same limits used by
+    the stock system.
+
+  - Steering torque is controlled through the 0x292 CAN message and it's limited by the panda firmware and by
+    openpilot to a value between -261 and 261. In addition, the vehicle EPS unit will fault for
+    commands outside these limits. A steering torque rate limit is enforced by the panda firmware and by
+    openpilot, so that the commanded steering torque must rise from 0 to max value no faster than
+    0.87s. Commanded steering torque is limited by the panda firmware and by openpilot to be no more than 80
+    units above the actual EPS generated motor torque to ensure limited differences between
+    commanded and actual torques.
+
+Subaru (Lateral only)
+------
+
+  - While the system is engaged, steer commands are subject to the same limits used by
+    the stock system.
+
+  - Steering torque is controlled through the 0x122 CAN message and it's limited by the panda firmware and by
+    openpilot to a value between -255 and 255. In addition, the vehicle EPS unit will fault for
+    commands outside the values of -2047 and 2047. A steering torque rate limit is enforced by the panda firmware and by
+    openpilot, so that the commanded steering torque must rise from 0 to max value no faster than
+    0.41s. Commanded steering torque is gradually limited by the panda firmware and by openpilot if the driver's
+    torque exceeds 60 units in the opposite dicrection to ensure limited applied torque against the
+    driver's will.

 **Extra note**: comma.ai strongly discourages the use of openpilot forks with safety code either missing or
  not fully meeting the above requirements.
@@ -1,232 +0,0 @@
-import os
-import subprocess
-import sys
-import platform
-
-AddOption('--test',
-          action='store_true',
-          help='build test files')
-
-AddOption('--asan',
-          action='store_true',
-          help='turn on ASAN')
-
-arch = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()
-if platform.system() == "Darwin":
-  arch = "Darwin"
-
-if arch == "aarch64":
-  lenv = {
-    "LD_LIBRARY_PATH": '/data/data/com.termux/files/usr/lib',
-    "PATH": os.environ['PATH'],
-    "ANDROID_DATA": os.environ['ANDROID_DATA'],
-    "ANDROID_ROOT": os.environ['ANDROID_ROOT'],
-  }
-
-  cpppath = [
-    "#phonelibs/opencl/include",
-  ]
-  libpath = [
-    "#phonelibs/snpe/aarch64-android-clang3.8",
-    "/usr/lib",
-    "/data/data/com.termux/files/usr/lib",
-    "/system/vendor/lib64",
-    "/system/comma/usr/lib",
-    "#phonelibs/nanovg",
-    "#phonelibs/libyuv/lib",
-  ]
-
-  cflags = ["-DQCOM", "-mcpu=cortex-a57"]
-  cxxflags = ["-DQCOM", "-mcpu=cortex-a57"]
-
-  rpath = ["/system/vendor/lib64"]
-else:
-  lenv = {
-    "PATH": "#external/bin:" + os.environ['PATH'],
-  }
-  cpppath = [
-    "#phonelibs/capnp-cpp/include",
-    "#phonelibs/capnp-c/include",
-    "#phonelibs/zmq/x64/include",
-    "#external/tensorflow/include",
-  ]
-
-  if arch == "Darwin":
-    libpath = [
-      "#phonelibs/capnp-cpp/mac/lib",
-      "#phonelibs/capnp-c/mac/lib",
-      "#phonelibs/libyuv/mac/lib",
-      "#cereal",
-      "#selfdrive/common",
-      "/usr/local/lib",
-      "/System/Library/Frameworks/OpenGL.framework/Libraries",
-    ]
-  else:
-    libpath = [
-      "#phonelibs/capnp-cpp/x64/lib",
-      "#phonelibs/capnp-c/x64/lib",
-      "#phonelibs/snpe/x86_64-linux-clang",
-      "#phonelibs/zmq/x64/lib",
-      "#phonelibs/libyuv/x64/lib",
-      "#external/zmq/lib",
-      "#external/tensorflow/lib",
-      "#cereal",
-      "#selfdrive/common",
-      "/usr/lib",
-      "/usr/local/lib",
-    ]
-
-  rpath = ["phonelibs/capnp-cpp/x64/lib",
-           "phonelibs/zmq/x64/lib",
-           "external/tensorflow/lib",
-           "cereal",
-           "selfdrive/common"]
-
-  # allows shared libraries to work globally
-  rpath = [os.path.join(os.getcwd(), x) for x in rpath]
-
-  cflags = []
-  cxxflags = []
-
-ccflags_asan = ["-fsanitize=address", "-fno-omit-frame-pointer"] if GetOption('asan') else []
-ldflags_asan = ["-fsanitize=address"] if GetOption('asan') else []
-
-# change pythonpath to this
-lenv["PYTHONPATH"] = Dir("#").path
-
-env = Environment(
-  ENV=lenv,
-  CCFLAGS=[
-    "-g",
-    "-fPIC",
-    "-O2",
-    "-Werror=implicit-function-declaration",
-    "-Werror=incompatible-pointer-types",
-    "-Werror=int-conversion",
-    "-Werror=return-type",
-    "-Werror=format-extra-args",
-  ] + cflags + ccflags_asan,
-
-  CPPPATH=cpppath + [
-    "#",
-    "#selfdrive",
-    "#phonelibs/bzip2",
-    "#phonelibs/libyuv/include",
-    "#phonelibs/openmax/include",
-    "#phonelibs/json/src",
-    "#phonelibs/json11",
-    "#phonelibs/eigen",
-    "#phonelibs/curl/include",
-    "#phonelibs/opencv/include",
-    "#phonelibs/libgralloc/include",
-    "#phonelibs/android_frameworks_native/include",
-    "#phonelibs/android_hardware_libhardware/include",
-    "#phonelibs/android_system_core/include",
-    "#phonelibs/linux/include",
-    "#phonelibs/snpe/include",
-    "#phonelibs/nanovg",
-    "#selfdrive/common",
-    "#selfdrive/camerad",
-    "#selfdrive/camerad/include",
-    "#selfdrive/loggerd/include",
-    "#selfdrive/modeld",
-    "#cereal/messaging",
-    "#cereal",
-    "#opendbc/can",
-  ],
-
-  CC='clang',
-  CXX='clang++',
-  LINKFLAGS=ldflags_asan,
-
-  RPATH=rpath,
-
-  CFLAGS=["-std=gnu11"] + cflags,
-  CXXFLAGS=["-std=c++14"] + cxxflags,
-  LIBPATH=libpath +
-  [
-    "#cereal",
-    "#selfdrive/common",
-    "#phonelibs",
-  ]
-)
-
-if os.environ.get('SCONS_CACHE'):
-  CacheDir('/tmp/scons_cache')
-
-node_interval = 5
-node_count = 0
-def progress_function(node):
-  global node_count
-  node_count += node_interval
-  sys.stderr.write("progress: %d\n" % node_count)
-
-if os.environ.get('SCONS_PROGRESS'):
-  Progress(progress_function, interval=node_interval)
-
-SHARED = False
-
-def abspath(x):
-  if arch == 'aarch64':
-    pth = os.path.join("/data/pythonpath", x[0].path)
-    env.Depends(pth, x)
-    return File(pth)
-  else:
-    # rpath works elsewhere
-    return x[0].path.rsplit("/", 1)[1][:-3]
-
-#zmq = 'zmq'
-# still needed for apks
-zmq = FindFile("libzmq.a", libpath)
-Export('env', 'arch', 'zmq', 'SHARED')
-
-# cereal and messaging are shared with the system
-SConscript(['cereal/SConscript'])
-if SHARED:
-  cereal = abspath([File('cereal/libcereal_shared.so')])
-  messaging = abspath([File('cereal/libmessaging_shared.so')])
-else:
-  cereal = [File('#cereal/libcereal.a')]
-  messaging = [File('#cereal/libmessaging.a')]
-Export('cereal', 'messaging')
-
-SConscript(['selfdrive/common/SConscript'])
-Import('_common', '_visionipc', '_gpucommon', '_gpu_libs')
-
-if SHARED:
-  common, visionipc, gpucommon = abspath(common), abspath(visionipc), abspath(gpucommon)
-else:
-  common = [_common, 'json']
-  visionipc = _visionipc
-  gpucommon = [_gpucommon] + _gpu_libs
-
-Export('common', 'visionipc', 'gpucommon')
-
-SConscript(['opendbc/can/SConscript'])
-
-SConscript(['common/SConscript'])
-SConscript(['common/kalman/SConscript'])
-SConscript(['phonelibs/SConscript'])
-
-if arch != "Darwin":
-  SConscript(['selfdrive/camerad/SConscript'])
-  SConscript(['selfdrive/modeld/SConscript'])
-
-SConscript(['selfdrive/controls/lib/cluster/SConscript'])
-SConscript(['selfdrive/controls/lib/lateral_mpc/SConscript'])
-SConscript(['selfdrive/controls/lib/longitudinal_mpc/SConscript'])
-
-SConscript(['selfdrive/boardd/SConscript'])
-SConscript(['selfdrive/proclogd/SConscript'])
-
-SConscript(['selfdrive/ui/SConscript'])
-SConscript(['selfdrive/loggerd/SConscript'])
-
-if arch == "aarch64":
-  SConscript(['selfdrive/logcatd/SConscript'])
-  SConscript(['selfdrive/sensord/SConscript'])
-  SConscript(['selfdrive/clocksd/SConscript'])
-
-SConscript(['selfdrive/locationd/SConscript'])
-
-# TODO: finish cereal, dbcbuilder, MPC
@@ -1,3 +0,0 @@
-Place apks here that you want to be installed with the name <app>.apk
-
-These won't be committed into one, but for now baseui will ship with openpilot.
@@ -0,0 +1,6 @@
+gen
+node_modules
+package-lock.json
+*.pyc
+__pycache__
+
@@ -0,0 +1,62 @@
+PWD := $(shell pwd)
+
+SRCS := log.capnp car.capnp
+
+GENS := gen/cpp/car.capnp.c++ gen/cpp/log.capnp.c++
+JS := gen/js/car.capnp.js gen/js/log.capnp.js
+
+UNAME_M ?= $(shell uname -m)
+
+GENS += gen/c/car.capnp.c gen/c/log.capnp.c gen/c/include/c++.capnp.h gen/c/include/java.capnp.h
+
+ifeq ($(UNAME_M),x86_64)
+
+ifneq (, $(shell which capnpc-java))
+GENS += gen/java/Car.java gen/java/Log.java
+else
+$(warning capnpc-java not found, skipping java build)
+endif
+
+endif
+
+
+ifeq ($(UNAME_M),aarch64)
+CAPNPC=PATH=$(PWD)/../phonelibs/capnp-cpp/aarch64/bin/:$$PATH capnpc
+else
+CAPNPC=capnpc
+endif
+
+.PHONY: all
+all: $(GENS)
+js: $(JS)
+
+.PHONY: clean
+clean:
+	rm -rf gen
+	rm -rf node_modules
+	rm -rf package-lock.json
+
+gen/c/%.capnp.c: %.capnp
+	@echo "[ CAPNPC C ] $@"
+	mkdir -p gen/c/
+	$(CAPNPC) '$<' -o c:gen/c/
+
+gen/js/%.capnp.js: %.capnp
+	@echo "[ CAPNPC JavaScript ] $@"
+	mkdir -p gen/js/
+	sh ./generate_javascript.sh
+
+gen/cpp/%.capnp.c++: %.capnp
+	@echo "[ CAPNPC C++ ] $@"
+	mkdir -p gen/cpp/
+	$(CAPNPC) '$<' -o c++:gen/cpp/
+
+gen/java/Car.java gen/java/Log.java: $(SRCS)
+	@echo "[ CAPNPC java ] $@"
+	mkdir -p gen/java/
+	$(CAPNPC) $^ -o java:gen/java
+
+# c-capnproto needs some empty headers
+gen/c/include/c++.capnp.h gen/c/include/java.capnp.h:
+	mkdir -p gen/c/include
+	touch '$@'
@@ -0,0 +1,8 @@
+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"))
@@ -0,0 +1,413 @@
+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;
+  enable @1 :Bool;
+  noEntry @2 :Bool;
+  warning @3 :Bool;
+  userDisable @4 :Bool;
+  softDisable @5 :Bool;
+  immediateDisable @6 :Bool;
+  preEnable @7 :Bool;
+  permanent @8 :Bool;
+
+  enum EventName @0xbaa8c5d505f727de {
+    # TODO: copy from error list
+    canError @0;
+    steerUnavailable @1;
+    brakeUnavailable @2;
+    gasUnavailable @3;
+    wrongGear @4;
+    doorOpen @5;
+    seatbeltNotLatched @6;
+    espDisabled @7;
+    wrongCarMode @8;
+    steerTempUnavailable @9;
+    reverseGear @10;
+    buttonCancel @11;
+    buttonEnable @12;
+    pedalPressed @13;
+    cruiseDisabled @14;
+    radarCanError @15;
+    dataNeeded @16;
+    speedTooLow @17;
+    outOfSpace @18;
+    overheat @19;
+    calibrationIncomplete @20;
+    calibrationInvalid @21;
+    controlsMismatch @22;
+    pcmEnable @23;
+    pcmDisable @24;
+    noTarget @25;
+    radarFault @26;
+    modelCommIssueDEPRECATED @27;
+    brakeHold @28;
+    parkBrake @29;
+    manualRestart @30;
+    lowSpeedLockout @31;
+    plannerError @32;
+    ipasOverride @33;
+    debugAlert @34;
+    steerTempUnavailableMute @35;
+    resumeRequired @36;
+    preDriverDistracted @37;
+    promptDriverDistracted @38;
+    driverDistracted @39;
+    geofence @40;
+    driverMonitorOn @41;
+    driverMonitorOff @42;
+    preDriverUnresponsive @43;
+    promptDriverUnresponsive @44;
+    driverUnresponsive @45;
+    belowSteerSpeed @46;
+    calibrationProgress @47;
+    lowBattery @48;
+    invalidGiraffeHonda @49;
+    vehicleModelInvalid @50;
+    controlsFailed @51;
+    sensorDataInvalid @52;
+    commIssue @53;
+    tooDistracted @54;
+    posenetInvalid @55;
+    soundsUnavailable @56;
+    preLaneChangeLeft @57;
+    preLaneChangeRight @58;
+    laneChange @59;
+  }
+}
+
+# ******* main car state @ 100hz *******
+# all speeds in m/s
+
+struct CarState {
+  errorsDEPRECATED @0 :List(CarEvent.EventName);
+  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
+  steeringAngle @7 :Float32;   # deg
+  steeringRate @15 :Float32;   # deg/s
+  steeringTorque @8 :Float32;  # TODO: standardize units
+  steeringTorqueEps @27 :Float32;  # TODO: standardize units
+  steeringPressed @9 :Bool;    # if the user is using the steering wheel
+
+  # 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;
+
+  # which packets this state came from
+  canMonoTimes @12: List(UInt64);
+
+  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;
+  }
+
+  enum GearShifter {
+    unknown @0;
+    park @1;
+    drive @2;
+    neutral @3;
+    reverse @4;
+    sport @5;
+    low @6;
+    brake @7;
+  }
+
+
+  # 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;
+    }
+  }
+}
+
+# ******* 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;
+
+  gasDEPRECATED @1 :Float32;
+  brakeDEPRECATED @2 :Float32;
+  steeringTorqueDEPRECATED @3 :Float32;
+
+  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;
+    steerAngle @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;
+    }
+
+    enum AudibleAlert {
+      # these are the choices from the Honda
+      # map as good as you can for your car
+      none @0;
+      chimeEngage @1;
+      chimeDisengage @2;
+      chimeError @3;
+      chimeWarning1 @4;
+      chimeWarning2 @5;
+      chimeWarningRepeat @6;
+      chimePrompt @7;
+    }
+  }
+}
+
+# ****** 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;
+  safetyModel @9 :SafetyModel;
+  safetyModelPassive @42 :SafetyModel = noOutput;
+  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;
+  lateralTuning :union {
+    pid @26 :LateralPIDTuning;
+    indi @27 :LateralINDITuning;
+    lqr @40 :LateralLQRTuning;
+  }
+
+  steerLimitAlert @28 :Bool;
+
+  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
+
+  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
+  isPandaBlack @39: Bool;
+  dashcamOnly @41: Bool;
+
+  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 {
+    outerLoopGain @0 :Float32;
+    innerLoopGain @1 :Float32;
+    timeConstant @2 :Float32;
+    actuatorEffectiveness @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 {
+    # does NOT match board setting
+    noOutput @0;
+    honda @1;
+    toyota @2;
+    elm327 @3;
+    gm @4;
+    hondaBosch @5;
+    ford @6;
+    cadillac @7;
+    hyundai @8;
+    chrysler @9;
+    tesla @10;
+    subaru @11;
+    gmPassive @12;
+  }
+
+  enum SteerControlType {
+    torque @0;
+    angle @1;
+  }
+}
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+rm -r gen/ts
+rm -r gen/js
+
+mkdir gen/ts
+mkdir gen/js
+
+echo "Installing needed npm modules"
+npm i capnpc-ts capnp-ts
+
+capnpc -o node_modules/.bin/capnpc-ts:gen/ts log.capnp car.capnp
+capnpc -o node_modules/.bin/capnpc-ts:gen/ts car.capnp
+
+cat log.capnp | egrep '\([a-zA-Z]*\.[^\s]+\.[^s]+\)' | sed 's/^.*([a-zA-Z]*\.\([a-zA-Z.]*\)).*/\1/' | while read line
+do
+  TOKEN=`echo $line | sed 's/\./_/g'`
+  ROOT=`echo $line | sed 's/\..*$//g'`
+  cat gen/ts/log.capnp.ts | grep '^import.*'${TOKEN}
+  if [[ "$?" == "1" ]]
+  then
+    sed -i 's/^\(import {.*\)'${ROOT}'\(,*\) \(.*\)$/\1'${ROOT}', '${TOKEN}'\2 \3/' ./gen/ts/log.capnp.ts
+  fi
+done
+
+tsc ./gen/ts/* --lib es2015 --outDir ./gen/js
@@ -0,0 +1,28 @@
+# 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.
@@ -0,0 +1,39 @@
+set -e
+echo "Installing capnp"
+
+cd /tmp
+VERSION=0.6.1
+wget https://capnproto.org/capnproto-c++-${VERSION}.tar.gz
+tar xvf capnproto-c++-${VERSION}.tar.gz
+cd capnproto-c++-${VERSION}
+CXXFLAGS="-fPIC" ./configure
+
+make -j4
+
+# manually build binaries statically
+g++ -std=gnu++11 -I./src -I./src -DKJ_HEADER_WARNINGS -DCAPNP_HEADER_WARNINGS -DCAPNP_INCLUDE_DIR=\"/usr/local/include\" -pthread -O2 -DNDEBUG -pthread -pthread -o .libs/capnp src/capnp/compiler/module-loader.o src/capnp/compiler/capnp.o  ./.libs/libcapnpc.a ./.libs/libcapnp.a ./.libs/libkj.a -lpthread -pthread
+
+g++ -std=gnu++11 -I./src -I./src -DKJ_HEADER_WARNINGS -DCAPNP_HEADER_WARNINGS -DCAPNP_INCLUDE_DIR=\"/usr/local/include\" -pthread -O2 -DNDEBUG -pthread -pthread -o .libs/capnpc-c++ src/capnp/compiler/capnpc-c++.o  ./.libs/libcapnp.a ./.libs/libkj.a -lpthread -pthread
+
+g++ -std=gnu++11 -I./src -I./src -DKJ_HEADER_WARNINGS -DCAPNP_HEADER_WARNINGS -DCAPNP_INCLUDE_DIR=\"/usr/local/include\" -pthread -O2 -DNDEBUG -pthread -pthread -o .libs/capnpc-capnp src/capnp/compiler/capnpc-capnp.o  ./.libs/libcapnp.a ./.libs/libkj.a -lpthread -pthread
+
+cp .libs/capnp /usr/local/bin/
+ln -s /usr/local/bin/capnp /usr/local/bin/capnpc
+cp .libs/capnpc-c++ /usr/local/bin/
+cp .libs/capnpc-capnp /usr/local/bin/
+cp .libs/*.a /usr/local/lib
+
+cd /tmp
+echo "Installing c-capnp"
+git clone https://github.com/commaai/c-capnproto.git
+cd c-capnproto
+git submodule update --init --recursive
+autoreconf -f -i -s
+CXXFLAGS="-fPIC" ./configure
+make -j4
+
+# manually build binaries statically
+gcc -fPIC -o .libs/capnpc-c compiler/capnpc-c.o compiler/schema.capnp.o compiler/str.o  ./.libs/libcapnp_c.a
+
+cp .libs/capnpc-c /usr/local/bin/
+cp .libs/*.a /usr/local/lib
@@ -0,0 +1,53 @@
+using Cxx = import "./include/c++.capnp";
+$Cxx.namespace("cereal");
+
+using Java = import "./include/java.capnp";
+$Java.package("ai.comma.openpilot.cereal");
+$Java.outerClassname("Map");
+
+@0xa086df597ef5d7a0;
+
+# Geometry
+struct Point {
+  x @0: Float64;
+  y @1: Float64;
+  z @2: Float64;
+}
+
+struct PolyLine {
+  points @0: List(Point);
+}
+
+# Map features
+struct Lane {
+  id @0 :Text;
+
+  leftBoundary @1 :LaneBoundary;
+  rightBoundary @2 :LaneBoundary;
+
+  leftAdjacentId @3 :Text;
+  rightAdjacentId @4 :Text;
+
+  inboundIds @5 :List(Text);
+  outboundIds @6 :List(Text);
+
+  struct LaneBoundary {
+    polyLine @0 :PolyLine;
+    startHeading @1 :Float32; # WRT north
+  }
+}
+
+# Map tiles
+struct TileSummary {
+  version @0 :Text;
+  updatedAt @1 :UInt64; # Millis since epoch
+
+  level @2 :UInt8;
+  x @3 :UInt16;
+  y @4 :UInt16;
+}
+
+struct MapTile {
+  summary @0 :TileSummary;
+  lanes @1 :List(Lane);
+}
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pyflakes $(find . -iname "*.py" | grep -vi "^\./pyextra.*" | grep -vi "^\./panda")
+RESULT=$?
+if [ $RESULT -eq 0 ]; then
+    pylint $(find . -iname "*.py" | grep -vi "^\./pyextra.*" | grep -vi "^\./panda")
+    RESULT=$? & 3
+fi
+
+[ $RESULT -ne 0 ] && exit 1
+exit 0
@@ -1 +0,0 @@
-*.cpp
@@ -1,6 +0,0 @@
-Import('env')
-
-# parser
-env.Command(['common_pyx.so'],
-  ['common_pyx_setup.py', 'clock.pyx'],
-  "cd common && python3 common_pyx_setup.py build_ext --inplace")
@@ -1,130 +0,0 @@
-import os
-import binascii
-import itertools
-import re
-import struct
-import subprocess
-import random
-from cereal import log
-
-NetworkType = log.ThermalData.NetworkType
-
-ANDROID = os.path.isfile('/EON')
-
-def getprop(key):
-  if not ANDROID:
-    return ""
-  return subprocess.check_output(["getprop", key], encoding='utf8').strip()
-
-def get_imei(slot):
-  slot = str(slot)
-  if slot not in ("0", "1"):
-    raise ValueError("SIM slot must be 0 or 1")
-
-  ret = parse_service_call_string(service_call(["iphonesubinfo", "3" ,"i32", str(slot)]))
-  if not ret:
-    # allow non android to be identified differently
-    ret = "%015d" % random.randint(0, 1<<32)
-  return ret
-
-def get_serial():
-  ret = getprop("ro.serialno")
-  if ret == "":
-    ret = "cccccccc"
-  return ret
-
-def get_subscriber_info():
-  ret = parse_service_call_string(service_call(["iphonesubinfo", "7"]))
-  if ret is None or len(ret) < 8:
-    return ""
-  return ret
-
-def reboot(reason=None):
-  if reason is None:
-    reason_args = ["null"]
-  else:
-    reason_args = ["s16", reason]
-
-  subprocess.check_output([
-    "service", "call", "power", "16", # IPowerManager.reboot
-    "i32", "0", # no confirmation,
-    *reason_args,
-    "i32", "1" # wait
-  ])
-
-def service_call(call):
-  if not ANDROID:
-    return None
-
-  ret = subprocess.check_output(["service", "call", *call], encoding='utf8').strip()
-  if 'Parcel' not in ret:
-    return None
-
-  return parse_service_call_bytes(ret)
-
-def parse_service_call_unpack(r, fmt):
-  try:
-    return struct.unpack(fmt, r)[0]
-  except Exception:
-    return None
-
-def parse_service_call_string(r):
-  try:
-    r = r[8:] # Cut off length field
-    r = r.decode('utf_16_be')
-
-    # All pairs of two characters seem to be swapped. Not sure why
-    result = ""
-    for a, b, in itertools.zip_longest(r[::2], r[1::2], fillvalue='\x00'):
-        result += b + a
-
-    result = result.replace('\x00', '')
-
-    return result
-  except Exception:
-    return None
-
-def parse_service_call_bytes(ret):
-  try:
-    r = b""
-    for hex_part in re.findall(r'[ (]([0-9a-f]{8})', ret):
-      r += binascii.unhexlify(hex_part)
-    return r
-  except Exception:
-    return None
-
-def get_network_type():
-  if not ANDROID:
-    return NetworkType.none
-
-  wifi_check = parse_service_call_string(service_call(["connectivity", "2"]))
-  if wifi_check is None:
-    return NetworkType.none
-  elif 'WIFI' in wifi_check:
-    return NetworkType.wifi
-  else:
-    cell_check = parse_service_call_unpack(service_call(['phone', '59']), ">q")
-    # from TelephonyManager.java
-    cell_networks = {
-      0: NetworkType.none,
-      1: NetworkType.cell2G,
-      2: NetworkType.cell2G,
-      3: NetworkType.cell3G,
-      4: NetworkType.cell2G,
-      5: NetworkType.cell3G,
-      6: NetworkType.cell3G,
-      7: NetworkType.cell3G,
-      8: NetworkType.cell3G,
-      9: NetworkType.cell3G,
-      10: NetworkType.cell3G,
-      11: NetworkType.cell2G,
-      12: NetworkType.cell3G,
-      13: NetworkType.cell4G,
-      14: NetworkType.cell4G,
-      15: NetworkType.cell3G,
-      16: NetworkType.cell2G,
-      17: NetworkType.cell3G,
-      18: NetworkType.cell4G,
-      19: NetworkType.cell4G
-    }
-    return cell_networks.get(cell_check, NetworkType.none)
@@ -1,13 +1,13 @@
 import jwt
 import requests
 from datetime import datetime, timedelta
-from common.basedir import PERSIST
+
 from selfdrive.version import version

-class Api():
+class Api(object):
  def __init__(self, dongle_id):
    self.dongle_id = dongle_id
-    with open(PERSIST+'/comma/id_rsa') as f:
+    with open('/persist/comma/id_rsa') as f:
      self.private_key = f.read()

  def get(self, *args, **kwargs):
@@ -27,7 +27,7 @@ class Api():
      'iat': now,
      'exp': now + timedelta(hours=1)
    }
-    return jwt.encode(payload, self.private_key, algorithm='RS256').decode('utf8')
+    return jwt.encode(payload, self.private_key, algorithm='RS256')

 def api_get(endpoint, method='GET', timeout=None, access_token=None, **params):
  backend = "https://api.commadotai.com/"
@@ -1,99 +0,0 @@
-import os
-import subprocess
-import glob
-import hashlib
-import shutil
-from common.basedir import BASEDIR
-from selfdrive.swaglog import cloudlog
-
-android_packages = ("ai.comma.plus.offroad", "ai.comma.plus.frame")
-
-def get_installed_apks():
-  dat = subprocess.check_output(["pm", "list", "packages", "-f"], encoding='utf8').strip().split("\n")
-  ret = {}
-  for x in dat:
-    if x.startswith("package:"):
-      v,k = x.split("package:")[1].split("=")
-      ret[k] = v
-  return ret
-
-def install_apk(path):
-  # can only install from world readable path
-  install_path = "/sdcard/%s" % os.path.basename(path)
-  shutil.copyfile(path, install_path)
-
-  ret = subprocess.call(["pm", "install", "-r", install_path])
-  os.remove(install_path)
-  return ret == 0
-
-def start_frame():
-  set_package_permissions()
-  system("am start -n ai.comma.plus.frame/.MainActivity")
-
-def set_package_permissions():
-  pm_grant("ai.comma.plus.offroad", "android.permission.ACCESS_FINE_LOCATION")
-  pm_grant("ai.comma.plus.offroad", "android.permission.READ_PHONE_STATE")
-  appops_set("ai.comma.plus.offroad", "SU", "allow")
-  appops_set("ai.comma.plus.offroad", "WIFI_SCAN", "allow")
-  appops_set("ai.comma.plus.offroad", "READ_EXTERNAL_STORAGE", "allow")
-  appops_set("ai.comma.plus.offroad", "WRITE_EXTERNAL_STORAGE", "allow")
-
-def appops_set(package, op, mode):
-  system(f"LD_LIBRARY_PATH= appops set {package} {op} {mode}")
-
-def pm_grant(package, permission):
-  system(f"pm grant {package} {permission}")
-
-def system(cmd):
-  try:
-    cloudlog.info("running %s" % cmd)
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-  except subprocess.CalledProcessError as e:
-    cloudlog.event("running failed",
-      cmd=e.cmd,
-      output=e.output[-1024:],
-      returncode=e.returncode)
-
-# *** external functions ***
-
-def update_apks():
-  # install apks
-  installed = get_installed_apks()
-
-  install_apks = glob.glob(os.path.join(BASEDIR, "apk/*.apk"))
-  for apk in install_apks:
-    app = os.path.basename(apk)[:-4]
-    if app not in installed:
-      installed[app] = None
-
-  cloudlog.info("installed apks %s" % (str(installed), ))
-
-  for app in installed.keys():
-    apk_path = os.path.join(BASEDIR, "apk/"+app+".apk")
-    if not os.path.exists(apk_path):
-      continue
-
-    h1 = hashlib.sha1(open(apk_path, 'rb').read()).hexdigest()
-    h2 = None
-    if installed[app] is not None:
-      h2 = hashlib.sha1(open(installed[app], 'rb').read()).hexdigest()
-      cloudlog.info("comparing version of %s  %s vs %s" % (app, h1, h2))
-
-    if h2 is None or h1 != h2:
-      cloudlog.info("installing %s" % app)
-
-      success = install_apk(apk_path)
-      if not success:
-        cloudlog.info("needing to uninstall %s" % app)
-        system("pm uninstall %s" % app)
-        success = install_apk(apk_path)
-
-      assert success
-
-def pm_apply_packages(cmd):
-  for p in android_packages:
-    system("pm %s %s" % (cmd, p))
-
-if __name__ == "__main__":
-  update_apks()
-
@@ -1,11 +1,4 @@
 import os
 BASEDIR = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../"))

-from common.android import ANDROID
-if ANDROID:
-  PERSIST = "/persist"
-  PARAMS = "/data/params"
-else:
-  PERSIST = os.path.join(BASEDIR, "persist")
-  PARAMS = os.path.join(BASEDIR, "persist", "params")

@@ -1,22 +1,16 @@
-from posix.time cimport clock_gettime, timespec, CLOCK_MONOTONIC_RAW, clockid_t
+from posix.time cimport clock_gettime, timespec, CLOCK_BOOTTIME, CLOCK_MONOTONIC_RAW

-IF UNAME_SYSNAME == "Darwin":
-  # Darwin doesn't have a CLOCK_BOOTTIME
-  CLOCK_BOOTTIME = CLOCK_MONOTONIC_RAW
-ELSE:
-  from posix.time cimport CLOCK_BOOTTIME
+cdef double readclock(int clock_id):
+    cdef timespec ts
+    cdef double current

-cdef double readclock(clockid_t clock_id):
-  cdef timespec ts
-  cdef double current
+    clock_gettime(clock_id, &ts)
+    current = ts.tv_sec + (ts.tv_nsec / 1000000000.)
+    return current

-  clock_gettime(clock_id, &ts)
-  current = ts.tv_sec + (ts.tv_nsec / 1000000000.)
-  return current

 def monotonic_time():
-  return readclock(CLOCK_MONOTONIC_RAW)
+    return readclock(CLOCK_MONOTONIC_RAW)

 def sec_since_boot():
-  return readclock(CLOCK_BOOTTIME)
-
+    return readclock(CLOCK_BOOTTIME)
@@ -1,150 +0,0 @@
-import os
-import numpy as np
-import collections
-from contextlib import closing
-
-from common.file_helpers import mkdirs_exists_ok
-
-class ColumnStoreReader():
-  def __init__(self, path, mmap=False, allow_pickle=False, direct_io=False):
-    if not (path and os.path.isdir(path)):
-      raise ValueError("Not a column store: {}".format(path))
-
-    self._path = os.path.realpath(path)
-    self._keys = os.listdir(self._path)
-    self._mmap = mmap
-    self._allow_pickle = allow_pickle
-    self._direct_io = direct_io
-
-  @property
-  def path(self):
-    return self._path
-
-  def close(self):
-    pass
-
-  def get(self, key):
-    try:
-      return self[key]
-    except KeyError:
-      return None
-
-  def keys(self):
-    return list(self._keys)
-
-  def iteritems(self):
-    for k in self:
-      yield (k, self[k])
-
-  def itervalues(self):
-    for k in self:
-      yield self[k]
-
-  def get_npy_path(self, key):
-    """Gets a filesystem path for an npy file containing the specified array,
-       or none if the column store does not contain key.
-    """
-    if key in self:
-      return os.path.join(self._path, key)
-    else:
-      return None
-
-  def __getitem__(self, key):
-    try:
-      path = os.path.join(self._path, key)
-
-      # TODO(mgraczyk): This implementation will need to change for zip.
-      if os.path.isdir(path):
-        return ColumnStoreReader(path)
-      else:
-        if self._mmap:
-          # note that direct i/o does nothing for mmap since file read/write interface is not used
-          ret = np.load(path, mmap_mode='r', allow_pickle=self._allow_pickle, fix_imports=False)
-        else:
-          if self._direct_io:
-            opener = lambda path, flags: os.open(path, os.O_RDONLY | os.O_DIRECT)
-            with open(path, 'rb', buffering=0, opener=opener) as f:
-              ret = np.load(f, allow_pickle=self._allow_pickle, fix_imports=False)
-          else:
-            ret = np.load(path, allow_pickle=self._allow_pickle, fix_imports=False)
-        if type(ret) == np.lib.npyio.NpzFile:
-          # if it's saved as compressed, it has arr_0 only in the file. deref this
-          return ret['arr_0']
-        else:
-          return ret
-    except IOError:
-      raise KeyError(key)
-
-  def __contains__(self, item):
-    try:
-      self[item]
-      return True
-    except KeyError:
-      return False
-
-  def __len__(self):
-    return len(self._keys)
-
-  def __bool__(self):
-    return bool(self._keys)
-
-  def __iter__(self):
-    return iter(self._keys)
-
-  def __str__(self):
-    return "ColumnStoreReader({})".format(str({k: "..." for k in self._keys}))
-
-  def __enter__(self): return self
-  def __exit__(self, type, value, traceback): self.close()
-
-class ColumnStoreWriter():
-  def __init__(self, path, allow_pickle=False):
-    self._path = path
-    self._allow_pickle = allow_pickle
-    mkdirs_exists_ok(self._path)
-
-  def map_column(self, path, dtype, shape):
-    npy_path = os.path.join(self._path, path)
-    mkdirs_exists_ok(os.path.dirname(npy_path))
-    return np.lib.format.open_memmap(npy_path, mode='w+', dtype=dtype, shape=shape)
-
-  def add_column(self, path, data, dtype=None, compression=False, overwrite=False):
-    npy_path = os.path.join(self._path, path)
-    mkdirs_exists_ok(os.path.dirname(npy_path))
-
-    if overwrite:
-      f = open(npy_path, "wb")
-    else:
-      f = os.fdopen(os.open(npy_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL), "wb")
-
-    with closing(f) as f:
-      data2 = np.array(data, copy=False, dtype=dtype)
-      if compression:
-        np.savez_compressed(f, data2)
-      else:
-        np.save(f, data2, allow_pickle=self._allow_pickle, fix_imports=False)
-
-  def add_group(self, group_name):
-    # TODO(mgraczyk): This implementation will need to change if we add zip or compression.
-    return ColumnStoreWriter(os.path.join(self._path, group_name))
-
-  def close(self):
-    pass
-
-  def __enter__(self): return self
-  def __exit__(self, type, value, traceback): self.close()
-
-
-def _save_dict_as_column_store(values, writer):
-  for k, v in values.items():
-    if isinstance(v, collections.Mapping):
-      _save_dict_as_column_store(v, writer.add_group(k))
-    else:
-      writer.add_column(k, v)
-
-
-def save_dict_as_column_store(values, output_path):
-  with ColumnStoreWriter(output_path) as writer:
-    _save_dict_as_column_store(values, writer)
-
-
@@ -1,20 +0,0 @@
-from distutils.core import Extension, setup  # pylint: disable=import-error,no-name-in-module
-from Cython.Build import cythonize
-
-from common.cython_hacks import BuildExtWithoutPlatformSuffix
-
-sourcefiles = ['clock.pyx']
-extra_compile_args = ["-std=c++11"]
-
-setup(name='Common',
-      cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
-      ext_modules=cythonize(
-        Extension(
-          "common_pyx",
-          language="c++",
-          sources=sourcefiles,
-          extra_compile_args=extra_compile_args,
-        )
-      ),
-      nthreads=4,
-)
@@ -1,3 +0,0 @@
-# py2,3 compatiblity helpers
-
-basestring = (str, bytes)
@@ -1,23 +0,0 @@
-import os
-import sysconfig
-from Cython.Distutils import build_ext
-
-def get_ext_filename_without_platform_suffix(filename):
-  name, ext = os.path.splitext(filename)
-  ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
-
-  if ext_suffix == ext:
-    return filename
-
-  ext_suffix = ext_suffix.replace(ext, '')
-  idx = name.find(ext_suffix)
-
-  if idx == -1:
-    return filename
-  else:
-    return name[:idx] + ext
-
-class BuildExtWithoutPlatformSuffix(build_ext):
-  def get_ext_filename(self, ext_name):
-    filename = super().get_ext_filename(ext_name)
-    return get_ext_filename_without_platform_suffix(filename)
@@ -0,0 +1,289 @@
+import re
+import os
+import struct
+import sys
+import numbers
+from collections import namedtuple, defaultdict
+
+def int_or_float(s):
+  # return number, trying to maintain int format
+  if s.isdigit():
+    return int(s, 10)
+  else:
+    return float(s)
+
+DBCSignal = namedtuple(
+  "DBCSignal", ["name", "start_bit", "size", "is_little_endian", "is_signed",
+                "factor", "offset", "tmin", "tmax", "units"])
+
+
+class dbc(object):
+  def __init__(self, fn):
+    self.name, _ = os.path.splitext(os.path.basename(fn))
+    with open(fn) as f:
+      self.txt = f.readlines()
+    self._warned_addresses = set()
+
+    # regexps from https://github.com/ebroecker/canmatrix/blob/master/canmatrix/importdbc.py
+    bo_regexp = re.compile(r"^BO\_ (\w+) (\w+) *: (\w+) (\w+)")
+    sg_regexp = re.compile(r"^SG\_ (\w+) : (\d+)\|(\d+)@(\d+)([\+|\-]) \(([0-9.+\-eE]+),([0-9.+\-eE]+)\) \[([0-9.+\-eE]+)\|([0-9.+\-eE]+)\] \"(.*)\" (.*)")
+    sgm_regexp = re.compile(r"^SG\_ (\w+) (\w+) *: (\d+)\|(\d+)@(\d+)([\+|\-]) \(([0-9.+\-eE]+),([0-9.+\-eE]+)\) \[([0-9.+\-eE]+)\|([0-9.+\-eE]+)\] \"(.*)\" (.*)")
+    val_regexp = re.compile(r"VAL\_ (\w+) (\w+) (\s*[-+]?[0-9]+\s+\".+?\"[^;]*)")
+
+    # A dictionary which maps message ids to tuples ((name, size), signals).
+    #   name is the ASCII name of the message.
+    #   size is the size of the message in bytes.
+    #   signals is a list signals contained in the message.
+    # signals is a list of DBCSignal in order of increasing start_bit.
+    self.msgs = {}
+
+    # A dictionary which maps message ids to a list of tuples (signal name, definition value pairs)
+    self.def_vals = defaultdict(list)
+
+    # lookup to bit reverse each byte
+    self.bits_index = [(i & ~0b111) + ((-i-1) & 0b111) for i in xrange(64)]
+
+    for l in self.txt:
+      l = l.strip()
+
+      if l.startswith("BO_ "):
+        # new group
+        dat = bo_regexp.match(l)
+
+        if dat is None:
+          print("bad BO {0}".format(l))
+
+        name = dat.group(2)
+        size = int(dat.group(3))
+        ids = int(dat.group(1), 0) # could be hex
+        if ids in self.msgs:
+          sys.exit("Duplicate address detected %d %s" % (ids, self.name))
+
+        self.msgs[ids] = ((name, size), [])
+
+      if l.startswith("SG_ "):
+        # new signal
+        dat = sg_regexp.match(l)
+        go = 0
+        if dat is None:
+          dat = sgm_regexp.match(l)
+          go = 1
+
+        if dat is None:
+          print("bad SG {0}".format(l))
+
+        sgname = dat.group(1)
+        start_bit = int(dat.group(go+2))
+        signal_size = int(dat.group(go+3))
+        is_little_endian = int(dat.group(go+4))==1
+        is_signed = dat.group(go+5)=='-'
+        factor = int_or_float(dat.group(go+6))
+        offset = int_or_float(dat.group(go+7))
+        tmin = int_or_float(dat.group(go+8))
+        tmax = int_or_float(dat.group(go+9))
+        units = dat.group(go+10)
+
+        self.msgs[ids][1].append(
+          DBCSignal(sgname, start_bit, signal_size, is_little_endian,
+                    is_signed, factor, offset, tmin, tmax, units))
+
+      if l.startswith("VAL_ "):
+        # new signal value/definition
+        dat = val_regexp.match(l)
+
+        if dat is None:
+          print("bad VAL {0}".format(l))
+
+        ids = int(dat.group(1), 0) # could be hex
+        sgname = dat.group(2)
+        defvals = dat.group(3)
+
+        defvals = defvals.replace("?",r"\?") #escape sequence in C++
+        defvals = defvals.split('"')[:-1]
+
+        defs = defvals[1::2]
+        #cleanup, convert to UPPER_CASE_WITH_UNDERSCORES
+        for i,d in enumerate(defs):
+          d = defs[i].strip().upper()
+          defs[i] = d.replace(" ","_")
+
+        defvals[1::2] = defs
+        defvals = '"'+"".join(str(i) for i in defvals)+'"'
+
+        self.def_vals[ids].append((sgname, defvals))
+
+    for msg in self.msgs.values():
+      msg[1].sort(key=lambda x: x.start_bit)
+
+    self.msg_name_to_address = {}
+    for address, m in self.msgs.items():
+      name = m[0][0]
+      self.msg_name_to_address[name] = address
+
+  def lookup_msg_id(self, msg_id):
+    if not isinstance(msg_id, numbers.Number):
+      msg_id = self.msg_name_to_address[msg_id]
+    return msg_id
+
+  def reverse_bytes(self, x):
+    return ((x & 0xff00000000000000) >> 56) | \
+           ((x & 0x00ff000000000000) >> 40) | \
+           ((x & 0x0000ff0000000000) >> 24) | \
+           ((x & 0x000000ff00000000) >> 8) | \
+           ((x & 0x00000000ff000000) << 8) | \
+           ((x & 0x0000000000ff0000) << 24) | \
+           ((x & 0x000000000000ff00) << 40) | \
+           ((x & 0x00000000000000ff) << 56)
+
+  def encode(self, msg_id, dd):
+    """Encode a CAN message using the dbc.
+
+       Inputs:
+        msg_id: The message ID.
+        dd: A dictionary mapping signal name to signal data.
+    """
+    msg_id = self.lookup_msg_id(msg_id)
+
+    msg_def = self.msgs[msg_id]
+    size = msg_def[0][1]
+
+    result = 0
+    for s in msg_def[1]:
+      ival = dd.get(s.name)
+      if ival is not None:
+
+        b2 = s.size
+        if s.is_little_endian:
+          b1 = s.start_bit
+        else:
+          b1 = (s.start_bit // 8) * 8 + (-s.start_bit - 1) % 8
+        bo = 64 - (b1 + s.size)
+
+        ival = (ival / s.factor) - s.offset
+        ival = int(round(ival))
+
+        if s.is_signed and ival < 0:
+          ival = (1 << b2) + ival
+
+        shift = b1 if s.is_little_endian else bo
+        mask = ((1 << b2) - 1) << shift
+        dat = (ival & ((1 << b2) - 1)) << shift
+
+        if s.is_little_endian:
+          mask = self.reverse_bytes(mask)
+          dat = self.reverse_bytes(dat)
+
+        result &= ~mask
+        result |= dat
+
+    result = struct.pack('>Q', result)
+    return result[:size]
+
+  def decode(self, x, arr=None, debug=False):
+    """Decode a CAN message using the dbc.
+
+       Inputs:
+        x: A collection with elements (address, time, data), where address is
+           the CAN address, time is the bus time, and data is the CAN data as a
+           hex string.
+        arr: Optional list of signals which should be decoded and returned.
+        debug: True to print debugging statements.
+
+       Returns:
+        A tuple (name, data), where name is the name of the CAN message and data
+        is the decoded result. If arr is None, data is a dict of properties.
+        Otherwise data is a list of the same length as arr.
+
+        Returns (None, None) if the message could not be decoded.
+    """
+
+    if arr is None:
+      out = {}
+    else:
+      out = [None]*len(arr)
+
+    msg = self.msgs.get(x[0])
+    if msg is None:
+      if x[0] not in self._warned_addresses:
+        #print("WARNING: Unknown message address {}".format(x[0]))
+        self._warned_addresses.add(x[0])
+      return None, None
+
+    name = msg[0][0]
+    if debug:
+      print(name)
+
+    st = x[2].ljust(8, '\x00')
+    le, be = None, None
+
+    for s in msg[1]:
+      if arr is not None and s[0] not in arr:
+        continue
+
+      start_bit = s[1]
+      signal_size = s[2]
+      little_endian = s[3]
+      signed = s[4]
+      factor = s[5]
+      offset = s[6]
+
+      b2 = signal_size
+      if little_endian:
+        b1 = start_bit
+      else:
+        b1 = (start_bit // 8) * 8 + (-start_bit - 1) % 8
+      bo = 64 - (b1 + signal_size)
+
+      if little_endian:
+        if le is None:
+          le = struct.unpack("<Q", st)[0]
+        shift_amount = b1
+        tmp = le
+      else:
+        if be is None:
+          be = struct.unpack(">Q", st)[0]
+        shift_amount = bo
+        tmp = be
+
+      if shift_amount < 0:
+        continue
+
+      tmp = (tmp >> shift_amount) & ((1 << b2) - 1)
+      if signed and (tmp >> (b2 - 1)):
+        tmp -= (1 << b2)
+
+      tmp = tmp * factor + offset
+
+      # if debug:
+      #   print("%40s  %2d %2d  %7.2f %s" % (s[0], s[1], s[2], tmp, s[-1]))
+
+      if arr is None:
+        out[s[0]] = tmp
+      else:
+        out[arr.index(s[0])] = tmp
+    return name, out
+
+  def get_signals(self, msg):
+    msg = self.lookup_msg_id(msg)
+    return [sgs.name for sgs in self.msgs[msg][1]]
+
+
+if __name__ == "__main__":
+   from opendbc import DBC_PATH
+   import numpy as np
+
+   dbc_test = dbc(os.path.join(DBC_PATH, 'toyota_prius_2017_pt_generated.dbc'))
+   msg = ('STEER_ANGLE_SENSOR', {'STEER_ANGLE': -6.0, 'STEER_RATE': 4, 'STEER_FRACTION': -0.2})
+   encoded = dbc_test.encode(*msg)
+   decoded = dbc_test.decode((0x25, 0, encoded))
+   assert decoded == msg
+
+   dbc_test = dbc(os.path.join(DBC_PATH, 'hyundai_santa_fe_2019_ccan.dbc'))
+   decoded = dbc_test.decode((0x2b0, 0, "\xfa\xfe\x00\x07\x12"))
+   assert np.isclose(decoded[1]['SAS_Angle'], -26.2)
+
+   msg = ('SAS11', {'SAS_Stat': 7.0, 'MsgCount': 0.0, 'SAS_Angle': -26.200000000000003, 'SAS_Speed': 0.0, 'CheckSum': 0.0})
+   encoded = dbc_test.encode(*msg)
+   decoded = dbc_test.decode((0x2b0, 0, encoded))
+
+   assert decoded == msg
@@ -2,20 +2,14 @@ import os
 import sys
 import fcntl
 import hashlib
-import platform
 from cffi import FFI

-def suffix():
-  if platform.system() == "Darwin":
-    return ".dylib"
-  else:
-    return ".so"

 def ffi_wrap(name, c_code, c_header, tmpdir="/tmp/ccache", cflags="", libraries=None):
  if libraries is None:
    libraries = []

-  cache = name + "_" + hashlib.sha1(c_code.encode('utf-8')).hexdigest()
+  cache = name + "_" + hashlib.sha1(c_code).hexdigest()
  try:
    os.mkdir(tmpdir)
  except OSError:
@@ -32,7 +32,7 @@ def get_tmpdir_on_same_filesystem(path):
    return "/{}/runner/tmp".format(parts[1])
  return "/tmp"

-class AutoMoveTempdir():
+class AutoMoveTempdir(object):
  def __init__(self, target_path, temp_dir=None):
    self._target_path = target_path
    self._path = tempfile.mkdtemp(dir=temp_dir)
@@ -52,7 +52,7 @@ class AutoMoveTempdir():
    else:
      shutil.rmtree(self._path)

-class NamedTemporaryDir():
+class NamedTemporaryDir(object):
  def __init__(self, temp_dir=None):
    self._path = tempfile.mkdtemp(dir=temp_dir)

@@ -1,43 +1,27 @@
 import os
 from common.basedir import BASEDIR

-def get_attr_from_cars(attr):
-  # read all the folders in selfdrive/car and return a dict where:
-  # - keys are all the car models
-  # - values are attr values from all car folders
-  result = {}
-
-  for car_folder in [x[0] for x in os.walk(BASEDIR + '/selfdrive/car')]:
-    try:
-      car_name = car_folder.split('/')[-1]
-      values = __import__('selfdrive.car.%s.values' % car_name, fromlist=[attr])
-      if hasattr(values, attr):
-        attr_values = getattr(values, attr)
-      else:
-        continue
-
-      for f, v in attr_values.items():
-        result[f] = v
-
-    except (ImportError, IOError):
-      pass
-
-  return result
-
-
-def get_fw_versions_list():
-  return get_attr_from_cars('FW_VERSIONS')
-
-
 def get_fingerprint_list():
  # read all the folders in selfdrive/car and return a dict where:
  # - keys are all the car models for which we have a fingerprint
  # - values are lists dicts of messages that constitute the unique
  #   CAN fingerprint of each car model and all its variants
-  return get_attr_from_cars('FINGERPRINTS')
+  fingerprints = {}
+  for car_folder in [x[0] for x in os.walk(BASEDIR + '/selfdrive/car')]:
+    try:
+      car_name = car_folder.split('/')[-1]
+      values = __import__('selfdrive.car.%s.values' % car_name, fromlist=['FINGERPRINTS'])
+      if hasattr(values, 'FINGERPRINTS'):
+        car_fingerprints = values.FINGERPRINTS
+      else:
+        continue
+      for f, v in car_fingerprints.items():
+        fingerprints[f] = v
+    except (ImportError, IOError):
+      pass
+  return fingerprints


-FW_VERSIONS = get_fw_versions_list()
 _FINGERPRINTS = get_fingerprint_list()

 _DEBUG_ADDRESS = {1880: 8}   # reserved for debug purposes
@@ -1 +0,0 @@
-
@@ -1,24 +0,0 @@
-import numpy as np
-import os
-import csv
-path = os.path.dirname(os.path.abspath(__file__))
-# locally cache cities from
-# https://github.com/thampiman/reverse-geocoder
-csv_file_name = path + '/rg_cities1000.csv'
-
-# right hand drive is when the steering wheel is on the right of the car
-# left hand traffic is when cars driver on the left side of the road
-LHT_COUNTRIES = ['AU', 'IN', 'IE', 'JP', 'MU', 'MY', 'NZ', 'UK', 'ZA']
-
-
-def get_city(lat, lon):
-  cities = np.array(list(csv.reader(open(csv_file_name))))[1:]
-  positions = cities[:,:2].astype(np.float32)
-  idx = np.argmin(np.linalg.norm((positions - np.array([lat, lon])), axis=1))
-  return cities[idx]
-
-
-def is_lht(lat, lon):
-  city = get_city(lat, lon)
-  country = city[-1]
-  return country in LHT_COUNTRIES
@@ -1 +0,0 @@
-simple_kalman_impl.c
@@ -0,0 +1,10 @@
+all: simple_kalman_impl.so
+
+simple_kalman_impl.so: simple_kalman_impl.pyx simple_kalman_impl.pxd simple_kalman_setup.py
+	python2 simple_kalman_setup.py build_ext --inplace
+	rm -rf build
+	rm simple_kalman_impl.c
+
+.PHONY: clean
+clean:
+	rm -f simple_kalman_impl.so
@@ -1,6 +0,0 @@
-Import('env')
-
-env.Command(['simple_kalman_impl.so'],
-  ['simple_kalman_impl.pyx', 'simple_kalman_impl.pxd', 'simple_kalman_setup.py'],
-  "cd common/kalman && python3 simple_kalman_setup.py build_ext --inplace")
-
@@ -1,3 +1,10 @@
 # pylint: skip-file
-from common.kalman.simple_kalman_impl import KF1D as KF1D
+import os
+import subprocess
+
+kalman_dir = os.path.dirname(os.path.abspath(__file__))
+subprocess.check_call(["make", "simple_kalman_impl.so"], cwd=kalman_dir)
+
+from simple_kalman_impl import KF1D as KF1D
+# Silence pyflakes
 assert KF1D
@@ -1,4 +1,3 @@
-# cython: language_level=3

 cdef class KF1D:
  def __init__(self, x0, A, C, K):
@@ -33,4 +32,4 @@ cdef class KF1D:
  @x.setter
  def x(self, x):
    self.x0_0 = x[0][0]
-    self.x1_0 = x[1][0]
+    self.x1_0 = x[1][0]
@@ -1,9 +1,5 @@
-from distutils.core import Extension, setup
-
+from distutils.core import setup, Extension
 from Cython.Build import cythonize

-from common.cython_hacks import BuildExtWithoutPlatformSuffix
-
 setup(name='Simple Kalman Implementation',
-      cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
-      ext_modules=cythonize(Extension("simple_kalman_impl", ["simple_kalman_impl.pyx"])))
+      ext_modules=cythonize(Extension("simple_kalman_impl", ["simple_kalman_impl.pyx"])))
@@ -1,12 +0,0 @@
-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
@@ -1,284 +0,0 @@
-import os
-import struct
-import bisect
-import numpy as np
-import _io
-
-import capnp
-from cereal import log as capnp_log
-
-class RawData():
-  def __init__(self, f):
-    self.f = _io.FileIO(f, 'rb')
-    self.lenn = struct.unpack("I", self.f.read(4))[0]
-    self.count = os.path.getsize(f) / (self.lenn+4)
-
-  def read(self, i):
-    self.f.seek((self.lenn+4)*i + 4)
-    return self.f.read(self.lenn)
-
-def yuv420_to_rgb(raw, image_dim=None, swizzled=False):
-  def expand(x):
-    x = np.repeat(x, 2, axis=0)
-    return np.repeat(x, 2, axis=1)
-
-  if image_dim is None:
-    image_dim = (raw.shape[1]*2, raw.shape[2]*2)
-    swizzled = True
-
-  if not swizzled:
-    img_data = np.array(raw, copy=False, dtype=np.uint8)
-    uv_len = (image_dim[0]/2)*(image_dim[1]/2)
-    img_data_u = expand(img_data[image_dim[0]*image_dim[1]: \
-                                 image_dim[0]*image_dim[1]+uv_len]. \
-                                 reshape(image_dim[0]/2, image_dim[1]/2))
-
-    img_data_v = expand(img_data[image_dim[0]*image_dim[1]+uv_len: \
-                                 image_dim[0]*image_dim[1]+2*uv_len]. \
-                                 reshape(image_dim[0]/2, image_dim[1]/2))
-    img_data_y = img_data[0:image_dim[0]*image_dim[1]].reshape(image_dim)
-  else:
-    img_data_y = np.zeros(image_dim, dtype=np.uint8)
-    img_data_y[0::2, 0::2] = raw[0]
-    img_data_y[1::2, 0::2] = raw[1]
-    img_data_y[0::2, 1::2] = raw[2]
-    img_data_y[1::2, 1::2] = raw[3]
-    img_data_u = expand(raw[4])
-    img_data_v = expand(raw[5])
-
-  yuv = np.stack((img_data_y, img_data_u, img_data_v)).swapaxes(0,2).swapaxes(0,1)
-  yuv = yuv.astype(np.int16)
-
-  # http://maxsharabayko.blogspot.com/2016/01/fast-yuv-to-rgb-conversion-in-python-3.html
-  # according to ITU-R BT.709
-  yuv[:,:, 0] = yuv[:,:, 0].clip(16, 235).astype(yuv.dtype) - 16
-  yuv[:,:,1:] = yuv[:,:,1:].clip(16, 240).astype(yuv.dtype) - 128
-
-  A = np.array([[1.164,  0.000,  1.793],
-                [1.164, -0.213, -0.533],
-                [1.164,  2.112,  0.000]])
-
-  # our result
-  img = np.dot(yuv, A.T).clip(0, 255).astype('uint8')
-  return img
-
-
-class YuvData():
-  def __init__(self, f, dim=(160,320)):
-    self.f = _io.FileIO(f, 'rb')
-    self.image_dim = dim
-    self.image_size = self.image_dim[0]/2 * self.image_dim[1]/2 * 6
-    self.count = os.path.getsize(f) / self.image_size
-
-  def read_frame(self, frame):
-    self.f.seek(self.image_size*frame)
-    raw = self.f.read(self.image_size)
-    return raw
-
-  def read_frames(self, range_start, range_len):
-    self.f.seek(self.image_size*range_start)
-    raw = self.f.read(self.image_size*range_len)
-    return raw
-
-  def read_frames_into(self, range_start, buf):
-    self.f.seek(self.image_size*range_start)
-    return self.f.readinto(buf)
-
-  def read(self, frame):
-    return yuv420_to_rgb(self.read_frame(frame), self.image_dim)
-
-  def close(self):
-    self.f.close()
-
-  def __enter__(self):
-    return self
-
-  def __exit__(self, type, value, traceback):
-    self.close()
-
-
-
-class OneReader():
-  def __init__(self, base_path, goofy=False, segment_range=None):
-    self.base_path = base_path
-
-    route_name = os.path.basename(base_path)
-
-    self.rcamera_size = (304, 560)
-
-    if segment_range is None:
-      parent_path = os.path.dirname(base_path)
-      self.segment_nums = []
-      for p in os.listdir(parent_path):
-        if not p.startswith(route_name+"--"):
-          continue
-        self.segment_nums.append(int(p.rsplit("--", 1)[-1]))
-      if not self.segment_nums:
-        raise Exception("no route segments found")
-      self.segment_nums.sort()
-      self.segment_range = (self.segment_nums[0], self.segment_nums[-1])
-    else:
-      self.segment_range = segment_range
-      self.segment_nums = range(segment_range[0], segment_range[1]+1)
-      for i in self.segment_nums:
-        if not os.path.exists(base_path+"--"+str(i)):
-          raise Exception("missing segment in provided range")
-
-    # goofy data is broken with discontinuous logs
-    if goofy and (self.segment_range[0] != 0
-        or self.segment_nums != range(self.segment_range[0], self.segment_range[1]+1)):
-      raise Exception("goofy data needs all the segments for a route")
-
-    self.cur_seg = None
-    self.cur_seg_f = None
-
-    # index the frames
-    print("indexing frames {}...".format(self.segment_nums))
-
-    self.rcamera_encode_map = {} # frame_id -> (segment num, segment id, frame_time)
-    last_frame_id = -1
-
-    if goofy:
-      # goofy is goofy
-
-      frame_size = self.rcamera_size[0]*self.rcamera_size[1]*3/2
-
-      # find the encode id ranges for each segment by using the rcamera file size
-      segment_encode_ids = []
-      cur_encode_id = 0
-      for n in self.segment_nums:
-        camera_path = os.path.join(self.seg_path(n), "rcamera")
-        if not os.path.exists(camera_path):
-          # for goofy, missing camera files means a bad route
-          raise Exception("Missing camera file {}".format(camera_path))
-        camera_size = os.path.getsize(camera_path)
-        assert (camera_size % frame_size) == 0
-
-        num_frames = camera_size / frame_size
-        segment_encode_ids.append(cur_encode_id)
-        cur_encode_id += num_frames
-
-      last_encode_id = -1
-      # use the segment encode id map and frame events to build the frame index
-      for n in self.segment_nums:
-        log_path = os.path.join(self.seg_path(n), "rlog")
-        if os.path.exists(log_path):
-          with open(log_path, "rb") as f:
-            for evt in capnp_log.Event.read_multiple(f):
-              if evt.which() == 'frame':
-
-                if evt.frame.frameId < last_frame_id:
-                  # a non-increasing frame id is bad route (eg visiond was restarted)
-                  raise Exception("non-increasing frame id")
-                last_frame_id = evt.frame.frameId
-
-                seg_i = bisect.bisect_right(segment_encode_ids, evt.frame.encodeId)-1
-                assert seg_i >= 0
-                seg_num = self.segment_nums[seg_i]
-                seg_id = evt.frame.encodeId-segment_encode_ids[seg_i]
-                frame_time = evt.logMonoTime / 1.0e9
-
-                self.rcamera_encode_map[evt.frame.frameId] = (seg_num, seg_id,
-                                                              frame_time)
-
-                last_encode_id = evt.frame.encodeId
-
-      if last_encode_id-cur_encode_id > 10:
-        # too many missing frames is a bad route (eg route from before encoder rotating worked)
-        raise Exception("goofy route is missing frames: {}, {}".format(
-          last_encode_id, cur_encode_id))
-
-    else:
-      # for harry data, build the index from encodeIdx events
-      for n in self.segment_nums:
-        log_path = os.path.join(self.seg_path(n), "rlog")
-        if os.path.exists(log_path):
-          with open(log_path, "rb") as f:
-            for evt in capnp_log.Event.read_multiple(f):
-              if evt.which() == 'encodeIdx' and evt.encodeIdx.type == 'bigBoxLossless':
-                frame_time = evt.logMonoTime / 1.0e9
-                self.rcamera_encode_map[evt.encodeIdx.frameId] = (
-                  evt.encodeIdx.segmentNum, evt.encodeIdx.segmentId,
-                  frame_time)
-
-    print("done")
-
-    # read the first event to find the start time
-    self.reset_to_seg(self.segment_range[0])
-    for evt in self.events():
-      if evt.which() != 'initData':
-        self.start_mono = evt.logMonoTime
-        break
-    self.reset_to_seg(self.segment_range[0])
-
-
-  def seg_path(self, num):
-    return self.base_path+"--"+str(num)
-
-  def reset_to_seg(self, seg):
-    self.cur_seg = seg
-    if self.cur_seg_f:
-      self.cur_seg_f.close()
-      self.cur_seg_f = None
-
-  def seek_ts(self, ts):
-    seek_seg = int(ts/60)
-    if seek_seg < self.segment_range[0] or seek_seg > self.segment_range[1]:
-      raise ValueError
-
-    self.reset_to_seg(seek_seg)
-    target_mono = self.start_mono + int(ts*1e9)
-    for evt in self.events():
-      if evt.logMonoTime >= target_mono:
-        break
-
-  def read_event(self):
-    while True:
-      if self.cur_seg > self.segment_range[1]:
-        return None
-      if self.cur_seg_f is None:
-        log_path = os.path.join(self.seg_path(self.cur_seg), "rlog")
-        if not os.path.exists(log_path):
-          print("missing log file!", log_path)
-          self.cur_seg += 1
-          continue
-        self.cur_seg_f = open(log_path, "rb")
-
-      try:
-        return capnp_log.Event.read(self.cur_seg_f)
-      except capnp.lib.capnp.KjException as e:
-        if 'EOF' in str(e): # dumb, but pycapnp does this too
-          self.cur_seg_f.close()
-          self.cur_seg_f = None
-          self.cur_seg += 1
-        else:
-          raise
-
-  def events(self):
-    while True:
-      r = self.read_event()
-      if r is None:
-        break
-      yield r
-
-  def read_frame(self, frame_id):
-    encode_idx = self.rcamera_encode_map.get(frame_id)
-    if encode_idx is None:
-      return None
-
-    seg_num, seg_id, _ = encode_idx
-    camera_path = os.path.join(self.seg_path(seg_num), "rcamera")
-    if not os.path.exists(camera_path):
-      return None
-    with YuvData(camera_path, self.rcamera_size) as data:
-      return data.read_frame(seg_id)
-
-  def close(self):
-    if self.cur_seg_f is not None:
-      self.cur_seg_f.close()
-
-  def __enter__(self):
-    return self
-
-  def __exit__(self, type, value, traceback):
-    self.close()
@@ -1,92 +0,0 @@
-import sys
-import json
-# pip2 install msgpack-python
-import msgpack
-import zlib
-import os
-import logging
-
-from Crypto.Cipher import AES
-
-ext = ".gz"
-SWAG = '\xde\xe2\x11\x15VVC\xf2\x8ep\xd7\xe4\x87\x8d,9'
-
-def compress_json(in_file, out_file):
-  logging.debug("compressing %s -> %s", in_file, out_file)
-
-  errors = 0
-
-  good = []
-  last_can_time = 0
-  with open(in_file, 'r') as inf:
-    for ln in inf:
-      ln = ln.rstrip()
-      if not ln: continue
-      try:
-        ll = json.loads(ln)
-      except ValueError:
-        errors += 1
-        continue
-      if ll is None or ll[0] is None:
-        continue
-      if ll[0][1] == 1:
-        # no CAN in hex
-        ll[1][2] = ll[1][2].decode("hex")
-        # relativize the CAN timestamps
-        this_can_time = ll[1][1]
-        ll[1] = [ll[1][0], this_can_time - last_can_time, ll[1][2]]
-        last_can_time = this_can_time
-      good.append(ll)
-
-  logging.debug("compressing %s -> %s, read done", in_file, out_file)
-  data = msgpack.packb(good)
-  data_compressed = zlib.compress(data)
-  # zlib doesn't care about this
-  data_compressed += "\x00" * (16 - len(data_compressed)%16)
-  aes = AES.new(SWAG, AES.MODE_CBC, "\x00"*16)
-  data_encrypted = aes.encrypt(data_compressed)
-  with open(out_file, "wb") as outf:
-    outf.write(data_encrypted)
-
-  logging.debug("compressing %s -> %s, write done", in_file, out_file)
-
-  return errors
-
-def decompress_json_internal(data_encrypted):
-  aes = AES.new(SWAG, AES.MODE_CBC, "\x00"*16)
-  data_compressed = aes.decrypt(data_encrypted)
-  data = zlib.decompress(data_compressed)
-  msgs = msgpack.unpackb(data)
-  good = []
-  last_can_time = 0
-  for ll in msgs:
-    if ll[0][1] == 1:
-      # back into hex
-      ll[1][2] = ll[1][2].encode("hex")
-      # derelativize CAN timestamps
-      last_can_time += ll[1][1]
-      ll[1] = [ll[1][0], last_can_time, ll[1][2]]
-    good.append(ll)
-  return good
-
-def decompress_json(in_file, out_file):
-  logging.debug("decompressing %s -> %s", in_file, out_file)
-  f = open(in_file)
-  data_encrypted = f.read()
-  f.close()
-
-  good = decompress_json_internal(data_encrypted)
-  out = '\n'.join(map(lambda x: json.dumps(x), good)) + "\n"
-  logging.debug("decompressing %s -> %s, writing", in_file, out_file)
-  f = open(out_file, 'w')
-  f.write(out)
-  f.close()
-  logging.debug("decompressing %s -> %s, write finished", in_file, out_file)
-
-if __name__ == "__main__":
-  for dat in sys.argv[1:]:
-    print(dat)
-    compress_json(dat, "/tmp/out"+ext)
-    decompress_json("/tmp/out"+ext, "/tmp/test")
-    os.system("diff "+dat+" /tmp/test")
-
@@ -1,11 +1,9 @@
-import io
 import os
 import sys
 import copy
 import json
 import socket
 import logging
-import traceback
 from threading import local
 from collections import OrderedDict
 from contextlib import contextmanager
@@ -80,6 +78,28 @@ class SwagLogger(logging.Logger):
    self.log_local = local()
    self.log_local.ctx = {}

+  def findCaller(self, stack_info=None):
+    """
+      Find the stack frame of the caller so that we can note the source
+      file name, line number and function name.
+      """
+    # f = currentframe()
+    f = sys._getframe(3)
+    #On some versions of IronPython, currentframe() returns None if
+    #IronPython isn't run with -X:Frames.
+    if f is not None:
+      f = f.f_back
+    rv = "(unknown file)", 0, "(unknown function)"
+    while hasattr(f, "f_code"):
+      co = f.f_code
+      filename = os.path.normcase(co.co_filename)
+      if filename in (logging._srcfile, _srcfile):
+        f = f.f_back
+        continue
+      rv = (co.co_filename, f.f_lineno, co.co_name)
+      break
+    return rv
+
  def local_ctx(self):
    try:
      return self.log_local.ctx
@@ -120,42 +140,6 @@ class SwagLogger(logging.Logger):
    else:
      self.info(evt)

-  def findCaller(self, stack_info=False, stacklevel=1):
-    """
-    Find the stack frame of the caller so that we can note the source
-    file name, line number and function name.
-    """
-    f = sys._getframe(3)
-    #On some versions of IronPython, currentframe() returns None if
-    #IronPython isn't run with -X:Frames.
-    if f is not None:
-        f = f.f_back
-    orig_f = f
-    while f and stacklevel > 1:
-        f = f.f_back
-        stacklevel -= 1
-    if not f:
-        f = orig_f
-    rv = "(unknown file)", 0, "(unknown function)", None
-    while hasattr(f, "f_code"):
-        co = f.f_code
-        filename = os.path.normcase(co.co_filename)
-        if filename == _srcfile:
-            f = f.f_back
-            continue
-        sinfo = None
-        if stack_info:
-            sio = io.StringIO()
-            sio.write('Stack (most recent call last):\n')
-            traceback.print_stack(f, file=sio)
-            sinfo = sio.getvalue()
-            if sinfo[-1] == '\n':
-                sinfo = sinfo[:-1]
-            sio.close()
-        rv = (co.co_filename, f.f_lineno, co.co_name, sinfo)
-        break
-    return rv
-
 if __name__ == "__main__":
  log = SwagLogger()

@@ -12,10 +12,7 @@ def interp(x, xp, fp):
      hi += 1
    low = hi - 1
    return fp[-1] if hi == N and xv > xp[low] else (
-      fp[0] if hi == 0 else
+      fp[0] if hi == 0 else 
      (xv - xp[low]) * (fp[hi] - fp[low]) / (xp[hi] - xp[low]) + fp[low])
  return [get_interp(v) for v in x] if hasattr(
    x, '__iter__') else get_interp(x)
-
-def mean(x):
-  return sum(x) / len(x)
@@ -1,66 +0,0 @@
-import bisect
-import numpy as np
-from scipy.interpolate import interp1d
-
-
-def deep_interp_0_fast(dx, x, y):
-  FIX = False
-  if len(y.shape) == 1:
-    y = y[:, None]
-    FIX = True
-  ret = np.zeros((dx.shape[0], y.shape[1]))
-  index = list(x)
-  for i in range(dx.shape[0]):
-    idx = bisect.bisect_left(index, dx[i])
-    if idx == x.shape[0]:
-      idx = x.shape[0] - 1
-    ret[i] = y[idx]
-
-  if FIX:
-    return ret[:, 0]
-  else:
-    return ret
-
-
-def running_mean(x, N):
-  cumsum = np.cumsum(np.insert(x, [0]*(int(N/2)) + [-1]*(N-int(N/2)), [x[0]]*int(N/2) + [x[-1]]*(N-int(N/2))))
-  return (cumsum[N:] - cumsum[:-N]) / N
-
-
-def deep_interp_np(x, xp, fp):
-  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 len(vals_interp) == 1:
-    return vals_interp[0]
-  else:
-    return vals_interp
-
-
-def clipping_deep_interp(x, xp, fp):
-  if len(xp) < 2:
-    return deep_interp_np(x, xp, fp)
-  bad_idx = np.where(np.diff(xp) < 0)[0]
-  if len(bad_idx) > 0:
-    if bad_idx[0] ==1:
-      return np.zeros([] + list(fp.shape[1:]))
-    return deep_interp_np(x, xp[:bad_idx[0]], fp[:bad_idx[0]])
-  else:
-    return deep_interp_np(x, xp, fp)
-
-
-def deep_interp(dx, x, y, kind="slinear"):
-  return interp1d(
-    x, y,
-    axis=0,
-    kind=kind,
-    bounds_error=False,
-    fill_value="extrapolate",
-    assume_sorted=True)(dx)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 """ROS has a parameter server, we have files.

 The parameter store is a persistent key value store, implemented as a directory with a writer lock.
@@ -29,7 +29,7 @@ import fcntl
 import tempfile
 import threading
 from enum import Enum
-from common.basedir import PARAMS
+

 def mkdirs_exists_ok(path):
  try:
@@ -54,53 +54,34 @@ keys = {
  "AthenadPid": [TxType.PERSISTENT],
  "CalibrationParams": [TxType.PERSISTENT],
  "CarParams": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "CarParamsCache": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
  "CarVin": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "CommunityFeaturesToggle": [TxType.PERSISTENT],
  "CompletedTrainingVersion": [TxType.PERSISTENT],
  "ControlsParams": [TxType.PERSISTENT],
  "DoUninstall": [TxType.CLEAR_ON_MANAGER_START],
  "DongleId": [TxType.PERSISTENT],
+  "GithubSshKeys": [TxType.PERSISTENT],
  "GitBranch": [TxType.PERSISTENT],
  "GitCommit": [TxType.PERSISTENT],
  "GitRemote": [TxType.PERSISTENT],
-  "GithubSshKeys": [TxType.PERSISTENT],
  "HasAcceptedTerms": [TxType.PERSISTENT],
-  "HasCompletedSetup": [TxType.PERSISTENT],
-  "IsLdwEnabled": [TxType.PERSISTENT],
  "IsGeofenceEnabled": [TxType.PERSISTENT],
  "IsMetric": [TxType.PERSISTENT],
-  "IsOffroad": [TxType.CLEAR_ON_MANAGER_START],
  "IsRHD": [TxType.PERSISTENT],
-  "IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
-  "IsUpdateAvailable": [TxType.CLEAR_ON_MANAGER_START],
+  "IsUpdateAvailable": [TxType.PERSISTENT],
  "IsUploadRawEnabled": [TxType.PERSISTENT],
-  "LastUpdateTime": [TxType.PERSISTENT],
+  "IsUploadVideoOverCellularEnabled": [TxType.PERSISTENT],
  "LimitSetSpeed": [TxType.PERSISTENT],
  "LimitSetSpeedNeural": [TxType.PERSISTENT],
  "LiveParameters": [TxType.PERSISTENT],
  "LongitudinalControl": [TxType.PERSISTENT],
-  "OpenpilotEnabledToggle": [TxType.PERSISTENT],
-  "PandaFirmware": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "PandaFirmwareHex": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "PandaDongleId": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
  "Passive": [TxType.PERSISTENT],
  "RecordFront": [TxType.PERSISTENT],
-  "ReleaseNotes": [TxType.PERSISTENT],
  "ShouldDoUpdate": [TxType.CLEAR_ON_MANAGER_START],
  "SpeedLimitOffset": [TxType.PERSISTENT],
  "SubscriberInfo": [TxType.PERSISTENT],
  "TermsVersion": [TxType.PERSISTENT],
  "TrainingVersion": [TxType.PERSISTENT],
-  "UpdateAvailable": [TxType.CLEAR_ON_MANAGER_START],
  "Version": [TxType.PERSISTENT],
-  "Offroad_ChargeDisabled": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "Offroad_ConnectivityNeeded": [TxType.CLEAR_ON_MANAGER_START],
-  "Offroad_ConnectivityNeededPrompt": [TxType.CLEAR_ON_MANAGER_START],
-  "Offroad_TemperatureTooHigh": [TxType.CLEAR_ON_MANAGER_START],
-  "Offroad_PandaFirmwareMismatch": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
-  "Offroad_InvalidTime": [TxType.CLEAR_ON_MANAGER_START],
-  "Offroad_IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
 }


@@ -112,7 +93,7 @@ def fsync_dir(path):
    os.close(fd)


-class FileLock():
+class FileLock(object):
  def __init__(self, path, create):
    self._path = path
    self._create = create
@@ -128,7 +109,7 @@ class FileLock():
      self._fd = None


-class DBAccessor():
+class DBAccessor(object):
  def __init__(self, path):
    self._path = path
    self._vals = None
@@ -298,9 +279,6 @@ def read_db(params_path, key):
    return None

 def write_db(params_path, key, value):
-  if isinstance(value, str):
-    value = value.encode('utf8')
-
  prev_umask = os.umask(0)
  lock = FileLock(params_path+"/.lock", True)
  lock.acquire()
@@ -319,8 +297,8 @@ def write_db(params_path, key, value):
    os.umask(prev_umask)
    lock.release()

-class Params():
-  def __init__(self, db=PARAMS):
+class Params(object):
+  def __init__(self, db='/data/params'):
    self.db = db

    # create the database if it doesn't exist...
@@ -328,11 +306,6 @@ class Params():
      with self.transaction(write=True):
        pass

-  def clear_all(self):
-    shutil.rmtree(self.db, ignore_errors=True)
-    with self.transaction(write=True):
-      pass
-
  def transaction(self, write=False):
    if write:
      return DBWriter(self.db)
@@ -355,7 +328,7 @@ class Params():
    with self.transaction(write=True) as txn:
      txn.delete(key)

-  def get(self, key, block=False, encoding=None):
+  def get(self, key, block=False):
    if key not in keys:
      raise UnknownKeyName(key)

@@ -365,21 +338,9 @@ class Params():
        break
      # is polling really the best we can do?
      time.sleep(0.05)
-
-    if ret is not None and encoding is not None:
-      ret = ret.decode(encoding)
-
    return ret

  def put(self, key, dat):
-    """
-    Warning: This function blocks until the param is written to disk!
-    In very rare cases this can take over a second, and your code will hang.
-
-    Use the put_nonblocking helper function in time sensitive code, but
-    in general try to avoid writing params as much as possible.
-    """
-
    if key not in keys:
      raise UnknownKeyName(key)

@@ -1,163 +0,0 @@
-#!/usr/bin/env python3
-
-
-# Copyright (C) 2016 Sixten Bergman
-# License WTFPL
-#
-# This program is free software. It comes without any warranty, to the extent
-# permitted by applicable law.
-# You can redistribute it and/or modify it under the terms of the Do What The
-# Fuck You Want To Public License, Version 2, as published by Sam Hocevar. See
-# http://www.wtfpl.net/ for more details.
-#
-# note that the function peakdetect is derived from code which was released to
-# public domain see: http://billauer.co.il/peakdet.html
-#
-
-from math import log
-import numpy as np
-
-__all__ = ["peakdetect"]
-
-
-
-def _datacheck_peakdetect(x_axis, y_axis):
-    if x_axis is None:
-        x_axis = range(len(y_axis))
-
-    if len(y_axis) != len(x_axis):
-        raise ValueError("Input vectors y_axis and x_axis must have same length")
-
-    #needs to be a numpy array
-    y_axis = np.array(y_axis)
-    x_axis = np.array(x_axis)
-    return x_axis, y_axis
-
-
-def _pad(fft_data, pad_len):
-    """
-    Pads fft data to interpolate in time domain
-
-    keyword arguments:
-    fft_data -- the fft
-    pad_len --  By how many times the time resolution should be increased by
-
-    return: padded list
-    """
-    length = len(fft_data)
-    n = _n(length * pad_len)
-    fft_data = list(fft_data)
-
-    return fft_data[:length // 2] + [0] * (2**n-length) + fft_data[length // 2:]
-
-
-def _n(x):
-    """
-    Find the smallest value for n, which fulfils 2**n >= x
-
-    keyword arguments:
-    x -- the value, which 2**n must surpass
-      return: the integer n
-    """
-    return int(log(x)/log(2)) + 1
-
-
-def peakdetect(y_axis, x_axis=None, lookahead=200, delta=0):
-    """
-    Converted from/based on a MATLAB script at:
-    http://billauer.co.il/peakdet.html
-      function for detecting local maxima and minima in a signal.
-    Discovers peaks by searching for values which are surrounded by lower
-    or larger values for maxima and minima respectively
-      keyword arguments:
-    y_axis -- A list containing the signal over which to find peaks
-      x_axis -- A x-axis whose values correspond to the y_axis list and is used
-        in the return to specify the position of the peaks. If omitted an
-        index of the y_axis is used.
-        (default: None)
-      lookahead -- distance to look ahead from a peak candidate to determine if
-        it is the actual peak
-        (default: 200)
-        '(samples / period) / f' where '4 >= f >= 1.25' might be a good value
-      delta -- this specifies a minimum difference between a peak and
-        the following points, before a peak may be considered a peak. Useful
-        to hinder the function from picking up false peaks towards to end of
-        the signal. To work well delta should be set to delta >= RMSnoise * 5.
-        (default: 0)
-            When omitted delta function causes a 20% decrease in speed.
-            When used Correctly it can double the speed of the function
-        return: two lists [max_peaks, min_peaks] containing the positive and
-        negative peaks respectively. Each cell of the lists contains a tuple
-        of: (position, peak_value)
-        to get the average peak value do: np.mean(max_peaks, 0)[1] on the
-        results to unpack one of the lists into x, y coordinates do:
-        x, y = zip(*max_peaks)
-    """
-    max_peaks = []
-    min_peaks = []
-    dump = []   # Used to pop the first hit which almost always is false
-    # check input data
-    x_axis, y_axis = _datacheck_peakdetect(x_axis, y_axis)
-    # store data length for later use
-    length = len(y_axis)
-    #perform some checks
-    if lookahead < 1:
-        raise ValueError("Lookahead must be '1' or above in value")
-    if not (np.isscalar(delta) and delta >= 0):
-        raise ValueError("delta must be a positive number")
-      #maxima and minima candidates are temporarily stored in
-    #mx and mn respectively
-    mn, mx = np.Inf, -np.Inf
-    #Only detect peak if there is 'lookahead' amount of points after it
-    for index, (x, y) in enumerate(zip(x_axis[:-lookahead],
-                                       y_axis[:-lookahead])):
-        if y > mx:
-            mx = y
-            mxpos = x
-        if y < mn:
-            mn = y
-            mnpos = x
-        ####look for max####
-        if y < mx-delta and mx != np.Inf:
-            #Maxima peak candidate found
-            #look ahead in signal to ensure that this is a peak and not jitter
-            if y_axis[index:index+lookahead].max() < mx:
-                max_peaks.append([mxpos, mx])
-                dump.append(True)
-                #set algorithm to only find minima now
-                mx = np.Inf
-                mn = np.Inf
-                if index+lookahead >= length:
-                    #end is within lookahead no more peaks can be found
-                    break
-                continue
-            #else:  #slows shit down this does
-            #    mx = ahead
-            #    mxpos = x_axis[np.where(y_axis[index:index+lookahead]==mx)]
-              ####look for min####
-        if y > mn+delta and mn != -np.Inf:
-            #Minima peak candidate found
-            #look ahead in signal to ensure that this is a peak and not jitter
-            if y_axis[index:index+lookahead].min() > mn:
-                min_peaks.append([mnpos, mn])
-                dump.append(False)
-                #set algorithm to only find maxima now
-                mn = -np.Inf
-                mx = -np.Inf
-                if index+lookahead >= length:
-                    #end is within lookahead no more peaks can be found
-                    break
-            #else:  #slows shit down this does
-            #    mn = ahead
-            #    mnpos = x_axis[np.where(y_axis[index:index+lookahead]==mn)]
-        #Remove the false hit on the first value of the y_axis
-    try:
-        if dump[0]:
-            max_peaks.pop(0)
-        else:
-            min_peaks.pop(0)
-        del dump
-    except IndexError:
-        #no peaks were found, should the function return empty lists?
-        pass
-    return [max_peaks, min_peaks]
@@ -1,6 +1,6 @@
 import time

-class Profiler():
+class Profiler(object):
  def __init__(self, enabled=False):
    self.enabled = enabled
    self.cp = {}
@@ -6,11 +6,18 @@ import subprocess
 import multiprocessing
 from cffi import FFI

-from common.common_pyx import sec_since_boot  # pylint: disable=no-name-in-module, import-error
+# Build and load cython module
+import pyximport
+installer = pyximport.install(inplace=True, build_dir='/tmp')
+from common.clock import monotonic_time, sec_since_boot  # pylint: disable=no-name-in-module, import-error
+pyximport.uninstall(*installer)
+assert monotonic_time
+assert sec_since_boot


 # time step for each process
 DT_CTRL = 0.01  # controlsd
+DT_PLAN = 0.05  # mpc
 DT_MDL = 0.05  # model
 DT_DMON = 0.1  # driver monitoring
 DT_TRML = 0.5  # thermald and manager
@@ -36,7 +43,7 @@ def set_realtime_priority(level):
  return subprocess.call(['chrt', '-f', '-p', str(level), str(tid)])


-class Ratekeeper():
+class Ratekeeper(object):
  def __init__(self, rate, print_delay_threshold=0.):
    """Rate in Hz for ratekeeping. print_delay_threshold must be nonnegative."""
    self._interval = 1. / rate
@@ -1,78 +0,0 @@
-import os
-import numpy as np
-import random
-
-class SamplingBuffer():
-  def __init__(self, fn, size, write=False):
-    self._fn = fn
-    self._write = write
-    if self._write:
-      self._f = open(self._fn, "ab")
-    else:
-      self._f = open(self._fn, "rb")
-    self._size = size
-    self._refresh()
-
-  def _refresh(self):
-    self.cnt = os.path.getsize(self._fn) / self._size
-
-  @property
-  def count(self):
-    self._refresh()
-    return self.cnt
-
-  def _fetch_one(self, x):
-    assert self._write == False
-    self._f.seek(x*self._size)
-    return self._f.read(self._size)
-
-  def sample(self, count, indices = None):
-    if indices == None:
-      cnt = self.count
-      assert cnt != 0
-      indices = map(lambda x: random.randint(0, cnt-1), range(count))
-    return map(self._fetch_one, indices)
-
-  def write(self, dat):
-    assert self._write == True
-    assert (len(dat) % self._size) == 0
-    self._f.write(dat)
-    self._f.flush()
-
-class NumpySamplingBuffer():
-  def __init__(self, fn, size, dtype, write=False):
-    self._size = size
-    self._dtype = dtype
-    self._buf = SamplingBuffer(fn, len(np.zeros(size, dtype=dtype).tobytes()), write)
-
-  @property
-  def count(self):
-    return self._buf.count
-
-  def write(self, dat):
-    self._buf.write(dat.tobytes())
-
-  def sample(self, count, indices = None):
-    return np.fromstring(''.join(self._buf.sample(count, indices)), dtype=self._dtype).reshape([count]+list(self._size))
-
-# TODO: n IOPS needed where n is the Multi
-class MultiNumpySamplingBuffer():
-  def __init__(self, fn, npa, write=False):
-    self._bufs = []
-    for i,n in enumerate(npa):
-      self._bufs.append(NumpySamplingBuffer(fn + ("_%d" % i), n[0], n[1], write))
-
-  def write(self, dat):
-    for b,x in zip(self._bufs, dat):
-      b.write(x)
-
-  @property
-  def count(self):
-    return min(map(lambda x: x.count, self._bufs))
-
-  def sample(self, count):
-    cnt = self.count
-    assert cnt != 0
-    indices = map(lambda x: random.randint(0, cnt-1), range(count))
-    return map(lambda x: x.sample(count, indices), self._bufs)
-
@@ -1,63 +0,0 @@
-import os
-import subprocess
-from common.basedir import BASEDIR
-
-
-class Spinner():
-  def __init__(self):
-    try:
-      self.spinner_proc = subprocess.Popen(["./spinner"],
-                                           stdin=subprocess.PIPE,
-                                           cwd=os.path.join(BASEDIR, "selfdrive", "ui", "spinner"),
-                                           close_fds=True)
-    except OSError:
-      self.spinner_proc = None
-
-  def __enter__(self):
-    return self
-
-  def update(self, spinner_text):
-    if self.spinner_proc is not None:
-      self.spinner_proc.stdin.write(spinner_text.encode('utf8') + b"\n")
-      try:
-        self.spinner_proc.stdin.flush()
-      except BrokenPipeError:
-        pass
-
-  def close(self):
-    if self.spinner_proc is not None:
-      try:
-        self.spinner_proc.stdin.close()
-      except BrokenPipeError:
-        pass
-      self.spinner_proc.terminate()
-      self.spinner_proc = None
-
-  def __del__(self):
-    self.close()
-
-  def __exit__(self, type, value, traceback):
-    self.close()
-
-
-class FakeSpinner():
-  def __init__(self):
-    pass
-
-  def __enter__(self):
-    return self
-
-  def update(self, _):
-    pass
-
-  def __exit__(self, type, value, traceback):
-    pass
-
-
-if __name__ == "__main__":
-  import time
-  with Spinner() as s:
-    s.update("Spinner text")
-    time.sleep(5.0)
-  print("gone")
-  time.sleep(5.0)
@@ -11,7 +11,7 @@ class RunningStat():
      self.n = priors[2]
      self.M_last = self.M
      self.S_last = self.S
-
+      
    else:
      self.reset()

@@ -70,4 +70,4 @@ class RunningStatFilter():
      pass
      # self.filtered_stat.push_data(self.filtered_stat.mean())

-# class SequentialBayesian():
+# class SequentialBayesian():
@@ -1,94 +0,0 @@
-import numpy as np
-
-_DESC_FMT = """
-{} (n={}):
-MEAN={}
-VAR={}
-MIN={}
-MAX={}
-"""
-
-class StatTracker():
-  def __init__(self, name):
-    self._name = name
-    self._mean = 0.
-    self._var = 0.
-    self._n = 0
-    self._min = -float("-inf")
-    self._max = -float("inf")
-
-  @property
-  def mean(self):
-    return self._mean
-
-  @property
-  def var(self):
-    return (self._n * self._var) / (self._n - 1.)
-
-  @property
-  def min(self):
-    return self._min
-
-  @property
-  def max(self):
-    return self._max
-
-  def update(self, samples):
-    # https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Parallel_algorithm
-    data = samples.reshape(-1)
-    n_a = data.size
-    mean_a = np.mean(data)
-    var_a = np.var(data, ddof=0)
-
-    n_b = self._n
-    mean_b = self._mean
-
-    delta = mean_b - mean_a
-    m_a = var_a * (n_a - 1)
-    m_b = self._var * (n_b - 1)
-    m2 = m_a + m_b + delta**2 * n_a * n_b / (n_a + n_b)
-
-    self._var = m2 / (n_a + n_b)
-    self._mean = (n_a * mean_a + n_b * mean_b) / (n_a + n_b)
-    self._n = n_a + n_b
-
-    self._min = min(self._min, np.min(data))
-    self._max = max(self._max, np.max(data))
-
-  def __str__(self):
-    return _DESC_FMT.format(self._name, self._n, self._mean, self.var, self._min,
-                            self._max)
-
-# FIXME(mgraczyk): The variance computation does not work with 1 sample batches.
-class VectorStatTracker(StatTracker):
-  def __init__(self, name, dim):
-    self._name = name
-    self._mean = np.zeros((dim, ))
-    self._var = np.zeros((dim, dim))
-    self._n = 0
-    self._min = np.full((dim, ), -float("-inf"))
-    self._max = np.full((dim, ), -float("inf"))
-
-  @property
-  def cov(self):
-    return self.var
-
-  def update(self, samples):
-    n_a = samples.shape[0]
-    mean_a = np.mean(samples, axis=0)
-    var_a = np.cov(samples, ddof=0, rowvar=False)
-
-    n_b = self._n
-    mean_b = self._mean
-
-    delta = mean_b - mean_a
-    m_a = var_a * (n_a - 1)
-    m_b = self._var * (n_b - 1)
-    m2 = m_a + m_b + delta**2 * n_a * n_b / (n_a + n_b)
-
-    self._var = m2 / (n_a + n_b)
-    self._mean = (n_a * mean_a + n_b * mean_b) / (n_a + n_b)
-    self._n = n_a + n_b
-
-    self._min = np.minimum(self._min, np.min(samples, axis=0))
-    self._max = np.maximum(self._max, np.max(samples, axis=0))
@@ -1,6 +0,0 @@
-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)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import sympy as sp
 import numpy as np

@@ -1,28 +0,0 @@
-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()
@@ -1,27 +0,0 @@
-import numpy as np
-import unittest
-import timeit
-
-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()
@@ -1,63 +0,0 @@
-from common.params import Params, UnknownKeyName
-import threading
-import time
-import tempfile
-import shutil
-import unittest
-
-
-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_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.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.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("AccessToken", "knope")
-    assert self.params.get("DongleId") == b"bob"
-    assert self.params.get("AccessToken") == b"knope"
-
-  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")
-
-
-if __name__ == "__main__":
-  unittest.main()
@@ -1,61 +0,0 @@
-
-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)|
-| Road | [Forward, Left, Up] | meters | On the road plane aligned to the vehicle. <br> ![img](https://upload.wikimedia.org/wikipedia/commons/f/f5/RPY_angles_of_cars.png) |
-| 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.
-
-
-Calibration
------
-EONs are not all mounted in the exact same way. To compensate for the effects of this the vision model takes in an image that is "calibrated". This means the image is aligned so the direction of travel of the car when it is going straight and the road is flat is always in the location on the image. This calibration is defined by a pitch and yaw angle that describe the direction of travel vector in 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)
-```
@@ -44,7 +44,6 @@ def get_calib_from_vp(vp):
  roll_calib = 0
  return roll_calib, pitch_calib, yaw_calib

-
 # aka 'extrinsic_matrix'
 # road : x->forward, y -> left, z->up
 def get_view_frame_from_road_frame(roll, pitch, yaw, height):
@@ -62,13 +61,6 @@ def vp_from_ke(m):
  """
  return (m[0, 0]/m[2,0], m[1,0]/m[2,0])

-
-def vp_from_rpy(rpy):
-  e = get_view_frame_from_road_frame(rpy[0], rpy[1], rpy[2], 1.22)
-  ke = np.dot(eon_intrinsics, e)
-  return vp_from_ke(ke)
-
-
 def roll_from_ke(m):
  # note: different from calibration.h/RollAnglefromKE: i think that one's just wrong
  return np.arctan2(-(m[1, 0] - m[1, 1] * m[2, 0] / m[2, 1]),
@@ -131,6 +123,37 @@ def img_from_device(pt_device):
  return pt_img.reshape(input_shape)[:,:2]


+#TODO please use generic img transform below
+def rotate_img(img, eulers, crop=None, intrinsics=eon_intrinsics):
+  import cv2
+
+  size = img.shape[:2]
+  rot = orient.rot_from_euler(eulers)
+  quadrangle = np.array([[0, 0],
+                         [size[1]-1, 0],
+                         [0, size[0]-1],
+                         [size[1]-1, size[0]-1]], dtype=np.float32)
+  quadrangle_norm = np.hstack((normalize(quadrangle, intrinsics=intrinsics), np.ones((4,1))))
+  warped_quadrangle_full = np.einsum('ij, kj->ki', intrinsics.dot(rot), quadrangle_norm)
+  warped_quadrangle = np.column_stack((warped_quadrangle_full[:,0]/warped_quadrangle_full[:,2],
+                                       warped_quadrangle_full[:,1]/warped_quadrangle_full[:,2])).astype(np.float32)
+  if crop:
+    W_border = (size[1] - crop[0])/2
+    H_border = (size[0] - crop[1])/2
+    outside_crop = (((warped_quadrangle[:,0] < W_border) |
+                     (warped_quadrangle[:,0] >= size[1] - W_border)) &
+                    ((warped_quadrangle[:,1] < H_border) |
+                     (warped_quadrangle[:,1] >= size[0] - H_border)))
+    if not outside_crop.all():
+      raise ValueError("warped image not contained inside crop")
+  else:
+    H_border, W_border = 0, 0
+  M = cv2.getPerspectiveTransform(quadrangle, warped_quadrangle)
+  img_warped = cv2.warpPerspective(img, M, size[::-1])
+  return img_warped[H_border: size[0] - H_border,
+                    W_border: size[1] - W_border]
+
+
 def get_camera_frame_from_calib_frame(camera_frame_from_road_frame):
  camera_frame_from_ground = camera_frame_from_road_frame[:, (0, 1, 3)]
  calib_frame_from_ground = np.dot(eon_intrinsics,
@@ -160,8 +183,7 @@ def transform_img(base_img,
                 alpha=1.0,
                 beta=0,
                 blur=0):
-  import cv2  # pylint: disable=import-error
-  cv2.setNumThreads(1)
+  import cv2

  if yuv:
    base_img = cv2.cvtColor(base_img, cv2.COLOR_YUV2RGB_I420)
@@ -218,7 +240,7 @@ def transform_img(base_img,
 def yuv_crop(frame, output_size, center=None):
  # output_size in camera coordinates so u,v
  # center in array coordinates so row, column
-  import cv2  # pylint: disable=import-error
+  import cv2
  rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2RGB_I420)
  if not center:
    center = (rgb.shape[0]/2, rgb.shape[1]/2)
@@ -65,7 +65,7 @@ def ecef2geodetic(ecef, radians=False):
  geodetic = np.column_stack((lat, lon, h))
  return geodetic.reshape(input_shape)

-class LocalCoord():
+class LocalCoord(object):
  """
   Allows conversions to local frames. In this case NED.
   That is: North East Down from the start position in
@@ -29,7 +29,7 @@ def euler2quat(eulers):
       np.sin(gamma / 2) * np.sin(theta / 2) * np.cos(psi / 2)

  quats = array([q0, q1, q2, q3]).T
-  for i in range(len(quats)):
+  for i in xrange(len(quats)):
    if quats[i,0] < 0:
      quats[i] = -quats[i]
  return quats.reshape(output_shape)
@@ -99,7 +99,7 @@ def rot2quat(rots):
  K3[:, 3, 2] = K3[:, 2, 3]
  K3[:, 3, 3] = (rots[:, 0, 0] + rots[:, 1, 1] + rots[:, 2, 2]) / 3.0
  q = np.empty((len(rots), 4))
-  for i in range(len(rots)):
+  for i in xrange(len(rots)):
    _, eigvecs = linalg.eigh(K3[i].T)
    eigvecs = eigvecs[:,3:]
    q[i, 0] = eigvecs[-1]
@@ -1,122 +0,0 @@
-#!/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]])
-
-geodetic_positions_radians = np.array([[0.65905448, -2.13764209, 115],
-                                       [0.47968789, -1.19706477, 2380],
-                                       [0.5670869, -1.98361593, -6],
-                                       [0.26422978, 1.80986461, 24],
-                                       [0.42289717, 0.7728936, 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)
-
-    np.testing.assert_allclose(geodetic_positions_radians[0], coord.ecef2geodetic(ecef_positions[0], radians=True), rtol=1e-5)
-    np.testing.assert_allclose(geodetic_positions_radians[:,:2], coord.ecef2geodetic(ecef_positions, radians=True)[:,:2], rtol=1e-7)
-    np.testing.assert_allclose(geodetic_positions_radians[:,2], coord.ecef2geodetic(ecef_positions, radians=True)[:,2], rtol=1e-7, atol=1e-4)
-
-
-
-  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()
@@ -1,69 +0,0 @@
-#!/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()
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+import selfdrive.messaging as messaging
+from selfdrive.boardd.boardd import can_list_to_can_capnp
+
+VIN_UNKNOWN = "0" * 17
+
+# sanity checks on response messages from vin query
+def is_vin_response_valid(can_dat, step, cnt):
+
+  can_dat = [ord(i) for i in can_dat]
+
+  if len(can_dat) != 8:
+    # ISO-TP meesages are all 8 bytes
+    return False
+
+  if step == 0:
+    # VIN does not fit in a single message and it's 20 bytes of data
+    if can_dat[0] != 0x10 or can_dat[1] != 0x14:
+       return False
+
+  if step == 1 and cnt == 0:
+    # first response after a CONTINUE query is sent
+    if can_dat[0] != 0x21:
+       return False
+
+  if step == 1 and cnt == 1:
+    # second response after a CONTINUE query is sent
+    if can_dat[0] != 0x22:
+       return False
+
+  return True
+
+
+class VinQuery():
+  def __init__(self, bus):
+    self.bus = bus
+    # works on standard 11-bit addresses for diagnostic. Tested on Toyota and Subaru;
+    # Honda uses the extended 29-bit addresses, and unfortunately only works from OBDII
+    self.query_ext_msgs = [[0x18DB33F1, 0, '\x02\x09\x02'.ljust(8, "\x00"), bus],
+                           [0x18DA10f1, 0, '\x30'.ljust(8, "\x00"), bus]]
+    self.query_nor_msgs = [[0x7df, 0, '\x02\x09\x02'.ljust(8, "\x00"), bus],
+                           [0x7e0, 0, '\x30'.ljust(8, "\x00"), bus]]
+
+    self.cnts = [1, 2]  # number of messages to wait for at each iteration
+    self.step = 0
+    self.cnt = 0
+    self.responded = False
+    self.never_responded = True
+    self.dat = []
+    self.vin = VIN_UNKNOWN
+
+  def check_response(self, msg):
+    # have we got a VIN query response?
+    if msg.src == self.bus and msg.address in [0x18daf110, 0x7e8]:
+      self.never_responded = False
+      # basic sanity checks on ISO-TP response
+      if is_vin_response_valid(msg.dat, self.step, self.cnt):
+        self.dat += msg.dat[2:] if self.step == 0 else msg.dat[1:]
+        self.cnt += 1
+        if self.cnt == self.cnts[self.step]:
+          self.responded = True
+          self.step += 1
+
+  def send_query(self, sendcan):
+    # keep sending VIN qury if ECU isn't responsing.
+    # sendcan is probably not ready due to the zmq slow joiner syndrome
+    if self.never_responded or (self.responded and self.step < len(self.cnts)):
+      sendcan.send(can_list_to_can_capnp([self.query_ext_msgs[self.step]], msgtype='sendcan'))
+      sendcan.send(can_list_to_can_capnp([self.query_nor_msgs[self.step]], msgtype='sendcan'))
+      self.responded = False
+      self.cnt = 0
+
+  def get_vin(self):
+    # only report vin if procedure is finished
+    if self.step == len(self.cnts) and self.cnt == self.cnts[-1]:
+      self.vin = "".join(self.dat[3:])
+    return self.vin
+
+
+def get_vin(logcan, sendcan, bus, query_time=1.):
+  vin_query = VinQuery(bus)
+  frame = 0
+
+  # 1s max of VIN query time
+  while frame < query_time * 100:
+    a = messaging.recv_one(logcan)
+
+    for can in a.can:
+      vin_query.check_response(can)
+
+    vin_query.send_query(sendcan)
+    frame += 1
+
+  return vin_query.get_vin()
+
+
+if __name__ == "__main__":
+  from selfdrive.services import service_list
+  logcan = messaging.sub_sock(service_list['can'].port)
+  sendcan = messaging.pub_sock(service_list['sendcan'].port)
+  print get_vin(logcan, sendcan, 0)
@@ -1,40 +0,0 @@
-import sys
-import pygame
-from pygame.locals import *
-
-class Window():
-  def __init__(self, w, h, caption="window", double=False):
-    self.w = w
-    self.h = h
-    pygame.init()
-    pygame.display.set_caption(caption)
-    self.double = double
-    if self.double:
-      self.screen = pygame.display.set_mode((w*2,h*2), pygame.DOUBLEBUF)
-    else:
-      self.screen = pygame.display.set_mode((w,h), pygame.DOUBLEBUF)
-    self.camera_surface = pygame.surface.Surface((w,h), 0, 24).convert()
-
-  def draw(self, out):
-    pygame.surfarray.blit_array(self.camera_surface, out.swapaxes(0,1))
-    if self.double:
-      camera_surface_2x = pygame.transform.scale2x(self.camera_surface)
-      self.screen.blit(camera_surface_2x, (0, 0))
-    else:
-      self.screen.blit(self.camera_surface, (0, 0))
-    pygame.display.flip()
-  
-  def getkey(self):
-    while 1:
-      event = pygame.event.wait()
-      if event.type == QUIT:
-        pygame.quit()
-        sys.exit()
-      if event.type == 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
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2007 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script is a wrapper for smali.jar, so you can simply call "smali",
-# instead of java -jar smali.jar. It is heavily based on the "dx" script
-# from the Android SDK
-
-# Set up prog to be the path of this script, including following symlinks,
-# and set up progdir to be the fully-qualified pathname of its directory.
-prog="$0"
-while [ -h "${prog}" ]; do
-    newProg=`/bin/ls -ld "${prog}"`
-
-    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
-    if expr "x${newProg}" : 'x/' >/dev/null; then
-        prog="${newProg}"
-    else
-        progdir=`dirname "${prog}"`
-        prog="${progdir}/${newProg}"
-    fi
-done
-oldwd=`pwd`
-progdir=`dirname "${prog}"`
-cd "${progdir}"
-progdir=`pwd`
-prog="${progdir}"/`basename "${prog}"`
-cd "${oldwd}"
-
-jarfile=apktool.jar
-libdir="$progdir"
-if [ ! -r "$libdir/$jarfile" ]
-then
-    echo `basename "$prog"`": can't find $jarfile"
-    exit 1
-fi
-
-javaOpts=""
-
-# If you want DX to have more memory when executing, uncomment the following
-# line and adjust the value accordingly. Use "java -X" for a list of options
-# you can pass here.
-# 
-javaOpts="-Xmx512M -Dfile.encoding=utf-8"
-
-# Alternatively, this will extract any parameter "-Jxxx" from the command line
-# and pass them to Java (instead of to dx). This makes it possible for you to
-# add a command-line parameter such as "-JXmx256M" in your ant scripts, for
-# example.
-while expr "x$1" : 'x-J' >/dev/null; do
-    opt=`expr "$1" : '-J\(.*\)'`
-    javaOpts="${javaOpts} -${opt}"
-    shift
-done
-
-if [ "$OSTYPE" = "cygwin" ] ; then
-	jarpath=`cygpath -w  "$libdir/$jarfile"`
-else
-	jarpath="$libdir/$jarfile"
-fi
-
-# add current location to path for aapt
-PATH=$PATH:`pwd`;
-export PATH;
-exec java $javaOpts -jar "$jarpath" "$@"
@@ -1 +0,0 @@
-apktool_2.3.0.jar
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7d08710ae4c0bbdc73184453b4d40da979fa3b0abbdb4e974980f9250730127
-size 18914367
@@ -1 +0,0 @@
-../gpac/bin/MP4Box
@@ -1 +0,0 @@
-../apktool/apktool
@@ -1 +0,0 @@
-../azcopy/azcopy
@@ -1 +0,0 @@
-../capnp/bin/capnp
@@ -1 +0,0 @@
-../capnp/bin/capnpc
@@ -1 +0,0 @@
-../capnp/bin/capnpc-c
@@ -1 +0,0 @@
-../capnp/bin/capnpc-c++
@@ -1 +0,0 @@
-../capnp/bin/capnpc-capnp
--- a/Show More
+++ b/Show More