update ota/recovery url

re-add apks
bug fix
2026-07-10 23:42:06 +08:00 · 2020-11-10 12:42:07 +10:00 · 2020-04-07 18:43:13 +10:00 · 2019-11-15 18:30:03 +10:00 · 2019-11-15 09:25:54 +10:00 · 2019-11-15 09:10:53 +10:00
1036 changed files with 7665 additions and 270755 deletions
@@ -16,7 +16,7 @@ Steps to reproduce the behavior, or a explorer/cabana link to the exact drive an
 **Expected behavior**
 A clear and concise description of what you expected to happen.

-**Device/Version information (please complete the following information):**
+** 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]
@@ -15,9 +15,7 @@ a.out
 .*.swp
 .*.swo
 .*.un~
-*.tmp
 *.o
-*.os
 *.so
 *.a
 *.clb
@@ -32,22 +30,18 @@ selfdrive/boardd/boardd
 selfdrive/logcatd/logcatd
 selfdrive/mapd/default_speeds_by_region.json
 selfdrive/proclogd/proclogd
-selfdrive/ui/_ui
+selfdrive/ui/ui
 selfdrive/test/longitudinal_maneuvers/out
 selfdrive/visiond/visiond
 selfdrive/loggerd/loggerd
-selfdrive/sensord/_gpsd
-selfdrive/sensord/_sensord
-selfdrive/camerad/camerad
-selfdrive/modeld/_modeld
-selfdrive/modeld/_monitoringd
+selfdrive/sensord/gpsd
+selfdrive/sensord/sensord
 /src/

 one
 openpilot
 notebooks
 xx
-panda_jungle

 .coverage*
 htmlcov
@@ -16,7 +16,6 @@ RUN apt-get update && apt-get install -y \
    libeigen3-dev \
    libffi-dev \
    libglew-dev \
-    libgles2-mesa-dev \
    libglib2.0-0 \
    liblzma-dev \
    libmysqlclient-dev \
@@ -24,7 +23,7 @@ RUN apt-get update && apt-get install -y \
    libopencv-dev \
    libssl-dev \
    libtool \
-    libusb-1.0-0-dev \
+    libusb-1.0-0 \
    libzmq5-dev \
    locales \
    ocl-icd-libopencl1 \
@@ -64,7 +63,7 @@ RUN pip install matplotlib==3.1.1 dictdiffer==0.8.0 fastcluster==1.1.25 aenum==2
 COPY phonelibs/install_capnp.sh /tmp/install_capnp.sh
 RUN /tmp/install_capnp.sh

-RUN git clone --branch v0.7 https://github.com/commaai/openpilot-tools.git /tmp/openpilot/tools
+RUN git clone --branch v0.6.5 https://github.com/commaai/openpilot-tools.git /tmp/openpilot/tools

 ENV PYTHONPATH /tmp/openpilot:${PYTHONPATH}
 COPY ./.pylintrc /tmp/openpilot/.pylintrc
@@ -76,7 +75,6 @@ COPY ./phonelibs /tmp/openpilot/phonelibs
 COPY ./pyextra /tmp/openpilot/pyextra
 COPY ./panda /tmp/openpilot/panda

-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
@@ -7,12 +7,12 @@ verify_ssl = true
 opencv-python= "==3.4.2.17"
 PyQt5 = "*"
 ipython = "*"
-networkx = "==2.3"
-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"
+networkx = "*"
+azure-common = "*"
+azure-nspkg = "*"
+azure-storage-blob = "*"
+azure-storage-common = "*"
+azure-storage-nspkg = "*"
 bincopy = "*"
 bleach = "*"
 boto = "*"
@@ -141,9 +141,6 @@ flake8 = "*"
 pylint = "*"
 pycryptodome = "*"
 pillow = "*"
-scons = "*"
-cysignals = "*"
-

 [requires]
 python_version = "3.7.3"
@@ -1,30 +1,35 @@
 [![](https://i.imgur.com/UetIFyH.jpg)](#)

+Welcome to openpilot
+======
+
+[openpilot](http://github.com/commaai/openpilot) is an open source driver assistance system. Currently, it performs the functions of Adaptive Cruise Control (ACC) and Automated Lane Centering (ALC) for selected Honda, Toyota, Acura, Lexus, Chevrolet, Hyundai, Kia, Subaru, Volkswagen. 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.
+
+[Follow us on Twitter](https://twitter.com/comma_ai) and [join our Discord](https://discord.comma.ai).

 <table>
  <tr>
@@ -41,234 +46,138 @@ What is openpilot?
  </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 DevKit](https://comma.ai/shop/products/eon-dashcam-devkit). A [car harness](https://comma.ai/shop/products/car-harness) is recommended to connect the EON to 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). A [car harness](https://comma.ai/shop/products/car-harness) is recommended to connect the EON to the car. In the future, we'd like to support other platforms as well.
+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          | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Honda     | Accord 2018-19                | All               | Stock            | 0mph               | 3mph         |
-| Honda     | Accord Hybrid 2018-19         | All               | Stock            | 0mph               | 3mph         |
-| Honda     | Civic Sedan/Coupe 2016-18     | Honda Sensing     | openpilot        | 0mph               | 12mph        |
-| Honda     | Civic Sedan/Coupe 2019        | Honda Sensing     | Stock            | 0mph               | 2mph         |
-| Honda     | Civic Hatchback 2017-19       | Honda Sensing     | Stock            | 0mph               | 12mph        |
-| 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   | Santa Fe 2019<sup>1</sup>     | All               | Stock            | 0mph               | 0mph         |
-| Hyundai   | Elantra 2017-19<sup>1</sup>   | SCC + LKAS        | Stock            | 19mph              | 34mph        |
-| Hyundai   | Genesis 2018<sup>1</sup>      | All               | Stock            | 19mph              | 34mph        |
-| 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 Hybrid 2019                | All               | openpilot        | 0mph               | 0mph         |
-| Lexus     | RX Hybrid 2016-19             | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
-| Lexus     | IS 2017-2019                  | All               | Stock            | 22mph              | 0mph         |
-| Lexus     | IS Hybrid 2017                | All               | Stock            | 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        | 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    | 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 |
+| ----------------------| -----------------------------------| ---------------------| --------| ---------------| -----------------| ---------------|
+| Acura                 | ILX 2016-18                        | AcuraWatch Plus      | Yes     | Yes            | 25mph<sup>1</sup>| 25mph          |
+| Acura                 | RDX 2016-18                        | AcuraWatch Plus      | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Buick<sup>3</sup>     | Regal 2018<sup>6</sup>             | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Chevrolet<sup>3</sup> | Malibu 2017<sup>6</sup>            | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Chevrolet<sup>3</sup> | Volt 2017-18<sup>6</sup>           | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Cadillac<sup>3</sup>  | ATS 2018                           | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Chrysler              | Pacifica 2017-18<sup>7</sup>       | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           |
+| Chrysler              | Pacifica Hybrid 2017-18<sup>7</sup>| Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           |
+| Chrysler              | Pacifica Hybrid 2019<sup>7</sup>   | Adaptive Cruise      | Yes     | Stock          | 0mph             | 39mph          |
+| GMC<sup>3</sup>       | Acadia Denali 2018<sup>6</sup>     | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Holden<sup>3</sup>    | Astra 2017<sup>6</sup>             | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           |
+| Honda                 | Accord 2018-19                     | All                  | Yes     | Stock          | 0mph             | 3mph           |
+| Honda                 | Accord Hybrid 2018-19              | All                  | Yes     | Stock          | 0mph             | 3mph           |
+| Honda                 | Civic Sedan/Coupe 2016-18          | Honda Sensing        | Yes     | Yes            | 0mph             | 12mph          |
+| Honda                 | Civic Sedan/Coupe 2019             | Honda Sensing        | Yes     | Stock          | 0mph             | 2mph           |
+| Honda                 | Civic Hatchback 2017-19            | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          |
+| Honda                 | CR-V 2015-16                       | Touring              | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Honda                 | CR-V 2017-19                       | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          |
+| Honda                 | CR-V Hybrid 2017-2019              | Honda Sensing        | Yes     | Stock          | 0mph             | 12mph          |
+| Honda                 | Fit 2018-19                        | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Honda                 | Odyssey 2018-19                    | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 0mph           |
+| Honda                 | Passport 2019                      | All                  | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Honda                 | Pilot 2016-18                      | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Honda                 | Pilot 2019                         | All                  | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Honda                 | Ridgeline 2017-19                  | Honda Sensing        | Yes     | Yes            | 25mph<sup>1</sup>| 12mph          |
+| Hyundai               | Santa Fe 2019<sup>5</sup>          | All                  | Yes     | Stock          | 0mph             | 0mph           |
+| Hyundai               | Elantra 2017-19<sup>5</sup>        | SCC + LKAS           | Yes     | Stock          | 19mph            | 34mph          |
+| Hyundai               | Genesis 2018<sup>5</sup>           | All                  | Yes     | Stock          | 19mph            | 34mph          |
+| Jeep                  | Grand Cherokee 2016-18<sup>7</sup> | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           |
+| Jeep                  | Grand Cherokee 2019<sup>7</sup>    | Adaptive Cruise      | Yes     | Stock          | 0mph             | 39mph          |
+| Kia                   | Optima 2019<sup>5</sup>            | SCC + LKAS           | Yes     | Stock          | 0mph             | 0mph           |
+| Kia                   | Sorento 2018<sup>5</sup>           | All                  | Yes     | Stock          | 0mph             | 0mph           |
+| Kia                   | Stinger 2018<sup>5</sup>           | SCC + LKAS           | Yes     | Stock          | 0mph             | 0mph           |
+| Lexus                 | CT Hybrid 2017-18                  | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Lexus                 | ES Hybrid 2019                     | All                  | Yes     | Yes            | 0mph             | 0mph           |
+| Lexus                 | RX Hybrid 2016-19                  | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Lexus                 | IS 2017-2019                       | All                  | Yes     | Stock          | 22mph            | 0mph           |
+| Lexus                 | IS Hybrid 2017                     | All                  | Yes     | Stock          | 0mph             | 0mph           |
+| Subaru                | Crosstrek 2018-19                  | EyeSight             | Yes     | Stock          | 0mph             | 0mph           |
+| Subaru                | Impreza 2019-20                    | EyeSight             | Yes     | Stock          | 0mph             | 0mph           |
+| Toyota                | Avalon 2016                        | TSS-P                | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           |
+| Toyota                | Avalon 2017-18                     | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           |
+| Toyota                | Camry 2018-19                      | All                  | Yes     | Stock          | 0mph<sup>4</sup> | 0mph           |
+| Toyota                | Camry Hybrid 2018-19               | All                  | Yes     | Stock          | 0mph<sup>4</sup> | 0mph           |
+| Toyota                | C-HR 2017-19                       | All                  | Yes     | Stock          | 0mph             | 0mph           |
+| Toyota                | C-HR Hybrid 2017-19                | All                  | Yes     | Stock          | 0mph             | 0mph           |
+| Toyota                | Corolla 2017-19                    | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           |
+| Toyota                | Corolla 2020                       | All                  | Yes     | Yes            | 0mph             | 0mph           |
+| Toyota                | Corolla Hatchback 2019             | All                  | Yes     | Yes            | 0mph             | 0mph           |
+| Toyota                | Corolla Hybrid 2020                | All                  | Yes     | Yes            | 0mph             | 0mph           |
+| Toyota                | Highlander 2017-19                 | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Highlander Hybrid 2017-19          | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Prius 2016                         | TSS-P                | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Prius 2017-19                      | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Prius Prime 2017-20                | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Rav4 2016                          | TSS-P                | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           |
+| Toyota                | Rav4 2017-18                       | All                  | Yes     | Yes<sup>2</sup>| 20mph<sup>1</sup>| 0mph           |
+| Toyota                | Rav4 2019                          | All                  | Yes     | Yes            | 0mph             | 0mph           |
+| Toyota                | Rav4 Hybrid 2016                   | TSS-P                | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Rav4 Hybrid 2017-18                | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Toyota                | Sienna 2018                        | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           |
+| Volkswagen<sup>8</sup>| Golf 2016-19                       | Driver Assistance    | Yes     | Stock          | 0mph             | 0mph           |

-<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>28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control. <br />
+<sup>5</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 Hyundais. <br />
+<sup>6</sup>Requires a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle) and community built giraffe, find more information [here](https://zoneos.com/shop/). <br />
+<sup>7</sup>Requires a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle) and FCA [giraffe](https://comma.ai/shop/products/giraffe) <br />
+<sup>8</sup>Requires a [custom connector](https://community.comma.ai/wiki/index.php/Volkswagen#Integration_at_J533_Gateway) for the [car harness](https://comma.ai/shop/products/car-harness) <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         |
-| Chevrolet | Malibu 2017<sup>6</sup>       | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chevrolet | Volt 2017-18<sup>6</sup>      | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Cadillac  | ATS 2018<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 (US Market Reference)        | Supported Package    | Lateral | Longitudinal   | No Accel Below   | No Steer Below |
+| ---------------------| -----------------------------------| ---------------------| --------| ---------------| -----------------| ---------------|
+| Tesla                | Model S 2012-13<sup>9</sup>        | All                  | Yes     | NA             | NA               | 0mph           |

-<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>9</sup>Requires a [panda](https://comma.ai/shop/products/panda-obd-ii-dongle) and community built giraffe, find more information [here](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, Genesis with SCC and LKAS.
+- All Chrysler, Jeep, Fiat with Adaptive Cruise Control and LaneSense.
+- All Subaru with EyeSight.
+- All Volkswagen, Audi, Škoda and SEAT with Adaptive Cruise Control.
+
+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.
-
-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 [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.
-
-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
@@ -276,20 +185,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://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.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,18 +1,3 @@
-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!
@@ -2,25 +2,15 @@ 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.
+Like other ACC and ALC 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,157 @@ 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 direction 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 direction 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 direction to ensure limited applied torque against the
+    driver's will.
+
+Volkswagen, Audi, SEAT, Škoda (Lateral only)
+------
+
+  - While the system is engaged, steer commands are subject to the same limits used by the stock system, and
+    additional limits required to meet Comma safety standards.
+
+  - Steering torque is controlled through the CAN message 0x126, also known as HCA_01 for Heading Control Assist.
+    It's limited by openpilot and Panda to a value between -250 and 250, representing 2.5 Nm of torque applied 
+    at the steering rack. The vehicle EPS unit will fault for values outside -300 and 300.
+
+  - The vehicle EPS unit will tolerate any rate of increase or decrease, but may limit the effective rate of
+    change to 5.0 Nm/s. In accordance with the Comma AI safety model requirements, a rate limit is enforced by
+    the Panda firmware and by openpilot, so that the commanded steering torque cannot rise from 0 to maximum
+    faster than 1.25s. Commanded steering torque is gradually limited by the Panda firmware and by openpilot
+    if the driver's torque exceeds 0.8 Nm in the opposite direction to ensure limited applied torque against
+    the driver's will.
+
+  - Brake and gas pedal pressed signals are contained in the ESP_05 0x106 and Motor_20 0x121 CAN messages,
+    respectively. A rising edge of either signals triggers a disengagement and is enforced by openpilot.
+    The cancellation due to the rising edge of the gas pressed signal is also enforced by the Panda firmware. 
+    Additionally, the cruise control system disengages on the rising edge of the brake pedal pressed signal,
+    and it's enforced by both openpilot and the Panda firmware.

 **Extra note**: comma.ai strongly discourages the use of openpilot forks with safety code either missing or
  not fully meeting the above requirements.
@@ -1,212 +0,0 @@
-import os
-import subprocess
-import sys
-
-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 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/yaml-cpp/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",
-  ]
-  libpath = [
-    "#phonelibs/capnp-cpp/x64/lib",
-    "#phonelibs/capnp-c/x64/lib",
-    "#phonelibs/yaml-cpp/x64/lib",
-    "#phonelibs/snpe/x86_64-linux-clang",
-    "#phonelibs/zmq/x64/lib",
-    "#phonelibs/libyuv/x64/lib",
-    "#external/zmq/lib",
-    "#cereal",
-    "#selfdrive/common",
-    "/usr/lib",
-    "/usr/local/lib",
-  ]
-
-  rpath = ["phonelibs/capnp-cpp/x64/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/yaml-cpp/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'])
-
-SConscript(['selfdrive/modeld/SConscript'])
-SConscript(['selfdrive/camerad/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'])
-
-if arch == "aarch64":
-  SConscript(['selfdrive/logcatd/SConscript'])
-  SConscript(['selfdrive/ui/SConscript'])
-  SConscript(['selfdrive/sensord/SConscript'])
-  SConscript(['selfdrive/loggerd/SConscript'])
-
-SConscript(['selfdrive/locationd/SConscript'])
-
-# TODO: finish cereal, dbcbuilder, MPC
@@ -1 +0,0 @@
-.sconsign.dblite
@@ -3,12 +3,4 @@ node_modules
 package-lock.json
 *.pyc
 __pycache__
-.*.swp
-.*.swo
-libcereal*.a
-libmessaging.*
-libmessaging_shared.*
-services.h
-.sconsign.dblite
-libcereal_shared.so

@@ -1,19 +0,0 @@
-from ubuntu:16.04
-
-RUN apt-get update && apt-get install -y libzmq3-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl
-
-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 pip3 install pyyaml==5.1.2 Cython==0.29.14 scons==3.1.1 pycapnp==0.6.4
-
-WORKDIR /project/cereal
-COPY install_capnp.sh .
-RUN ./install_capnp.sh
-
-ENV PYTHONPATH=/project
-
-COPY . .
-RUN scons -c && scons -j$(nproc)
@@ -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 '$@'
@@ -1,68 +0,0 @@
-Import('env', 'arch', 'zmq')
-
-gen_dir = Dir('gen')
-messaging_dir = Dir('messaging')
-
-# TODO: remove src-prefix and cereal from command string. can we set working directory?
-env.Command(["gen/c/include/c++.capnp.h", "gen/c/include/java.capnp.h"], [], "mkdir -p " + gen_dir.path + "/c/include && touch $TARGETS")
-env.Command(
-  ['gen/c/car.capnp.c', 'gen/c/log.capnp.c', 'gen/c/car.capnp.h', 'gen/c/log.capnp.h'],
-  ['car.capnp', 'log.capnp'],
-  'capnpc $SOURCES --src-prefix=cereal -o c:' + gen_dir.path + '/c/')
-env.Command(
-  ['gen/cpp/car.capnp.c++', 'gen/cpp/log.capnp.c++', 'gen/cpp/car.capnp.h', 'gen/cpp/log.capnp.h'],
-  ['car.capnp', 'log.capnp'],
-  'capnpc $SOURCES --src-prefix=cereal -o c++:' + gen_dir.path + '/cpp/')
-import shutil
-if shutil.which('capnpc-java'):
-  env.Command(
-    ['gen/java/Car.java', 'gen/java/Log.java'],
-    ['car.capnp', 'log.capnp'],
-    'capnpc $SOURCES --src-prefix=cereal -o java:' + gen_dir.path + '/java/')
-
-# TODO: remove non shared cereal and messaging
-cereal_objects = env.SharedObject([
-    'gen/c/car.capnp.c',
-    'gen/c/log.capnp.c',
-    'gen/cpp/car.capnp.c++',
-    'gen/cpp/log.capnp.c++',
-  ])
-
-env.Library('cereal', cereal_objects)
-env.SharedLibrary('cereal_shared', cereal_objects)
-
-cereal_dir = Dir('.')
-services_h = env.Command(
-  ['services.h'],
-  ['service_list.yaml', 'services.py'],
-  'python3 ' + cereal_dir.path + '/services.py > $TARGET')
-
-messaging_objects = env.SharedObject([
-  'messaging/messaging.cc',
-  'messaging/impl_zmq.cc',
-  'messaging/impl_msgq.cc',
-  'messaging/msgq.cc',
-])
-
-messaging_lib = env.Library('messaging', messaging_objects)
-Depends('messaging/impl_zmq.cc', services_h)
-
-# note, this rebuilds the deps shared, zmq is statically linked to make APK happy
-# TODO: get APK to load system zmq to remove the static link
-shared_lib_shared_lib = [zmq, 'm', 'stdc++'] + ["gnustl_shared"] if arch == "aarch64" else []
-env.SharedLibrary('messaging_shared', messaging_objects, LIBS=shared_lib_shared_lib)
-
-env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq'])
-Depends('messaging/bridge.cc', services_h)
-
-# different target?
-#env.Program('messaging/demo', ['messaging/demo.cc'], LIBS=[messaging_lib, 'zmq'])
-
-
-env.Command(['messaging/messaging_pyx.so'],
-  [messaging_lib, 'messaging/messaging_pyx_setup.py', 'messaging/messaging_pyx.pyx', 'messaging/messaging.pxd'],
-  "cd " + messaging_dir.path + " && python3 messaging_pyx_setup.py build_ext --inplace")
-
-
-if GetOption('test'):
-  env.Program('messaging/test_runner', ['messaging/test_runner.cc', 'messaging/msgq_tests.cc'], LIBS=[messaging_lib])
@@ -1,49 +0,0 @@
-import os
-import subprocess
-
-zmq = 'zmq'
-arch = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()
-
-cereal_dir = Dir('.')
-
-cpppath = [
-    cereal_dir,
-    '/usr/lib/include',
-]
-
-AddOption('--test',
-          action='store_true',
-          help='build test files')
-
-AddOption('--asan',
-          action='store_true',
-          help='turn on ASAN')
-
-ccflags_asan = ["-fsanitize=address", "-fno-omit-frame-pointer"] if GetOption('asan') else []
-ldflags_asan = ["-fsanitize=address"] if GetOption('asan') else []
-
-env = Environment(
-  ENV=os.environ,
-  CC='clang',
-  CXX='clang++',
-  CCFLAGS=[
-    "-g",
-    "-fPIC",
-    "-O2",
-    "-Werror=implicit-function-declaration",
-    "-Werror=incompatible-pointer-types",
-    "-Werror=int-conversion",
-    "-Werror=return-type",
-    "-Werror=format-extra-args",
-  ] + ccflags_asan,
-  LDFLAGS=ldflags_asan,
-  LINKFLAGS=ldflags_asan,
-
-  CFLAGS="-std=gnu11",
-  CXXFLAGS="-std=c++14",
-  CPPPATH=cpppath,
-)
-
-
-Export('env', 'zmq', 'arch')
-SConscript(['SConscript'])
@@ -1,14 +0,0 @@
-pr: none
-
-pool:
-  vmImage: 'ubuntu-16.04'
-
-steps:
- script: |
-    set -e
-    docker build -t cereal .
-    docker run cereal bash -c "scons --test --asan -j$(nproc) && messaging/test_runner"
-    docker run cereal bash -c "ZMQ=1 python -m unittest discover ."
-    docker run cereal bash -c "MSGQ=1 python -m unittest discover ."
-
-  displayName: 'Run Tests'
@@ -84,19 +84,10 @@ struct CarEvent @0x9b1657f34caf3ad3 {
    laneChange @59;
    invalidGiraffeToyota @60;
    internetConnectivityNeeded @61;
-    communityFeatureDisallowed @62;
-    lowMemory @63;
-    stockAeb @64;
-    ldw @65;
-
-    # dragonpilot
-    manualSteeringRequired @66;
-    manualSteeringRequiredBlinkersOn @67;
-    leadCarMoving @68;
-    leadCarDetected @69;
-    preAutoLaneChangeLeft @70;
-    preAutoLaneChangeRight @71;
-    autoLaneChange @72;
+    manualSteeringRequired @62;
+    manualSteeringRequiredBlinkersOn @63;
+    leadCarMoving @64;
+    leadCarDetected @65;
  }
 }

@@ -130,9 +121,6 @@ struct CarState {
  steeringTorque @8 :Float32;  # TODO: standardize units
  steeringTorqueEps @27 :Float32;  # TODO: standardize units
  steeringPressed @9 :Bool;    # if the user is using the steering wheel
-  steeringRateLimited @29 :Bool;    # if the torque is limited by the rate limiter
-  stockAeb @30 :Bool;
-  stockFcw @31 :Bool;

  # cruise state
  cruiseState @10 :CruiseState;
@@ -186,6 +174,7 @@ struct CarState {
    manumatic @9;
  }

+
  # send on change
  struct ButtonEvent {
    pressed @0 :Bool;
@@ -329,7 +318,7 @@ struct CarParams {
  minEnableSpeed @7 :Float32;
  minSteerSpeed @8 :Float32;
  safetyModel @9 :SafetyModel;
-  safetyModelPassive @42 :SafetyModel = silent;
+  safetyModelPassive @42 :SafetyModel = noOutput;
  safetyParam @10 :Int16;

  steerMaxBP @11 :List(Float32);
@@ -339,6 +328,7 @@ struct CarParams {
  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
@@ -359,7 +349,6 @@ struct CarParams {
  }

  steerLimitAlert @28 :Bool;
-  steerLimitTimer @47 :Float32;  # time before steerLimitAlert is issued

  vEgoStopping @29 :Float32; # Speed at which the car goes into stopping state
  directAccelControl @30 :Bool; # Does the car have direct accel control or just gas/brake
@@ -375,9 +364,6 @@ struct CarParams {
  isPandaBlack @39: Bool;
  dashcamOnly @41: Bool;
  transmissionType @43 :TransmissionType;
-  carFw @44 :List(CarFw);
-  radarTimeStep @45: Float32 = 0.05;  # time delta between radar updates, 20Hz is very standard
-  communityFeature @46: Bool;  # true if a community maintained feature is detected

  struct LateralPIDTuning {
    kpBP @0 :List(Float32);
@@ -396,6 +382,7 @@ struct CarParams {
    deadzoneV @5 :List(Float32);
  }

+
  struct LateralINDITuning {
    outerLoopGain @0 :Float32;
    innerLoopGain @1 :Float32;
@@ -418,7 +405,7 @@ struct CarParams {
  }

  enum SafetyModel {
-    silent @0;
+    noOutput @0;
    honda @1;
    toyota @2;
    elm327 @3;
@@ -437,7 +424,6 @@ struct CarParams {
    toyotaIpas @16;
    allOutput @17;
    gmAscm @18;
-    noOutput @19;  # like silent but with silent CAN TXs
  }

  enum SteerControlType {
@@ -450,16 +436,4 @@ struct CarParams {
    automatic @1;
    manual @2;
  }
-
-  struct CarFw {
-    ecu @0 :Ecu;
-    fwVersion @1 :Text;
-  }
-
-  enum Ecu {
-    eps @0;
-    esp @1;
-    fwdRadar @2;
-    fwdCamera @3;
-  }
 }
@@ -8,8 +8,7 @@ tar xvf capnproto-c++-${VERSION}.tar.gz
 cd capnproto-c++-${VERSION}
 CXXFLAGS="-fPIC" ./configure

-make -j$(nproc)
-make install
+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
@@ -19,6 +18,7 @@ g++ -std=gnu++11 -I./src -I./src -DKJ_HEADER_WARNINGS -DCAPNP_HEADER_WARNINGS -D
 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
@@ -30,8 +30,7 @@ cd c-capnproto
 git submodule update --init --recursive
 autoreconf -f -i -s
 CXXFLAGS="-fPIC" ./configure
-make -j$(nproc)
-make install
+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
@@ -126,7 +126,6 @@ struct FrameData {
  lensErr @13 :Float32;
  lensTruePos @14 :Float32;
  image @6 :Data;
-  gainFrac @15 :Float32;

  frameType @7 :FrameType;
  timestampSof @8 :UInt64;
@@ -138,7 +137,6 @@ struct FrameData {
    unknown @0;
    neo @1;
    chffrAndroid @2;
-    front @3;
  }

  struct AndroidCaptureResult {
@@ -270,7 +268,6 @@ struct ThermalData {
  mem @4 :UInt16;
  gpu @5 :UInt16;
  bat @6 :UInt32;
-  pa0 @21 :UInt16;

  # not thermal
  freeSpace @7 :Float32;
@@ -287,11 +284,7 @@ struct ThermalData {
  thermalStatus @14 :ThermalStatus;
  chargingError @17 :Bool;
  chargingDisabled @18 :Bool;
-
-  memUsedPercent @19 :Int8;
-  cpuPerc @20 :Int8;
-
-  ipAddr @22 :Text; # dragonpilot
+  ipAddr @19 :Text;

  enum ThermalStatus {
    green @0;   # all processes run
@@ -318,20 +311,6 @@ struct HealthData {
  usbPowerMode @12 :UsbPowerMode;
  ignitionCan @13 :Bool;
  safetyModel @14 :Car.CarParams.SafetyModel;
-  faultStatus @15 :FaultStatus;
-  powerSaveEnabled @16 :Bool;
-  uptime @17 :UInt32;
-  faults @18 :List(FaultType);
-
-  enum FaultStatus {
-    none @0;
-    faultTemp @1;
-    faultPerm @2;
-  }
-
-  enum FaultType {
-    relayMalfunction @0;
-  }

  enum HwType {
    unknown @0;
@@ -531,7 +510,6 @@ struct ControlsState @0x97ff69c53601abf1 {
    delayedOutput @7 :Float32;
    delta @8 :Float32;
    output @9 :Float32;
-    saturated @10 :Bool;
  }

  struct LateralPIDState {
@@ -552,7 +530,6 @@ struct ControlsState @0x97ff69c53601abf1 {
    i @2 :Float32;
    output @3 :Float32;
    lqrOutput @4 :Float32;
-    saturated @5 :Bool;
   }


@@ -576,7 +553,6 @@ struct ModelData {
  settings @5 :ModelSettings;
  leadFuture @7 :LeadData;
  speed @8 :List(Float32);
-  meta @10 :MetaData;

  struct PathData {
    points @0 :List(Float32);
@@ -607,13 +583,6 @@ struct ModelData {
    yuvCorrection @5 :List(Float32);
    inputTransform @6 :List(Float32);
  }
-  struct MetaData {
-    engagedProb @0 :Float32;
-    desirePrediction @1 :List(Float32);
-    brakeDisengageProb @2 :Float32;
-    gasDisengageProb @3 :Float32;
-    steerOverrideProb @4 :Float32;
-  }
 }

 struct CalibrationFeatures {
@@ -747,8 +716,6 @@ struct PathPlan {
  desire @17 :Desire;
  laneChangeState @18 :LaneChangeState;
  laneChangeDirection @19 :LaneChangeDirection;
-  # dragonpilot
-  autoLCAllowed @20 :Bool;

  enum Desire {
    none @0;
@@ -1683,7 +1650,6 @@ struct UiLayoutState {
    home @0;
    music @1;
    nav @2;
-    settings @3;
  }
 }

@@ -1760,7 +1726,7 @@ struct DriverMonitoring {
  rightEyeProb @7 :Float32;
  leftBlinkProb @8 :Float32;
  rightBlinkProb @9 :Float32;
-  irPwrDEPRECATED @10 :Float32;
+  irPwr @10 :Float32;
 }

 struct Boot {
@@ -1892,6 +1858,5 @@ struct Event {
    thumbnail @66: Thumbnail;
    carEvents @68: List(Car.CarEvent);
    carParams @69: Car.CarParams;
-    frontFrame @70: FrameData;
  }
 }
@@ -1,10 +0,0 @@
-demo
-bridge
-test_runner
-*.o
-*.os
-*.d
-*.a
-*.so
-messaging_pyx.cpp
-build/
@@ -1,62 +0,0 @@
-#include <iostream>
-#include <string>
-#include <cassert>
-#include <csignal>
-#include <map>
-
-#include "services.h"
-
-#include "impl_msgq.hpp"
-#include "impl_zmq.hpp"
-
-void sigpipe_handler(int sig) {
-  assert(sig == SIGPIPE);
-  std::cout << "SIGPIPE received" << std::endl;
-}
-
-static std::vector<std::string> get_services() {
-  std::vector<std::string> name_list;
-
-  for (const auto& it : services) {
-    std::string name = it.name;
-    if (name == "plusFrame" || name == "uiLayoutState") continue;
-    name_list.push_back(name);
-  }
-
-  return name_list;
-}
-
-
-int main(void){
-  signal(SIGPIPE, (sighandler_t)sigpipe_handler);
-
-  auto endpoints = get_services();
-
-  std::map<SubSocket*, PubSocket*> sub2pub;
-
-  Context *zmq_context = new ZMQContext();
-  Context *msgq_context = new MSGQContext();
-  Poller *poller = new MSGQPoller();
-
-  for (auto endpoint: endpoints){
-    SubSocket * msgq_sock = new MSGQSubSocket();
-    msgq_sock->connect(msgq_context, endpoint, "127.0.0.1", false);
-    poller->registerSocket(msgq_sock);
-
-    PubSocket * zmq_sock = new ZMQPubSocket();
-    zmq_sock->connect(zmq_context, endpoint);
-
-    sub2pub[msgq_sock] = zmq_sock;
-  }
-
-
-  while (true){
-    for (auto sub_sock : poller->poll(100)){
-      Message * msg = sub_sock->receive();
-      if (msg == NULL) continue;
-      sub2pub[sub_sock]->sendMessage(msg);
-      delete msg;
-    }
-  }
-  return 0;
-}
@@ -1,190 +0,0 @@
-#include <cassert>
-#include <cstring>
-#include <iostream>
-#include <cstdlib>
-#include <csignal>
-#include <cerrno>
-
-
-#include "impl_msgq.hpp"
-
-volatile sig_atomic_t msgq_do_exit = 0;
-
-void sig_handler(int signal) {
-  assert(signal == SIGINT || signal == SIGTERM);
-  msgq_do_exit = 1;
-}
-
-
-MSGQContext::MSGQContext() {
-}
-
-MSGQContext::~MSGQContext() {
-}
-
-void MSGQMessage::init(size_t sz) {
-  size = sz;
-  data = new char[size];
-}
-
-void MSGQMessage::init(char * d, size_t sz) {
-  size = sz;
-  data = new char[size];
-  memcpy(data, d, size);
-}
-
-void MSGQMessage::takeOwnership(char * d, size_t sz) {
-  size = sz;
-  data = d;
-}
-
-void MSGQMessage::close() {
-  if (size > 0){
-    delete[] data;
-  }
-  size = 0;
-}
-
-MSGQMessage::~MSGQMessage() {
-  this->close();
-}
-
-
-int MSGQSubSocket::connect(Context *context, std::string endpoint, std::string address, bool conflate){
-  assert(context);
-  assert(address == "127.0.0.1");
-
-  q = new msgq_queue_t;
-  int r = msgq_new_queue(q, endpoint.c_str(), DEFAULT_SEGMENT_SIZE);
-  if (r != 0){
-    return r;
-  }
-
-  msgq_init_subscriber(q);
-
-  if (conflate){
-    q->read_conflate = true;
-  }
-
-  timeout = -1;
-
-  return 0;
-}
-
-
-Message * MSGQSubSocket::receive(bool non_blocking){
-  msgq_do_exit = 0;
-
-  void (*prev_handler_sigint)(int);
-  void (*prev_handler_sigterm)(int);
-  if (!non_blocking){
-    prev_handler_sigint = std::signal(SIGINT, sig_handler);
-    prev_handler_sigterm = std::signal(SIGTERM, sig_handler);
-  }
-
-  msgq_msg_t msg;
-
-  MSGQMessage *r = NULL;
-  r = NULL;
-
-  int rc = msgq_msg_recv(&msg, q);
-
-  // Hack to implement blocking read with a poller. Don't use this
-  while (!non_blocking && rc == 0 && msgq_do_exit == 0){
-    msgq_pollitem_t items[1];
-    items[0].q = q;
-
-    int t = (timeout != -1) ? timeout : 100;
-
-    int n = msgq_poll(items, 1, t);
-    rc = msgq_msg_recv(&msg, q);
-
-    // The poll indicated a message was ready, but the receive failed. Try again
-    if (n == 1 && rc == 0){
-      continue;
-    }
-
-    if (timeout != -1){
-      break;
-    }
-  }
-
-  if (rc > 0){
-    r = new MSGQMessage;
-    r->takeOwnership(msg.data, msg.size);
-  }
-  errno = msgq_do_exit ? EINTR : 0;
-
-  if (!non_blocking){
-    std::signal(SIGINT, prev_handler_sigint);
-    std::signal(SIGTERM, prev_handler_sigterm);
-  }
-
-  return (Message*)r;
-}
-
-void MSGQSubSocket::setTimeout(int t){
-  timeout = t;
-}
-
-MSGQSubSocket::~MSGQSubSocket(){
-  if (q != NULL){
-    msgq_close_queue(q);
-    delete q;
-  }
-}
-
-int MSGQPubSocket::connect(Context *context, std::string endpoint){
-  assert(context);
-
-  q = new msgq_queue_t;
-  msgq_new_queue(q, endpoint.c_str(), DEFAULT_SEGMENT_SIZE);
-  msgq_init_publisher(q);
-
-  return 0;
-}
-
-int MSGQPubSocket::sendMessage(Message *message){
-  msgq_msg_t msg;
-  msg.data = message->getData();
-  msg.size = message->getSize();
-
-  return msgq_msg_send(&msg, q);
-}
-
-int MSGQPubSocket::send(char *data, size_t size){
-  msgq_msg_t msg;
-  msg.data = data;
-  msg.size = size;
-
-  return msgq_msg_send(&msg, q);
-}
-
-MSGQPubSocket::~MSGQPubSocket(){
-  if (q != NULL){
-    msgq_close_queue(q);
-    delete q;
-  }
-}
-
-
-void MSGQPoller::registerSocket(SubSocket * socket){
-  assert(num_polls + 1 < MAX_POLLERS);
-  polls[num_polls].q = (msgq_queue_t*)socket->getRawSocket();
-
-  sockets.push_back(socket);
-  num_polls++;
-}
-
-std::vector<SubSocket*> MSGQPoller::poll(int timeout){
-  std::vector<SubSocket*> r;
-
-  msgq_poll(polls, num_polls, timeout);
-  for (size_t i = 0; i < num_polls; i++){
-    if (polls[i].revents){
-      r.push_back(sockets[i]);
-    }
-  }
-
-  return r;
-}
@@ -1,64 +0,0 @@
-#pragma once
-#include "messaging.hpp"
-#include "msgq.hpp"
-#include <zmq.h>
-#include <string>
-
-#define MAX_POLLERS 128
-
-class MSGQContext : public Context {
-private:
-  void * context = NULL;
-public:
-  MSGQContext();
-  void * getRawContext() {return context;}
-  ~MSGQContext();
-};
-
-class MSGQMessage : public Message {
-private:
-  char * data;
-  size_t size;
-public:
-  void init(size_t size);
-  void init(char *data, size_t size);
-  void takeOwnership(char *data, size_t size);
-  size_t getSize(){return size;}
-  char * getData(){return data;}
-  void close();
-  ~MSGQMessage();
-};
-
-class MSGQSubSocket : public SubSocket {
-private:
-  msgq_queue_t * q = NULL;
-  int timeout;
-public:
-  int connect(Context *context, std::string endpoint, std::string address, bool conflate=false);
-  void setTimeout(int timeout);
-  void * getRawSocket() {return (void*)q;}
-  Message *receive(bool non_blocking=false);
-  ~MSGQSubSocket();
-};
-
-class MSGQPubSocket : public PubSocket {
-private:
-  msgq_queue_t * q = NULL;
-public:
-  int connect(Context *context, std::string endpoint);
-  int sendMessage(Message *message);
-  int send(char *data, size_t size);
-  ~MSGQPubSocket();
-};
-
-class MSGQPoller : public Poller {
-private:
-  std::vector<SubSocket*> sockets;
-  msgq_pollitem_t polls[MAX_POLLERS];
-  size_t num_polls = 0;
-
-public:
-  void registerSocket(SubSocket *socket);
-  std::vector<SubSocket*> poll(int timeout);
-  ~MSGQPoller(){};
-};
@@ -1,117 +0,0 @@
-#include "messaging.hpp"
-#include "impl_zmq.hpp"
-#include "impl_msgq.hpp"
-
-Context * Context::create(){
-  Context * c;
-  if (std::getenv("MSGQ")){
-    c = new MSGQContext();
-  } else {
-    c = new ZMQContext();
-  }
-  return c;
-}
-
-SubSocket * SubSocket::create(){
-  SubSocket * s;
-  if (std::getenv("MSGQ")){
-    s = new MSGQSubSocket();
-  } else {
-    s = new ZMQSubSocket();
-  }
-  return s;
-}
-
-SubSocket * SubSocket::create(Context * context, std::string endpoint){
-  SubSocket *s = SubSocket::create();
-  int r = s->connect(context, endpoint, "127.0.0.1");
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-SubSocket * SubSocket::create(Context * context, std::string endpoint, std::string address){
-  SubSocket *s = SubSocket::create();
-  int r = s->connect(context, endpoint, address);
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-SubSocket * SubSocket::create(Context * context, std::string endpoint, std::string address, bool conflate){
-  SubSocket *s = SubSocket::create();
-  int r = s->connect(context, endpoint, address, conflate);
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-PubSocket * PubSocket::create(){
-  PubSocket * s;
-  if (std::getenv("MSGQ")){
-    s = new MSGQPubSocket();
-  } else {
-    s = new ZMQPubSocket();
-  }
-  return s;
-}
-
-PubSocket * PubSocket::create(Context * context, std::string endpoint){
-  PubSocket *s = PubSocket::create();
-  int r = s->connect(context, endpoint);
-
-  if (r == 0) {
-    return s;
-  } else {
-    delete s;
-    return NULL;
-  }
-}
-
-Poller * Poller::create(){
-  Poller * p;
-  if (std::getenv("MSGQ")){
-    p = new MSGQPoller();
-  } else {
-    p = new ZMQPoller();
-  }
-  return p;
-}
-
-Poller * Poller::create(std::vector<SubSocket*> sockets){
-  Poller * p = Poller::create();
-
-  for (auto s : sockets){
-    p->registerSocket(s);
-  }
-  return p;
-}
-
-extern "C" Context * messaging_context_create() {
-  return Context::create();
-}
-
-extern "C" SubSocket * messaging_subsocket_create(Context* context, const char* endpoint) {
-  return SubSocket::create(context, std::string(endpoint));
-}
-
-extern "C" PubSocket * messaging_pubsocket_create(Context* context, const char* endpoint) {
-  return PubSocket::create(context, std::string(endpoint));
-}
-
-extern "C" Poller * messaging_poller_create(SubSocket** sockets, int size) {
-  std::vector<SubSocket*> socketsVec(sockets, sockets + size);
-  return Poller::create(socketsVec);
-}
@@ -1,441 +0,0 @@
-#include <iostream>
-#include <cassert>
-#include <cerrno>
-#include <cmath>
-#include <cstring>
-#include <cstdint>
-#include <chrono>
-#include <algorithm>
-#include <cstdlib>
-#include <csignal>
-#include <random>
-
-#include <poll.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <stdio.h>
-
-#include "msgq.hpp"
-
-void sigusr1_handler(int signal) {
-  assert(signal == SIGUSR1);
-}
-
-uint64_t msgq_get_uid(void){
-  std::random_device rd("/dev/urandom");
-  std::uniform_int_distribution<uint64_t> distribution(0,std::numeric_limits<uint32_t>::max());
-
-  uint64_t uid = distribution(rd) << 32 | syscall(SYS_gettid);
-  return uid;
-}
-
-int msgq_msg_init_size(msgq_msg_t * msg, size_t size){
-  msg->size = size;
-  msg->data = new(std::nothrow) char[size];
-
-  return (msg->data == NULL) ? -1 : 0;
-}
-
-
-int msgq_msg_init_data(msgq_msg_t * msg, char * data, size_t size) {
-  int r = msgq_msg_init_size(msg, size);
-
-  if (r == 0)
-    memcpy(msg->data, data, size);
-
-  return r;
-}
-
-int msgq_msg_close(msgq_msg_t * msg){
-  if (msg->size > 0)
-    delete[] msg->data;
-
-  msg->size = 0;
-
-  return 0;
-}
-
-void msgq_reset_reader(msgq_queue_t * q){
-  int id = q->reader_id;
-  q->read_valids[id]->store(true);
-  q->read_pointers[id]->store(*q->write_pointer);
-}
-
-void msgq_wait_for_subscriber(msgq_queue_t *q){
-  while (*q->num_readers == 0){
-    ;
-  }
-
-  return;
-}
-
-
-
-int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size){
-  assert(size < 0xFFFFFFFF); // Buffer must be smaller than 2^32 bytes
-
-  std::signal(SIGUSR1, sigusr1_handler);
-
-  const char * prefix = "/dev/shm/";
-  char * full_path = new char[strlen(path) + strlen(prefix) + 1];
-  strcpy(full_path, prefix);
-  strcat(full_path, path);
-
-  auto fd = open(full_path, O_RDWR | O_CREAT, 0777);
-  delete[] full_path;
-
-  if (fd < 0)
-    return -1;
-
-  int rc = ftruncate(fd, size + sizeof(msgq_header_t));
-  if (rc < 0)
-    return -1;
-
-  char * mem = (char*)mmap(NULL, size + sizeof(msgq_header_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-  close(fd);
-
-  if (mem == NULL)
-    return -1;
-
-  q->mmap_p = mem;
-
-  msgq_header_t *header = (msgq_header_t *)mem;
-
-  // Setup pointers to header segment
-  q->num_readers = reinterpret_cast<std::atomic<uint64_t>*>(&header->num_readers);
-  q->write_pointer = reinterpret_cast<std::atomic<uint64_t>*>(&header->write_pointer);
-  q->write_uid = reinterpret_cast<std::atomic<uint64_t>*>(&header->write_uid);
-
-  for (size_t i = 0; i < NUM_READERS; i++){
-    q->read_pointers[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_pointers[i]);
-    q->read_valids[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_valids[i]);
-    q->read_uids[i] = reinterpret_cast<std::atomic<uint64_t>*>(&header->read_uids[i]);
-  }
-
-  q->data = mem + sizeof(msgq_header_t);
-  q->size = size;
-  q->reader_id = -1;
-
-  q->endpoint = path;
-  q->read_conflate = false;
-
-  return 0;
-}
-
-void msgq_close_queue(msgq_queue_t *q){
-  if (q->mmap_p != NULL){
-    munmap(q->mmap_p, q->size + sizeof(msgq_header_t));
-  }
-}
-
-
-void msgq_init_publisher(msgq_queue_t * q) {
-  std::cout << "Starting publisher" << std::endl;
-  uint64_t uid = msgq_get_uid();
-
-  *q->write_uid = uid;
-  *q->num_readers = 0;
-
-  for (size_t i = 0; i < NUM_READERS; i++){
-    *q->read_valids[i] = false;
-    *q->read_uids[i] = 0;
-  }
-
-  q->write_uid_local = uid;
-}
-
-void msgq_init_subscriber(msgq_queue_t * q) {
-  assert(q != NULL);
-  assert(q->num_readers != NULL);
-
-  uint64_t uid = msgq_get_uid();
-
-  // Get reader id
-  while (true){
-    uint64_t cur_num_readers = *q->num_readers;
-    uint64_t new_num_readers = cur_num_readers + 1;
-
-    // No more slots available. Reset all subscribers to kick out inactive ones
-    if (new_num_readers > NUM_READERS){
-      std::cout << "Warning, evicting all subscribers!" << std::endl;
-      *q->num_readers = 0;
-
-      for (size_t i = 0; i < NUM_READERS; i++){
-        *q->read_valids[i] = false;
-
-        uint64_t old_uid = *q->read_uids[i];
-        *q->read_uids[i] = 0;
-
-        // Wake up reader in case they are in a poll
-        syscall(SYS_tkill, old_uid & 0xFFFFFFFF, SIGUSR1);
-      }
-
-      continue;
-    }
-
-    // Use atomic compare and swap to handle race condition
-    // where two subscribers start at the same time
-    if (std::atomic_compare_exchange_strong(q->num_readers,
-                                            &cur_num_readers,
-                                            new_num_readers)){
-      q->reader_id = cur_num_readers;
-      q->read_uid_local = uid;
-
-      // We start with read_valid = false,
-      // on the first read the read pointer will be synchronized with the write pointer
-      *q->read_valids[cur_num_readers] = false;
-      *q->read_pointers[cur_num_readers] = 0;
-      *q->read_uids[cur_num_readers] = uid;
-      break;
-    }
-  }
-
-  std::cout << "New subscriber id: " << q->reader_id << " uid: " << q->read_uid_local << " " << q->endpoint << std::endl;
-  msgq_reset_reader(q);
-}
-
-int msgq_msg_send(msgq_msg_t * msg, msgq_queue_t *q){
-  // Die if we are no longer the active publisher
-  if (q->write_uid_local != *q->write_uid){
-    std::cout << "Killing old publisher: " << q->endpoint << std::endl;
-    errno = EADDRINUSE;
-    return -1;
-  }
-
-  uint64_t total_msg_size = ALIGN(msg->size + sizeof(int64_t));
-
-  // We need to fit at least three messages in the queue,
-  // then we can always safely access the last message
-  assert(3 * total_msg_size <= q->size);
-
-  uint64_t num_readers = *q->num_readers;
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  char *p = q->data + write_pointer; // add base offset
-
-  // Check remaining space
-  // Always leave space for a wraparound tag for the next message, including alignment
-  int64_t remaining_space = q->size - write_pointer - total_msg_size - sizeof(int64_t);
-  if (remaining_space <= 0){
-    // Write -1 size tag indicating wraparound
-    *(int64_t*)p = -1;
-
-    // Invalidate all readers that are beyond the write pointer
-    // TODO: should we handle the case where a new reader shows up while this is running?
-    for (uint64_t i = 0; i < num_readers; i++){
-      uint64_t read_pointer = *q->read_pointers[i];
-      uint64_t read_cycles = read_pointer >> 32;
-      read_pointer &= 0xFFFFFFFF;
-
-      if ((read_pointer > write_pointer) && (read_cycles != write_cycles)) {
-        *q->read_valids[i] = false;
-      }
-    }
-
-    // Update global and local copies of write pointer and write_cycles
-    write_pointer = 0;
-    write_cycles = write_cycles + 1;
-    PACK64(*q->write_pointer, write_cycles, write_pointer);
-
-    // Set actual pointer to the beginning of the data segment
-    p = q->data;
-  }
-
-  // Invalidate readers that are in the area that will be written
-  uint64_t start = write_pointer;
-  uint64_t end = ALIGN(start + sizeof(int64_t) + msg->size);
-
-  for (uint64_t i = 0; i < num_readers; i++){
-    uint32_t read_cycles, read_pointer;
-    UNPACK64(read_cycles, read_pointer, *q->read_pointers[i]);
-
-    if ((read_pointer >= start) && (read_pointer < end) && (read_cycles != write_cycles)) {
-      *q->read_valids[i] = false;
-    }
-  }
-
-
-  // Write size tag
-  std::atomic<int64_t> *size_p = reinterpret_cast<std::atomic<int64_t>*>(p);
-  *size_p = msg->size;
-
-  // Copy data
-  memcpy(p + sizeof(int64_t), msg->data, msg->size);
-  __sync_synchronize();
-
-  // Update write pointer
-  uint32_t new_ptr = ALIGN(write_pointer + msg->size + sizeof(int64_t));
-  PACK64(*q->write_pointer, write_cycles, new_ptr);
-
-  // Notify readers
-  for (uint64_t i = 0; i < num_readers; i++){
-    uint64_t reader_uid = *q->read_uids[i];
-
-    syscall(SYS_tkill, reader_uid & 0xFFFFFFFF, SIGUSR1);
-  }
-
-  return msg->size;
-}
-
-
-int msgq_msg_ready(msgq_queue_t * q){
- start:
-  int id = q->reader_id;
-  assert(id >= 0); // Make sure subscriber is initialized
-
-  if (q->read_uid_local != *q->read_uids[id]){
-    std::cout << q->endpoint << ": Reader was evicted, reconnecting" << std::endl;
-    msgq_init_subscriber(q);
-    goto start;
-  }
-
-  // Check valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  uint32_t read_cycles, read_pointer;
-  UNPACK64(read_cycles, read_pointer, *q->read_pointers[id]);
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  // Check if new message is available
-  return (read_pointer != write_pointer);
-}
-
-int msgq_msg_recv(msgq_msg_t * msg, msgq_queue_t * q){
- start:
-  int id = q->reader_id;
-  assert(id >= 0); // Make sure subscriber is initialized
-
-  if (q->read_uid_local != *q->read_uids[id]){
-    std::cout << q->endpoint << ": Reader was evicted, reconnecting" << std::endl;
-    msgq_init_subscriber(q);
-    goto start;
-  }
-
-  // Check valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  uint32_t read_cycles, read_pointer;
-  UNPACK64(read_cycles, read_pointer, *q->read_pointers[id]);
-
-  uint32_t write_cycles, write_pointer;
-  UNPACK64(write_cycles, write_pointer, *q->write_pointer);
-
-  char * p = q->data + read_pointer;
-
-  // Check if new message is available
-  if (read_pointer == write_pointer) {
-    msg->size = 0;
-    return 0;
-  }
-
-  // Read potential message size
-  std::atomic<int64_t> *size_p = reinterpret_cast<std::atomic<int64_t>*>(p);
-  std::int64_t size = *size_p;
-
-  // Check if the size that was read is valid
-  if (!*q->read_valids[id]){
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-  // If size is -1 the buffer was full, and we need to wrap around
-  if (size == -1){
-    read_cycles++;
-    PACK64(*q->read_pointers[id], read_cycles, 0);
-    goto start;
-  }
-
-  // crashing is better than passing garbage data to the consumer
-  // the size will have weird value if it was overwritten by data accidentally
-  assert((uint64_t)size < q->size);
-  assert(size > 0);
-
-  uint32_t new_read_pointer = ALIGN(read_pointer + sizeof(std::int64_t) + size);
-
-  // If conflate is true, check if this is the latest message, else start over
-  if (q->read_conflate){
-    if (new_read_pointer != write_pointer){
-      // Update read pointer
-      PACK64(*q->read_pointers[id], read_cycles, new_read_pointer);
-      goto start;
-    }
-  }
-
-  // Copy message
-  if (msgq_msg_init_size(msg, size) < 0)
-    return -1;
-
-  __sync_synchronize();
-  memcpy(msg->data, p + sizeof(int64_t), size);
-  __sync_synchronize();
-
-  // Update read pointer
-  PACK64(*q->read_pointers[id], read_cycles, new_read_pointer);
-
-  // Check if the actual data that was copied is valid
-  if (!*q->read_valids[id]){
-    msgq_msg_close(msg);
-    msgq_reset_reader(q);
-    goto start;
-  }
-
-
-  return msg->size;
-}
-
-
-
-int msgq_poll(msgq_pollitem_t * items, size_t nitems, int timeout){
-  assert(timeout >= 0);
-
-  int num = 0;
-
-  // Check if messages ready
-  for (size_t i = 0; i < nitems; i++) {
-    items[i].revents = msgq_msg_ready(items[i].q);
-    if (items[i].revents) num++;
-  }
-
-  int ms = (timeout == -1) ? 100 : timeout;
-  struct timespec ts;
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000 * 1000;
-
-
-  while (num == 0) {
-    int ret;
-
-    ret = nanosleep(&ts, &ts);
-
-    // Check if messages ready
-    for (size_t i = 0; i < nitems; i++) {
-      if (items[i].revents == 0 && msgq_msg_ready(items[i].q)){
-        num += 1;
-        items[i].revents = 1;
-      }
-    }
-
-    // exit if we had a timeout and the sleep finished
-    if (timeout != -1 && ret == 0){
-      break;
-    }
-  }
-
-  return num;
-}
@@ -1,66 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <atomic>
-
-#define DEFAULT_SEGMENT_SIZE (10 * 1024 * 1024)
-#define NUM_READERS 8
-#define ALIGN(n) ((n + (8 - 1)) & -8)
-
-#define UNPACK64(higher, lower, input) do {uint64_t tmp = input; higher = tmp >> 32; lower = tmp & 0xFFFFFFFF;} while (0)
-#define PACK64(output, higher, lower) output = ((uint64_t)higher << 32 ) | ((uint64_t)lower & 0xFFFFFFFF)
-
-struct  msgq_header_t {
-  uint64_t num_readers;
-  uint64_t write_pointer;
-  uint64_t write_uid;
-  uint64_t read_pointers[NUM_READERS];
-  uint64_t read_valids[NUM_READERS];
-  uint64_t read_uids[NUM_READERS];
-};
-
-struct msgq_queue_t {
-  std::atomic<uint64_t> *num_readers;
-  std::atomic<uint64_t> *write_pointer;
-  std::atomic<uint64_t> *write_uid;
-  std::atomic<uint64_t> *read_pointers[NUM_READERS];
-  std::atomic<uint64_t> *read_valids[NUM_READERS];
-  std::atomic<uint64_t> *read_uids[NUM_READERS];
-  char * mmap_p;
-  char * data;
-  size_t size;
-  int reader_id;
-  uint64_t read_uid_local;
-  uint64_t write_uid_local;
-
-  bool read_conflate;
-  std::string endpoint;
-};
-
-struct msgq_msg_t {
-  size_t size;
-  char * data;
-};
-
-struct msgq_pollitem_t {
-  msgq_queue_t *q;
-  int revents;
-};
-
-void msgq_wait_for_subscriber(msgq_queue_t *q);
-void msgq_reset_reader(msgq_queue_t *q);
-
-int msgq_msg_init_size(msgq_msg_t *msg, size_t size);
-int msgq_msg_init_data(msgq_msg_t *msg, char * data, size_t size);
-int msgq_msg_close(msgq_msg_t *msg);
-
-int msgq_new_queue(msgq_queue_t * q, const char * path, size_t size);
-void msgq_close_queue(msgq_queue_t *q);
-void msgq_init_publisher(msgq_queue_t * q);
-void msgq_init_subscriber(msgq_queue_t * q);
-
-int msgq_msg_send(msgq_msg_t *msg, msgq_queue_t *q);
-int msgq_msg_recv(msgq_msg_t *msg, msgq_queue_t *q);
-int msgq_msg_ready(msgq_queue_t * q);
-int msgq_poll(msgq_pollitem_t * items, size_t nitems, int timeout);
@@ -1,56 +0,0 @@
-# MSGQ: A lock free single producer multi consumer message queue
-
-[![Build Status](https://dev.azure.com/commaai/default/_apis/build/status/commaai.msgq?branchName=master)](https://dev.azure.com/commaai/default/_build/latest?definitionId=21&branchName=master)
-
-## What is MSGQ?
-MSGQ is a system to pass messages from a single producer to multiple consumers. All the consumers need to be able to receive all the messages. It is designed to be a high performance replacement for ZMQ-like SUB/PUB patterns. It uses a ring buffer in shared memory to efficiently read and write data. Each read requires a copy. Writing can be done without a copy, as long as the size of the data is known in advance.
-
-## Storage
-The storage for the queue consists of an area of metadata, and the actual buffer. The metadata contains:
-
-1. A counter to the number of readers that are active
-2. A pointer to the head of the queue for writing. From now on referred to as *write pointer*
-3. A cycle counter for the writer. This counter is incremented when the writer wraps around
-4. N pointers, pointing to the current read position for all the readers. From now on referred to as *read pointer*
-5. N counters,  counting the number of cycles for all the readers
-6. N booleans, indicating validity for all the readers. From now on referred to as *validity flag*
-
-The counter and the pointer are both 32 bit values, packed into 64 bit so they can be read and written atomically.
-
-The data buffer is a ring buffer. All messages are prefixed by an 8 byte size field, followed by the data. A size of -1 indicates a wrap-around, and means the next message is stored at the beginning of the buffer.
-
-
-## Writing
-Writing involves the following steps:
-
-1. Check if the area that is to be written overlaps with any of the read pointers, mark those readers as invalid by clearing the validity flag.
-2. Write the message
-3. Increase the write pointer by the size of the message
-
-In case there is not enough space at the end of the buffer, a special empty message with a prefix of -1 is written. The cycle counter is incremented by one. In this case step 1 will check there are no read pointers pointing to the remainder of the buffer. Then another write cycle will start with the actual message.
-
-There always needs to be 8 bytes of empty space at the end of the buffer. By doing this there is always space to write the -1.
-
-## Reset reader
-When the reader is lagging too much behind the read pointer becomes invalid and no longer points to the beginning of a valid message. To reset a reader to the current write pointer, the following steps are performed:
-
-1. Set valid flag
-2. Set read cycle counter to that of the writer
-3. Set read pointer to write pointer
-
-## Reading
-Reading involves the following steps:
-
-1. Read the size field at the current read pointer
-2. Read the validity flag
-3. Copy the data out of the buffer
-4. Increase the read pointer by the size of the message
-5. Check the validity flag again
-
-Before starting the copy, the valid flag is checked. This is to prevent a race condition where the size prefix was invalid, and the read could read outside of the buffer. Make sure that step 1 and 2 are not reordered by your compiler or CPU.
-
-If a writer overwrites the data while it's being copied out, the data will be invalid. Therefore the validity flag is also checked after reading it. The order of step 4 and 5 does not matter.
-
-If at steps 2 or 5 the validity flag is not set, the reader is reset. Any data that was already read is discarded. After the reader is reset, the reading starts from the beginning.
-
-If a message with size -1 is encountered, step 3 and 4 are replaced by increasing the cycle counter and setting the read pointer to the beginning of the buffer. After that another read is performed.
@@ -1,395 +0,0 @@
-#include "catch2/catch.hpp"
-#include "msgq.hpp"
-
-TEST_CASE("ALIGN"){
-  REQUIRE(ALIGN(0) == 0);
-  REQUIRE(ALIGN(1) == 8);
-  REQUIRE(ALIGN(7) == 8);
-  REQUIRE(ALIGN(8) == 8);
-  REQUIRE(ALIGN(99999) == 100000);
-}
-
-TEST_CASE("msgq_msg_init_size"){
-  const size_t msg_size = 30;
-  msgq_msg_t msg;
-
-  msgq_msg_init_size(&msg, msg_size);
-  REQUIRE(msg.size == msg_size);
-
-  msgq_msg_close(&msg);
-}
-
-TEST_CASE("msgq_msg_init_data"){
-  const size_t msg_size = 30;
-  char * data = new char[msg_size];
-
-  for (size_t i = 0; i < msg_size; i++){
-    data[i] = i;
-  }
-
-  msgq_msg_t msg;
-  msgq_msg_init_data(&msg, data, msg_size);
-
-  REQUIRE(msg.size == msg_size);
-  REQUIRE(memcmp(msg.data, data, msg_size) == 0);
-
-  delete[] data;
-  msgq_msg_close(&msg);
-}
-
-
-TEST_CASE("msgq_init_subscriber"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q;
-  msgq_new_queue(&q, "test_queue", 1024);
-  REQUIRE(*q.num_readers == 0);
-
-  q.reader_id = 1;
-  *q.read_valids[0] = false;
-  *q.read_pointers[0] = ((uint64_t)1 << 32);
-
-  *q.write_pointer = 255;
-
-  msgq_init_subscriber(&q);
-  REQUIRE(q.read_conflate == false);
-  REQUIRE(*q.read_valids[0] == true);
-  REQUIRE((*q.read_pointers[0] >> 32) == 0);
-  REQUIRE((*q.read_pointers[0]  & 0xFFFFFFFF) == 255);
-}
-
-TEST_CASE("msgq_msg_send first message"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q;
-  msgq_new_queue(&q, "test_queue", 1024);
-  msgq_init_publisher(&q);
-
-  REQUIRE(*q.write_pointer == 0);
-
-  size_t msg_size = 128;
-
-  SECTION("Aligned message size"){
-  }
-  SECTION("Unaligned message size"){
-    msg_size--;
-  }
-
-  char * data = new char[msg_size];
-
-  for (size_t i = 0; i < msg_size; i++){
-    data[i] = i;
-  }
-
-  msgq_msg_t msg;
-  msgq_msg_init_data(&msg, data, msg_size);
-
-
-  msgq_msg_send(&msg, &q);
-  REQUIRE(*(int64_t*)q.data == msg_size); // Check size tag
-  REQUIRE(*q.write_pointer == 128 + sizeof(int64_t));
-  REQUIRE(memcmp(q.data + sizeof(int64_t), data, msg_size) == 0);
-
-  delete[] data;
-  msgq_msg_close(&msg);
-}
-
-TEST_CASE("msgq_msg_send test wraparound"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q;
-  msgq_new_queue(&q, "test_queue", 1024);
-  msgq_init_publisher(&q);
-
-  REQUIRE((*q.write_pointer & 0xFFFFFFFF) == 0);
-  REQUIRE((*q.write_pointer >> 32) == 0);
-
-  const size_t msg_size = 120;
-  msgq_msg_t msg;
-  msgq_msg_init_size(&msg, msg_size);
-
-  for (int i = 0; i < 8; i++) {
-    msgq_msg_send(&msg, &q);
-  }
-  // Check 8th message was written at the beginning
-  REQUIRE((*q.write_pointer & 0xFFFFFFFF) == msg_size + sizeof(int64_t));
-
-  // Check cycle count
-  REQUIRE((*q.write_pointer >> 32) == 1);
-
-  // Check wraparound tag
-  char * tag_location = q.data;
-  tag_location += 7 * (msg_size + sizeof(int64_t));
-  REQUIRE(*(int64_t*)tag_location == -1);
-
-  msgq_msg_close(&msg);
-}
-
-TEST_CASE("msgq_msg_recv test wraparound"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q_pub, q_sub;
-  msgq_new_queue(&q_pub, "test_queue", 1024);
-  msgq_new_queue(&q_sub, "test_queue", 1024);
-
-  msgq_init_publisher(&q_pub);
-  msgq_init_subscriber(&q_sub);
-
-  REQUIRE((*q_pub.write_pointer >> 32) == 0);
-  REQUIRE((*q_sub.read_pointers[0] >> 32) == 0);
-
-  const size_t msg_size = 120;
-  msgq_msg_t msg1;
-  msgq_msg_init_size(&msg1, msg_size);
-
-
-  SECTION("Check cycle counter after reset") {
-    for (int i = 0; i < 8; i++) {
-      msgq_msg_send(&msg1, &q_pub);
-    }
-
-    msgq_msg_t msg2;
-    msgq_msg_recv(&msg2, &q_sub);
-    REQUIRE(msg2.size == 0); // Reader had to reset
-    msgq_msg_close(&msg2);
-
-  }
-  SECTION("Check cycle counter while keeping up with writer") {
-    for (int i = 0; i < 8; i++) {
-      msgq_msg_send(&msg1, &q_pub);
-
-      msgq_msg_t msg2;
-      msgq_msg_recv(&msg2, &q_sub);
-      REQUIRE(msg2.size > 0);
-      msgq_msg_close(&msg2);
-    }
-  }
-
-  REQUIRE((*q_sub.read_pointers[0] >> 32) == 1);
-  msgq_msg_close(&msg1);
-}
-
-TEST_CASE("msgq_msg_send test invalidation"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q_pub, q_sub;
-  msgq_new_queue(&q_pub, "test_queue", 1024);
-  msgq_new_queue(&q_sub, "test_queue", 1024);
-
-  msgq_init_publisher(&q_pub);
-  msgq_init_subscriber(&q_sub);
-  *q_sub.write_pointer = (uint64_t)1 << 32;
-
-  REQUIRE(*q_sub.read_valids[0] == true);
-
-  SECTION("read pointer in tag"){
-    *q_sub.read_pointers[0] = 0;
-  }
-  SECTION("read pointer in data section"){
-    *q_sub.read_pointers[0] = 64;
-  }
-  SECTION("read pointer in wraparound section"){
-    *q_pub.write_pointer = ((uint64_t)1 << 32) | 1000; // Writer is one cycle ahead
-    *q_sub.read_pointers[0] = 1020;
-  }
-
-  msgq_msg_t msg;
-  msgq_msg_init_size(&msg, 128);
-  msgq_msg_send(&msg, &q_pub);
-
-  REQUIRE(*q_sub.read_valids[0] == false);
-
-  msgq_msg_close(&msg);
-}
-
-TEST_CASE("msgq_init_subscriber init 2 subscribers"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t q1, q2;
-  msgq_new_queue(&q1, "test_queue", 1024);
-  msgq_new_queue(&q2, "test_queue", 1024);
-
-  *q1.num_readers = 0;
-
-  REQUIRE(*q1.num_readers == 0);
-  REQUIRE(*q2.num_readers == 0);
-
-  msgq_init_subscriber(&q1);
-  REQUIRE(*q1.num_readers == 1);
-  REQUIRE(*q2.num_readers == 1);
-  REQUIRE(q1.reader_id == 0);
-
-  msgq_init_subscriber(&q2);
-  REQUIRE(*q1.num_readers == 2);
-  REQUIRE(*q2.num_readers == 2);
-  REQUIRE(q2.reader_id == 1);
-}
-
-
-TEST_CASE("Write 1 msg, read 1 msg", "[integration]"){
-  remove("/dev/shm/test_queue");
-  const size_t msg_size = 128;
-  msgq_queue_t writer, reader;
-
-  msgq_new_queue(&writer, "test_queue", 1024);
-  msgq_new_queue(&reader, "test_queue", 1024);
-
-  msgq_init_publisher(&writer);
-  msgq_init_subscriber(&reader);
-
-  // Build 128 byte message
-  msgq_msg_t outgoing_msg;
-  msgq_msg_init_size(&outgoing_msg, msg_size);
-
-  for (size_t i = 0; i < msg_size; i++){
-    outgoing_msg.data[i] = i;
-  }
-
-  REQUIRE(msgq_msg_send(&outgoing_msg, &writer) == msg_size);
-
-  msgq_msg_t incoming_msg1;
-  REQUIRE(msgq_msg_recv(&incoming_msg1, &reader) == msg_size);
-  REQUIRE(memcmp(incoming_msg1.data, outgoing_msg.data, msg_size) == 0);
-
-  // Verify that there are no more messages
-  msgq_msg_t incoming_msg2;
-  REQUIRE(msgq_msg_recv(&incoming_msg2, &reader) == 0);
-
-  msgq_msg_close(&outgoing_msg);
-  msgq_msg_close(&incoming_msg1);
-  msgq_msg_close(&incoming_msg2);
-}
-
-TEST_CASE("Write 2 msg, read 2 msg - conflate = false", "[integration]"){
-  remove("/dev/shm/test_queue");
-  const size_t msg_size = 128;
-  msgq_queue_t writer, reader;
-
-  msgq_new_queue(&writer, "test_queue", 1024);
-  msgq_new_queue(&reader, "test_queue", 1024);
-
-  msgq_init_publisher(&writer);
-  msgq_init_subscriber(&reader);
-
-  // Build 128 byte message
-  msgq_msg_t outgoing_msg;
-  msgq_msg_init_size(&outgoing_msg, msg_size);
-
-  for (size_t i = 0; i < msg_size; i++){
-    outgoing_msg.data[i] = i;
-  }
-
-  REQUIRE(msgq_msg_send(&outgoing_msg, &writer) == msg_size);
-  REQUIRE(msgq_msg_send(&outgoing_msg, &writer) == msg_size);
-
-  msgq_msg_t incoming_msg1;
-  REQUIRE(msgq_msg_recv(&incoming_msg1, &reader) == msg_size);
-  REQUIRE(memcmp(incoming_msg1.data, outgoing_msg.data, msg_size) == 0);
-
-  msgq_msg_t incoming_msg2;
-  REQUIRE(msgq_msg_recv(&incoming_msg2, &reader) == msg_size);
-  REQUIRE(memcmp(incoming_msg2.data, outgoing_msg.data, msg_size) == 0);
-
-  msgq_msg_close(&outgoing_msg);
-  msgq_msg_close(&incoming_msg1);
-  msgq_msg_close(&incoming_msg2);
-}
-
-TEST_CASE("Write 2 msg, read 2 msg - conflate = true", "[integration]"){
-  remove("/dev/shm/test_queue");
-  const size_t msg_size = 128;
-  msgq_queue_t writer, reader;
-
-  msgq_new_queue(&writer, "test_queue", 1024);
-  msgq_new_queue(&reader, "test_queue", 1024);
-
-  msgq_init_publisher(&writer);
-  msgq_init_subscriber(&reader);
-  reader.read_conflate = true;
-
-  // Build 128 byte message
-  msgq_msg_t outgoing_msg;
-  msgq_msg_init_size(&outgoing_msg, msg_size);
-
-  for (size_t i = 0; i < msg_size; i++){
-    outgoing_msg.data[i] = i;
-  }
-
-  REQUIRE(msgq_msg_send(&outgoing_msg, &writer) == msg_size);
-  REQUIRE(msgq_msg_send(&outgoing_msg, &writer) == msg_size);
-
-  msgq_msg_t incoming_msg1;
-  REQUIRE(msgq_msg_recv(&incoming_msg1, &reader) == msg_size);
-  REQUIRE(memcmp(incoming_msg1.data, outgoing_msg.data, msg_size) == 0);
-
-  // Verify that there are no more messages
-  msgq_msg_t incoming_msg2;
-  REQUIRE(msgq_msg_recv(&incoming_msg2, &reader) == 0);
-
-  msgq_msg_close(&outgoing_msg);
-  msgq_msg_close(&incoming_msg1);
-  msgq_msg_close(&incoming_msg2);
-}
-
-TEST_CASE("1 publisher, 1 slow subscriber", "[integration]"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t writer, reader;
-
-  msgq_new_queue(&writer, "test_queue", 1024);
-  msgq_new_queue(&reader, "test_queue", 1024);
-
-  msgq_init_publisher(&writer);
-  msgq_init_subscriber(&reader);
-
-  int n_received = 0;
-  int n_skipped = 0;
-
-  for (uint64_t i = 0; i < 1e5; i++) {
-    msgq_msg_t outgoing_msg;
-    msgq_msg_init_data(&outgoing_msg, (char*)&i, sizeof(uint64_t));
-    msgq_msg_send(&outgoing_msg, &writer);
-    msgq_msg_close(&outgoing_msg);
-
-    if (i % 10 == 0){
-      msgq_msg_t msg1;
-      msgq_msg_recv(&msg1, &reader);
-
-      if (msg1.size == 0){
-        n_skipped++;
-      } else {
-        n_received++;
-      }
-      msgq_msg_close(&msg1);
-    }
-  }
-
-  // TODO: verify these numbers by hand
-  REQUIRE(n_received == 8572);
-  REQUIRE(n_skipped == 1428);
-}
-
-TEST_CASE("1 publisher, 2 subscribers", "[integration]"){
-  remove("/dev/shm/test_queue");
-  msgq_queue_t writer, reader1, reader2;
-
-  msgq_new_queue(&writer, "test_queue", 1024);
-  msgq_new_queue(&reader1, "test_queue", 1024);
-  msgq_new_queue(&reader2, "test_queue", 1024);
-
-  msgq_init_publisher(&writer);
-  msgq_init_subscriber(&reader1);
-  msgq_init_subscriber(&reader2);
-
-  for (uint64_t i = 0; i < 1024 * 3; i++) {
-    msgq_msg_t outgoing_msg;
-    msgq_msg_init_data(&outgoing_msg, (char*)&i, sizeof(uint64_t));
-    msgq_msg_send(&outgoing_msg, &writer);
-
-    msgq_msg_t msg1, msg2;
-    msgq_msg_recv(&msg1, &reader1);
-    msgq_msg_recv(&msg2, &reader2);
-
-    REQUIRE(msg1.size == sizeof(uint64_t));
-    REQUIRE(msg2.size == sizeof(uint64_t));
-    REQUIRE(*(uint64_t*)msg1.data == i);
-    REQUIRE(*(uint64_t*)msg2.data == i);
-
-    msgq_msg_close(&outgoing_msg);
-    msgq_msg_close(&msg1);
-    msgq_msg_close(&msg2);
-  }
-}
@@ -1,14 +0,0 @@
-from messaging_pyx import Context, SubSocket, PubSocket  # pylint: disable=no-name-in-module, import-error
-
-if __name__ == "__main__":
-  c = Context()
-  pub_sock = PubSocket()
-  pub_sock.connect(c, "controlsState")
-
-  for i in range(int(1e10)):
-    print(i)
-    sub_sock = SubSocket()
-    sub_sock.connect(c, "controlsState")
-
-    pub_sock.send(b'a')
-    print(sub_sock.receive())
@@ -1,2 +0,0 @@
-#define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"
@@ -1,142 +0,0 @@
-import unittest
-import time
-import cereal.messaging as messaging
-
-import concurrent.futures
-
-
-def poller():
-  context = messaging.Context()
-
-  p = messaging.Poller()
-
-  sub = messaging.SubSocket()
-  sub.connect(context, 'controlsState')
-  p.registerSocket(sub)
-
-  socks = p.poll(10000)
-  r = [s.receive(non_blocking=True) for s in socks]
-
-  return r
-
-
-class TestPoller(unittest.TestCase):
-  def test_poll_once(self):
-    context = messaging.Context()
-
-    pub = messaging.PubSocket()
-    pub.connect(context, 'controlsState')
-
-    with concurrent.futures.ThreadPoolExecutor() as e:
-      poll = e.submit(poller)
-
-      time.sleep(0.1)  # Slow joiner syndrome
-
-      # Send message
-      pub.send("a")
-
-      # Wait for poll result
-      result = poll.result()
-
-    del pub
-    context.term()
-
-    self.assertEqual(result, [b"a"])
-
-  def test_poll_and_create_many_subscribers(self):
-    context = messaging.Context()
-
-    pub = messaging.PubSocket()
-    pub.connect(context, 'controlsState')
-
-    with concurrent.futures.ThreadPoolExecutor() as e:
-      poll = e.submit(poller)
-
-      time.sleep(0.1)  # Slow joiner syndrome
-      c = messaging.Context()
-      for _ in range(10):
-        messaging.SubSocket().connect(c, 'controlsState')
-
-      time.sleep(0.1)
-
-      # Send message
-      pub.send("a")
-
-      # Wait for poll result
-      result = poll.result()
-
-    del pub
-    context.term()
-
-    self.assertEqual(result, [b"a"])
-
-  def test_multiple_publishers_exception(self):
-    context = messaging.Context()
-
-    with self.assertRaises(messaging.MultiplePublishersError):
-      pub1 = messaging.PubSocket()
-      pub1.connect(context, 'controlsState')
-
-      pub2 = messaging.PubSocket()
-      pub2.connect(context, 'controlsState')
-
-      pub1.send("a")
-
-    del pub1
-    del pub2
-    context.term()
-
-  def test_multiple_messages(self):
-    context = messaging.Context()
-
-    pub = messaging.PubSocket()
-    pub.connect(context, 'controlsState')
-
-    sub = messaging.SubSocket()
-    sub.connect(context, 'controlsState')
-
-    time.sleep(0.1)  # Slow joiner
-
-    for i in range(100):
-      pub.send(str(i))
-
-    msg_seen = False
-    i = 0
-    while True:
-      r = sub.receive(non_blocking=True)
-
-      if r is not None:
-        self.assertEqual(str(i), r.decode('utf8'))
-
-        msg_seen = True
-        i += 1
-
-      if r is None and msg_seen:  # ZMQ sometimes receives nothing on the first receive
-        break
-
-    del pub
-    del sub
-    context.term()
-
-  def test_conflate(self):
-    context = messaging.Context()
-
-    pub = messaging.PubSocket()
-    pub.connect(context, 'controlsState')
-
-    sub = messaging.SubSocket()
-    sub.connect(context, 'controlsState', conflate=True)
-
-    time.sleep(0.1)  # Slow joiner
-    pub.send('a')
-    pub.send('b')
-
-    self.assertEqual(b'b', sub.receive())
-
-    del pub
-    del sub
-    context.term()
-
-
-if __name__ == "__main__":
-  unittest.main()
@@ -1,33 +0,0 @@
-#!/usr/bin/env python3
-import os
-import yaml
-
-class Service():
-  def __init__(self, port, should_log, frequency, decimation=None):
-    self.port = port
-    self.should_log = should_log
-    self.frequency = frequency
-    self.decimation = decimation
-
-service_list_path = os.path.join(os.path.dirname(__file__), "service_list.yaml")
-
-service_list = {}
-with open(service_list_path, "r") as f:
-  for k, v in yaml.safe_load(f).items():
-    decimation = None
-    if len(v) == 4:
-      decimation = v[3]
-
-    service_list[k] = Service(v[0], v[1], v[2], decimation)
-
-if __name__ == "__main__":
-  print("/* THIS IS AN AUTOGENERATED FILE, PLEASE EDIT service_list.yaml */")
-  print("#ifndef __SERVICES_H")
-  print("#define __SERVICES_H")
-  print("struct service { int port; bool should_log; int frequency; int decimation; char name[0x100]; };")
-  print("static struct service services[] = {")
-  for k, v in service_list.items():
-    print('  { .name = "%s", .port = %d, .should_log = %s, .frequency = %d, .decimation = %d },' % (k, v.port, "true" if v.should_log else "false", v.frequency, -1 if v.decimation is None else v.decimation))
-  print("};")
-  print("#endif")
-
@@ -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,73 +0,0 @@
-import binascii
-import itertools
-import re
-import struct
-import subprocess
-
-def getprop(key):
-  return subprocess.check_output(["getprop", key], encoding='utf8').strip()
-
-def get_imei():
-  ret = getprop("oem.device.imeicache")
-  if ret == "":
-    ret = "000000000000000"
-  return ret
-
-def get_serial():
-  return getprop("ro.serialno")
-
-def get_subscriber_info():
-  ret = parse_service_call_string(["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 parse_service_call_unpack(call, fmt):
-  r = parse_service_call_bytes(call)
-  try:
-    return struct.unpack(fmt, r)[0]
-  except Exception:
-    return None
-
-def parse_service_call_string(call):
-  r = parse_service_call_bytes(call)
-  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(call):
-  ret = subprocess.check_output(["service", "call", *call], encoding='utf8').strip()
-  if 'Parcel' not in ret:
-    return None
-
-  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
@@ -1,98 +0,0 @@
-import os
-import subprocess
-import glob
-import hashlib
-import shutil
-from common.basedir import BASEDIR
-from selfdrive.swaglog import cloudlog
-
-android_packages = ("tw.com.ainvest.outpack", "cn.dragonpilot.gpsservice", "com.autonavi.amapauto", "com.mixplorer", "com.tomtom.speedcams.android.map", "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")
-  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,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,
-)
@@ -257,6 +257,7 @@ class dbc():

 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})
@@ -266,7 +267,7 @@ if __name__ == "__main__":

   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 abs(decoded[1]['SAS_Angle'] - (-26.2)) < 0.001
+   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)
@@ -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
+	python3 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,9 @@
 # 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
 assert KF1D
@@ -1,4 +1,4 @@
-from distutils.core import Extension, setup
+from distutils.core import Extension, setup  # pylint: disable=import-error,no-name-in-module

 from Cython.Build import cythonize

@@ -55,7 +55,6 @@ keys = {
  "CalibrationParams": [TxType.PERSISTENT],
  "CarParams": [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],
@@ -66,13 +65,12 @@ keys = {
  "GithubSshKeys": [TxType.PERSISTENT],
  "HasAcceptedTerms": [TxType.PERSISTENT],
  "HasCompletedSetup": [TxType.PERSISTENT],
-  "IsLdwEnabled": [TxType.PERSISTENT],
  "IsGeofenceEnabled": [TxType.PERSISTENT],
  "IsMetric": [TxType.PERSISTENT],
  "IsRHD": [TxType.PERSISTENT],
-  "IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
  "IsUpdateAvailable": [TxType.PERSISTENT],
  "IsUploadRawEnabled": [TxType.PERSISTENT],
+  "IsUploadVideoOverCellularEnabled": [TxType.PERSISTENT],
  "LastUpdateTime": [TxType.PERSISTENT],
  "LimitSetSpeed": [TxType.PERSISTENT],
  "LimitSetSpeedNeural": [TxType.PERSISTENT],
@@ -97,7 +95,6 @@ keys = {
  "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],
  #dragonpilot config
  "DragonEnableDashcam": [TxType.PERSISTENT],
  "DragonEnableDriverSafetyCheck": [TxType.PERSISTENT],
@@ -152,14 +149,6 @@ keys = {
  "DragonToyotaSnGMod": [TxType.PERSISTENT],
  "DragonIsEON": [TxType.PERSISTENT],
  "DragonHWChecked": [TxType.PERSISTENT],
-  "DragonEnableSRLearner": [TxType.PERSISTENT],
-  "DragonWazeMode": [TxType.PERSISTENT],
-  "DragonRunWaze": [TxType.PERSISTENT],
-  "DragonEnableAssistedLC": [TxType.PERSISTENT],
-  "DragonEnableAutoLC": [TxType.PERSISTENT],
-  "DragonAssistedLCMinMPH": [TxType.PERSISTENT],
-  "DragonAutoLCMinMPH": [TxType.PERSISTENT],
-  "DragonAutoLCDelay": [TxType.PERSISTENT],
 }


@@ -6,12 +6,20 @@ 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_RDR = 0.05  # radar
 DT_DMON = 0.1  # driver monitoring
 DT_TRML = 0.5  # thermald and manager

@@ -2,52 +2,27 @@ import os
 import subprocess
 from common.basedir import BASEDIR

-
 class Spinner():
-  def __init__(self):
+  def __enter__(self):
    self.spinner_proc = subprocess.Popen(["./spinner"],
                                         stdin=subprocess.PIPE,
                                         cwd=os.path.join(BASEDIR, "selfdrive", "ui", "spinner"),
                                         close_fds=True)
-
-  def __enter__(self):
    return self

  def update(self, spinner_text):
    self.spinner_proc.stdin.write(spinner_text.encode('utf8') + b"\n")
    self.spinner_proc.stdin.flush()

-  def close(self):
-    if self.spinner_proc is not None:
-      self.spinner_proc.stdin.close()
-      self.spinner_proc.terminate()
-      self.spinner_proc = None
-
-  def __del__(self):
-    self.close()
-
  def __exit__(self, type, value, traceback):
-    self.close()
+    self.spinner_proc.stdin.close()
+    self.spinner_proc.terminate()


-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)
+
@@ -125,7 +125,7 @@ def img_from_device(pt_device):

 #TODO please use generic img transform below
 def rotate_img(img, eulers, crop=None, intrinsics=eon_intrinsics):
-  import cv2  # pylint: disable=import-error
+  import cv2  # pylint: disable=no-name-in-module, import-error

  size = img.shape[:2]
  rot = orient.rot_from_euler(eulers)
@@ -183,7 +183,7 @@ def transform_img(base_img,
                 alpha=1.0,
                 beta=0,
                 blur=0):
-  import cv2  # pylint: disable=import-error
+  import cv2  # pylint: disable=no-name-in-module, import-error
  cv2.setNumThreads(1)

  if yuv:
@@ -241,7 +241,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   # pylint: disable=no-name-in-module, import-error
  rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2RGB_I420)
  if not center:
    center = (rgb.shape[0]/2, rgb.shape[1]/2)
@@ -31,7 +31,7 @@


 # Android system locale, zh-TW = Traditional Chinese, zh-CN = Simplified Chinese
-lang=zh-CN
+lang=en

 update_font=0
 remove_old_font=0
@@ -1,7 +1,7 @@
 {
-  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-07df505453684371b6c22583ffbb74ee414fcd389a46ff369ffd1b6bac75414e.zip",
-  "ota_hash": "07df505453684371b6c22583ffbb74ee414fcd389a46ff369ffd1b6bac75414e",
-  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-3a6f973295ded6e4ff5cfff3b12e19c80d3bf45e2e8dd8699da3fc25b23ed7c6.img",
+  "ota_url": "http://dpp.cool/neosupdate/ota-signed-7a0117425bc4a6673958d265312994e124654a566228f3cec2f0f9bc8120a9ab.zip",
+  "ota_hash": "7a0117425bc4a6673958d265312994e124654a566228f3cec2f0f9bc8120a9ab",
+  "recovery_url": "http://dpp.cool/neosupdate/recovery-3dc234d868c29a3739f6ca3bd47b1c2d3c570d9f478b6849a4fada129ee4af76.img",
  "recovery_len": 15848748,
-  "recovery_hash": "3a6f973295ded6e4ff5cfff3b12e19c80d3bf45e2e8dd8699da3fc25b23ed7c6"
+  "recovery_hash": "3dc234d868c29a3739f6ca3bd47b1c2d3c570d9f478b6849a4fada129ee4af76"
 }
@@ -11,16 +11,21 @@ if [ -z "$PASSIVE" ]; then
 fi

 function launch {
-  # Wifi scan
-  wpa_cli IFNAME=wlan0 SCAN
-
-  ## apply update
-  #if [ "$(git rev-parse HEAD)" != "$(git rev-parse @{u})" ]; then
-  #  git reset --hard @{u} &&
-  #  git clean -xdf &&
-  #
-  #  exec "${BASH_SOURCE[0]}"
-  #fi
+  # apply update
+#  if [ "$(git rev-parse HEAD)" != "$(git rev-parse @{u})" ]; then
+#    git reset --hard @{u} &&
+#    git clean -xdf &&
+#
+#    # Touch all files on release2 after checkout to prevent rebuild
+#    BRANCH=$(git rev-parse --abbrev-ref HEAD)
+#    if [[ "$BRANCH" == "release2" ]]; then
+#        touch **
+#    fi
+#
+#    exec "${BASH_SOURCE[0]}"
+#  fi
+  chmod 700 reset_update.sh
+  chmod 700 update_panda_firmware.sh

  # no cpu rationing for now
  echo 0-3 > /dev/cpuset/background/cpus
@@ -37,7 +42,7 @@ function launch {
  fi

  # Check for NEOS update
-  if [ $(< /VERSION) != "13" ]; then
+  if [ $(< /VERSION) != "12" ]; then
    if [ -f "$DIR/scripts/continue.sh" ]; then
      cp "$DIR/scripts/continue.sh" "/data/data/com.termux/files/continue.sh"
    fi
@@ -48,7 +53,7 @@ function launch {


  # handle pythonpath
-  ln -sfn $(pwd) /data/pythonpath
+  ln -s /data/openpilot /data/pythonpath
  export PYTHONPATH="$PWD"

  # start manager
@@ -1,10 +1,2 @@
 *.pyc
-*.os
-*.tmp
 .*.swp
-can/*.so
-can/build/
-can/obj/
-can/packer_pyx.cpp
-can/parser_pyx.cpp
-can/packer_impl.cpp
@@ -1,25 +0,0 @@
-from ubuntu:16.04
-
-RUN apt-get update && apt-get install -y libzmq3-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl
-
-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
-
-COPY requirements.txt /tmp/
-RUN pip install -r /tmp/requirements.txt
-
-ENV PYTHONPATH=/project
-
-# TODO: Add tag to cereal
-RUN git clone https://github.com/commaai/cereal.git /project/cereal
-RUN /project/cereal/install_capnp.sh
-
-WORKDIR /project
-
-COPY SConstruct .
-COPY . /project/opendbc
-
-RUN scons -c && scons -j$(nproc)
@@ -42,7 +42,7 @@ For example:
    SG_ VEHICLE_SPEED : 7|15@0+ (0.01,0) [0|250] "kph" PCM
    ```

- Signal size: always use the smallest amount of bits possible. For example, let's say I'm reverse engineering the gas pedal position and I've determined that it's in a 3 bytes message. For 0% pedal position I read a message value of `0x00 0x00 0x00`, while for 100% of pedal position I read `0x64 0x00 0x00`: clearly, the gas pedal position is within the first byte of the message and I might be tempted to define the signal `GAS_POS` as:
+- Signal's size: always use the smallest amount of bits possible. For example, let's say I'm reverse engineering the gas pedal position and I've determined that it's in a 3 bytes message. For 0% pedal position I read a message value of `0x00 0x00 0x00`, while for 100% of pedal position I read `0x64 0x00 0x00`: clearly, the gas pedal position is within the first byte of the message and I might be tempted to define the signal `GAS_POS` as:
    ```
    SG_ GAS_POS : 7|8@0+ (1,0) [0|100] "%" PCM
    ```
@@ -1,57 +0,0 @@
-import os
-import subprocess
-
-zmq = 'zmq'
-arch = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()
-
-cereal_dir = Dir('.')
-
-cpppath = [
-    '#',
-    '#cereal',
-    "#cereal/messaging",
-    "#opendbc/can",
-    '/usr/lib/include',
-]
-
-AddOption('--test',
-          action='store_true',
-          help='build test files')
-
-AddOption('--asan',
-          action='store_true',
-          help='turn on ASAN')
-
-ccflags_asan = ["-fsanitize=address", "-fno-omit-frame-pointer"] if GetOption('asan') else []
-ldflags_asan = ["-fsanitize=address"] if GetOption('asan') else []
-
-env = Environment(
-  ENV=os.environ,
-  CC='clang',
-  CXX='clang++',
-  CCFLAGS=[
-    "-g",
-    "-fPIC",
-    "-O2",
-    "-Werror=implicit-function-declaration",
-    "-Werror=incompatible-pointer-types",
-    "-Werror=int-conversion",
-    "-Werror=return-type",
-    "-Werror=format-extra-args",
-  ] + ccflags_asan,
-  LDFLAGS=ldflags_asan,
-  LINKFLAGS=ldflags_asan,
-
-  CFLAGS="-std=gnu11",
-  CXXFLAGS="-std=c++14",
-  CPPPATH=cpppath,
-)
-
-Export('env', 'zmq', 'arch')
-
-cereal = [File('#cereal/libcereal.a')]
-messaging = [File('#cereal/libmessaging.a')]
-Export('cereal', 'messaging')
-
-SConscript(['cereal/SConscript'])
-SConscript(['opendbc/can/SConscript'])
@@ -164,7 +164,7 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
 SG_ ACC_PROBLEM : 37|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_OFF : 36|1@0+ (1,0) [0|1] "" BDY
- SG_ FCM_OFF_2 : 35|1@0+ (1,0) [0|1] "" BDY
+ SG_ BOH_2 : 35|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY
 SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY
 SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY
@@ -174,12 +174,10 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY
 SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
 SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
- SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
- SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
 SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
- SG_ CHIME : 51|3@0+ (1,0) [0|1] "" BDY
+ SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
+ SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
 SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
- SG_ ICONS : 63|2@0+ (1,0) [0|1] "" BDY
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY

@@ -273,8 +271,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -164,7 +164,7 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
 SG_ ACC_PROBLEM : 37|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_OFF : 36|1@0+ (1,0) [0|1] "" BDY
- SG_ FCM_OFF_2 : 35|1@0+ (1,0) [0|1] "" BDY
+ SG_ BOH_2 : 35|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY
 SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY
 SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY
@@ -174,12 +174,10 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY
 SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
 SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
- SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
- SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
 SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
- SG_ CHIME : 51|3@0+ (1,0) [0|1] "" BDY
+ SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
+ SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
 SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
- SG_ ICONS : 63|2@0+ (1,0) [0|1] "" BDY
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY

@@ -261,8 +259,8 @@ BO_ 392 GEARBOX: 6 XXX
 SG_ GEAR : 36|5@0+ (1,0) [0|31] "" EON

 BO_ 399 STEER_STATUS: 6 EPS
- SG_ STEER_TORQUE_SENSOR : 7|12@0- (-1,0) [-2047.5|2047.5] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|12@0- (1,0) [-2047.5|2047.5] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 35|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 36|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON
@@ -1,16 +0,0 @@
-pr: none
-
-pool:
-  vmImage: 'ubuntu-16.04'
-steps:
- script: |
-    set -e
-    docker build -t opendbc .
-  displayName: 'Build'
- script: |
-    docker run opendbc bash -c "python -m unittest discover opendbc"
-  displayName: 'Unit tests'
- script: |
-    docker run opendbc bash -c "cd opendbc/can/tests/linter_python; PYTHONPATH=/ ./flake8_opendbc.sh"
-    docker run opendbc bash -c "cd opendbc/can/tests/linter_python; PYTHONPATH=/ ./pylint_opendbc.sh"
-  displayName: 'Python linter'
@@ -1,27 +0,0 @@
-Import('env', 'cereal')
-
-import os
-from opendbc.can.process_dbc import process
-
-dbcs = []
-for x in sorted(os.listdir('../')):
-  if x.endswith(".dbc"):
-    def compile_dbc(target, source, env):
-      process(source[0].path, target[0].path)
-    in_fn = [os.path.join('../', x), 'dbc_template.cc']
-    out_fn = os.path.join('dbc_out', x.replace(".dbc", ".cc"))
-    dbc = env.Command(out_fn, in_fn, compile_dbc)
-    dbcs.append(dbc)
-
-
-libdbc = env.SharedLibrary('libdbc', ["dbc.cc", "parser.cc", "packer.cc", "common.cc"]+dbcs, LIBS=["capnp", "kj"])
-
-# packer
-env.Command(['packer_pyx.so'],
-  [libdbc, 'packer_pyx.pyx', 'packer_pyx_setup.py'],
-  "cd opendbc/can && python3 packer_pyx_setup.py build_ext --inplace")
-
-# parser
-env.Command(['parser_pyx.so'],
-  [libdbc, cereal, 'parser_pyx_setup.py', 'parser_pyx.pyx', 'common.pxd'],
-  "cd opendbc/can && python3 parser_pyx_setup.py build_ext --inplace")
@@ -1,2 +0,0 @@
-from opendbc.can.parser_pyx import CANDefine # pylint: disable=no-name-in-module, import-error
-assert CANDefine
@@ -1,108 +0,0 @@
-#include <cassert>
-#include <utility>
-#include <algorithm>
-#include <map>
-#include <cmath>
-
-#include "common.h"
-
-#define WARN printf
-
-// this is the same as read_u64_le, but uses uint64_t as in/out
-uint64_t ReverseBytes(uint64_t x) {
-  return ((x & 0xff00000000000000ull) >> 56) |
-          ((x & 0x00ff000000000000ull) >> 40) |
-          ((x & 0x0000ff0000000000ull) >> 24) |
-          ((x & 0x000000ff00000000ull) >> 8) |
-          ((x & 0x00000000ff000000ull) << 8) |
-          ((x & 0x0000000000ff0000ull) << 24) |
-          ((x & 0x000000000000ff00ull) << 40) |
-          ((x & 0x00000000000000ffull) << 56);
-}
-
-uint64_t set_value(uint64_t ret, Signal sig, int64_t ival){
-  int shift = sig.is_little_endian? sig.b1 : sig.bo;
-  uint64_t mask = ((1ULL << sig.b2)-1) << shift;
-  uint64_t dat = (ival & ((1ULL << sig.b2)-1)) << shift;
-  if (sig.is_little_endian) {
-    dat = ReverseBytes(dat);
-    mask = ReverseBytes(mask);
-  }
-  ret &= ~mask;
-  ret |= dat;
-  return ret;
-}
-
-CANPacker::CANPacker(const std::string& dbc_name) {
-  dbc = dbc_lookup(dbc_name);
-  assert(dbc);
-
-  for (int i=0; i<dbc->num_msgs; i++) {
-    const Msg* msg = &dbc->msgs[i];
-    message_lookup[msg->address] = *msg;
-    for (int j=0; j<msg->num_sigs; j++) {
-      const Signal* sig = &msg->sigs[j];
-      signal_lookup[std::make_pair(msg->address, std::string(sig->name))] = *sig;
-    }
-  }
-  init_crc_lookup_tables();
-}
-
-uint64_t CANPacker::pack(uint32_t address, const std::vector<SignalPackValue> &signals, int counter) {
-  uint64_t ret = 0;
-  for (const auto& sigval : signals) {
-    std::string name = std::string(sigval.name);
-    double value = sigval.value;
-
-    auto sig_it = signal_lookup.find(std::make_pair(address, name));
-    if (sig_it == signal_lookup.end()) {
-      WARN("undefined signal %s - %d\n", name.c_str(), address);
-      continue;
-    }
-    auto sig = sig_it->second;
-
-    int64_t ival = (int64_t)(round((value - sig.offset) / sig.factor));
-    if (ival < 0) {
-      ival = (1ULL << sig.b2) + ival;
-    }
-
-    ret = set_value(ret, sig, ival);
-  }
-
-  if (counter >= 0){
-    auto sig_it = signal_lookup.find(std::make_pair(address, "COUNTER"));
-    if (sig_it == signal_lookup.end()) {
-      WARN("COUNTER not defined\n");
-      return ret;
-    }
-    auto sig = sig_it->second;
-
-    if ((sig.type != SignalType::HONDA_COUNTER) && (sig.type != SignalType::VOLKSWAGEN_COUNTER)) {
-      WARN("COUNTER signal type not valid\n");
-    }
-
-    ret = set_value(ret, sig, counter);
-  }
-
-  auto sig_it_checksum = signal_lookup.find(std::make_pair(address, "CHECKSUM"));
-  if (sig_it_checksum != signal_lookup.end()) {
-    auto sig = sig_it_checksum->second;
-    if (sig.type == SignalType::HONDA_CHECKSUM) {
-      unsigned int chksm = honda_checksum(address, ret, message_lookup[address].size);
-      ret = set_value(ret, sig, chksm);
-    } else if (sig.type == SignalType::TOYOTA_CHECKSUM) {
-      unsigned int chksm = toyota_checksum(address, ret, message_lookup[address].size);
-      ret = set_value(ret, sig, chksm);
-    } else if (sig.type == SignalType::VOLKSWAGEN_CHECKSUM) {
-      // FIXME: Hackish fix for an endianness issue. The message is in reverse byte order
-      // until later in the pack process. Checksums can be run backwards, CRCs not so much.
-      // The correct fix is unclear but this works for the moment.
-      unsigned int chksm = volkswagen_crc(address, ReverseBytes(ret), message_lookup[address].size);
-      ret = set_value(ret, sig, chksm);
-    } else {
-      //WARN("CHECKSUM signal type not valid\n");
-    }
-  }
-
-  return ret;
-}
@@ -1,3 +0,0 @@
-# pylint: skip-file
-from opendbc.can.packer_pyx import CANPacker
-assert CANPacker
@@ -1,67 +0,0 @@
-# distutils: language = c++
-# cython: c_string_encoding=ascii, language_level=3
-
-from libc.stdint cimport uint32_t, uint64_t
-from libcpp.vector cimport vector
-from libcpp.map cimport map
-from libcpp.string cimport string
-from libcpp cimport bool
-from posix.dlfcn cimport dlopen, dlsym, RTLD_LAZY
-
-from common cimport CANPacker as cpp_CANPacker
-from common cimport dbc_lookup, SignalPackValue, DBC
-
-
-cdef class CANPacker:
-  cdef:
-    cpp_CANPacker *packer
-    const DBC *dbc
-    map[string, (int, int)] name_to_address_and_size
-    map[int, int] address_to_size
-
-  def __init__(self, dbc_name):
-    self.packer = new cpp_CANPacker(dbc_name)
-    self.dbc = dbc_lookup(dbc_name)
-
-    num_msgs = self.dbc[0].num_msgs
-    for i in range(num_msgs):
-      msg = self.dbc[0].msgs[i]
-      self.name_to_address_and_size[string(msg.name)] = (msg.address, msg.size)
-      self.address_to_size[msg.address] = msg.size
-
-  cdef uint64_t pack(self, addr, values, counter):
-    cdef vector[SignalPackValue] values_thing
-    cdef SignalPackValue spv
-
-    names = []
-
-    for name, value in values.iteritems():
-      n = name.encode('utf8')
-      names.append(n) # TODO: find better way to keep reference to temp string arround
-
-      spv.name = n
-      spv.value = value
-      values_thing.push_back(spv)
-
-    return self.packer.pack(addr, values_thing, counter)
-
-  cdef inline uint64_t ReverseBytes(self, uint64_t x):
-    return (((x & 0xff00000000000000ull) >> 56) |
-           ((x & 0x00ff000000000000ull) >> 40) |
-           ((x & 0x0000ff0000000000ull) >> 24) |
-           ((x & 0x000000ff00000000ull) >> 8) |
-           ((x & 0x00000000ff000000ull) << 8) |
-           ((x & 0x0000000000ff0000ull) << 24) |
-           ((x & 0x000000000000ff00ull) << 40) |
-           ((x & 0x00000000000000ffull) << 56))
-
-  cpdef make_can_msg(self, name_or_addr, bus, values, counter=-1):
-    cdef int addr, size
-    if type(name_or_addr) == int:
-      addr = name_or_addr
-      size = self.address_to_size[name_or_addr]
-    else:
-      addr, size = self.name_to_address_and_size[name_or_addr.encode('utf8')]
-    cdef uint64_t val = self.pack(addr, values, counter)
-    val = self.ReverseBytes(val)
-    return [addr, 0, (<char *>&val)[:size], bus]
@@ -1,60 +0,0 @@
-import os
-import sysconfig
-import subprocess
-from distutils.core import Extension, setup  # pylint: disable=import-error,no-name-in-module
-
-from Cython.Build import cythonize
-from Cython.Distutils import build_ext
-
-BASEDIR = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../"))
-
-
-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)
-
-
-sourcefiles = ['packer_pyx.pyx']
-extra_compile_args = ["-std=c++11"]
-ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()  # pylint: disable=unexpected-keyword-arg
-
-if ARCH == "aarch64":
-  extra_compile_args += ["-Wno-deprecated-register"]
-
-
-setup(name='CAN packer',
-      cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
-      ext_modules=cythonize(
-        Extension(
-          "packer_pyx",
-          language="c++",
-          sources=sourcefiles,
-          extra_compile_args=extra_compile_args,
-          include_dirs=[
-            BASEDIR,
-            os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
-          ],
-          extra_link_args=[
-            os.path.join(BASEDIR, 'opendbc', 'can', 'libdbc.so'),
-          ],
-        )
-      ),
-      nthreads=4,
-)
@@ -1,2 +0,0 @@
-from opendbc.can.parser_pyx import CANParser # pylint: disable=no-name-in-module, import-error
-assert CANParser
@@ -1 +0,0 @@
-*.bz2
@@ -1,585 +0,0 @@
-[MASTER]
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=scipy
-
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
-ignore=CVS
-
-# Add files or directories matching the regex patterns to the blacklist. The
-# regex matches against base names, not paths.
-ignore-patterns=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Use multiple processes to speed up Pylint.
-jobs=4
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# Specify a configuration file.
-#rcfile=
-
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages
-suggestion-mode=yes
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
-        bad-inline-option,
-        locally-disabled,
-        locally-enabled,
-        file-ignored,
-        suppressed-message,
-        useless-suppression,
-        deprecated-pragma,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        bad-indentation,
-        line-too-long,
-        missing-docstring,
-        multiple-statements,
-        bad-continuation,
-        invalid-name,
-        too-many-arguments,
-        too-many-locals,
-        superfluous-parens,
-        bad-whitespace,
-        too-many-instance-attributes,
-        wrong-import-position,
-        ungrouped-imports,
-        wrong-import-order,
-        protected-access,
-        trailing-whitespace,
-        too-many-branches,
-        too-few-public-methods,
-        too-many-statements,
-        trailing-newlines,
-        attribute-defined-outside-init,
-        too-many-return-statements,
-        too-many-public-methods,
-        unused-argument,
-        old-style-class,
-        no-init,
-        len-as-condition,
-        unneeded-not,
-        no-self-use,
-        multiple-imports,
-        no-else-return,
-        logging-not-lazy,
-        fixme,
-        redefined-outer-name,
-        unused-variable,
-        unsubscriptable-object,
-        expression-not-assigned,
-        too-many-boolean-expressions,
-        consider-using-ternary,
-        invalid-unary-operand-type,
-        relative-import,
-        deprecated-lambda
-
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-enable=c-extension-no-member
-
-
-[REPORTS]
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-# Set the output format. Available formats are text, parseable, colorized, json
-# and msvs (visual studio).You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Activate the evaluation score.
-score=yes
-
-
-[REFACTORING]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-# Complete name of functions that never returns. When checking for
-# inconsistent-return-statements if a never returning function is called then
-# it will be considered as an explicit return statement and no message will be
-# printed.
-never-returning-functions=optparse.Values,sys.exit
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
-
-
-[SPELLING]
-
-# Limits count of emitted suggestions for spelling mistakes
-max-spelling-suggestions=4
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,
-      XXX,
-      TODO
-
-
-[SIMILARITIES]
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-
-[TYPECHECK]
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=capnp.* cereal.* pygame.* zmq.* setproctitle.* smbus2.* usb1.* serial.* cv2.*
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# This flag controls whether pylint should warn about no-member and similar
-# checks whenever an opaque object is returned when inferring. The inference
-# can return multiple potential results while evaluating a Python object, but
-# some branches might not be evaluated, which results in partial inference. In
-# that case, it might be useful to still emit no-member and other checks for
-# the rest of the inferred objects.
-ignore-on-opaque-inference=yes
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=flask setproctitle usb1 flask.ext.socketio smbus2 usb1.*
-
-# Show a hint with possible names when a member name was not found. The aspect
-# of finding the hint is based on edit distance.
-missing-member-hint=yes
-
-# The minimum edit distance a name should have in order to be considered a
-# similar match for a missing member name.
-missing-member-hint-distance=1
-
-# The total number of similar names that should be taken in consideration when
-# showing a hint for a missing member.
-missing-member-max-choices=1
-
-
-[VARIABLES]
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# Tells whether unused global variables should be treated as a violation.
-allow-global-unused-variables=yes
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,
-          _cb
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*|^ignored_|^unused_
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins
-
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='  '
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
-# Allow the body of a class to be on the same line as the declaration if body
-# contains single statement.
-single-line-class-stmt=no
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-
-[BASIC]
-
-# Naming style matching correct argument names
-argument-naming-style=snake_case
-
-# Regular expression matching correct argument names. Overrides argument-
-# naming-style
-#argument-rgx=
-
-# Naming style matching correct attribute names
-attr-naming-style=snake_case
-
-# Regular expression matching correct attribute names. Overrides attr-naming-
-# style
-#attr-rgx=
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,
-          bar,
-          baz,
-          toto,
-          tutu,
-          tata
-
-# Naming style matching correct class attribute names
-class-attribute-naming-style=any
-
-# Regular expression matching correct class attribute names. Overrides class-
-# attribute-naming-style
-#class-attribute-rgx=
-
-# Naming style matching correct class names
-class-naming-style=PascalCase
-
-# Regular expression matching correct class names. Overrides class-naming-style
-#class-rgx=
-
-# Naming style matching correct constant names
-const-naming-style=UPPER_CASE
-
-# Regular expression matching correct constant names. Overrides const-naming-
-# style
-#const-rgx=
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-# Naming style matching correct function names
-function-naming-style=snake_case
-
-# Regular expression matching correct function names. Overrides function-
-# naming-style
-#function-rgx=
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=i,
-           j,
-           k,
-           ex,
-           Run,
-           _
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# Naming style matching correct inline iteration names
-inlinevar-naming-style=any
-
-# Regular expression matching correct inline iteration names. Overrides
-# inlinevar-naming-style
-#inlinevar-rgx=
-
-# Naming style matching correct method names
-method-naming-style=snake_case
-
-# Regular expression matching correct method names. Overrides method-naming-
-# style
-#method-rgx=
-
-# Naming style matching correct module names
-module-naming-style=snake_case
-
-# Regular expression matching correct module names. Overrides module-naming-
-# style
-#module-rgx=
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty
-
-# Naming style matching correct variable names
-variable-naming-style=snake_case
-
-# Regular expression matching correct variable names. Overrides variable-
-# naming-style
-#variable-rgx=
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,
-                      __new__,
-                      setUp
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,
-                  _fields,
-                  _replace,
-                  _source,
-                  _make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-
-[IMPORTS]
-
-# Allow wildcard imports from modules that define __all__.
-allow-wildcard-with-all=no
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,
-                   TERMIOS,
-                   Bastion,
-                   rexec
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-RESULT=$(python3 -m flake8 --select=F $(find ../../../ -type f | grep "\.py$"))
-if [[ $RESULT  ]]; then
-	echo "Pyflakes found errors in the code. Please fix and try again"
-	echo "$RESULT"
-	exit 1
-fi
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-python3 -m pylint --disable=R,C,W $(find ../../../ -type f | grep "\.py$")
-
-exit_status=$?
-(( res = exit_status & 3 ))
-
-if [[ $res != 0  ]]; then
-	echo "Pylint found errors in the code. Please fix and try again"
-	exit 1
-fi
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-import unittest
-
-from opendbc.can.can_define import CANDefine
-
-
-class TestCADNDefine(unittest.TestCase):
-  def test_civic(self):
-
-    dbc_file = "honda_civic_touring_2016_can_generated"
-    defs = CANDefine(dbc_file)
-
-    self.assertDictEqual(defs.dv[399], defs.dv['STEER_STATUS'])
-    self.assertDictEqual(defs.dv[399],
-                         {'STEER_STATUS':
-                          {6: 'TMP_FAULT',
-                           5: 'FAULT_1',
-                           4: 'NO_TORQUE_ALERT_2',
-                           3: 'LOW_SPEED_LOCKOUT',
-                           2: 'NO_TORQUE_ALERT_1',
-                           0: 'NORMAL'}
-                          }
-                         )
-
-
-if __name__ == "__main__":
-  unittest.main()
@@ -91,8 +91,8 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -26,8 +26,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -14,8 +14,8 @@ BO_ 392 GEARBOX: 6 XXX
 SG_ GEAR : 36|5@0+ (1,0) [0|31] "" EON

 BO_ 399 STEER_STATUS: 6 EPS
- SG_ STEER_TORQUE_SENSOR : 7|12@0- (-1,0) [-2047.5|2047.5] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|12@0- (1,0) [-2047.5|2047.5] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 35|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 36|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON
@@ -31,8 +31,8 @@ BO_ 330 STEERING_SENSORS: 8 EPS
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -8,8 +8,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" EON

 BO_ 399 STEER_STATUS: 6 EPS
- SG_ STEER_TORQUE_SENSOR : 7|12@0- (-1,0) [-2047.5|2047.5] "tbd"  EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd"  EON
+ SG_ STEER_TORQUE_SENSOR : 7|12@0- (1,0) [-2047.5|2047.5] "tbd"  EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd"  EON
 SG_ STEER_CONTROL_ACTIVE : 36|1@0+ (1,0) [0|1] ""  EON
 SG_ STEER_STATUS : 35|4@0+ (1,0) [0|15] ""  EON
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] ""  EON
@@ -26,8 +26,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -26,8 +26,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -18,8 +18,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -11,8 +11,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-2985|2985] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-2985|2985] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ CHECKSUM : 51|4@0+ (1,0) [0|15] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
 SG_ STEER_STATUS : 43|4@0+ (1,0) [0|15] "" EON
@@ -26,8 +26,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -21,8 +21,8 @@ BO_ 342 STEERING_SENSORS: 6 EPS
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -95,8 +95,8 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -95,8 +95,8 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -95,8 +95,8 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
@@ -164,7 +164,7 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
 SG_ ACC_PROBLEM : 37|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_OFF : 36|1@0+ (1,0) [0|1] "" BDY
- SG_ FCM_OFF_2 : 35|1@0+ (1,0) [0|1] "" BDY
+ SG_ BOH_2 : 35|1@0+ (1,0) [0|1] "" BDY
 SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY
 SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY
 SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY
@@ -174,12 +174,10 @@ BO_ 780 ACC_HUD: 8 ADAS
 SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY
 SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
 SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
- SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
- SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
 SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
- SG_ CHIME : 51|3@0+ (1,0) [0|1] "" BDY
+ SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
+ SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
 SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
- SG_ ICONS : 63|2@0+ (1,0) [0|1] "" BDY
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY

@@ -278,8 +276,8 @@ BO_ 330 STEERING_SENSORS: 8 EPS
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON

 BO_ 399 STEER_STATUS: 7 EPS
- SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-31000|31000] "tbd" EON
- SG_ STEER_TORQUE_MOTOR : 23|16@0- (-1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_SENSOR : 7|16@0- (1,0) [-31000|31000] "tbd" EON
+ SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" EON
 SG_ STEER_STATUS : 39|4@0+ (1,0) [0|15] "" EON
 SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON
 SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
--- a/Show More
+++ b/Show More