Merge branch 'devel-i18n' into devel-zht

Merge pull request #18 from dragonpilot-community/devel
dp 0.7.3.3
2026-08-22 00:33:48 +08:00 · 2020-03-14 11:33:08 +10:00 · 2020-03-14 11:26:32 +10:00 · 2020-03-14 11:11:03 +10:00 · 2020-03-13 14:02:11 +10:00 · 2020-03-13 12:40:27 +10:00
477 changed files with 14373 additions and 31776 deletions
@@ -20,9 +20,7 @@ a.out
 .*.un~
 *.tmp
 *.o
-*.o-*
 *.os
-*.os-*
 *.so
 *.a
 *.clb
@@ -56,7 +54,6 @@ xx
 panda_jungle

 .coverage*
-coverage.xml
 htmlcov
 pandaextra

@@ -1,436 +0,0 @@
-dragonpilot 0.7.5.4
-========================
-* 加入 2018 skoda kodiaq 指紋v1。(感謝 @Gold 提供)
-* Added 2018 skoda kodiaq FPv1. (Thanks to @Gold)
-* 移除方向盤監控設定。(無法取消/關閉方向盤監控)
-* Removed Steering monitor timer adjustment in code (timer in settings will no longer work.)
-* Dynamic Follow 更新模型。(感謝 @ShaneSmiskol 提供代碼、 @cgw1968 測試)
-* Updated Dynamic Follow model. (Special Thanks to @ShaneSmiskol for the feature and @cgw1968 for testing)
-
-dragonpilot 0.7.5.3
-========================
-* Dynamic Follow 更新至 ShaneSmiskol:stock_additions 0.7.5 版。(感謝 @ShaneSmiskol 提供代碼、 @Wei 測試)
-* Updated Dynamic Follow to ShaneSmiskol:stock_additions 0.7.5. (Special Thanks to @ShaneSmiskol for the feature and @Wei for testing)
-* 優化 Lexus GSH 轉向。(感謝 @簡銘佑 測試)
-* Optimize Lexus GSH steering. (Thanks to @簡銘佑)
-* C2 支援自動關機「DragonAutoShutdownAt」參數。(感謝 @cgw1968 建議)
-* C2 to support auto shutdown "DragonAutoShutDownAt" param. (Thanks to @cgw1968)
-* 修正出現「pedalPressed」的錯誤。(感謝 @Wei 回報)
-* Fixed issue showing "pedalPressed" error. (Thanks to @Wei) 
-* 將剎車狀熊顯示於 dp 資訊欄。
-* Added brake indicator to dp infobar.
-* 修正「溫度監控」燈示。
-* Fixed "Temp monitor" indicator.
-* 加入「方向燈取消控制」延遲控制設。(感謝 @wabes 建議)
-* Added delay config to "Disable Lat Control on Blinker". (Thanks to @wabes)
-* 加入巴西版 2020 Corolla Hybrid 指紋v2。(感謝 @berno22 提供)
-* Added Brazil 2020 Corolla Hybrid FPv2. (Thanks to @berno22) 
-
-dragonpilot 0.7.5.2
-========================
-* 加入對 VW MQB/PQ 的支援。(感謝 @dingliangxue 移植)
-* Added support to VW MQB/PQ platform. (Thanks to @dingliangxue)
-* 修改成 3 小時後停止供電。(感謝 @Wei 建議)
-* Updated to stop charging after 3 hrs. (Thanks to @Wei)
-* 移除行車記錄下的「碰撞偵測」功能。
-* Removed Impact Detection in Dashcam.
-* 修正開啟「Noctua 風扇」模式導致的錯誤。(感謝 @阿濤 回報)
-* Fixed a bug caused by enabling "Noctua Mod". (Thanks to @阿濤)
-* 修正「位智模式」無法顯示警示的問題。(感謝 @axandres 回報)
-* Fixed alert issue in waze mode. (Thanks to @axandres)
-* 修正無法顯示更新中圖示的問題。
-* Fixed unable to display "UPDATING" icon issue. 
-* 加入「允許多次自動換道」功能。(感謝 @阿濤 建議)
-* Added "Allow Continuous Auto Lane Change" Toggle. (Thanks to @阿濤)
-* 修正開機後設定頁面有時會錯誤的問題。(感謝 @salmankhan、@Wei 回報)
-* Fixed setting page crash issue. (Thanks to @salmankhan, @Wei)
-* 修正熄火後一直出現更新訊息的錯誤。(感謝 @Sky Chang 回報)
-* Fixed issue that keep showing update prompt. (Thanks to @Sky Chang)
-
-dragonpilot 0.7.5.1
-========================
-* 修正因同時使用「社群功能」和「自定車型」造成的加減速問題。(特別感謝 @Wei、@Sky Chang、@Han9365、@鄧育林 的測試以及回報。)
-* Fixed acceleration issue caused by used of both "Community Maintain Feature" and "Custom Car Model". (Special Thanks to @Wei, @Sky Chang, @Han9365, @鄧育林)
-* 新增 DragonMaxSpeedLimit 設定值 (mph)，當如果車速高於此值 op 將會停止操控。(感謝 @Anthony 建議)
-* Added DragonMaxSpeedLimit parameter (mph), op will stop controlling when car speed is high than the value. (Thanks to @Anthony)
-* 更新 appd 使用 cnpmjs 來下載 APKs。
-* Updated appd to use cnpmjs to download APKs.
-* 修正更新服務。(感謝 @Wei)
-* Fixed Update Service. (Thanks to @Wei)
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v2)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v2). (Thanks to 明峰)
-* 新增「通過移動網路上傳」開關
-* Added Upload Over Mobile Network toggle.
-* 新增「通過熱點上傳」開關
-* Added Upload Over Hotspot toggle.
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v1)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v1). (Thanks to 明峰)
-* 新增大陸版 Volkswagen Golf GTI 指紋 (v1)。(感謝 easyeiji 提供)
-* Added China Volkswagen Golf GTI fingerprint (v1). (Thanks to easyeiji)
-
-dragonpilot 0.7.5.0
-========================
-* 基於最新 openpilot 0.7.5 devel-staging.
-* Based on latest openpilot 0.7.5 devel-staging.
-* 更新 dp 圖示 (特別感謝 @wabes 的設計與提供)。
-* Updated dp logo, special thanks to @wabes for the design.
-* 簡/繁中文版和 i18n 整合成為單一版本。  
-* Merged zhs/zht/i18n versions into one.
-* 新增大陸版 CAMRY HYBRID 指紋v2。(感謝 @杜子腾)
-* Added China Camery Hybrid FPv2. (Thanks to @杜子腾) 
-* 新增台灣版 Altis HYBRID 指紋v1。(感謝 @Fish)
-* Added Taiwan Altis Hybrid FPv1. (Thanks to @Fish)
-* 新增行駛時關閉畫面功能。
-* Added Screen off while driving feature.
-* 新增倒車時關閉畫面功能。
-* Added Screen off while reversing feature.
-* 新增駕駛介面加入「加速模式」切換鈕。 
-* Added acceleration profile toggle onto driving UI.
-* 新增自定車型功能，取代指紋暫存功能。
-* Replaced fingerprint cache with custom car model selector.
-* 新增可調亮度。
-* Added Brightness changer.
-* 新增部分德語支持。(特別感謝 @arne182 提供)
-* Added partial de_DE language support (Thanks to @arne182)
-* 新增停車碰撞偵測記錄功能。
-* Added off road impact detection to dashcam.
-
-2020-05-06
-========================
-* 更新 dp 圖示 (特別感謝 @wabes 的設計與提供)。
-* 中文版整合進 i18n 版。  
-* 刪除指紋暫存功能。
-* 新增 CAMERY HIBRID 指紋。(感謝 @杜子腾)
-* 新增行駛時關閉畫面功能。
-* 新增倒車時關閉畫面功能。
-* 新增駕駛介面加入「加速模式」切換鈕。 
-* 新增自定義車型。
-
-2020-04-16
-========================
-* [DEVEL] 加入台灣版 2016 Lexus IS200t 指紋。(感謝 Philip / Cody Dai)
-* [DEVEL] 加入台灣版 2016 Toyota Prius 4.5 代指紋。(感謝 Philip)
-* [DEVEL] 加入台灣版 201x Toyota RAV4 4WD 指紋。(感謝 Philip)
-* [DEVEL] 加入台灣版 2020 Toyota Auris w/ LTA 指紋。(感謝 Philip)
-* [DEVEL] 修正 commIssue 錯誤。(感謝 Kent 協助)
-
-2020-04-13
-========================
-* [DEVEL] 加入可調整 Toyota Sng 起步反應值 (DragonToyotaSngResponse)。 (特別感謝 @Wei 提供 PR)
-* [DEVEL] 駕駛介面加入「動態調整車距」按鈕。(感謝 @cgw1968-5779 建議)
-* [DEVEL] 更新 update script。(感謝 深鯨希西 回報)
-
-2020-04-10
-========================
-* [DEVEL] 更新 panda 至最新的 comma:master 分支。
-* [DEVEL] 移除所有的第三方應用改為自動下載。
-* [DEVEL] 移除「啟用原廠 DSU 模式」、「安全帶檢查」、「車門檢查」開關。
-
-2020-03-31
-========================
-* [DEVEL] 更新至 2020-03-31 testing 分支。
-
-2020-03-27
-========================
-* [DEVEL] 更新至最新的 testing 分支:
-  * 加入波蘭版 2015 Lexus NX200T 支援。(感謝 wabes 提供)
-  * 調整「啟用原廠 DSU 模式」為不再需要 AHB 。(Enable Stock DSU Mode no longer requires "AHB" toggle)
-  * 加入「安全帶檢查」、「車門檢查」、「檔位檢查」、「溫度檢查」開關。
-  * 加入曲率學習功能 - Curvature Learner 。(感謝 zorrobyte 提供)
-  * 加入大陸版 2018 Toyota Highlander 支援。(感謝 toyboxZ 提供)
-  * 加入大陸版 2018 Toyota Camry 2.0 支援。(感謝 Rming 提供)
-  * 加入韓文支持。(感謝 crwusiz 提供)
-  * 調整 OFFROAD 主頁翻譯將 "dragonpilot" 改回 "openpilot"。
-
-2020-03-22
-========================
-* [DEVEL] 更新至最新的 testing 分支。
-
-2020-03-17
-========================
-* [DEVEL] 更新至最新的 testing 分支 (commaai:devel-staging 0.7.4)。
-* [DEVEL] 加入動態調整車距功能。(特別感謝 @ShaneSmiskol 提供 PR)
-
-2020-03-14
-========================
-* [DEVEL] 更新 pt-Br (葡萄牙語) 翻譯。(感謝 berno22 提供)
-* [DEVEL] 加入自動關機開關。(感謝 Rzxd 建議)
-* [DEVEL] 調高 Toyota 扭力容錯值。
-* [DEVEL] 優化讀取 dp 設定值。
-* [DEVEL] 加入 2019 手動 Civic 指紋。感謝 (AlexNoop 提供)
-* [DEVEL] dp 功能加入對 Subaru 車系的支援。
-
-2020-03-06
-========================
-* [DEVEL] 加入葡萄牙語支持。(感謝 berno22 提供)
-* [DEVEL] 加入大陸 2018 Camry、2020 RAV4 指紋。(感謝 笨木匠 提供)
-* [DEVEL] 建立 devel-i18n 取代 devel-en。
-* [DEVEL] devel-en is deprecated, please switch to devel-i18n instead.
-
-2020-03-04
-========================
-* [DEVEL] 加入顯示駕駛監控畫面。
-* [DEVEL] 加入加速模式選項。(特別感謝 @arne182, @cgw1968-5779 提供 PR)
-* [DEVEL] 修正 shutdownd 在 comma two 可能會不正常關機的錯誤。(感謝 @Wei, @Rzxd 回報)
-
-2020-02-25
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.3)。
-
-2020-02-21
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.3)。
-
-2020-02-14
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.2)。
-* [DEVEL] 修正錯誤。
-
-2020-02-08
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.2)。
-* [DEVEL] dp 功能加入對現代 (Hyundai) 車系的支援。
-* [DEVEL] 加入神盾測速照相自動啟動的開關。
-* [DEVEL] 更新高德地圖至 v4.5.0.600053。
-* [DEVEL] 使用 0.6.6 版的更新系統。
-* [DEVEL] 修正急剎問題。(感謝 kumar 提供)
-
-2020-01-31
-========================
-* [DEVEL] 移除行車介面電量、溫度顯示，(修正畫面當機、黑屏問題)
-
-2020-01-29
-========================
-* [DEVEL] 修正行車介面錯誤。(感謝 深鲸希西 測試；eisenheim、HeatNation 反應)
-
-2020-01-23
-========================
-* [DEVEL] 加入 Steer Ratio Learner 關閉。(感謝 eisenheim 建議)
-* [DEVEL] 行車介面加入電量、溫度。(感謝 eisenheim 建議)
-* [DEVEL] 優化 appd。
-
-2020-01-19
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.1)。
-* [DEVEL] 調整 appd 和 ALC 邏輯。 
-
-2020-01-14
-========================
-* [DEVEL] 加入開機啟動個人熱點。(感謝 eisenheim 建議)
-
-2020-01-08
-========================
-* [DEVEL] 加入大陸版 2018 Lexus RX300 支援。(感謝 cafe 提供)
-* [DEVEL] 加入 DragonBTG 設定。(感謝 CloudJ、低調哥、歐姓Altis車主 提供)
-
-2019-12-31
-========================
-* [DEVEL-ZHS] 加回第三方應用。
-
-2019-12-29
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.0)。
-* [DEVEL] 輔助/自動變道改為可調整參數 (進階用戶)。(DragonAssistedLCMinMPH、DragonAutoLCMinMPH、DragonAutoLCDelay)
-* [DEVEL-ZHS] 修正無法運行第三方應用錯誤。(感謝 深鲸希西 反應)
-
-2019-12-18
-========================
-* [DEVEL] 修正自動換道邏輯。
-* [DEVEL] 更新 offroad 翻譯。
-* [DEVEL] 錯誤修正。
-* [DEVEL] 移除美版 2017 Civic Hatchback 指紋。(與其它車型衝突)
-
-2019-12-17
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.0)。
-* [DEVEL] 加入輔助換道開關。（24mph / 40kph 以上)
-* [DEVEL] 加入自動換道開關。（40mph / 65kph 以上)
-* [DEVEL] 加入大陸版 2019 雷凌汽油版指紋。 (感謝 Shell 提供)
-* [DEVEL] 加入大陸版 2019 卡羅拉汽油版指紋。 (感謝 Shell 提供)
-* [DEVEL] 加入美版 2017 Civic Hatchback 指紋。(感謝 CFranHonda 提供)
-
-2019-12-10
-========================
-* [DEVEL] 加入位智車機模式。 (Waze Mode)
-
-2019-11-21
-========================
-* [DEVEL] 修正 offroad 翻譯。(感謝 鄧育林 回報)
-* [DEVEL] 調整前車靜止移動偵測參數。
-* [DEVEL] 前車靜止移動偵測可在未啟用 dp 時運作。
-
-2019-11-18
-========================
-* [DEVEL] 修正 offroad 翻譯。(感謝 Cody、鄧育林 回報)
-
-2019-11-18
-========================
-* [DEVEL] 修正 frame 翻譯。
-
-2019-11-15
-========================
-* [DEVEL] 修正不會充電的錯誤。 (感謝 袁昊 反應)
-
-2019-11-15
-========================
-* [DEVEL] 修正充電控制。 (感謝 KT 反應)
-* [DEVEL] 更新 frame 翻譯，改為多語言版。 (感謝 深鲸希西、shaoching885、鄧育林 反應)
-* [DEVEL] 更新至最新的 commaai:devel (0.6.6)。
-
-2019-11-12
-========================
-* [DEVEL] 只顯示電量文字 (注意：有時不會更新，需要拔插 USB 線)
-* [DEVEL] 自動偵測並鎖定硬體 (EON / UNO)。
-
-2019-11-12
-========================
-* [DEVEL] 加入鎖定硬體 (EON / UNO) 的程式碼。
-
-2019-11-11
-========================
-* [DEVEL] 更新高德地圖至 v4.3.0.600310 R2098NSLAE
-* [DEVEL] 更新 MiXplorer 至 v6.40.3
-* [DEVEL] 更新至最新的 commaai:devel (0.6.6)。
-* [DEVEL] 前車靜止移動偵測加入偵測警示。
-
-2019-11-07
-========================
-* [DEVEL] 讓 Bosch 系統顯示三角。 (感謝 ching885 回報)
-* [DEVEL] 更新 offroad 多語言版簡體中文翻譯 (感謝 Rming 提供)
-
-2019-11-06
-========================
-* [DEVEL] 修正 0.6.6 appd 和 dashcamd 錯誤。 (感謝 鄧育林 回報)
-* [DEVEL] 更新至最新的 commaai:devel (0.6.6)。
-
-2019-11-05
-========================
-* [DEVEL] 加入台灣 Lexus 2017 GS450h 支援。 (感謝 簡銘佑 提供指紋)
-
-2019-11-01
-========================
-* [DEVEL] 新增神盾測速照相。 (感謝 Sky Chang 和 Wei Yi Chen)
-* [DEVEL] 修正 offroad 翻譯。 (感謝 Leo Hsieh)
-
-2019-11-01
-========================
-* [DEVEL] 移除 Miui 字型，縮小 dp 使用空間。
-* [DEVEL] 更新 offroad 為多語言版
-* [DEVEL] 更新至最新的 commaai:devel (0.6.5)。
-
-2019-10-29
-========================
-* [DEVEL] 加入 SnG 補丁。（感謝 楊雅智)
-
-2019-10-28
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.6.5)。
-* [DEVEL] 調整 dragon_allow_gas 邏輯 (請回報任何問題，需更新 Panda 韌體)
-
-2019-10-18
-========================
-* [DEVEL] 加入前車靜止移動偵測。(測試版，感謝 ucolchen)
-* [DEVEL] 移除強迫網路連線提示。(感謝 Shell)
-* [DEVEL] 修正 allow_gas 功能。
-
-2019-10-18
-========================
-* [DEVEL] 加入彎道減速功能開關。
-* [DEVEL] 強迫使用 dp 版 Panda 韌體。
-* [DEVEL] 更新至最新的 commaai:devel (0.6.5)。 
-
-2019-10-17
-========================
-* [DEVEL] 加入「車型」顯示於 dp 設定畫面。
-* [DEVEL] 修正充電控制讀取預設值的錯誤。
-* [DEVEL] 修正無法顯示更新記錄的錯誤。
-
-2019-10-16
-========================
-* [DEVEL] 刷新 Panda 韌體按鈕將會自動重啟 EON。(感謝 鄧育林 建議)
-* [DEVEL] 下載更新記錄時使用 "no-cache" 標頭。
-* [DEVEL] 更新高德地圖至 v4.3.0
-* [DEVEL] 刪除 bs (Branch Switcher)
-
-2019-10-14
-========================
-* [DEVEL] 啟用自動更新功能。(感謝 鄧育林 提供)
-* [DEVEL] 清除不再使用的 dp params。
-* [DEVEL] 加入數字電量指示。(感謝 鄧育林 建議)
-* [DEVEL] 加入刷新 Panda 韌體按鈕。
-
-2019-10-11
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.6.5)。 
-* [DEVEL] 加入台灣 2019 RAV4 汽油版指紋。 (感謝 Max Duan / CloudJ 提供)
-
-2019-10-09
-========================
-* [DEVEL] 加入當 LatCtrl 關閉時，畫面顯示提示訊息。
-
-2019-10-08
-========================
-* [DEVEL] 加回駕駛監控開關。
-* [DEVEL] 加入 bs (branch switcher) 程式。
-
-2019-10-07
-========================
-* [DEVEL] 加入台灣版 2019 RAV4H 油電版指紋。(感謝 Max Duan 提供)
-
-2019-10-05
-========================
-* [DEVEL] 移除 curvature learner: 轉角明顯比原廠小。
-* [DEVEL] 更新至最新的 commaai:devel (0.6.4)。 
-
-2019-09-30
-========================
-* [DEVEL] 更新 curvature learner 版本至 v4。
-* [DEVEL] Lexus ISH 使用更精確的 EPS Steering Angle Sensor 
-
-2019-09-27
-========================
-* [DEVEL] 加入 Zorrobyte 的 curvature learner (https://github.com/zorrobyte/openpilot)
-* [DEVEL] 加入可開關駕駛監控的程式碼。
-* [DEVEL] 取消當 steering 出現錯誤時，自動切斷方向控制 2 秒的機制。
-* [DEVEL] 讓行車介面的「方向盤」/「轉彎」圖示半透明化。
-
-2019-09-26
-========================
-* [DEVEL] 修正當「啟用記錄服務」關閉時，make 會有問題的錯誤。 (感謝 shaoching885 和 afa 回報)
-
-2019-09-24
-========================
-* [DEVEL] 行車介面加入可開關的「前車」、「路線」、「車道」設定。
-* [DEVEL] 行車介面加入可開關的「方向燈號」提示。 (感謝 CloudJ 建議，程式碼來源: https://github.com/kegman/openpilot)
-
-2019-09-23
-========================
-* [DEVEL] 優化讀取 params 的次數。
-* [DEVEL] 加入可開關的車道偏移警示。
-* [DEVEL] 修正充電控制邏輯。
-* [DEVEL] 加入台灣 Prius 4.5 指紋。 (感謝 Lin Hsin Hung 提供)
-
-2019-09-20
-========================
-* [DEVEL] 加入充電控制功能。 (感謝 loveloveses 和 KT 建議)
-
-2019-09-16
-========================
-* [DEVEL] 加入台灣 CT200h 指紋。 (感謝 CloudJ 提供)
-* [DEVEL] 加入美版 CT200h 移植。 (感謝 thomaspich 提供)
-
-2019-09-13
-========================
-* [DEVEL] 行車介面加入可開關的「速度顯示」設定。
-
-2019-09-09
-========================
-* [DEVEL] 加入 GreyPanda 模式。
-
-2019-08-28
-========================
-* [DEVEL] 加入可調警示音量。
-
-2019-08-27
-========================
-* [DEVEL] 自動關機改為可調時長。
@@ -1,195 +0,0 @@
-dragonpilot 0.7.5
-========================
-* 移除方向盤監控設定。(無法取消/關閉方向盤監控)
-* Removed Steering monitor timer adjustment in code (timer in settings will no longer work.)
-* 優化 Lexus GSH 轉向。(感謝 @簡銘佑 測試)
-* Optimize Lexus GSH steering. (Thanks to @簡銘佑)
-* C2 支援自動關機「DragonAutoShutdownAt」參數。(感謝 @cgw1968 建議)
-* C2 to support auto shutdown "DragonAutoShutDownAt" param. (Thanks to @cgw1968)
-* 將剎車狀熊顯示於 dp 資訊欄。
-* Added brake indicator to dp infobar.
-* 加入「方向燈取消控制」延遲控制設。(感謝 @wabes 建議)
-* Added delay config to "Disable Lat Control on Blinker". (Thanks to @wabes)
-* 加入巴西版 2020 Corolla Hybrid 指紋v2。(感謝 @berno22 提供)
-* Added Brazil 2020 Corolla Hybrid FPv2. (Thanks to @berno22) 
-* 加入對 VW MQB/PQ 的支援。(感謝 @dingliangxue 移植)
-* Added support to VW MQB/PQ platform. (Thanks to @dingliangxue)
-* 加入「允許多次自動換道」功能。(感謝 @阿濤 建議)
-* Added "Allow Continuous Auto Lane Change" Toggle. (Thanks to @阿濤)
-* 新增 DragonMaxSpeedLimit 設定值 (mph)，當如果車速高於此值 op 將會停止操控。(感謝 @Anthony 建議)
-* Added DragonMaxSpeedLimit parameter (mph), op will stop controlling when car speed is high than the value. (Thanks to @Anthony)
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v2)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v2). (Thanks to 明峰)
-* 新增「通過移動網路上傳」開關
-* Added Upload Over Mobile Network toggle.
-* 新增「通過熱點上傳」開關
-* Added Upload Over Hotspot toggle.
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v1)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v1). (Thanks to 明峰)
-* 新增大陸版 Volkswagen Golf GTI 指紋 (v1)。(感謝 easyeiji 提供)
-* Added China Volkswagen Golf GTI fingerprint (v1). (Thanks to easyeiji)
-* 更新 dp 圖示 (特別感謝 @wabes 的設計與提供)。
-* Updated dp logo, special thanks to @wabes for the design.
-* 簡/繁中文版和 i18n 整合成為單一版本。  
-* Merged zhs/zht/i18n versions into one.
-* 新增大陸版 CAMRY HYBRID 指紋v2。(感謝 @杜子腾)
-* Added China Camery Hybrid FPv2. (Thanks to @杜子腾) 
-* 新增台灣版 Altis HYBRID 指紋v1。(感謝 @Fish)
-* Added Taiwan Altis Hybrid FPv1. (Thanks to @Fish)
-* 新增行駛時關閉畫面功能。
-* Added Screen off while driving feature.
-* 新增倒車時關閉畫面功能。
-* Added Screen off while reversing feature.
-* 新增駕駛介面加入「加速模式」切換鈕。 
-* Added acceleration profile toggle onto driving UI.
-* 新增自定車型功能，取代指紋暫存功能。
-* Replaced fingerprint cache with custom car model selector.
-* 新增可調亮度。
-* Added Brightness changer.
-* 新增部分德語支持。(特別感謝 @arne182 提供)
-* Added partial de_DE language support (Thanks to @arne182)
-
-dragonpilot 0.7.4
-========================
-* [2020-04-10] 移除所有的第三方應用改為自動下載。
-* [2020-04-10] 移除「啟用原廠 DSU 模式」、「安全帶檢查」、「車門檢查」開關。
-* [2020-03-31] 還原部分修改代碼以達到 comma ai 安全準則。 (Reverted changes to panda safety code to comply with comma ai safety guideline.)
-* [2020-03-31] 調整「啟用原廠 DSU 模式」為踩剎車時會暫時斷開控制 。(Enable Stock DSU Mode will temporary disable controls when brake is pressed.)
-* [2020-03-27] 加入波蘭版 2015 Lexus NX200T 支援。(感謝 wabes 提供)
-* [2020-03-27] 調整「啟用原廠 DSU 模式」為不再需要 AHB 。(Enable Stock DSU Mode no longer requires "AHB" toggle)
-* [2020-03-27] 加入「安全帶檢查」、「車門檢查」、「檔位檢查」、「溫度檢查」開關。
-* [2020-03-27] 加入曲率學習功能 - Curvature Learner 。(感謝 zorrobyte 提供)
-* [2020-03-27] 加入大陸版 2018 Toyota Highlander 支援。(感謝 toyboxZ 提供)
-* [2020-03-27] 加入大陸版 2018 Toyota Camry 2.0 支援。(感謝 Rming 提供)
-* [2020-03-27] 加入韓文支持。(感謝 crwusiz 提供)
-* [2020-03-27] 調整 OFFROAD 主頁翻譯將 "dragonpilot" 改回 "openpilot"。
-
-dragonpilot 0.7.3
-========================
-* [2020-03-17] 加入動態調整車距功能。(特別感謝 @ShaneSmiskol 提供 PR)
-* [2020-03-14] 更新 pt-Br (葡萄牙語) 翻譯。(感謝 berno22 提供)
-* [2020-03-14] 加入自動關機開關。(感謝 Rzxd 建議)
-* [2020-03-14] 調高 Toyota 扭力容錯值。
-* [2020-03-14] 優化讀取 dp 設定值。
-* [2020-03-14] 加入 2019 手動 Civic 指紋。感謝 (AlexNoop 提供)
-* [2020-03-14] dp 功能加入對 Subaru 車系的支援。
-* [2020-03-06] 加入葡萄牙語支持。(感謝 berno22 提供)
-* [2020-03-06] 加入大陸 2018 Camry、2020 RAV4 指紋。(感謝 笨木匠 提供)
-* [2020-03-04] 加入顯示駕駛監控畫面。
-* [2020-03-04] 加入加速模式選項。(特別感謝 @arne182, @cgw1968-5779 提供 PR)
-* [2020-03-04] 修正 shutdownd 在 comma two 可能會不正常關機的錯誤。(感謝 @Wei, @Rzxd 回報)
-
-dragonpilot 0.7.2
-========================
-* [2020-02-08] dp 功能加入對現代 (Hyundai) 車系的支援。
-* [2020-02-08] 加入神盾測速照相自動啟動的開關。
-* [2020-02-08] 更新高德地圖至 v4.5.0.600053。
-* [2020-02-08] 使用 0.6.6 版的更新系統。
-* [2020-02-08] 修正急剎問題。(感謝 kumar 提供)
-* [2020-01-31] 移除行車介面電量、溫度顯示，(修正畫面當機、黑屏問題)
-* [2020-01-29] 修正行車介面錯誤。(感謝 深鲸希西 測試；eisenheim、HeatNation 反應)
-* [2020-01-23] 加入 Steer Ratio Learner 關閉。(感謝 eisenheim 建議)
-* [2020-01-23] 行車介面加入電量、溫度。(感謝 eisenheim 建議)
-* [2020-01-23] 優化 appd。
-
-dragonpilot 0.7.1
-========================
-* [2020-01-19] 調整 appd 和 ALC 邏輯。 
-* [2020-01-14] 加入開機啟動個人熱點。(感謝 eisenheim 建議)
-* [2020-01-18] 加入大陸版 2018 Lexus RX300 支援。(感謝 cafe 提供)
-* [2020-01-18] 加入 DragonBTG 設定。(感謝 CloudJ、低調哥、歐姓Altis車主 提供)
-
-dragonpilot 0.7.0
-========================
-* [DEVEL] 更新至最新的 commaai:devel (0.7.0)。
-* [2019-12-29] 輔助/自動變道改為可調整參數 (進階用戶)。(DragonAssistedLCMinMPH、DragonAutoLCMinMPH、DragonAutoLCDelay)
-* [2019-12-29] 修正無法運行第三方應用錯誤。(感謝 深鲸希西 反應)
-* [2019-12-18] 修正自動換道邏輯。
-* [2019-12-18] 更新 offroad 翻譯。
-* [2019-12-18] 錯誤修正。
-* [2019-12-18] 移除美版 2017 Civic Hatchback 指紋。(與其它車型衝突)
-* [2019-12-17] 加入輔助換道開關。（24mph / 40kph 以上)
-* [2019-12-17] 加入自動換道開關。（40mph / 65kph 以上)
-* [2019-12-17] 加入大陸版 2019 雷凌汽油版指紋。 (感謝 Shell 提供)
-* [2019-12-17] 加入大陸版 2019 卡羅拉汽油版指紋。 (感謝 Shell 提供)
-* [2019-12-17] 加入美版 2017 Civic Hatchback 指紋。(感謝 CFranHonda 提供)
-* [2019-12-10] 加入位智車機模式。 (Waze Mode)
-* [2019-11-21] 修正 offroad 翻譯。(感謝 鄧育林 回報)
-* [2019-11-21] 調整前車靜止移動偵測參數。
-* [2019-11-21] 前車靜止移動偵測可在未啟用 dp 時運作。
-* [2019-11-18] 修正 offroad 翻譯。(感謝 Cody、鄧育林 回報)
-* [2019-11-18] 修正 frame 翻譯。
-
-dragonpilot 0.6.6
-========================
-* [2019-11-15] 修正不會充電的錯誤。 (感謝 袁昊 反應)
-* [2019-11-15] 修正充電控制。 (感謝 KT 反應)
-* [2019-11-15] 更新 frame 翻譯，改為多語言版。 (感謝 深鲸希西、shaoching885、鄧育林 反應)
-* [2019-11-12] 只顯示電量文字 (注意：有時不會更新，需要拔插 USB 線)
-* [2019-11-12] 自動偵測並鎖定硬體 (EON / UNO)。
-* [2019-11-12] 加入鎖定硬體 (EON / UNO) 的程式碼。
-* [2019-11-11] 更新高德地圖至 v4.3.0.600310 R2098NSLAE
-* [2019-11-11] 更新 MiXplorer 至 v6.40.3
-* [2019-11-11] 前車靜止移動偵測加入偵測警示。
-* [2019-11-07] 讓 Bosch 系統顯示三角。 (感謝 ching885 回報)
-* [2019-11-07] 更新 offroad 多語言版簡體中文翻譯 (感謝 Rming 提供)
-* [2019-11-06] 修正 0.6.6 appd 和 dashcamd 錯誤。 (感謝 鄧育林 回報)
-
-dragonpilot 0.6.5
-========================
-* [2019-11-05] 加入台灣 Lexus 2017 GS450h 支援。 (感謝 簡銘佑 提供指紋)
-* [2019-11-01] 新增神盾測速照相。 (感謝 Sky Chang 和 Wei Yi Chen)
-* [2019-11-01] 修正 offroad 翻譯。 (感謝 Leo Hsieh)
-* [2019-11-01] 移除 Miui 字型，縮小 dp 使用空間。
-* [2019-11-01] 更新 offroad 為多語言版
-* [2019-10-29] 加入 SnG 補丁。（感謝 楊雅智)
-* [2019-10-28] 調整 dragon_allow_gas 邏輯 (請回報任何問題，需更新 Panda 韌體)
-* [2019-10-22] 移除強迫網路連線提示。(感謝 Shell)
-* [2019-10-18] 加入前車靜止移動偵測。(測試版，感謝 ucolchen)
-* [2019-10-18] 移除強迫網路連線提示。(感謝 Shell)
-* [2019-10-18] 修正 allow_gas 功能。
-* [2019-10-18] 加入彎道減速功能開關。
-* [2019-10-18] 強迫使用 dp 版 Panda 韌體。
-* [2019-10-17] 加入「車型」顯示於 dp 設定畫面。
-* [2019-10-17] 修正充電控制讀取預設值的錯誤。
-* [2019-10-17] 修正無法顯示更新記錄的錯誤。
-* [2019-10-17] 刷新 Panda 韌體按鈕將會自動重啟 EON。(感謝 鄧育林 建議)
-* [2019-10-17] 下載更新記錄時使用 "no-cache" 標頭。
-* [2019-10-17] 更新高德地圖至 v4.3.0
-* [2019-10-14] 啟用自動更新功能。(感謝 鄧育林 提供)
-* [2019-10-14] 清除不再使用的 dp params。
-* [2019-10-14] 加入數字電量指示。(感謝 鄧育林 建議)
-* [2019-10-14] 加入刷新 Panda 韌體按鈕。
-* [2019-10-11] 加入台灣 2019 RAV4 汽油版指紋。 (感謝 Max Duan / CloudJ 提供)
-* [2019-10-11] 加入當 LatCtrl 關閉時，畫面顯示提示訊息。
-
-dragonpilot 0.6.4
-========================
-* [2019-10-11] 加入台灣版 2019 RAV4H 油電版指紋。
-* [2019-10-08] 加回駕駛監控開關。
-* [2019-10-07] 加入台灣版 2019 RAV4H 油電版指紋。(感謝 Max Duan 提供)
-* [2019-10-05] 移除 curvature learner: 轉角明顯比原廠小。
-* [2019-09-30] 更新 curvature learner 版本至 v4。
-* [2019-09-30] Lexus ISH 使用更精確的 EPS Steering Angle Sensor 
-* [2019-09-27] 加入 Zorrobyte 的 curvature learner (https://github.com/zorrobyte/openpilot)
-* [2019-09-27] 加入可開關駕駛監控的程式碼。
-* [2019-09-27] 取消當 steering 出現錯誤時，自動切斷方向控制 2 秒的機制。
-* [2019-09-27] 讓行車介面的「方向盤」/「轉彎」圖示半透明化。
-* [2019-09-26] 修正當「啟用記錄服務」關閉時，make 會有問題的錯誤。 (感謝 shaoching885 和 afa 回報)
-* [2019-09-24] 行車介面加入可開關的「前車」、「路線」、「車道」設定。
-* [2019-09-24] 行車介面加入可開關的「方向燈號」提示。 (感謝 CloudJ 建議，程式碼來源: https://github.com/kegman/openpilot)
-* [2019-09-23] 優化讀取 params 的次數。
-* [2019-09-23] 加入可開關的車道偏移警示。
-* [2019-09-23] 修正充電控制邏輯。
-* [2019-09-23] 加入台灣 Prius 4.5 指紋。 (感謝 Lin Hsin Hung 提供)
-* [2019-09-20] 加入充電控制功能。 (感謝 loveloveses 和 KT 建議)
-* [2019-09-16] 加入台灣 CT200h 指紋。 (感謝 CloudJ 提供)
-* [2019-09-16] 加入美版 CT200h 移植。 (感謝 thomaspich 提供)
-* [2019-09-13] 行車介面加入可開關的「速度顯示」設定。
-* [2019-09-09] 加入 GreyPanda 模式。
-* [2019-08-28] 加入可調警示音量。
-* [2019-08-27] 自動關機改為可調時長。
-
-dragonpilot 0.6.3
-========================
-* [2019-10-11] 加入台灣版 2019 RAV4H 油電版指紋。
@@ -1,120 +0,0 @@
-2020-06-22 (0.7.5)
-========================
-* 移除方向盤監控設定。(無法取消/關閉方向盤監控)
-* Removed Steering monitor timer adjustment in code (timer in settings will no longer work.)
-
-2020-06-18 (0.7.5)
-========================
-* Dynamic Follow 更新模型。(感謝 @ShaneSmiskol 提供代碼、 @cgw1968 測試)
-* Updated Dynamic Follow model. (Special Thanks to @ShaneSmiskol for the feature and @cgw1968 for testing)
-
-2020-05-30 (0.7.5)
-========================
-* Dynamic Follow 更新至 ShaneSmiskol:stock_additions 0.7.5 版。(感謝 @ShaneSmiskol 提供代碼、 @Wei 測試)
-* Updated Dynamic Follow to ShaneSmiskol:stock_additions 0.7.5. (Special Thanks to @ShaneSmiskol for the feature and @Wei for testing)
-
-2020-05-28 (0.7.5)
-========================
-* 優化 Lexus GSH 轉向。(感謝 @簡銘佑 測試)
-* Optimize Lexus GSH steering. (Thanks to @簡銘佑)
-* C2 支援自動關機「DragonAutoShutdownAt」參數。(感謝 @cgw1968 建議)
-* C2 to support auto shutdown "DragonAutoShutDownAt" param. (Thanks to @cgw1968)
-* 修正出現「pedalPressed」的錯誤。(感謝 @Wei 回報)
-* Fixed issue showing "pedalPressed" error. (Thanks to @Wei) 
-
-2020-05-26 (0.7.5)
-========================
-* 將剎車狀熊顯示於 dp 資訊欄。
-* Added brake indicator to dp infobar.
-* 修正「溫度監控」燈示。
-* Fixed "Temp monitor" indicator.
-* 加入「方向燈取消控制」延遲控制設。(感謝 @wabes 建議)
-* Added delay config to "Disable Lat Control on Blinker". (Thanks to @wabes)
-* 加入巴西版 2020 Corolla Hybrid 指紋v2。(感謝 @berno22 提供)
-* Added Brazil 2020 Corolla Hybrid FPv2. (Thanks to @berno22) 
-
-2020-05-25 (0.7.5)
-========================
-* 加入對 VW MQB/PQ 的支援。(感謝 @dingliangxue 移植)
-* Added support to VW MQB/PQ platform. (Thanks to @dingliangxue)
-
-2020-05-21 (0.7.5)
-========================
-* 修改成 3 小時後停止供電。(感謝 @Wei 建議)
-* Updated to stop charging after 3 hrs. (Thanks to @Wei)
-* 移除行車記錄下的「碰撞偵測」功能。
-* Removed Impact Detection in Dashcam.
-* 修正開啟「Noctua 風扇」模式導致的錯誤。(感謝 @阿濤 回報)
-* Fixed a bug caused by enabling "Noctua Mod". (Thanks to @阿濤)
-* 修正「位智模式」無法顯示警示的問題。(感謝 @axandres 回報)
-* Fixed alert issue in waze mode. (Thanks to @axandres)
-* 修正無法顯示更新中圖示的問題。
-* Fixed unable to display "UPDATING" icon issue. 
-
-2020-05-20 (0.7.5)
-========================
-* 加入「允許多次自動換道」功能。(感謝 @阿濤 建議)
-* Added "Allow Continuous Auto Lane Change" Toggle. (Thanks to @阿濤)
-* 修正開機後設定頁面有時會錯誤的問題。(感謝 @salmankhan、@Wei 回報)
-* Fixed setting page crash issue. (Thanks to @salmankhan, @Wei)
-* 修正熄火後一直出現更新訊息的錯誤。(感謝 @Sky Chang 回報)
-* Fixed issue that keep showing update prompt. (Thanks to @Sky Chang)
-
-2020-05-19 (0.7.5)
-========================
-* 加入 DragonEnableAutoUpdate 預設值。
-* Added DragonEnableAutoUpdate default value.
-
-2020-05-18 (0.7.5)
-========================
-* 修正因同時使用「社群功能」和「自定車型」造成的加減速問題。(特別感謝 @Wei、@Sky Chang、@Han9365、@鄧育林 的測試以及回報。)
-* Fixed acceleration issue caused by used of both "Community Maintain Feature" and "Custom Car Model"
-
-2020-05-16 (0.7.5)
-========================
-* 新增 DragonMaxSpeedLimit 設定值 (mph)，當如果車速高於此值 op 將會停止操控。(感謝 @Anthony 建議)
-* Added DragonMaxSpeedLimit parameter (mph), op will stop controlling when car speed is high than the value. (Thanks to @Anthony)
-* 更新 appd 使用 cnpmjs 來下載 APKs。
-* Updated appd to use cnpmjs to download APKs.
-* 修正更新服務。(感謝 @Wei)
-* Fixed Update Service. (Thanks to @Wei)
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v2)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v2). (Thanks to 明峰)
-
-2020-05-15 (0.7.5)
-========================
-* 新增「通過移動網路上傳」開關
-* Added Upload Over Mobile Network toggle.
-* 新增「通過熱點上傳」開關
-* Added Upload Over Hotspot toggle.
-* 新增加拿大版 2018 Toyota Sienna LTD 指紋(v1)。(感謝 明峰 提供)
-* Added Canada 2018 Toyota Sienna LTD fingerprint (v1). (Thanks to 明峰)
-* 新增大陸版 Volkswagen Golf GTI 指紋 (v1)。(感謝 easyeiji 提供)
-* Added China Volkswagen Golf GTI fingerprint (v1). (Thanks to easyeiji)
-
-2020-05-10
-========================
-* 基於最新 openpilot 0.7.5 devel-staging.
-* Based on latest openpilot 0.7.5 devel-staging.
-* 更新 dp 圖示 (特別感謝 @wabes 的設計與提供)。
-* Updated dp logo, special thanks to @wabes for the design.
-* 簡/繁中文版和 i18n 整合成為單一版本。  
-* Merged zhs/zht/i18n versions into one.
-* 新增大陸版 CAMRY HYBRID 指紋v2。(感謝 @杜子腾)
-* Added China Camry Hybrid FPv2. (Thanks to @杜子腾) 
-* 新增台灣版 Altis HYBRID 指紋v1。(感謝 @Fish)
-* Added Taiwan Altis Hybrid FPv1. (Thanks to @Fish)
-* 新增行駛時關閉畫面功能。
-* Added Screen off while driving feature.
-* 新增倒車時關閉畫面功能。
-* Added Screen off while reversing feature.
-* 新增駕駛介面加入「加速模式」切換鈕。 
-* Added acceleration profile toggle onto driving UI.
-* 新增自定車型功能，取代指紋暫存功能。
-* Replaced fingerprint cache with custom car model selector.
-* 新增可調亮度。
-* Added Brightness changer.
-* 新增部分德語支持。(特別感謝 @arne182 提供)
-* Added partial de_DE language support (Thanks to @arne182)
-* 新增停車碰撞偵測記錄功能。
-* Added off road impact detection to dashcam.
@@ -14,15 +14,15 @@ Most open source development activity is coordinated through our [Discord](https

 ### Local Testing

-You can test your changes on your machine by running `run_docker_tests.sh`. This will run some automated tests in docker against your code.
+You can test your changes on your machine by running `run_docker_tests.sh`. This will run some automated tests in docker against your code. 

 ### Automated Testing

-All PRs are automatically checked by Github Actions. Check out `.github/workflows/` for what Github Actions runs. Any new tests sould be added to Github Actions.
+All PRs are automatically checked by travis. Check out `.travis.yml` for what travis runs. Any new tests sould be added to travis.

 ### Code Style and Linting

-Code is automatically checked for style by Github Actions as part of the automated tests. You can also run these tests yourself by running `pylint_openpilot.sh` and `flake8_openpilot.sh`.
+Code is automatically check for style by travis as part of the automated tests. You can also run these yourself by running `check_code_quality.sh`. 

 ## Car Ports (openpilot)

@@ -32,19 +32,9 @@ If you port openpilot to a substantially new car brand, see this more generic [B

 ## Pull Requests

-Pull requests should be against the master branch. Before running master on in-car hardware, you'll need to clone the submodules too. That can be done by recursively cloning the repository:
-```
-git clone https://github.com/commaai/openpilot.git --recursive
-```
-Or alternatively, when on the master branch:
+Pull requests should be against the master branch. Before running master on in-car hardware, you'll need to run
 ```
 git submodule init
 git submodule update
 ```
-The reasons for having submodules on a dedicated repository and our new development philosophy can be found in our [post about externalization](https://medium.com/@comma_ai/a-2020-theme-externalization-13b33326d8b3).
-Modules that are in seperate repositories include:
-* apks
-* cereal
-* laika
-* opendbc
-* panda
+in order to pull down the submodules, such as `panda` and `opendbc`.
@@ -57,125 +57,104 @@ openpilot should preserve all other vehicle's stock features, including, but are
 Supported Hardware
 ------

-At the moment, openpilot supports the [EON DevKit](https://comma.ai/shop/products/eon-dashcam-devkit) and the [comma two](https://comma.ai/shop/products/comma-two-devkit). A [car harness](https://comma.ai/shop/products/car-harness) is recommended to connect the EON or comma two to the car. For experimental purposes, openpilot can also run on an Ubuntu computer with external [webcams](https://github.com/commaai/openpilot/tree/master/tools/webcam).
+At the moment, openpilot supports the [EON DevKit](https://comma.ai/shop/products/eon-dashcam-devkit) and the [comma two](https://comma.ai/shop/products/comma-two-devkit). A [car harness](https://comma.ai/shop/products/car-harness) is recommended to connect the EON or comma two to the car. In the future, we'd like to support other platforms as well, like gaming PCs.

 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>1</sup>  | 25mph             |
-| Acura     | RDX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Accord 2018-19                | All               | Stock            | 0mph               | 3mph              |
-| Honda     | Accord Hybrid 2018-19         | All               | Stock            | 0mph               | 3mph              |
-| Honda     | Civic Hatchback 2017-19       | Honda Sensing     | Stock            | 0mph               | 12mph             |
-| Honda     | Civic Sedan/Coupe 2016-18     | Honda Sensing     | openpilot        | 0mph               | 12mph             |
-| Honda     | Civic Sedan/Coupe 2019-20     | Honda Sensing     | Stock            | 0mph               | 2mph<sup>2</sup>  |
-| Honda     | CR-V 2015-16                  | Touring           | openpilot        | 25mph<sup>1</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>1</sup>  | 12mph             |
-| Honda     | HR-V 2019                     | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Insight 2019                  | Honda Sensing     | Stock            | 0mph               | 3mph              |
-| Honda     | Odyssey 2018-20               | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 0mph              |
-| Honda     | Passport 2019                 | All               | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Pilot 2016-18                 | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Pilot 2019                    | All               | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Honda     | Ridgeline 2017-20             | Honda Sensing     | openpilot        | 25mph<sup>1</sup>  | 12mph             |
-| Lexus     | CT Hybrid 2017-18             | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Lexus     | ES 2019                       | All               | openpilot        | 0mph               | 0mph              |
-| Lexus     | ES Hybrid 2019                | All               | openpilot        | 0mph               | 0mph              |
-| Lexus     | IS 2017-2019                  | All               | Stock            | 22mph              | 0mph              |
-| Lexus     | IS Hybrid 2017                | All               | Stock            | 0mph               | 0mph              |
-| Lexus     | NX Hybrid 2018                | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Lexus     | RX 2016-17                    | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Lexus     | RX 2020                       | All               | openpilot        | 0mph               | 0mph              |
-| Lexus     | RX Hybrid 2016-19             | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Avalon 2016                   | TSS-P             | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
-| Toyota    | Avalon 2017-18                | All               | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
-| Toyota    | Camry 2018-20                 | All               | Stock            | 0mph<sup>4</sup>   | 0mph              |
-| Toyota    | Camry Hybrid 2018-19          | All               | Stock            | 0mph<sup>4</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>3</sup>| 20mph<sup>1</sup>  | 0mph              |
-| Toyota    | Corolla 2020                  | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Corolla Hatchback 2019-20     | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Corolla Hybrid 2020           | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Highlander 2017-19            | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Highlander Hybrid 2017-19     | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Highlander 2020               | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Highlander Hybrid 2020        | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Prius 2016                    | TSS-P             | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Prius 2017-19                 | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Prius Prime 2017-20           | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Rav4 2016                     | TSS-P             | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
-| Toyota    | Rav4 2017-18                  | All               | Stock<sup>3</sup>| 20mph<sup>1</sup>  | 0mph              |
-| Toyota    | Rav4 2019-20                  | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Rav4 Hybrid 2016              | TSS-P             | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Rav4 Hybrid 2017-18           | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
-| Toyota    | Rav4 Hybrid 2019-20           | All               | openpilot        | 0mph               | 0mph              |
-| Toyota    | Sienna 2018                   | All               | Stock<sup>3</sup>| 0mph               | 0mph              |
+| Make      | Model (US Market Reference)   | Supported Package | ACC              | No ACC accel below | No ALC below |
+| ----------| ------------------------------| ------------------| -----------------| -------------------| -------------|
+| Acura     | ILX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>5</sup>  | 25mph        |
+| Acura     | RDX 2016-18                   | AcuraWatch Plus   | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Chrysler  | Pacifica 2017-18              | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
+| Chrysler  | Pacifica Hybrid 2017-18       | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
+| Chrysler  | Pacifica Hybrid 2019-20       | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
+| Honda     | Accord 2018-19                | All               | Stock            | 0mph               | 3mph         |
+| Honda     | Accord Hybrid 2018-19         | All               | Stock            | 0mph               | 3mph         |
+| Honda     | Civic Hatchback 2017-19       | Honda Sensing     | Stock            | 0mph               | 12mph        |
+| Honda     | Civic Sedan/Coupe 2016-18     | Honda Sensing     | openpilot        | 0mph               | 12mph        |
+| Honda     | Civic Sedan/Coupe 2019        | Honda Sensing     | Stock            | 0mph               | 2mph         |
+| Honda     | CR-V 2015-16                  | Touring           | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Honda     | CR-V 2017-19                  | Honda Sensing     | Stock            | 0mph               | 12mph        |
+| Honda     | CR-V Hybrid 2017-2019         | Honda Sensing     | Stock            | 0mph               | 12mph        |
+| Honda     | Fit 2018-19                   | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Honda     | Odyssey 2018-20               | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 0mph         |
+| Honda     | Passport 2019                 | All               | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Honda     | Pilot 2016-18                 | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Honda     | Pilot 2019                    | All               | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Honda     | Ridgeline 2017-19             | Honda Sensing     | openpilot        | 25mph<sup>5</sup>  | 12mph        |
+| Hyundai   | Elantra 2017-19<sup>1</sup>   | SCC + LKAS        | Stock            | 19mph              | 34mph        |
+| Hyundai   | Genesis 2018<sup>1</sup>      | All               | Stock            | 19mph              | 34mph        |
+| Hyundai   | Santa Fe 2019<sup>1</sup>     | All               | Stock            | 0mph               | 0mph         |
+| Jeep      | Grand Cherokee 2016-18        | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
+| Jeep      | Grand Cherokee 2019           | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
+| Kia       | Optima 2019<sup>1</sup>       | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Kia       | Sorento 2018<sup>1</sup>      | All               | Stock            | 0mph               | 0mph         |
+| Kia       | Stinger 2018<sup>1</sup>      | SCC + LKAS        | Stock            | 0mph               | 0mph         |
+| Lexus     | CT Hybrid 2017-18             | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Lexus     | ES 2019                       | All               | openpilot        | 0mph               | 0mph         |
+| Lexus     | ES Hybrid 2019                | All               | openpilot        | 0mph               | 0mph         |
+| Lexus     | IS 2017-2019                  | All               | Stock            | 22mph              | 0mph         |
+| Lexus     | IS Hybrid 2017                | All               | Stock            | 0mph               | 0mph         |
+| Lexus     | NX Hybrid 2018                | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Lexus     | RX 2016-17                    | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Lexus     | RX 2020                       | All               | openpilot        | 0mph               | 0mph         |
+| Lexus     | RX Hybrid 2016-19             | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Subaru    | Crosstrek 2018-19             | EyeSight          | Stock            | 0mph               | 0mph         |
+| Subaru    | Impreza 2019-20               | EyeSight          | Stock            | 0mph               | 0mph         |
+| Toyota    | Avalon 2016                   | TSS-P             | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
+| Toyota    | Avalon 2017-18                | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
+| Toyota    | Camry 2018-19                 | All               | Stock            | 0mph<sup>2</sup>   | 0mph         |
+| Toyota    | Camry Hybrid 2018-19          | All               | Stock            | 0mph<sup>2</sup>   | 0mph         |
+| Toyota    | C-HR 2017-19                  | All               | Stock            | 0mph               | 0mph         |
+| Toyota    | C-HR Hybrid 2017-19           | All               | Stock            | 0mph               | 0mph         |
+| Toyota    | Corolla 2017-19               | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
+| Toyota    | Corolla 2020                  | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Corolla Hatchback 2019-20     | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Corolla Hybrid 2020           | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Highlander 2017-19            | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Highlander Hybrid 2017-19     | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Highlander 2020               | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Prius 2016                    | TSS-P             | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Prius 2017-19                 | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Prius Prime 2017-20           | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Rav4 2016                     | TSS-P             | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
+| Toyota    | Rav4 2017-18                  | All               | Stock<sup>4</sup>| 20mph<sup>5</sup>  | 0mph         |
+| Toyota    | Rav4 2019                     | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Rav4 Hybrid 2016              | TSS-P             | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Rav4 Hybrid 2017-18           | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Toyota    | Rav4 Hybrid 2019-20           | All               | openpilot        | 0mph               | 0mph         |
+| Toyota    | Sienna 2018                   | All               | Stock<sup>4</sup>| 0mph               | 0mph         |
+| Volkswagen| Golf 2016-19<sup>3</sup>      | Driver Assistance | Stock            | 0mph               | 0mph         |

-<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](https://comma.ai).*** <br />
-<sup>2</sup>2019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph. <br />
-<sup>3</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>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>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 />

 Community Maintained Cars and Features
 ------

 | Make      | Model (US Market Reference)   | Supported Package | ACC              | No ACC accel below | No ALC below |
 | ----------| ------------------------------| ------------------| -----------------| -------------------| -------------|
-| Buick     | Regal 2018<sup>1</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Cadillac  | ATS 2018<sup>1</sup>          | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chevrolet | Malibu 2017<sup>1</sup>       | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chevrolet | Volt 2017-18<sup>1</sup>      | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Chrysler  | Pacifica 2017-18              | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Chrysler  | Pacifica 2020                 | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Chrysler  | Pacifica Hybrid 2017-18       | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Chrysler  | Pacifica Hybrid 2019-20       | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Genesis   | G80 2018<sup>2</sup>          | All               | Stock            | 0mph               | 0mph         |
-| Genesis   | G90 2018<sup>2</sup>          | All               | Stock            | 0mph               | 0mph         |
-| GMC       | Acadia Denali 2018<sup>3</sup>| Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Holden    | Astra 2017<sup>1</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
-| Hyundai   | Elantra 2017-19<sup>2</sup>   | SCC + LKAS        | Stock            | 19mph              | 34mph        |
-| Hyundai   | Genesis 2015-16<sup>2</sup>   | SCC + LKAS        | Stock            | 19mph              | 37mph        |
-| Hyundai   | Ioniq 2017<sup>2</sup>        | SCC + LKAS        | Stock            | 0mph               | 32mph        |
-| Hyundai   | Ioniq 2019 EV<sup>2</sup>     | SCC + LKAS        | Stock            | 0mph               | 32mph        |
-| Hyundai   | Kona 2017-19<sup>2</sup>      | SCC + LKAS        | Stock            | 22mph              | 0mph         |
-| Hyundai   | Kona 2019 EV<sup>2</sup>      | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Hyundai   | Palisade 2020<sup>2</sup>     | All               | Stock            | 0mph               | 0mph         |
-| Hyundai   | Santa Fe 2019<sup>2</sup>     | All               | Stock            | 0mph               | 0mph         |
-| Hyundai   | Sonata 2020<sup>2</sup>       | All               | Stock            | 0mph               | 0mph         |
-| Jeep      | Grand Cherokee 2016-18        | Adaptive Cruise   | Stock            | 0mph               | 9mph         |
-| Jeep      | Grand Cherokee 2019           | Adaptive Cruise   | Stock            | 0mph               | 39mph        |
-| Kia       | Forte 2018<sup>2</sup>        | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Kia       | Optima 2017<sup>2</sup>       | SCC + LKAS/LDWS   | Stock            | 0mph               | 32mph        |
-| Kia       | Optima 2019<sup>2</sup>       | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Kia       | Sorento 2018<sup>2</sup>      | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Kia       | Stinger 2018<sup>2</sup>      | SCC + LKAS        | Stock            | 0mph               | 0mph         |
-| Nissan    | Leaf 2019                     | Propilot          | Stock            | 0mph               | 0mph         |
-| Nissan    | X-Trail 2018                  | Propilot          | Stock            | 0mph               | 0mph         |
-| Subaru    | Crosstrek 2018-19             | EyeSight          | Stock            | 0mph               | 0mph         |
-| Subaru    | Impreza 2018-20               | EyeSight          | Stock            | 0mph               | 0mph         |
-| Volkswagen| Golf 2016-19<sup>3</sup>      | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Buick     | Regal 2018<sup>6</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| Cadillac  | ATS 2018<sup>6</sup>          | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| Chevrolet | Malibu 2017<sup>6</sup>       | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| Chevrolet | Volt 2017-18<sup>6</sup>      | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| GMC       | Acadia Denali 2018<sup>6</sup>| Adaptive Cruise   | openpilot        | 0mph               | 7mph         |
+| Holden    | Astra 2017<sup>6</sup>        | Adaptive Cruise   | openpilot        | 0mph               | 7mph         |

-<sup>1</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 />
-<sup>2</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>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 />
-
-Although it's not upstream, there's a community of people getting openpilot to run on Tesla's [here](https://tinkla.us/)
+<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 />

 Community Maintained Cars and Features are not verified by comma to meet our [safety model](SAFETY.md). Be extra cautious using them. They are only available after enabling the toggle in `Settings->Developer->Enable Community Features`.

-To promote a car from community maintained, it must meet a few requirements. We must own one from the brand, we must sell the harness for it, has full ISO26262 in both panda and openpilot, there must be a path forward for longitudinal control, it must have AEB still enabled, and it must support fingerprinting 2.0
-
 Installation Instructions
 ------

-Install openpilot on an EON or comma two by entering ``https://openpilot.comma.ai`` during the installer setup.
+Install openpilot on a EON by entering ``https://openpilot.comma.ai`` during the installer setup.

-Follow these [video instructions](https://youtu.be/3nlkomHathI) to properly mount the device 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 device mounting.
+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.

 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.

@@ -193,7 +172,7 @@ Many factors can impact the performance of openpilot ALC and openpilot LDW, caus
 * 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 device is mounted incorrectly.
+* 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.
@@ -213,7 +192,7 @@ Many factors can impact the performance of openpilot ACC and openpilot FCW, caus
 * 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 device is mounted incorrectly.
+* 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.
@@ -231,13 +210,13 @@ The list above does not represent an exhaustive list of situations that may inte
 Limitations of openpilot DM
 ------

-openpilot DM should not be considered an exact measurement of the alertness of the driver.
+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's face is partially or completely outside field of view of the driver facing camera.
+* 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.

@@ -259,7 +238,7 @@ Safety and Testing
 ----

 * openpilot observes ISO26262 guidelines, see [SAFETY.md](SAFETY.md) for more detail.
-* openpilot has software in the loop [tests](.github/workflows/test.yaml) that run on every commit.
+* 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.
@@ -286,15 +265,15 @@ Directory Structure
 ------
    .
    ├── apk                 # The apk files used for the UI
-    ├── cereal              # The messaging spec and libs used for all logs
+    ├── cereal              # The messaging spec and libs 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
-    ├── phonelibs           # Libraries used on NEOS devices
-    ├── pyextra             # Libraries used on NEOS devices
+    ├── phonelibs           # Libraries used on EON
+    ├── pyextra             # Libraries used on EON
    └── selfdrive           # Code needed to drive the car
-        ├── assets          # Fonts, images, and sounds for UI
+        ├── 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
@@ -308,7 +287,7 @@ Directory Structure
        ├── modeld          # Driving and monitoring model runners
        ├── proclogd        # Logs information from proc
        ├── sensord         # IMU / GPS interface code
-        ├── test            # Unit tests, system tests and a car simulator
+        ├── tests           # Unit tests, system tests and a car simulator
        └── ui              # The UI

 To understand how the services interact, see `cereal/service_list.yaml`.
@@ -327,8 +306,3 @@ NO WARRANTY EXPRESSED OR IMPLIED.**
 ---

 <img src="https://d1qb2nb5cznatu.cloudfront.net/startups/i/1061157-bc7e9bf3b246ece7322e6ffe653f6af8-medium_jpg.jpg?buster=1458363130" width="75"></img> <img src="https://cdn-images-1.medium.com/max/1600/1*C87EjxGeMPrkTuVRVWVg4w.png" width="225"></img>
-
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/commaai/openpilot.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/commaai/openpilot/alerts/)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/commaai/openpilot.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/commaai/openpilot/context:python)
-[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/commaai/openpilot.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/commaai/openpilot/context:cpp)
-[![codecov](https://codecov.io/gh/commaai/openpilot/branch/master/graph/badge.svg)](https://codecov.io/gh/commaai/openpilot)
@@ -1,24 +1,3 @@
-Version 0.7.5 (2020-05-13)
-========================
-* Right-Hand Drive support for both driving and driver monitoring!
-* New driving model: improved at sharp turns and lead speed estimation
-* New driver monitoring model: overall improvement on comma two
-* Driver camera preview in settings to improve mounting position
-* Added support for many Hyundai, Kia, Genesis models thanks to xx979xx!
-* 2019 Nissan X-Trail and 2018 Nissan Leaf support thanks to avolmensky!
-* Improved lateral tuning for 2020 Toyota Rav 4 (hybrid)
-
-Version 0.7.4 (2020-03-20)
-========================
- * New driving model: improved lane changes and lead car detection
- * Improved driver monitoring model: improve eye detection
- * Improved calibration stability
- * Improved lateral control on some 2019 and 2020 Toyota Prius
- * Improved lateral control on VW Golf: 20% more steering torque
- * Fixed bug where some 2017 and 2018 Toyota C-HR would use the wrong steering angle sensor
- * Support for Honda Insight thanks to theantihero!
- * Code cleanup in car abstraction layers and ui
-
 Version 0.7.3 (2020-02-21)
 ========================
 * Support for 2020 Highlander thanks to che220!
@@ -14,55 +14,39 @@ AddOption('--asan',
 arch = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()
 if platform.system() == "Darwin":
  arch = "Darwin"
-if arch == "aarch64" and not os.path.isdir("/system"):
-  arch = "larch64"

-webcam = bool(ARGUMENTS.get("use_webcam", 0))
-
-if arch == "aarch64" or arch == "larch64":
+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'],
  }

-  if arch == "aarch64":
-    # android
-    lenv["ANDROID_DATA"] = os.environ['ANDROID_DATA']
-    lenv["ANDROID_ROOT"] = os.environ['ANDROID_ROOT']
-
  cpppath = [
    "#phonelibs/opencl/include",
  ]
-
  libpath = [
+    "#phonelibs/snpe/aarch64-android-clang3.8",
    "/usr/lib",
    "/data/data/com.termux/files/usr/lib",
    "/system/vendor/lib64",
    "/system/comma/usr/lib",
    "#phonelibs/nanovg",
+    "#phonelibs/libyuv/lib",
  ]

-  if arch == "larch64":
-    cpppath += ["#phonelibs/capnp-cpp/include"]
-    libpath += ["#phonelibs/snpe/larch64"]
-    libpath += ["#phonelibs/libyuv/larch64/lib"]
-    libpath += ["#external/capnparm/lib", "/usr/lib/aarch64-linux-gnu"]
-    cflags = ["-DQCOM2", "-mcpu=cortex-a57"]
-    cxxflags = ["-DQCOM2", "-mcpu=cortex-a57"]
-    rpath = ["/usr/local/lib"]
-  else:
-    libpath += ["#phonelibs/snpe/aarch64"]
-    libpath += ["#phonelibs/libyuv/lib"]
-    cflags = ["-DQCOM", "-mcpu=cortex-a57"]
-    cxxflags = ["-DQCOM", "-mcpu=cortex-a57"]
-    rpath = ["/system/vendor/lib64"]
+  cflags = ["-DQCOM", "-mcpu=cortex-a57"]
+  cxxflags = ["-DQCOM", "-mcpu=cortex-a57"]

+  rpath = ["/system/vendor/lib64"]
 else:
  lenv = {
    "PATH": "#external/bin:" + os.environ['PATH'],
  }
  cpppath = [
    "#phonelibs/capnp-cpp/include",
+    "#phonelibs/capnp-c/include",
    "#phonelibs/zmq/x64/include",
    "#external/tensorflow/include",
  ]
@@ -70,6 +54,7 @@ else:
  if arch == "Darwin":
    libpath = [
      "#phonelibs/capnp-cpp/mac/lib",
+      "#phonelibs/capnp-c/mac/lib",
      "#phonelibs/libyuv/mac/lib",
      "#cereal",
      "#selfdrive/common",
@@ -79,6 +64,7 @@ else:
  else:
    libpath = [
      "#phonelibs/capnp-cpp/x64/lib",
+      "#phonelibs/capnp-c/x64/lib",
      "#phonelibs/snpe/x86_64-linux-clang",
      "#phonelibs/zmq/x64/lib",
      "#phonelibs/libyuv/x64/lib",
@@ -127,10 +113,11 @@ env = Environment(
    "#phonelibs/bzip2",
    "#phonelibs/libyuv/include",
    "#phonelibs/openmax/include",
+    "#phonelibs/json/src",
    "#phonelibs/json11",
    "#phonelibs/eigen",
    "#phonelibs/curl/include",
-    #"#phonelibs/opencv/include", # use opencv4 instead
+    "#phonelibs/opencv/include",
    "#phonelibs/libgralloc/include",
    "#phonelibs/android_frameworks_native/include",
    "#phonelibs/android_hardware_libhardware/include",
@@ -188,12 +175,10 @@ def abspath(x):
    # rpath works elsewhere
    return x[0].path.rsplit("/", 1)[1][:-3]

+#zmq = 'zmq'
 # still needed for apks
-if arch == 'larch64':
-  zmq = 'zmq'
-else:
-  zmq = FindFile("libzmq.a", libpath)
-Export('env', 'arch', 'zmq', 'SHARED', 'webcam')
+zmq = FindFile("libzmq.a", libpath)
+Export('env', 'arch', 'zmq', 'SHARED')

 # cereal and messaging are shared with the system
 SConscript(['cereal/SConscript'])
@@ -211,7 +196,7 @@ Import('_common', '_visionipc', '_gpucommon', '_gpu_libs')
 if SHARED:
  common, visionipc, gpucommon = abspath(common), abspath(visionipc), abspath(gpucommon)
 else:
-  common = [_common, 'json11']
+  common = [_common, 'json']
  visionipc = _visionipc
  gpucommon = [_gpucommon] + _gpu_libs

@@ -230,7 +215,6 @@ if arch != "Darwin":
 SConscript(['selfdrive/controls/lib/cluster/SConscript'])
 SConscript(['selfdrive/controls/lib/lateral_mpc/SConscript'])
 SConscript(['selfdrive/controls/lib/longitudinal_mpc/SConscript'])
-SConscript(['selfdrive/controls/lib/longitudinal_mpc_model/SConscript'])

 SConscript(['selfdrive/boardd/SConscript'])
 SConscript(['selfdrive/proclogd/SConscript'])
@@ -245,4 +229,5 @@ if arch == "aarch64":

 SConscript(['selfdrive/locationd/SConscript'])
 SConscript(['selfdrive/locationd/kalman/SConscript'])
-SConscript(['tools/lib/index_log/SConscript'])
+
+# TODO: finish cereal, dbcbuilder, MPC
@@ -1,5 +1,6 @@
 #!/usr/bin/bash

+mode=$1
 if [ $1 -eq 1 ]; then
  printf %s "1" > /data/params/d/DragonBTG
 fi
@@ -35,7 +35,8 @@ while 1:

 # in publisher
 pm = messaging.PubMaster(['sensorEvents'])
-dat = messaging.new_message('sensorEvents', size=1)
+dat = messaging.new_message()
+dat.init('sensorEvents', 1)
 dat.sensorEvents[0] = {"gyro": {"v": [0.1, -0.1, 0.1]}}
 pm.send('sensorEvents', dat)
 ```
@@ -5,6 +5,10 @@ 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'],
@@ -18,12 +22,14 @@ if shutil.which('capnpc-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)
+env.SharedLibrary('cereal_shared', cereal_objects, LIBS=["capnp_c"])

 cereal_dir = Dir('.')
 services_h = env.Command(
@@ -91,20 +91,14 @@ struct CarEvent @0x9b1657f34caf3ad3 {
    carUnrecognized @66;
    radarCommIssue @67;
    driverMonitorLowAcc @68;
-    invalidLkasSetting @69;
-    speedTooHigh @70;
-    laneChangeBlocked @71;
-    relayMalfunction @72;
-    gasPressed @73;
-    stockFcw @74;
-    # dp
-    preLaneChangeLeftALC @75;
-    preLaneChangeRightALC @76;
-    laneChangeALC @77;
-    manualSteeringRequired @78;
-    manualSteeringRequiredBlinkersOn @79;
-    leadCarMoving @80;
-    leadCarDetected @81;
+    # dragonpilot
+    manualSteeringRequired @69;
+    manualSteeringRequiredBlinkersOn @70;
+    leadCarMoving @71;
+    leadCarDetected @72;
+    preAutoLaneChangeLeft @73;
+    preAutoLaneChangeRight @74;
+    autoLaneChange @75;
  }
 }

@@ -133,17 +127,14 @@ struct CarState {
  brakeLights @19 :Bool;

  # steering wheel
-  steeringAngle @7 :Float32;       # deg
-  steeringRate @15 :Float32;       # deg/s
-  steeringTorque @8 :Float32;      # TODO: standardize units
+  steeringAngle @7 :Float32;   # deg
+  steeringRate @15 :Float32;   # deg/s
+  steeringTorque @8 :Float32;  # TODO: standardize units
  steeringTorqueEps @27 :Float32;  # TODO: standardize units
-  steeringPressed @9 :Bool;        # if the user is using the steering wheel
-  steeringRateLimited @29 :Bool;   # if the torque is limited by the rate limiter
-  steerWarning @35 :Bool;          # temporary steer unavailble
-  steerError @36 :Bool;            # permanent steer error
+  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;
-  espDisabled @32 :Bool;

  # cruise state
  cruiseState @10 :CruiseState;
@@ -165,16 +156,9 @@ struct CarState {
  # clutch (manual transmission only)
  clutchPressed @28 :Bool;

-  # dp
-  lkMode @37 :Bool;
-
  # which packets this state came from
  canMonoTimes @12: List(UInt64);

-  # blindspot sensors
-  leftBlindspot @33 :Bool; # Is there something blocking the left lane change
-  rightBlindspot @34 :Bool; # Is there something blocking the right lane change
-
  struct WheelSpeeds {
    # optional wheel speeds
    fl @0 :Float32;
@@ -328,7 +312,6 @@ struct CarControl {
      chimeWarning2 @5;
      chimeWarningRepeat @6;
      chimePrompt @7;
-      chimeWarning2Repeat @8;
    }
  }
 }
@@ -399,7 +382,6 @@ struct CarParams {
  radarTimeStep @45: Float32 = 0.05;  # time delta between radar updates, 20Hz is very standard
  communityFeature @46: Bool;  # true if a community maintained feature is detected
  fingerprintSource @49: FingerprintSource;
-  networkLocation @50 :NetworkLocation;  # Where Panda/C2 is integrated into the car's CAN network

  struct LateralParams {
    torqueBP @0 :List(Int32);
@@ -467,7 +449,6 @@ struct CarParams {
    noOutput @19;  # like silent but without silent CAN TXs
    hondaBoschHarness @20;
    volkswagenPq @21;
-    subaruLegacy @22;  # pre-Global platform
  }

  enum SteerControlType {
@@ -477,9 +458,8 @@ struct CarParams {

  enum TransmissionType {
    unknown @0;
-    automatic @1;  # Traditional auto, including DSG
-    manual @2;  # True "stick shift" only
-    direct @3;  # Electric vehicle or other direct drive
+    automatic @1;
+    manual @2;
  }

  struct CarFw {
@@ -496,21 +476,10 @@ struct CarParams {
    fwdCamera @3;
    engine @4;
    unknown @5;
-    transmission @8; # Transmission Control Module
-    srs @9; # airbag
-    gateway @10; # can gateway
-    hud @11; # heads up display
-    combinationMeter @12; # instrument cluster

    # Toyota only
    dsu @6;
    apgs @7;
-
-    # Honda only
-    vsa @13; # Vehicle Stability Assist
-    programmedFuelInjection @14;
-    electricBrakeBooster @15;
-    shiftByWire @16;
  }

  enum FingerprintSource {
@@ -518,9 +487,4 @@ struct CarParams {
    fw @1;
    fixed @2;
  }
-
-  enum NetworkLocation {
-    fwdCamera @0;  # Standard/default integration at LKAS camera
-    gateway @1;    # Integration at vehicle's CAN gateway
-  }
 }
@@ -127,9 +127,6 @@ struct FrameData {
  lensTruePos @14 :Float32;
  image @6 :Data;
  gainFrac @15 :Float32;
-  focusVal @16 :List(Int16);
-  focusConf @17 :List(UInt8);
-  sharpnessScore @18 :List(UInt16);

  frameType @7 :FrameType;
  timestampSof @8 :UInt64;
@@ -284,7 +281,6 @@ struct ThermalData {
  usbOnline @12 :Bool;
  networkType @22 :NetworkType;
  offroadPowerUsage @23 :UInt32;  # Power usage since going offroad in uWh
-  networkStrength @24 :NetworkStrength;

  fanSpeed @10 :UInt16;
  started @11 :Bool;
@@ -297,7 +293,7 @@ struct ThermalData {
  memUsedPercent @19 :Int8;
  cpuPerc @20 :Int8;

-  ipAddr @25 :Text; # dp
+  ipAddr @24 :Text; # dragonpilot

  enum ThermalStatus {
    green @0;   # all processes run
@@ -314,14 +310,6 @@ struct ThermalData {
    cell4G @4;
    cell5G @5;
  }
-
-  enum NetworkStrength {
-    unknown @0;
-    poor @1;
-    moderate @2;
-    good @3;
-    great @4;
-  }
 }

 struct HealthData {
@@ -355,25 +343,6 @@ struct HealthData {

  enum FaultType {
    relayMalfunction @0;
-    unusedInterruptHandled @1;
-    interruptRateCan1 @2;
-    interruptRateCan2 @3;
-    interruptRateCan3 @4;
-    interruptRateTach @5;
-    interruptRateGmlan @6;
-    interruptRateInterrupts @7;
-    interruptRateSpiDma @8;
-    interruptRateSpiCs @9;
-    interruptRateUart1 @10;
-    interruptRateUart2 @11;
-    interruptRateUart3 @12;
-    interruptRateUart5 @13;
-    interruptRateUartDma @14;
-    interruptRateUsb @15;
-    interruptRateTim1 @16;
-    interruptRateTim3 @17;
-    registerDivergent @18;
-    # Update max fault type in boardd when adding faults
  }

  enum HwType {
@@ -659,11 +628,9 @@ struct ModelData {
    brakeDisengageProb @2 :Float32;
    gasDisengageProb @3 :Float32;
    steerOverrideProb @4 :Float32;
-    desireState @5 :List(Float32);
  }

  struct LongitudinalData {
-    distances @2 :List(Float32);
    speeds @0 :List(Float32);
    accelerations @1 :List(Float32);
  }
@@ -800,9 +767,8 @@ struct PathPlan {
  desire @17 :Desire;
  laneChangeState @18 :LaneChangeState;
  laneChangeDirection @19 :LaneChangeDirection;
-
  # dragonpilot
-  alcAllowed @20 :Bool;
+  autoLCAllowed @20 :Bool;

  enum Desire {
    none @0;
@@ -828,52 +794,6 @@ struct PathPlan {
  }
 }

-struct LiveLocationKalman {
-
-  # More info on reference frames:
-  # https://github.com/commaai/openpilot/tree/master/common/transformations
-
-  positionECEF @0 : Measurement;
-  positionGeodetic @1 : Measurement;
-  velocityECEF @2 : Measurement;
-  velocityNED @3 : Measurement;
-  velocityDevice @4 : Measurement;
-  accelerationDevice @5: Measurement;
-
-
-  # These angles are all eulers and roll, pitch, yaw
-  # orientationECEF transforms to rot matrix: ecef_from_device
-  orientationECEF @6 : Measurement;
-  orientationNED @7 : Measurement;
-  angularVelocityDevice @8 : Measurement;
-
-  # orientationNEDCalibrated transforms to rot matrix: NED_from_calibrated
-  orientationNEDCalibrated @9 : Measurement;
-
-  # Calibrated frame is simply device frame
-  # aligned with the vehicle
-  velocityCalibrated @10 : Measurement;
-  accelerationCalibrated @11 : Measurement;
-  angularVelocityCalibrated @12 : Measurement;
-
-  gpsWeek @13 :Int32;
-  gpsTimeOfWeek @14 :Float64;
-  status @15 :Status;
-  unixTimestampMillis @16 :Int64;
-
-  enum Status {
-    uninitialized @0;
-    uncalibrated @1;
-    valid @2;
-  }
-
-  struct Measurement {
-    value @0 : List(Float64);
-    std @1 : List(Float64);
-    valid @2 : Bool;
-  }
-}
-
 struct LiveLocationData {
  status @0 :UInt8;

@@ -1800,14 +1720,12 @@ struct UiLayoutState {
  activeApp @0 :App;
  sidebarCollapsed @1 :Bool;
  mapEnabled @2 :Bool;
-  mockEngaged @3 :Bool;

  enum App {
    home @0;
    music @1;
    nav @2;
    settings @3;
-    none @4;
  }
 }

@@ -1906,7 +1824,6 @@ struct DMonitoringState {
  awarenessPassive @12 :Float32;
  isLowStd @13 :Bool;
  hiStdCount @14 :UInt32;
-  isPreview @15 :Bool;
 }

 struct Boot {
@@ -1964,16 +1881,6 @@ struct KalmanOdometry {
  rotStd @3 :List(Float32); # std rad/s in device frame
 }

-struct Sentinel {
-  enum SentinelType {
-    endOfSegment @0;
-    endOfRoute @1;
-    startOfSegment @2;
-    startOfRoute @3;
-  }
-  type @0 :SentinelType;
-}
-
 struct Event {
  # in nanoseconds?
  logMonoTime @0 :UInt64;
@@ -1999,7 +1906,7 @@ struct Event {
    sendcan @17 :List(CanData);
    logMessage @18 :Text;
    liveCalibration @19 :LiveCalibrationData;
-    androidLog @20 :AndroidLogEntry;
+    androidLogEntry @20 :AndroidLogEntry;
    gpsLocation @21 :GpsLocationData;
    carState @22 :Car.CarState;
    carControl @23 :Car.CarControl;
@@ -2030,7 +1937,7 @@ struct Event {
    gpsLocationExternal @48 :GpsLocationData;
    location @49 :LiveLocationData;
    uiNavigationEvent @50 :UiNavigationEvent;
-    liveLocationKalmanDEPRECATED @51 :LiveLocationData;
+    liveLocationKalman @51 :LiveLocationData;
    testJoystick @52 :Joystick;
    orbOdometry @53 :OrbOdometry;
    orbFeatures @54 :OrbFeatures;
@@ -2050,7 +1957,5 @@ struct Event {
    carParams @69: Car.CarParams;
    frontFrame @70: FrameData;
    dMonitoringState @71: DMonitoringState;
-    liveLocationKalman @72 :LiveLocationKalman;
-    sentinel @73 :Sentinel;
  }
 }
@@ -19,15 +19,10 @@ except ImportError:

 context = Context()

-def new_message(service=None, size=None):
+def new_message():
  dat = log.Event.new_message()
  dat.logMonoTime = int(sec_since_boot() * 1e9)
  dat.valid = True
-  if service is not None:
-    if size is None:
-      dat.init(service)
-    else:
-      dat.init(service, size)
  return dat

 def pub_sock(endpoint):
@@ -153,11 +148,12 @@ class SubMaster():
        self.sock[s] = sub_sock(s, poller=self.poller, addr=addr, conflate=True)
      self.freq[s] = service_list[s].frequency

+      data = new_message()
      try:
-        data = new_message(s)
+        data.init(s)
      except capnp.lib.capnp.KjException:
        # lists
-        data = new_message(s, 0)
+        data.init(s, 0)

      self.data[s] = getattr(data, s)
      self.logMonoTime[s] = 0
@@ -34,8 +34,7 @@ extra_compile_args = ["-std=c++11"]
 libraries = ['zmq']
 ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()  # pylint: disable=unexpected-keyword-arg

-if ARCH == "aarch64" and os.path.isdir("/system"):
-  # android
+if ARCH == "aarch64":
  extra_compile_args += ["-Wno-deprecated-register"]
  libraries += ['gnustl_shared']

@@ -19,7 +19,7 @@ controlsState: [8007, true, 100., 100]
 model: [8009, true, 20., 5]
 features: [8010, true, 0.]
 health: [8011, true, 2., 1]
-radarState: [8012, true, 20., 5]
+radarState: [8012, true, 20.]
 #liveUI: [8014, true, 0.]
 encodeIdx: [8015, true, 20.]
 liveTracks: [8016, true, 20.]
@@ -57,7 +57,7 @@ orbslamCorrection: [8050, true, 0.]
 liveLocationCorrected: [8051, true, 0.]
 orbObservation: [8052, true, 0.]
 applanixLocation: [8053, true, 0.]
-liveLocationKalman: [8054, true, 0., 1]
+liveLocationKalman: [8054, true, 0.]
 uiNavigationEvent: [8055, true, 0.]
 orbOdometry: [8057, true, 0.]
 orbFeatures: [8058, false, 0.]
@@ -76,7 +76,6 @@ carEvents: [8070, true, 1., 1]
 carParams: [8071, true, 0.02, 1]
 frontFrame: [8072, true, 10.]
 dMonitoringState: [8073, true, 5., 1]
-offroadLayout: [8074, false, 0.]

 testModel: [8040, false, 0.]
 testLiveLocation: [8045, false, 0.]
@@ -104,31 +103,19 @@ testJoystick: [8056, false, 0.]
 # gpsd -- publishes EON's gps
 #   publishes: gpsNMEA

-# camerad -- publishes camera frames
-#   publishes: frame, frontFrame, thumbnail
-#   subscribes: driverState
-
-# dmonitoringmodeld -- runs face detection on camera frames
-#   publishes: driverState
+# visiond -- talks to the cameras, runs the model, saves the videos
+#   publishes:  frame, model, driverMonitoring, cameraOdometry, thumbnail

 # **** stateful data transformers ****

-# modeld -- runs & publishes the model 
-#   publishes: model, cameraOdometry
-#   subscribes: liveCalibration, pathPlan
-
 # plannerd -- decides where to drive the car
 #   subscribes: carState, model, radarState, controlsState, liveParameters
 #   publishes:  plan, pathPlan, liveMpc, liveLongitudinalMpc

 # controlsd -- drives the car by sending CAN messages to panda
-#   subscribes: can, thermal, health, plan, pathPlan, dMonitoringState, liveCalibration, model
+#   subscribes: can, thermal, health, plan, pathPlan, driverMonitoring, liveCalibration
 #   publishes:  carState, carControl, sendcan, controlsState, carEvents, carParams

-# dmonitoringd -- processes driver monitoring data and publishes driver awareness
-#   subscribes: driverState, liveCalibration, carState, model, gpsLocation
-#   publishes: dMonitoringState
-
 # radard -- processes the radar and vision data
 #   subscribes: can, controlsState, model, liveParameters
 #   publishes:  radarState, liveTracks
@@ -1,7 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        informational: true
-    patch: off
-
@@ -8,7 +8,6 @@ import random
 from cereal import log

 NetworkType = log.ThermalData.NetworkType
-NetworkStrength = log.ThermalData.NetworkStrength

 ANDROID = os.path.isfile('/EON')

@@ -129,153 +128,3 @@ def get_network_type():
      19: NetworkType.cell4G
    }
    return cell_networks.get(cell_check, NetworkType.none)
-
-def get_network_strength(network_type):
-  network_strength = NetworkStrength.unknown
-  # from SignalStrength.java
-  def get_lte_level(rsrp, rssnr):
-    INT_MAX = 2147483647
-    if rsrp == INT_MAX:
-      lvl_rsrp = NetworkStrength.unknown
-    elif rsrp >= -95:
-      lvl_rsrp = NetworkStrength.great
-    elif rsrp >= -105:
-      lvl_rsrp = NetworkStrength.good
-    elif rsrp >= -115:
-      lvl_rsrp = NetworkStrength.moderate
-    else:
-      lvl_rsrp = NetworkStrength.poor
-    if rssnr == INT_MAX:
-      lvl_rssnr = NetworkStrength.unknown
-    elif rssnr >= 45:
-      lvl_rssnr = NetworkStrength.great
-    elif rssnr >= 10:
-      lvl_rssnr = NetworkStrength.good
-    elif rssnr >= -30:
-      lvl_rssnr = NetworkStrength.moderate
-    else:
-      lvl_rssnr = NetworkStrength.poor
-    return max(lvl_rsrp, lvl_rssnr)
-
-  def get_tdscdma_level(tdscmadbm):
-    lvl = NetworkStrength.unknown
-    if tdscmadbm > -25:
-      lvl = NetworkStrength.unknown
-    elif tdscmadbm >= -49:
-      lvl = NetworkStrength.great
-    elif tdscmadbm >= -73:
-      lvl = NetworkStrength.good
-    elif tdscmadbm >= -97:
-      lvl = NetworkStrength.moderate
-    elif tdscmadbm >= -110:
-      lvl = NetworkStrength.poor
-    return lvl
-
-  def get_gsm_level(asu):
-    if asu <= 2 or asu == 99:
-      lvl = NetworkStrength.unknown
-    elif asu >= 12:
-      lvl = NetworkStrength.great
-    elif asu >= 8:
-      lvl = NetworkStrength.good
-    elif asu >= 5:
-      lvl = NetworkStrength.moderate
-    else:
-      lvl = NetworkStrength.poor
-    return lvl
-
-  def get_evdo_level(evdodbm, evdosnr):
-    lvl_evdodbm = NetworkStrength.unknown
-    lvl_evdosnr = NetworkStrength.unknown
-    if evdodbm >= -65:
-      lvl_evdodbm = NetworkStrength.great
-    elif evdodbm >= -75:
-      lvl_evdodbm = NetworkStrength.good
-    elif evdodbm >= -90:
-      lvl_evdodbm = NetworkStrength.moderate
-    elif evdodbm >= -105:
-      lvl_evdodbm = NetworkStrength.poor
-    if evdosnr >= 7:
-      lvl_evdosnr = NetworkStrength.great
-    elif evdosnr >= 5:
-      lvl_evdosnr = NetworkStrength.good
-    elif evdosnr >= 3:
-      lvl_evdosnr = NetworkStrength.moderate
-    elif evdosnr >= 1:
-      lvl_evdosnr = NetworkStrength.poor
-    return max(lvl_evdodbm, lvl_evdosnr)
-
-  def get_cdma_level(cdmadbm, cdmaecio):
-    lvl_cdmadbm = NetworkStrength.unknown
-    lvl_cdmaecio = NetworkStrength.unknown
-    if cdmadbm >= -75:
-      lvl_cdmadbm = NetworkStrength.great
-    elif cdmadbm >= -85:
-      lvl_cdmadbm = NetworkStrength.good
-    elif cdmadbm >= -95:
-      lvl_cdmadbm = NetworkStrength.moderate
-    elif cdmadbm >= -100:
-      lvl_cdmadbm = NetworkStrength.poor
-    if cdmaecio >= -90:
-      lvl_cdmaecio = NetworkStrength.great
-    elif cdmaecio >= -110:
-      lvl_cdmaecio = NetworkStrength.good
-    elif cdmaecio >= -130:
-      lvl_cdmaecio = NetworkStrength.moderate
-    elif cdmaecio >= -150:
-      lvl_cdmaecio = NetworkStrength.poor
-    return max(lvl_cdmadbm, lvl_cdmaecio)
-
-  if network_type == NetworkType.none:
-    return network_strength
-  if network_type == NetworkType.wifi:
-    out = subprocess.check_output('dumpsys connectivity', shell=True).decode('utf-8')
-    network_strength = NetworkStrength.unknown
-    for line in out.split('\n'):
-      signal_str = "SignalStrength: "
-      if signal_str in line:
-        lvl_idx_start = line.find(signal_str) + len(signal_str)
-        lvl_idx_end = line.find(']', lvl_idx_start)
-        lvl = int(line[lvl_idx_start : lvl_idx_end])
-        if lvl >= -50:
-          network_strength = NetworkStrength.great
-        elif lvl >= -60:
-          network_strength = NetworkStrength.good
-        elif lvl >= -70:
-          network_strength = NetworkStrength.moderate
-        else:
-          network_strength = NetworkStrength.poor
-    return network_strength
-  else:
-    # check cell strength
-    out = subprocess.check_output('dumpsys telephony.registry', shell=True).decode('utf-8')
-    for line in out.split('\n'):
-      if "mSignalStrength" in line:
-        arr = line.split(' ')
-        ns = 0
-        if ("gsm" in arr[14]):
-          rsrp = int(arr[9])
-          rssnr = int(arr[11])
-          ns = get_lte_level(rsrp, rssnr)
-          if ns == NetworkStrength.unknown:
-            tdscmadbm = int(arr[13])
-            ns = get_tdscdma_level(tdscmadbm)
-            if ns == NetworkStrength.unknown:
-              asu = int(arr[1])
-              ns = get_gsm_level(asu)
-        else:
-          cdmadbm = int(arr[3])
-          cdmaecio = int(arr[4])
-          evdodbm = int(arr[5])
-          evdosnr = int(arr[7])
-          lvl_cdma = get_cdma_level(cdmadbm, cdmaecio)
-          lvl_edmo = get_evdo_level(evdodbm, evdosnr)
-          if lvl_edmo == NetworkStrength.unknown:
-            ns = lvl_cdma
-          elif lvl_cdma == NetworkStrength.unknown:
-            ns = lvl_edmo
-          else:
-            ns = min(lvl_cdma, lvl_edmo)
-        network_strength = max(network_strength, ns)
-
-    return network_strength
@@ -6,7 +6,7 @@ import shutil
 from common.basedir import BASEDIR
 from selfdrive.swaglog import cloudlog

-android_packages = ("ai.comma.plus.offroad",)
+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")
@@ -26,9 +26,9 @@ def install_apk(path):
  os.remove(install_path)
  return ret == 0

-def start_offroad():
+def start_frame():
  set_package_permissions()
-  system("am start -n ai.comma.plus.offroad/.MainActivity")
+  system("am start -n ai.comma.plus.frame/.MainActivity")

 def set_package_permissions():
  pm_grant("ai.comma.plus.offroad", "android.permission.ACCESS_FINE_LOCATION")
@@ -95,3 +95,4 @@ def pm_apply_packages(cmd):

 if __name__ == "__main__":
  update_apks()
+
@@ -1,33 +0,0 @@
-#!/usr/bin/env python3.7
-import subprocess
-from common.params import Params
-params = Params()
-
-def get_last_modified():
-  return Params().get('DragonLastModified', encoding='utf-8')
-
-def is_online():
-  return not subprocess.call(["ping", "-W", "4", "-c", "1", "117.28.245.92"])
-
-def common_controller_update():
-  dragon_lat_ctrl = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True
-  if dragon_lat_ctrl:
-    dragon_enable_steering_on_signal = True if (params.get("DragonEnableSteeringOnSignal", encoding='utf8') == "1" and params.get("LaneChangeEnabled", encoding='utf8') == "0") else False
-    if dragon_enable_steering_on_signal:
-      try:
-        dragon_blinker_off_timer = float(params.get("DragonBlinkerOffTimer", encoding='utf8')) * 100
-      except (TypeError, ValueError):
-        dragon_blinker_off_timer = 0
-    else:
-      dragon_blinker_off_timer = 0
-  else:
-    dragon_enable_steering_on_signal = False
-    dragon_blinker_off_timer = 0
-  return dragon_lat_ctrl, dragon_enable_steering_on_signal, dragon_blinker_off_timer
-
-def common_controller_ctrl(enabled, dragon_lat_ctrl, dragon_enable_steering_on_signal, blinker_on, steer_req):
-  if enabled:
-    if (dragon_enable_steering_on_signal and blinker_on) or not dragon_lat_ctrl:
-      steer_req = 0 if isinstance(steer_req, int) else False
-
-  return steer_req
@@ -6,4 +6,5 @@ class FirstOrderFilter():

  def update(self, x):
    self.x = (1. - self.k) * self.x + self.k * x
-    return self.x
+
+
@@ -1,50 +0,0 @@
-def cputime_total(ct):
-  return ct.cpuUser + ct.cpuSystem + ct.cpuChildrenUser + ct.cpuChildrenSystem
-
-
-def print_cpu_usage(first_proc, last_proc):
-  r = 0
-  procs = [
-      ("selfdrive.controls.controlsd", 59.46),
-      ("./_modeld", 48.94),
-      ("./loggerd", 28.49),
-      ("selfdrive.controls.plannerd", 19.77),
-      ("selfdrive.controls.radard", 9.54),
-      ("./_ui", 9.54),
-      ("./camerad", 7.07),
-      ("selfdrive.locationd.locationd", 7.13),
-      ("./_sensord", 6.17),
-      ("selfdrive.controls.dmonitoringd", 5.48),
-      ("./boardd", 3.63),
-      ("./_dmonitoringmodeld", 2.67),
-      ("selfdrive.logmessaged", 2.71),
-      ("selfdrive.thermald", 2.41),
-      ("./paramsd", 2.18),
-      ("selfdrive.locationd.calibrationd", 1.76),
-      ("./proclogd", 1.54),
-      ("./_gpsd", 0.09),
-      ("./clocksd", 0.02),
-      ("./ubloxd", 0.02),
-      ("selfdrive.tombstoned", 0),
-      ("./logcatd", 0),
-      ("selfdrive.updated", 0),
-  ]
-
-  dt = (last_proc.logMonoTime - first_proc.logMonoTime) / 1e9
-  print("------------------------------------------------")
-  for proc_name, normal_cpu_usage in procs:
-    try:
-      first = [p for p in first_proc.procLog.procs if proc_name in p.cmdline][0]
-      last = [p for p in last_proc.procLog.procs if proc_name in p.cmdline][0]
-      cpu_time = cputime_total(last) - cputime_total(first)
-      cpu_usage = cpu_time / dt * 100.
-      if cpu_usage > max(normal_cpu_usage * 1.1, normal_cpu_usage + 5.0):
-        print(f"Warning {proc_name} using more CPU than normal")
-        r = 1
-
-      print(f"{proc_name.ljust(35)}  {cpu_usage:.2f}%")
-    except IndexError:
-      print(f"{proc_name.ljust(35)}  NO METRICS FOUND")
-  print("------------------------------------------------")
-
-  return r
@@ -22,8 +22,6 @@ file in place without messing with <params_dir>/d.
 """
 import time
 import os
-import string
-import binascii
 import errno
 import sys
 import shutil
@@ -52,7 +50,7 @@ class UnknownKeyName(Exception):


 keys = {
-  "AccessToken": [TxType.CLEAR_ON_MANAGER_START],
+  "AccessToken": [TxType.PERSISTENT],
  "AthenadPid": [TxType.PERSISTENT],
  "CalibrationParams": [TxType.PERSISTENT],
  "CarParams": [TxType.CLEAR_ON_MANAGER_START, TxType.CLEAR_ON_PANDA_DISCONNECT],
@@ -61,7 +59,6 @@ keys = {
  "CommunityFeaturesToggle": [TxType.PERSISTENT],
  "CompletedTrainingVersion": [TxType.PERSISTENT],
  "ControlsParams": [TxType.PERSISTENT],
-  "DisablePowerDown": [TxType.PERSISTENT],
  "DoUninstall": [TxType.CLEAR_ON_MANAGER_START],
  "DongleId": [TxType.PERSISTENT],
  "GitBranch": [TxType.PERSISTENT],
@@ -70,7 +67,6 @@ keys = {
  "GithubSshKeys": [TxType.PERSISTENT],
  "HasAcceptedTerms": [TxType.PERSISTENT],
  "HasCompletedSetup": [TxType.PERSISTENT],
-  "IsDriverViewEnabled": [TxType.CLEAR_ON_MANAGER_START],
  "IsLdwEnabled": [TxType.PERSISTENT],
  "IsGeofenceEnabled": [TxType.PERSISTENT],
  "IsMetric": [TxType.PERSISTENT],
@@ -79,7 +75,6 @@ keys = {
  "IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
  "IsUpdateAvailable": [TxType.CLEAR_ON_MANAGER_START],
  "IsUploadRawEnabled": [TxType.PERSISTENT],
-  "LastAthenaPingTime": [TxType.PERSISTENT],
  "LastUpdateTime": [TxType.PERSISTENT],
  "LimitSetSpeed": [TxType.PERSISTENT],
  "LimitSetSpeedNeural": [TxType.PERSISTENT],
@@ -110,6 +105,7 @@ keys = {
  "Offroad_IsTakingSnapshot": [TxType.CLEAR_ON_MANAGER_START],
  #dragonpilot config
  "DragonEnableDashcam": [TxType.PERSISTENT],
+  "DragonEnableDriverSafetyCheck": [TxType.PERSISTENT],
  "DragonEnableAutoShutdown": [TxType.PERSISTENT],
  "DragonAutoShutdownAt": [TxType.PERSISTENT],
  "DragonEnableSteeringOnSignal": [TxType.PERSISTENT],
@@ -117,11 +113,11 @@ keys = {
  "DragonEnableUploader": [TxType.PERSISTENT],
  "DragonNoctuaMode": [TxType.PERSISTENT],
  "DragonCacheCar": [TxType.PERSISTENT],
-  "DragonCachedModel": [TxType.CLEAR_ON_MANAGER_START], # deprecated
-  "DragonCachedFP": [TxType.CLEAR_ON_MANAGER_START], # deprecated
-  "DragonCachedVIN": [TxType.CLEAR_ON_MANAGER_START], # deprecated
-  "DragonCachedCarFW": [TxType.CLEAR_ON_MANAGER_START], # deprecated
-  "DragonCachedSource": [TxType.CLEAR_ON_MANAGER_START], # deprecated
+  "DragonCachedModel": [TxType.PERSISTENT],
+  "DragonCachedFP": [TxType.PERSISTENT],
+  "DragonCachedVIN": [TxType.PERSISTENT],
+  "DragonCachedCarFW": [TxType.PERSISTENT],
+  "DragonCachedSource": [TxType.PERSISTENT],
  "DragonAllowGas": [TxType.PERSISTENT],
  "DragonToyotaStockDSU": [TxType.PERSISTENT],
  "DragonLatCtrl": [TxType.PERSISTENT],
@@ -158,10 +154,11 @@ keys = {
  "DragonUIBlinker": [TxType.PERSISTENT],
  "DragonUIDMView": [TxType.PERSISTENT],
  "DragonEnableDriverMonitoring": [TxType.PERSISTENT],
-  "DragonCarModel": [TxType.CLEAR_ON_MANAGER_START],
+  "DragonCarModel": [TxType.PERSISTENT],
  "DragonEnableSlowOnCurve": [TxType.PERSISTENT],
  "DragonEnableLeadCarMovingAlert": [TxType.PERSISTENT],
  "DragonToyotaSnGMod": [TxType.PERSISTENT],
+  "DragonEnableSRLearner": [TxType.PERSISTENT],
  "DragonWazeMode": [TxType.PERSISTENT],
  "DragonRunWaze": [TxType.PERSISTENT],
  "DragonEnableAutoLC": [TxType.PERSISTENT],
@@ -171,34 +168,7 @@ keys = {
  "DragonBTG": [TxType.PERSISTENT],
  "DragonBootHotspot": [TxType.PERSISTENT],
  "DragonAccelProfile": [TxType.PERSISTENT],
-  "DragonLastModified": [TxType.CLEAR_ON_MANAGER_START],
-  "DragonEnableRegistration": [TxType.PERSISTENT],
-  "DragonDynamicFollow": [TxType.PERSISTENT],
-  "DragonToyotaSngResponse": [TxType.PERSISTENT],
-  "DragonEnableGearCheck": [TxType.PERSISTENT],
-  "DragonEnableTempMonitor": [TxType.PERSISTENT],
-  "DragonAppAutoUpdate": [TxType.PERSISTENT],
-  "DragonUpdating": [TxType.CLEAR_ON_MANAGER_START],
-  "DragonCustomModel": [TxType.PERSISTENT],
-  "DragonSupportedCars": [TxType.PERSISTENT],
-  "DragonLocale": [TxType.PERSISTENT],
-  "DragonUIScreenOffReversing": [TxType.PERSISTENT],
-  "DragonEnableSRLearner": [TxType.PERSISTENT],
-  "DragonEnableSteerBoost": [TxType.PERSISTENT],
-  "DragonSteerBoostMin": [TxType.PERSISTENT],
-  "DragonSteerBoostMax": [TxType.PERSISTENT],
-  "DragonSteerBoostMinAt": [TxType.PERSISTENT],
-  "DragonSteerBoostMaxAt": [TxType.PERSISTENT],
-  "DragonDashcamHours": [TxType.PERSISTENT],
-  "DragonUIScreenOffDriving": [TxType.PERSISTENT],
-  "DragonEnableAutoUpdate": [TxType.PERSISTENT],
-  "DragonUIBrightness": [TxType.PERSISTENT],
-  "DragonEnableUploadOnMobile": [TxType.PERSISTENT],
-  "DragonEnableUploadOnHotspot": [TxType.PERSISTENT],
-  "DragonMaxSpeedLimit": [TxType.PERSISTENT],
-  "DragonEnableRating": [TxType.PERSISTENT],
-  "DragonEnableContALC": [TxType.PERSISTENT],
-  "DragonBlinkerOffTimer": [TxType.PERSISTENT],
+  "DragonLastModified": [TxType.PERSISTENT],
 }


@@ -503,10 +473,10 @@ if __name__ == "__main__":
      pp = params.get(k)
      if pp is None:
        print("%s is None" % k)
-      elif all(chr(c) in string.printable for c in pp):
+      elif all(ord(c) < 128 and ord(c) >= 32 for c in pp):
        print("%s = %s" % (k, pp))
      else:
-        print("%s = %s" % (k, binascii.hexlify(pp)))
+        print("%s = %s" % (k, pp.encode("hex")))

  # Test multiprocess:
  # seq 0 100000 | xargs -P20 -I{} python common/params.py DongleId {} && sleep 0.05
@@ -39,8 +39,8 @@ class Profiler():
    print("******* Profiling *******")
    for n, ms in sorted(self.cp.items(), key=lambda x: -x[1]):
      if n in self.cp_ignored:
-        print("%30s: %9.2f   percent: %3.0f   IGNORED" % (n, ms*1000.0, ms/self.tot*100))
+        print("%30s: %7.2f   percent: %3.0f   IGNORED" % (n, ms*1000.0, ms/self.tot*100))
      else:
-        print("%30s: %9.2f   percent: %3.0f" % (n, ms*1000.0, ms/self.tot*100))
+        print("%30s: %7.2f   percent: %3.0f" % (n, ms*1000.0, ms/self.tot*100))
    print("Iter clock: %2.6f   TOTAL: %2.2f" % (self.tot/self.iter, self.tot))

@@ -50,9 +50,6 @@ class FakeSpinner():
  def update(self, _):
    pass

-  def close(self):
-    pass
-
  def __exit__(self, type, value, traceback):
    pass

@@ -53,7 +53,7 @@ class RunningStat():

 class RunningStatFilter():
  def __init__(self, raw_priors=None, filtered_priors=None, max_trackable=-1):
-    self.raw_stat = RunningStat(raw_priors, -1)
+    self.raw_stat = RunningStat(raw_priors, max_trackable)
    self.filtered_stat = RunningStat(filtered_priors, max_trackable)

  def reset(self):
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-import os
-import time
-import subprocess
-from common.basedir import BASEDIR
-
-
-class TextWindow():
-  def __init__(self, s):
-    try:
-      self.text_proc = subprocess.Popen(["./text", s],
-                                        stdin=subprocess.PIPE,
-                                        cwd=os.path.join(BASEDIR, "selfdrive", "ui", "text"),
-                                        close_fds=True)
-    except OSError:
-      self.text_proc = None
-
-  def get_status(self):
-    if self.text_proc is not None:
-      self.text_proc.poll()
-      return self.text_proc.returncode
-
-    return None
-
-  def __enter__(self):
-    return self
-
-  def close(self):
-    if self.text_proc is not None:
-      self.text_proc.terminate()
-      self.text_proc = None
-
-  def wait_for_exit(self):
-    while True:
-      if self.get_status() == 1:
-        return
-      time.sleep(0.1)
-
-  def __del__(self):
-    self.close()
-
-  def __exit__(self, type, value, traceback):
-    self.close()
-
-
-class FakeTextWindow():
-  def __init__(self, s):
-    pass
-
-  def get_status(self):
-    return 1
-
-  def wait_for_exit(self):
-    return
-
-  def __enter__(self):
-    return self
-
-  def update(self, _):
-    pass
-
-  def __exit__(self, type, value, traceback):
-    pass
-
-
-if __name__ == "__main__":
-  text = """Traceback (most recent call last):
-  File "./controlsd.py", line 608, in <module>
-    main()
-  File "./controlsd.py", line 604, in main
-    controlsd_thread(sm, pm, logcan)
-  File "./controlsd.py", line 455, in controlsd_thread
-    1/0
-ZeroDivisionError: division by zero"""
-  print(text)
-
-  with TextWindow(text) as s:
-    for _ in range(100):
-      if s.get_status() == 1:
-        print("Got exit button")
-        break
-      time.sleep(0.1)
-  print("gone")
@@ -1,5 +1,6 @@
 import numpy as np
 import common.transformations.orientation as orient
+import math

 FULL_FRAME_SIZE = (1164, 874)
 W, H = FULL_FRAME_SIZE[0], FULL_FRAME_SIZE[1]
@@ -146,3 +147,81 @@ def pretransform_from_calib(calib):
  camera_frame_from_calib_frame = get_camera_frame_from_calib_frame(camera_frame_from_road_frame)
  return np.linalg.inv(camera_frame_from_calib_frame)

+
+def transform_img(base_img,
+                 augment_trans=np.array([0,0,0]),
+                 augment_eulers=np.array([0,0,0]),
+                 from_intr=eon_intrinsics,
+                 to_intr=eon_intrinsics,
+                 output_size=None,
+                 pretransform=None,
+                 top_hacks=False,
+                 yuv=False,
+                 alpha=1.0,
+                 beta=0,
+                 blur=0):
+  import cv2  # pylint: disable=import-error
+  cv2.setNumThreads(1)
+
+  if yuv:
+    base_img = cv2.cvtColor(base_img, cv2.COLOR_YUV2RGB_I420)
+
+  size = base_img.shape[:2]
+  if not output_size:
+    output_size = size[::-1]
+
+  cy = from_intr[1,2]
+  def get_M(h=1.22):
+    quadrangle = np.array([[0, cy + 20],
+                           [size[1]-1, cy + 20],
+                           [0, size[0]-1],
+                           [size[1]-1, size[0]-1]], dtype=np.float32)
+    quadrangle_norm = np.hstack((normalize(quadrangle, intrinsics=from_intr), np.ones((4,1))))
+    quadrangle_world = np.column_stack((h*quadrangle_norm[:,0]/quadrangle_norm[:,1],
+                                        h*np.ones(4),
+                                        h/quadrangle_norm[:,1]))
+    rot = orient.rot_from_euler(augment_eulers)
+    to_extrinsics = np.hstack((rot.T, -augment_trans[:,None]))
+    to_KE = to_intr.dot(to_extrinsics)
+    warped_quadrangle_full = np.einsum('jk,ik->ij', to_KE, np.hstack((quadrangle_world, np.ones((4,1)))))
+    warped_quadrangle = np.column_stack((warped_quadrangle_full[:,0]/warped_quadrangle_full[:,2],
+                                         warped_quadrangle_full[:,1]/warped_quadrangle_full[:,2])).astype(np.float32)
+    M = cv2.getPerspectiveTransform(quadrangle, warped_quadrangle.astype(np.float32))
+    return M
+
+  M = get_M()
+  if pretransform is not None:
+    M = M.dot(pretransform)
+  augmented_rgb = cv2.warpPerspective(base_img, M, output_size, borderMode=cv2.BORDER_REPLICATE)
+
+  if top_hacks:
+    cyy = int(math.ceil(to_intr[1,2]))
+    M = get_M(1000)
+    if pretransform is not None:
+      M = M.dot(pretransform)
+    augmented_rgb[:cyy] = cv2.warpPerspective(base_img, M, (output_size[0], cyy), borderMode=cv2.BORDER_REPLICATE)
+
+  # brightness and contrast augment
+  augmented_rgb = np.clip((float(alpha)*augmented_rgb + beta), 0, 255).astype(np.uint8)
+
+  # gaussian blur
+  if blur > 0:
+    augmented_rgb = cv2.GaussianBlur(augmented_rgb,(blur*2+1,blur*2+1),cv2.BORDER_DEFAULT)
+
+  if yuv:
+    augmented_img = cv2.cvtColor(augmented_rgb, cv2.COLOR_RGB2YUV_I420)
+  else:
+    augmented_img = augmented_rgb
+  return augmented_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
+  rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2RGB_I420)
+  if not center:
+    center = (rgb.shape[0]/2, rgb.shape[1]/2)
+  rgb_crop = rgb[center[0] - output_size[1]/2: center[0] + output_size[1]/2,
+                 center[1] - output_size[0]/2: center[1] + output_size[0]/2]
+  return cv2.cvtColor(rgb_crop, cv2.COLOR_RGB2YUV_I420)
@@ -44,15 +44,24 @@ medmodel_intrinsics = np.array(

 # BIG model

-BIGMODEL_INPUT_SIZE = (1024, 512)
+BIGMODEL_INPUT_SIZE = (864, 288)
 BIGMODEL_YUV_SIZE = (BIGMODEL_INPUT_SIZE[0], BIGMODEL_INPUT_SIZE[1] * 3 // 2)

 bigmodel_zoom = 1.
 bigmodel_intrinsics = np.array(
  [[ eon_focal_length / bigmodel_zoom,    0. , 0.5 * BIGMODEL_INPUT_SIZE[0]],
-   [   0. ,  eon_focal_length / bigmodel_zoom,  256+MEDMODEL_CY],
+   [   0. ,  eon_focal_length / bigmodel_zoom,  0.2 * BIGMODEL_INPUT_SIZE[1]],
   [   0. ,                            0. ,   1.]])

+
+bigmodel_border = np.array([
+    [0,0,1],
+    [BIGMODEL_INPUT_SIZE[0], 0, 1],
+    [BIGMODEL_INPUT_SIZE[0], BIGMODEL_INPUT_SIZE[1], 1],
+    [0, BIGMODEL_INPUT_SIZE[1], 1],
+])
+
+
 model_frame_from_road_frame = np.dot(model_intrinsics,
  get_view_frame_from_road_frame(0, 0, 0, model_height))

@@ -63,7 +72,6 @@ medmodel_frame_from_road_frame = np.dot(medmodel_intrinsics,
  get_view_frame_from_road_frame(0, 0, 0, model_height))

 model_frame_from_bigmodel_frame = np.dot(model_intrinsics, np.linalg.inv(bigmodel_intrinsics))
-medmodel_frame_from_bigmodel_frame = np.dot(medmodel_intrinsics, np.linalg.inv(bigmodel_intrinsics))

 # 'camera from model camera'
 def get_model_height_transform(camera_frame_from_road_frame, height):
@@ -1,45 +0,0 @@
-import os
-from cffi import FFI
-
-# Workaround for the EON/termux build of Python having os.*xattr removed.
-ffi = FFI()
-ffi.cdef("""
-int setxattr(const char *path, const char *name, const void *value, size_t size, int flags);
-ssize_t getxattr(const char *path, const char *name, void *value, size_t size);
-ssize_t listxattr(const char *path, char *list, size_t size);
-int removexattr(const char *path, const char *name);
-""")
-libc = ffi.dlopen(None)
-
-def setxattr(path, name, value, flags=0):
-  path = path.encode()
-  name = name.encode()
-  if libc.setxattr(path, name, value, len(value), flags) == -1:
-    raise OSError(ffi.errno, f"{os.strerror(ffi.errno)}: setxattr({path}, {name}, {value}, {flags})")
-
-def getxattr(path, name, size=128):
-  path = path.encode()
-  name = name.encode()
-  value = ffi.new(f"char[{size}]")
-  l = libc.getxattr(path, name, value, size)
-  if l == -1:
-    # errno 61 means attribute hasn't been set
-    if ffi.errno == 61:
-      return None
-    raise OSError(ffi.errno, f"{os.strerror(ffi.errno)}: getxattr({path}, {name}, {size})")
-  return ffi.buffer(value)[:l]
-
-def listxattr(path, size=128):
-  path = path.encode()
-  attrs = ffi.new(f"char[{size}]")
-  l = libc.listxattr(path, attrs, size)
-  if l == -1:
-    raise OSError(ffi.errno, f"{os.strerror(ffi.errno)}: listxattr({path}, {size})")
-  # attrs is b'\0' delimited values (so chop off trailing empty item)
-  return [a.decode() for a in ffi.buffer(attrs)[:l].split(b"\0")[0:-1]]
-
-def removexattr(path, name):
-  path = path.encode()
-  name = name.encode()
-  if libc.removexattr(path, name) == -1:
-    raise OSError(ffi.errno, f"{os.strerror(ffi.errno)}: removexattr({path}, {name})")
@@ -31,7 +31,7 @@


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

 update_font=0
 remove_old_font=0
@@ -41,22 +41,31 @@ if [ ! -f "/system/fonts/NotoSansCJKtc-Regular.otf" ]; then
    update_font=1
 fi

+# check miui font
+if ls /system/fonts/Miui*.ttf 1> /dev/null 2>&1; then
+    remove_old_font=1
+fi
+
 if [ $update_font -eq "1" ] || [ $remove_old_font -eq "1" ]; then
    # sleep 3 secs in case, make sure the /system is re-mountable
    sleep 3
    mount -o remount,rw /system
    if [ $update_font -eq "1" ]; then
        # install font
-        cp -rf /data/openpilot/dragonpilot/cjk-fonts/NotoSansCJKtc-* /system/fonts/
+        cp -rf /data/openpilot/dragonpilot/chinese-fonts/NotoSansCJKtc-* /system/fonts/
        # install font mapping
-        cp -rf /data/openpilot/dragonpilot/cjk-fonts/fonts.xml /system/etc/fonts.xml
+        cp -rf /data/openpilot/dragonpilot/chinese-fonts/fonts.xml /system/etc/fonts.xml
        # change permissions
        chmod 644 /system/etc/fonts.xml
        chmod 644 /system/fonts/NotoSansCJKtc-*
    fi
+    # remove miui font
+    if [ $remove_old_font -eq "1" ]; then
+        rm -fr /system/fonts/Miui*.ttf
+    fi
    mount -o remount,r /system
    # change system locale
 fi

-#setprop persist.sys.locale $lang
-#setprop persist.sys.local $lang
+setprop persist.sys.locale $lang
+setprop persist.sys.local $lang
@@ -31,9 +31,9 @@ FRAMEBUFFER_LIBS = -lutils -lgui -lEGL
 .PHONY: all
 all: updater

-OBJS = opensans_regular.ttf.o \
-			 opensans_semibold.ttf.o \
-			 opensans_bold.ttf.o \
+OBJS = NotoSansCJKtc-Regular.otf.o \
+			 NotoSansCJKtc-Medium.otf.o \
+			 NotoSansCJKtc-Bold.otf.o \
       ../../selfdrive/common/touch.o \
       ../../selfdrive/common/framebuffer.o \
       $(PHONELIBS)/json11/json11.o \
@@ -52,15 +52,15 @@ updater: updater.o $(OBJS)
    -lcutils -lm -llog
 	strip updater

-opensans_regular.ttf.o: ../../selfdrive/assets/fonts/opensans_regular.ttf
+NotoSansCJKtc-Regular.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Regular.otf
 	@echo "[ bin2o ] $@"
 	cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'

-opensans_bold.ttf.o: ../../selfdrive/assets/fonts/opensans_bold.ttf
+NotoSansCJKtc-Bold.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Bold.otf
 	@echo "[ bin2o ] $@"
 	cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'

-opensans_semibold.ttf.o: ../../selfdrive/assets/fonts/opensans_semibold.ttf
+NotoSansCJKtc-Medium.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Medium.otf
 	@echo "[ bin2o ] $@"
 	cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'

@@ -1,7 +1,7 @@
 {
-  "ota_url": "http://dpp.cool/neosupdate/ota-signed-7bf9c7c55f0a5dff4aca834d32642cbe1a1a6bf2056f38d64f7aa3575390c9de.zip",
-  "ota_hash": "7bf9c7c55f0a5dff4aca834d32642cbe1a1a6bf2056f38d64f7aa3575390c9de",
-  "recovery_url": "http://dpp.cool/neosupdate/recovery-4772f9348e04b560b9df87d6dea6c740fa8d62ea41a8db3842eec216f04e3110.img",
-  "recovery_len": 15922476,
-  "recovery_hash": "4772f9348e04b560b9df87d6dea6c740fa8d62ea41a8db3842eec216f04e3110"
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a.zip",
+  "ota_hash": "efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e.img",
+  "recovery_len": 15861036,
+  "recovery_hash": "97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e"
 }
@@ -43,12 +43,12 @@ const char *manifest_url = MANIFEST_URL_EON;

 #define UPDATE_DIR "/data/neoupdate"

-extern const uint8_t bin_opensans_regular[] asm("_binary_opensans_regular_ttf_start");
-extern const uint8_t bin_opensans_regular_end[] asm("_binary_opensans_regular_ttf_end");
-extern const uint8_t bin_opensans_semibold[] asm("_binary_opensans_semibold_ttf_start");
-extern const uint8_t bin_opensans_semibold_end[] asm("_binary_opensans_semibold_ttf_end");
-extern const uint8_t bin_opensans_bold[] asm("_binary_opensans_bold_ttf_start");
-extern const uint8_t bin_opensans_bold_end[] asm("_binary_opensans_bold_ttf_end");
+extern const uint8_t bin_opensans_regular[] asm("_binary_NotoSansCJKtc_Regular_otf_start");
+extern const uint8_t bin_opensans_regular_end[] asm("_binary_NotoSansCJKtc_Regular_otf_end");
+extern const uint8_t bin_opensans_semibold[] asm("_binary_NotoSansCJKtc_Medium_otf_start");
+extern const uint8_t bin_opensans_semibold_end[] asm("_binary_NotoSansCJKtc_Medium_otf_end");
+extern const uint8_t bin_opensans_bold[] asm("_binary_NotoSansCJKtc_Bold_otf_start");
+extern const uint8_t bin_opensans_bold_end[] asm("_binary_NotoSansCJKtc_Bold_otf_end");

 namespace {

@@ -322,18 +322,18 @@ struct Updater {
  std::string stage_download(std::string url, std::string hash, std::string name) {
    std::string out_fn = UPDATE_DIR "/" + util::base_name(url);

-    set_progress("Downloading " + name + "...");
+    set_progress("下載 " + name + " 中...");
    bool r = download_file(url, out_fn);
    if (!r) {
-      set_error("failed to download " + name);
+      set_error("無法下載 " + name);
      return "";
    }

-    set_progress("Verifying " + name + "...");
+    set_progress("驗證 " + name + " 中...");
    std::string fn_hash = sha256_file(out_fn);
-    printf("got %s hash: %s\n", name.c_str(), hash.c_str());
+    printf("得到 %s hash: %s\n", name.c_str(), hash.c_str());
    if (fn_hash != hash) {
-      set_error(name + " was corrupt");
+      set_error(name + " 已損壞");
      unlink(out_fn.c_str());
      return "";
    }
@@ -357,7 +357,7 @@ struct Updater {
    }

    if (!check_space()) {
-      set_error("2GB of free space required to update");
+      set_error("您需要至少 2GB 的空間進行升級");
      return;
    }

@@ -365,7 +365,7 @@ struct Updater {

    const int EON = (access("/EON", F_OK) != -1);

-    set_progress("Finding latest version...");
+    set_progress("尋找最新的版本...");
    std::string manifest_s;
    if (EON) {
      manifest_s = download_string(curl, manifest_url);
@@ -374,12 +374,12 @@ struct Updater {
      exit(0);
    }

-    printf("manifest: %s\n", manifest_s.c_str());
+    printf("宣示說明: %s\n", manifest_s.c_str());

    std::string err;
    auto manifest = json11::Json::parse(manifest_s, err);
    if (manifest.is_null() || !err.empty()) {
-      set_error("failed to load update manifest");
+      set_error("無法載入新的宣示說明");
      return;
    }

@@ -394,7 +394,7 @@ struct Updater {
    // std::string installer_hash = manifest["installer_hash"].string_value();

    if (ota_url.empty() || ota_hash.empty()) {
-      set_error("invalid update manifest");
+      set_error("錯誤的宣示說明");
      return;
    }

@@ -406,12 +406,12 @@ struct Updater {

    std::string recovery_fn;
    if (recovery_url.empty() || recovery_hash.empty() || recovery_len == 0) {
-      set_progress("Skipping recovery flash...");
+      set_progress("跳過 recovery 更新...");
    } else {
      // only download the recovery if it differs from what's flashed
-      set_progress("Checking recovery...");
+      set_progress("檢查 recovery...");
      std::string existing_recovery_hash = sha256_file(RECOVERY_DEV, recovery_len);
-      printf("existing recovery hash: %s\n", existing_recovery_hash.c_str());
+      printf("目前 recovery 的 hash: %s\n", existing_recovery_hash.c_str());

      if (existing_recovery_hash != recovery_hash) {
        recovery_fn = stage_download(recovery_url, recovery_hash, "recovery");
@@ -441,18 +441,18 @@ struct Updater {

    if (!recovery_fn.empty()) {
      // flash recovery
-      set_progress("Flashing recovery...");
+      set_progress("刷新 recovery...");

      FILE *flash_file = fopen(recovery_fn.c_str(), "rb");
      if (!flash_file) {
-        set_error("failed to flash recovery");
+        set_error("刷新 recovery 失敗");
        return;
      }

      FILE *recovery_dev = fopen(RECOVERY_DEV, "w+b");
      if (!recovery_dev) {
        fclose(flash_file);
-        set_error("failed to flash recovery");
+        set_error("刷新 recovery 失敗");
        return;
      }

@@ -467,7 +467,7 @@ struct Updater {
        if (bytes_read != bytes_written) {
          fclose(recovery_dev);
          fclose(flash_file);
-          set_error("failed to flash recovery: write failed");
+          set_error("刷新 recovery 失敗: 無法寫入");
          return;
        }
      }
@@ -475,12 +475,12 @@ struct Updater {
      fclose(recovery_dev);
      fclose(flash_file);

-      set_progress("Verifying flash...");
+      set_progress("驗證新的 recovery...");
      std::string new_recovery_hash = sha256_file(RECOVERY_DEV, recovery_len);
-      printf("new recovery hash: %s\n", new_recovery_hash.c_str());
+      printf("新的 recovery hash: %s\n", new_recovery_hash.c_str());

      if (new_recovery_hash != recovery_hash) {
-        set_error("recovery flash corrupted");
+        set_error("刷新 recovery 失敗");
        return;
      }

@@ -489,13 +489,13 @@ struct Updater {
    // write arguments to recovery
    FILE *cmd_file = fopen(RECOVERY_COMMAND, "wb");
    if (!cmd_file) {
-      set_error("failed to reboot into recovery");
+      set_error("無法重啟至 recovery");
      return;
    }
    fprintf(cmd_file, "--update_package=%s\n", ota_fn.c_str());
    fclose(cmd_file);

-    set_progress("Rebooting");
+    set_progress("重新啟動");

    // remove the continue.sh so we come back into the setup.
    // maybe we should go directly into the installer, but what if we don't come back with internet? :/
@@ -562,9 +562,9 @@ struct Updater {
  }

  void draw_battery_screen() {
-    low_battery_title = "Low Battery";
-    low_battery_text = "Please connect EON to your charger. Update will continue once EON battery reaches 35%.";
-    low_battery_context = "Current battery charge: " + battery_cap_text + "%";
+    low_battery_title = "電量過低";
+    low_battery_text = "請將您的 EON 充電。當電量達到 35% 時系統將會繼續更新。";
+    low_battery_context = "目前的電量為: " + battery_cap_text + "%";

    nvgFillColor(vg, nvgRGBA(255,255,255,255));
    nvgTextAlign(vg, NVG_ALIGN_CENTER | NVG_ALIGN_BASELINE);
@@ -601,7 +601,7 @@ struct Updater {
      int powerprompt_y = 312;
      nvgFontFace(vg, "opensans_regular");
      nvgFontSize(vg, 64.0f);
-      nvgText(vg, fb_w/2, 740, "Ensure EON is connected to power.", NULL);
+      nvgText(vg, fb_w/2, 740, "請確保您的 EON 已接上充電器。", NULL);

      NVGpaint paint = nvgBoxGradient(
          vg, progress_x + 1, progress_y + 1,
@@ -635,10 +635,10 @@ struct Updater {

    switch (state) {
    case CONFIRMATION:
-      draw_ack_screen("An update to NEOS is required.",
-                      "Your device will now be reset and upgraded. You may want to connect to wifi as download is around 1 GB. Existing data on device should not be lost.",
-                      "Continue",
-                      "Connect to WiFi");
+      draw_ack_screen("NEOS 需要更新。",
+                      "您的設備將在點擊繼續後開始更新。\n更新檔約為 1GB 我們建議您先連接至無線網路。\n設備上現有的檔案不會丟失。",
+                      "繼續",
+                      "連線至無線網路");
      break;
    case LOW_BATTERY:
      draw_battery_screen();
@@ -647,7 +647,7 @@ struct Updater {
      draw_progress_screen();
      break;
    case ERROR:
-      draw_ack_screen("There was an error", (error_text).c_str(), NULL, "Reboot");
+      draw_ack_screen("發生錯誤", (error_text).c_str(), NULL, "重新啟動");
      break;
    }

@@ -62,12 +62,6 @@ function launch {
  echo 0-3 > /dev/cpuset/foreground/cpus
  echo 0-3 > /dev/cpuset/android/cpus

-  # change interrupt affinity
-  echo 3 > /proc/irq/6/smp_affinity_list # MDSS
-  echo 1 > /proc/irq/78/smp_affinity_list # Modem, can potentially lock up
-  echo 2 > /proc/irq/733/smp_affinity_list # USB
-  echo 2 > /proc/irq/736/smp_affinity_list # USB
-
  DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"

  # Remove old NEOS update file
@@ -1,11 +1,6 @@
 #!/usr/bin/bash
-/usr/bin/sh /data/openpilot/scripts/toyota_dsu_mode.sh
-if [ -f "/sdcard/dp_patcher.py" ]; then
-    /data/data/com.termux/files/usr/bin/python /sdcard/dp_patcher.py
-fi
-getprop persist.sys.locale | tr -d '\n' > /data/params/d/DragonLocale
-chmod +x scripts/*.sh
-/usr/bin/sh /data/openpilot/dragonpilot/cjk-fonts/installer.sh &
+
+/usr/bin/sh /data/openpilot/dragonpilot/chinese-fonts/installer.sh &
 export PASSIVE="0"
 exec ./launch_chffrplus.sh

@@ -1,14 +0,0 @@
-path_classifiers:
-  library:
-    - external
-    - phonelibs
-    - pyextra
-    - tools/lib/mkvparse
-extraction:
-  cpp:
-    after_prepare:
-      - "pip3 install jinja2 pyyaml cython pycapnp numpy sympy tqdm cffi logentries zmq"
-      - "export PATH=$PWD/external/bin:$PATH"
-    index:
-      build_command: "python3 $(which scons)"
-
@@ -1,291 +0,0 @@
-VERSION ""
-
-
-NS_ :
-    NS_DESC_
-    CM_
-    BA_DEF_
-    BA_
-    VAL_
-    CAT_DEF_
-    CAT_
-    FILTER
-    BA_DEF_DEF_
-    EV_DATA_
-    ENVVAR_DATA_
-    SGTYPE_
-    SGTYPE_VAL_
-    BA_DEF_SGTYPE_
-    BA_SGTYPE_
-    SIG_TYPE_REF_
-    VAL_TABLE_
-    SIG_GROUP_
-    SIG_VALTYPE_
-    SIGTYPE_VALTYPE_
-    BO_TX_BU_
-    BA_DEF_REL_
-    BA_REL_
-    BA_DEF_DEF_REL_
-    BU_SG_REL_
-    BU_EV_REL_
-    BU_BO_REL_
-    SG_MUL_VAL_
-
-BS_:
-
-BU_: XXX EON Vector__XXX
-
-
-BO_ 170 AccPedal: 8 XXX
- SG_ KickDownPressed : 53|1@0+ (1,0) [0|3] "" XXX
- SG_ CruisePedalActive : 54|1@0+ (1,0) [0|1] "" XXX
- SG_ CruisePedalInactive : 55|1@0+ (1,0) [0|1] "" XXX
- SG_ ThrottlelPressed : 50|1@0+ (1,0) [0|1] "" XXX
- SG_ AcceleratorPedalPressed : 52|1@0+ (1,0) [0|7] "" XXX
- SG_ AcceleratorPedalPercentage : 16|16@1+ (0.01,0) [0|100] "" XXX
- SG_ Counter1 : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ EngineSpeed : 32|16@1- (1,0) [0|65535] "" XXX
- SG_ uknown : 7|8@0- (1,0) [0|65535] "" XXX
-
-BO_ 404 CruiseControl: 4 XXX
- SG_ plus1mph_request : 16|1@0+ (1,0) [0|1] "" XXX
- SG_ minus1mph_request : 18|1@0+ (1,0) [0|1] "" XXX
- SG_ Cancel_request_up_stalk : 23|1@0+ (1,0) [0|1] "" XXX
- SG_ Cancel_request_up_or_down_stalk : 20|1@0+ (1,0) [0|1] "" XXX
- SG_ Resume_request : 22|1@0+ (1,0) [0|1] "" XXX
- SG_ Counter1 : 3|4@0+ (1,0) [0|15] "" XXX
- SG_ Counter2 : 11|4@0+ (1,0) [0|15] "" XXX
- SG_ notCancel_0xF : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ setMe_0xFC : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ requests_0xF : 15|4@0+ (1,0) [0|15] "" XXX
- SG_ plus5mph_request : 17|1@0+ (1,0) [0|0] "" Vector__XXX
- SG_ minus5mph_request : 19|1@0+ (1,0) [0|0] "" Vector__XXX
-
-BO_ 512 CruiseControlStatus: 8 XXX
- SG_ CruiseControlInactiveFlag : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ CruiseCoontrolActiveFlag : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ CruiseControlSetpointSpeed : 7|8@0+ (0.25,0) [0|255] "mph" XXX
-
-BO_ 168 EngineAndBrake: 8 XXX
- SG_ Brake_active2 : 62|1@0+ (1,0) [0|1] "" XXX
- SG_ BrakePressed : 61|1@0+ (1,0) [0|1] "" XXX
- SG_ EngineTorque : 8|16@1- (1,0) [0|65535] "" XXX
- SG_ EngineTorqueWoInterv : 24|16@1- (1,0) [0|65535] "" XXX
-
-BO_ 470 SteeringButtons: 2 XXX
- SG_ Volume_DOWN : 2|1@0+ (1,0) [0|1] "" XXX
- SG_ Volume_UP : 3|1@0+ (1,0) [0|1] "" XXX
- SG_ VoiceControl : 8|1@0+ (1,0) [0|1] "" XXX
- SG_ Telephone : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ Next_up : 5|1@0+ (1,0) [0|1] "" XXX
- SG_ Previous_down : 4|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 403 DynamicCruiseControlStatus: 8 XXX
- SG_ Counter : 7|8@0+ (1,0) [0|255] "" XXX
- SG_ CruiseActive : 43|1@0+ (1,0) [0|1] "" XXX
- SG_ CruiseSpeedChangeRequest : 48|1@0+ (1,0) [0|1] "" XXX
- SG_ CruiseControlSetpointSpeed : 15|8@0+ (1,-2) [0|255] "mph" XXX
-
-BO_ 201 SteeringWheelAngle_DSC: 8 XXX
- SG_ Counter1 : 23|4@0+ (1,0) [0|15] "" XXX
- SG_ WeirdCounter : 44|4@1+ (1,0) [0|3] "" XXX
- SG_ SteeringPositionComplementLow : 24|11@1- (1,0) [0|1] "" XXX
- SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "deg" XXX
-
-BO_ 206 WheelSpeeds: 8 XXX
- SG_ Wheel1 : 0|16@1- (0.0643699,0) [0|255] "kph" XXX
- SG_ Wheel2 : 16|16@1- (0.0643699,0) [0|255] "kph" XXX
- SG_ Wheel4 : 48|16@1- (0.0643699,0) [0|255] "kph" XXX
- SG_ Wheel3 : 32|16@1- (0.0643699,0) [0|255] "kph" XXX
-
-BO_ 884 WheelToleranceAdjustment: 8 XXX
-
-BO_ 678 WiperSwitch: 8 XXX
- SG_ AutoWipersOn : 0|1@1+ (1,0) [0|3] "" XXX
-
-BO_ 304 TerminalStatus: 8 XXX
- SG_ AccOn : 23|1@0+ (1,0) [0|255] "" XXX
- SG_ IgnitionOff : 22|1@0+ (1,0) [0|3] "" XXX
-
-BO_ 169 Torque2: 8 XXX
-
-BO_ 184 TorqueTransmisionRequest: 8 XXX
-
-BO_ 196 SteeringWheelAngle: 7 XXX
- SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "degree" XXX
- SG_ SteeringSpeed : 24|16@1- (0.0439453125,0) [0|255] "degree/s" XXX
-
-BO_ 180 WheelTorqueDriveTrain1: 8 XXX
-
-BO_ 182 DynamicCruiseControlTorqueDemand: 8 XXX
-
-BO_ 186 TransmissionData: 8 XXX
-
-BO_ 191 RequestedWheelTorqueDriveTrainActiveCruiseControl: 8 XXX
- SG_ Counter : 11|4@0- (1,0) [0|255] "" XXX
- SG_ TorqueReq : 16|11@1+ (1,0) [0|65535] "" XXX
-
-BO_ 414 Status_DSC: 8 XXX
-
-BO_ 416 Speed: 8 XXX
- SG_ VehicleSpeed : 0|12@1+ (0.103,0) [0|255] "kph" XXX
-
-BO_ 418 TransimissionData2: 8 XXX
-
-BO_ 690 WheelPressure: 8 XXX
-
-BO_ 691 AccelerationData: 8 XXX
-
-BO_ 408 GearSelectorSwitch: 8 XXX
- SG_ Gear : 0|8@1+ (1,0) [0|0] "" Vector__XXX
-
-BO_ 422 Distance: 8 XXX
-
-BO_ 436 InstrumentClusterStatus_KOMBI: 8 XXX
-
-BO_ 464 EngineData: 8 XXX
-
-BO_ 945 TransmissionData3: 8 XXX
-
-BO_ 200 SteeringWheelAngle_slow: 8 XXX
- SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "degree" XXX
- SG_ SteeringSpeed : 24|16@1- (0.0439453125,0) [-65535|65535] "degree/s" XXX
-
-BO_ 466 TransmissionDataDisplay: 8 XXX
-
-BO_ 437 HeatFlow_LoadMomentClimate: 8 XXX
-
-BO_ 1152 NetworkManagment1: 8 XXX
-
-BO_ 1170 NetworkManagment2: 8 XXX
-
-BO_ 1175 NetworkManagment3: 8 XXX
-
-BO_ 1176 NetworkManagment4: 8 XXX
-
-BO_ 1193 NetworkManagment5: 8 XXX
-
-BO_ 1246 NetworkManagment6: 8 XXX
-
-BO_ 438 HeatFlowEngine: 8 XXX
-
-BO_ 784 AmbientTemperature: 8 XXX
-
-BO_ 821 ElectricFuelPumpStatus: 8 XXX
-
-BO_ 1007 EngineOBD_data: 8 XXX
-
-BO_ 1432 ServicesDKG: 8 XXX
-
-BO_ 309 CrashDisconnectControl: 8 XXX
-
-BO_ 502 TurnSignals: 2 XXX
- SG_ TurnSignalIdle : 9|1@0+ (1,0) [0|1] "" XXX
- SG_ TurnSignalActive : 8|1@0+ (1,0) [0|1] "" XXX
- SG_ RightTurn : 5|1@0+ (1,0) [0|1] "" XXX
- SG_ LeftTurn : 4|1@1+ (1,0) [0|1] "" XXX
- SG_ HoldActivated : 0|1@1+ (1,0) [0|1] "" XXX
-
-BO_ 514 Dimming: 8 XXX
-
-BO_ 538 LampsCondition: 8 XXX
-
-BO_ 550 RainSensorWiperSpeed: 8 XXX
-
-BO_ 578 ClimateFrontStatus: 8 XXX
-
-BO_ 704 LCD_lighting: 8 XXX
-
-BO_ 758 LightControl: 8 XXX
-
-BO_ 760 Time_Date: 8 XXX
-
-BO_ 762 SeatBeltContact: 8 XXX
-
-BO_ 764 TrunkStatus: 8 XXX
-
-BO_ 797 TirePressureStatus: 8 XXX
-
-BO_ 816 Range_Mileage: 8 XXX
-
-BO_ 823 StatusFuelControl: 8 XXX
-
-BO_ 897 EngineOilLevelStatus: 8 XXX
-
-BO_ 940 Terminal30Eerror: 8 XXX
-
-BO_ 947 PowerManagmentConsumptionControl: 8 XXX
-
-BO_ 948 PowerBatteryVoltage: 8 XXX
- SG_ BatteryVoltage : 7|24@0+ (0.001,0) [0|65535] "" XXX
-
-BO_ 958 PowerRunningTime: 8 XXX
-
-BO_ 1408 ServicesKGM: 8 XXX
-
-BO_ 1426 ServicesDME: 8 XXX
-
-BO_ 1449 ServicesDSC: 8 XXX
-
-BO_ 1504 ServicesKOMBI: 8 XXX
-
-BO_ 1522 ServicesKBM: 8 XXX
-
-BO_ 209 Accelerometer: 8 XXX
- SG_ LateralAcceleration : 0|16@1- (1,0) [0|7] "" XXX
- SG_ LongitudalAcceleration : 32|16@1- (1,0) [0|65535] "" XXX
-
-BO_ 172 WheelTorqueDrivetrain2: 8 XXX
-
-BO_ 128 Unknown80: 5 XXX
- SG_ State2 : 24|4@1+ (1,0) [0|15] "" XXX
- SG_ State1 : 23|8@0+ (1,0) [0|255] "" XXX
- SG_ Counter1 : 31|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 320 Unknown140: 2 XXX
- SG_ State : 7|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 212 Unknown_d4: 8 XXX
- SG_ State1 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ Counter1 : 55|8@0+ (1,0) [0|255] "" XXX
- SG_ Counter2 : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 205 Unknown_cd: 8 XXX
- SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_4 : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_5 : 39|8@0- (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_6 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ Counter1 : 55|4@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_7 : 63|8@0- (1,0) [0|255] "" XXX
-
-BO_ 1577 NEW_MSG_1: 8 XXX
-
-
-
-
-CM_ SG_ 170 ThrottlelPressed "Active when accelerator pedal pressed or cruise control drives";
-CM_ SG_ 170 AcceleratorPedalPressed "Active only when driver actually presses the pedal";
-CM_ SG_ 170 AcceleratorPedalPercentage "ToDo Factor to be adjusted";
-CM_ SG_ 170 EngineSpeed "It's hard to say that is even a rate";
-CM_ SG_ 404 plus1mph_request "Appears when +1mph/kph stalk is depressed";
-CM_ SG_ 404 minus1mph_request "Appears when -1mph/kph stalk is depressed";
-CM_ SG_ 404 Cancel_request_up_stalk "Appears when cancel stalk (up) is depressed";
-CM_ SG_ 404 Cancel_request_up_or_down_stalk "Appears when cancel stalk (up or down) is depressed";
-CM_ SG_ 404 Resume_request "It appears when resume stalk button is depressed";
-CM_ SG_ 404 Counter1 "It accelerates when requests are being sent";
-CM_ SG_ 404 Counter2 "It accelerates when requests are being sent";
-CM_ SG_ 404 notCancel_0xF "0xF unless cancel is requested then 0x0";
-CM_ SG_ 168 Brake_active2 "";
-CM_ SG_ 168 BrakePressed "Brake when driver presses the brake";
-CM_ SG_ 168 EngineTorque "Engine torque without inertia - combustion torque";
-CM_ SG_ 168 EngineTorqueWoInterv "Engine torque without inertia and without shift intervention";
-CM_ SG_ 403 CruiseControlSetpointSpeed "Speed target";
-CM_ SG_ 408 Gear "This is just provision, needs to be reverse engineered";
-CM_ SG_ 502 TurnSignalIdle "Turn signal off";
-CM_ SG_ 502 TurnSignalActive "Turn signal on or transitioning";
-CM_ SG_ 502 RightTurn "Indicates right blinker or when steering returning right clears left blinker";
-CM_ SG_ 502 LeftTurn "Indicates left blinker or when steering returning left clears right blinker";
-CM_ SG_ 502 HoldActivated "Spikes down if blinker cleared with timeout or turn. Stays off if blinker cleared with stalk";
-VAL_ 408 Gear 1 "D" 2 "S" 3 "N" 4 "R" 5 "P" ;
@@ -18,55 +18,12 @@ unsigned int toyota_checksum(unsigned int address, uint64_t d, int l) {
  d >>= 8; // remove checksum

  unsigned int s = l;
-  while (address) { s += address & 0xFF; address >>= 8; }
-  while (d) { s += d & 0xFF; d >>= 8; }
+  while (address) { s += address & 0xff; address >>= 8; }
+  while (d) { s += d & 0xff; d >>= 8; }

  return s & 0xFF;
 }

-unsigned int subaru_checksum(unsigned int address, uint64_t d, int l) {
-  d >>= ((8-l)*8); // remove padding
-
-  unsigned int s = 0;
-  while (address) { s += address & 0xFF; address >>= 8; }
-  l -= 1; // checksum is first byte
-  while (l) { s += d & 0xFF; d >>= 8; l -= 1; }
-
-  return s & 0xFF;
-}
-
-unsigned int chrysler_checksum(unsigned int address, uint64_t d, int l) {
-  /* This function does not want the checksum byte in the input data.
-  jeep chrysler canbus checksum from http://illmatics.com/Remote%20Car%20Hacking.pdf */
-  uint8_t checksum = 0xFF;
-  for (int j = 0; j < (l - 1); j++) {
-    uint8_t shift = 0x80;
-    uint8_t curr = (d >> 8*j) & 0xFF;
-    for (int i=0; i<8; i++) {
-      uint8_t bit_sum = curr & shift;
-      uint8_t temp_chk = checksum & 0x80U;
-      if (bit_sum != 0U) {
-        bit_sum = 0x1C;
-        if (temp_chk != 0U) {
-          bit_sum = 1;
-        }
-        checksum = checksum << 1;
-        temp_chk = checksum | 1U;
-        bit_sum ^= temp_chk;
-      } else {
-        if (temp_chk != 0U) {
-          bit_sum = 0x1D;
-        }
-        checksum = checksum << 1;
-        bit_sum ^= checksum;
-      }
-      checksum = bit_sum;
-      shift = shift >> 1;
-    }
-  }
-  return ~checksum & 0xFF;
-}
-
 // Static lookup table for fast computation of CRC8 poly 0x2F, aka 8H2F/AUTOSAR
 uint8_t crc8_lut_8h2f[256];

@@ -128,12 +85,6 @@ unsigned int volkswagen_crc(unsigned int address, uint64_t d, int l) {
    case 0x117: // ACC_10 Automatic Cruise Control
      crc ^= (uint8_t[]){0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC,0xAC}[counter];
      break;
-    case 0x120: // TSK_06 Drivetrain Coordinator
-      crc ^= (uint8_t[]){0xC4,0xE2,0x4F,0xE4,0xF8,0x2F,0x56,0x81,0x9F,0xE5,0x83,0x44,0x05,0x3F,0x97,0xDF}[counter];
-      break;
-    case 0x121: // Motor_20 Driver Throttle Inputs
-      crc ^= (uint8_t[]){0xE9,0x65,0xAE,0x6B,0x7B,0x35,0xE5,0x5F,0x4E,0xC7,0x86,0xA2,0xBB,0xDD,0xEB,0xB4}[counter];
-      break;
    case 0x122: // ACC_06 Automatic Cruise Control
      crc ^= (uint8_t[]){0x37,0x7D,0xF3,0xA9,0x18,0x46,0x6D,0x4D,0x3D,0x71,0x92,0x9C,0xE5,0x32,0x10,0xB9}[counter];
      break;
@@ -149,9 +100,6 @@ unsigned int volkswagen_crc(unsigned int address, uint64_t d, int l) {
    case 0x30C: // ACC_02 Automatic Cruise Control
      crc ^= (uint8_t[]){0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F}[counter];
      break;
-    case 0x30F: // SWA_01 Lane Change Assist (SpurWechselAssistent)
-      crc ^= (uint8_t[]){0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C}[counter];
-      break;
    case 0x3C0: // Klemmen_Status_01 ignition and starting status
      crc ^= (uint8_t[]){0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3}[counter];
      break;
@@ -13,8 +13,6 @@
 // Helper functions
 unsigned int honda_checksum(unsigned int address, uint64_t d, int l);
 unsigned int toyota_checksum(unsigned int address, uint64_t d, int l);
-unsigned int subaru_checksum(unsigned int address, uint64_t d, int l);
-unsigned int chrysler_checksum(unsigned int address, uint64_t d, int l);
 void init_crc_lookup_tables();
 unsigned int volkswagen_crc(unsigned int address, uint64_t d, int l);
 unsigned int pedal_checksum(uint64_t d, int l);
@@ -18,9 +18,7 @@ cdef extern from "common_dbc.h":
    PEDAL_CHECKSUM,
    PEDAL_COUNTER,
    VOLKSWAGEN_CHECKSUM,
-    VOLKSWAGEN_COUNTER,
-    SUBARU_CHECKSUM,
-    CHRYSLER_CHECKSUM
+    VOLKSWAGEN_COUNTER

  cdef struct Signal:
    const char* name
@@ -38,8 +38,6 @@ enum SignalType {
  PEDAL_COUNTER,
  VOLKSWAGEN_CHECKSUM,
  VOLKSWAGEN_COUNTER,
-  SUBARU_CHECKSUM,
-  CHRYSLER_CHECKSUM,
 };

 struct Signal {
@@ -29,10 +29,6 @@ const Signal sigs_{{address}}[] = {
      .type = SignalType::VOLKSWAGEN_CHECKSUM,
      {% elif checksum_type == "volkswagen" and sig.name == "COUNTER" %}
      .type = SignalType::VOLKSWAGEN_COUNTER,
-      {% elif checksum_type == "subaru" and sig.name == "CHECKSUM" %}
-      .type = SignalType::SUBARU_CHECKSUM,
-      {% elif checksum_type == "chrysler" and sig.name == "CHECKSUM" %}
-      .type = SignalType::CHRYSLER_CHECKSUM,
      {% elif address in [512, 513] and sig.name == "CHECKSUM_PEDAL" %}
      .type = SignalType::PEDAL_CHECKSUM,
      {% elif address in [512, 513] and sig.name == "COUNTER_PEDAL" %}
@@ -99,12 +99,6 @@ uint64_t CANPacker::pack(uint32_t address, const std::vector<SignalPackValue> &s
      // 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 if (sig.type == SignalType::SUBARU_CHECKSUM) {
-      unsigned int chksm = subaru_checksum(address, ret, message_lookup[address].size);
-      ret = set_value(ret, sig, chksm);
-    } else if (sig.type == SignalType::CHRYSLER_CHECKSUM) {
-      unsigned int chksm = chrysler_checksum(address, ReverseBytes(ret), message_lookup[address].size);
-      ret = set_value(ret, sig, chksm);
    } else {
      //WARN("CHECKSUM signal type not valid\n");
    }
@@ -57,16 +57,6 @@ bool MessageState::parse(uint64_t sec, uint16_t ts_, uint8_t * dat) {
        if (!update_counter_generic(tmp, sig.b2)) {
        return false;
      }
-    } else if (sig.type == SignalType::SUBARU_CHECKSUM) {
-      if (subaru_checksum(address, dat_be, size) != tmp) {
-        INFO("0x%X CHECKSUM FAIL\n", address);
-        return false;
-      }
-    } else if (sig.type == SignalType::CHRYSLER_CHECKSUM) {
-      if (chrysler_checksum(address, dat_le, size) != tmp) {
-        INFO("0x%X CHECKSUM FAIL\n", address);
-        return false;
-      }
    } else if (sig.type == SignalType::PEDAL_CHECKSUM) {
      if (pedal_checksum(dat_be, size) != tmp) {
        INFO("0x%X PEDAL CHECKSUM FAIL\n", address);
@@ -46,20 +46,6 @@ def process(in_fn, out_fn):
    checksum_start_bit = 0
    counter_start_bit = 0
    little_endian = True
-  elif can_dbc.name.startswith(("subaru_")):
-    checksum_type = "subaru"
-    checksum_size = 8
-    counter_size = None
-    checksum_start_bit = 0
-    counter_start_bit = None
-    little_endian = True
-  elif can_dbc.name.startswith(("chrysler_")):
-    checksum_type = "chrysler"
-    checksum_size = 8
-    counter_size = None
-    checksum_start_bit = 7
-    counter_start_bit = None
-    little_endian = False
  else:
    checksum_type = None
    checksum_size = None
@@ -43,7 +43,7 @@ BO_ 258 STEERING: 8 XXX
 SG_ STEERING_RATE : 20|13@0+ (0.3187251,-1305.498) [0|8191] "deg/s" XXX
 SG_ STEER_ANGLE : 4|13@0+ (0.3187251,-1307.888) [-360|360] "deg" XXX

-BO_ 514 SPEED_1: 8 XXX
+BO_ 514 SPEED_1: 4 XXX
 SG_ SPEED_LEFT : 7|12@0+ (0.071028,0) [0|65535] "m/s" XXX
 SG_ SPEED_RIGHT : 23|12@0+ (0.071028,0) [0|1023] "m/s" XXX

@@ -47,14 +47,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -168,82 +160,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -368,9 +284,5 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;
@@ -56,7 +56,6 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM

 BO_ 420 VSA_STATUS: 8 VSA
 SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON
- SG_ COMPUTER_BRAKING : 23|1@0+ (1,0) [0|1] "" EON
 SG_ ESP_DISABLED : 28|1@0+ (1,0) [0|1] "" EON
 SG_ BRAKE_HOLD_RELATED : 52|1@0+ (1,0) [0|1] "" XXX
 SG_ BRAKE_HOLD_ACTIVE : 46|1@0+ (1,0) [0|1] "" EON
@@ -64,13 +63,6 @@ BO_ 420 VSA_STATUS: 8 VSA
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

-BO_ 427 STEER_MOTOR_TORQUE: 3 EPS
- SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON
- SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON
- SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 19|4@0+ (1,0) [0|15] "" EON
-
 BO_ 432 STANDSTILL: 7 VSA
 SG_ CONTROLLED_STANDSTILL : 0|1@0+ (1,0) [0|1] "" EON
 SG_ WHEELS_MOVING : 12|1@0+ (1,0) [0|1] "" EON
@@ -101,15 +93,12 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS
 SG_ CRUISE_FAULT_CMD : 18|1@0+ (1,0) [0|1] "" EBCM
 SG_ CRUISE_CANCEL_CMD : 17|1@0+ (1,0) [0|1] "" EBCM
 SG_ COMPUTER_BRAKE_REQUEST : 16|1@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_1 : 31|1@0+ (1,0) [0|1] "" EBCM
- SG_ AEB_REQ_1 : 29|1@0+ (1,0) [0|1] "" XXX
- SG_ AEB_REQ_2 : 26|3@0+ (1,0) [0|7] "" XXX
+ SG_ SET_ME_0X80 : 31|8@0+ (1,0) [0|1] "" EBCM
 SG_ BRAKE_LIGHTS : 39|1@0+ (1,0) [0|1] "" EBCM
 SG_ CRUISE_STATES : 38|7@0+ (1,0) [0|1] "" EBCM
 SG_ CHIME : 47|3@0+ (1,0) [0|7] "" EBCM
 SG_ ZEROS_BOH6 : 44|1@0+ (1,0) [0|1] "" EBCM
 SG_ FCW : 43|2@0+ (1,0) [0|3] "" EBCM
- SG_ AEB_STATUS : 41|2@0+ (1,0) [0|3] "" XXX
 SG_ COMPUTER_BRAKE : 55|10@0+ (1,0) [0|1] "" EBCM
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
@@ -149,7 +138,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
@@ -159,12 +148,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

@@ -214,7 +201,6 @@ BO_ 1029 DOORS_STATUS: 8 BDY
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON

 CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
-CM_ SG_ 506 AEB_REQ_1 "set for duration of suspected AEB event";
 CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light";
 CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light";
 CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
@@ -224,7 +210,6 @@ CM_ SG_ 829 BEEP "beeps are pleasant, chimes are for warnngs etc...";

 VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
 VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeating_chime" 0 "no_chime" ;
-VAL_ 506 AEB_STATUS 3 "aeb_prepare" 2 "aeb_ready" 1 "aeb_braking" 0 "no_aeb" ;
 VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
@@ -1,91 +0,0 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
-
-BO_ 145 KINEMATICS: 8 XXX
- SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
-
-BO_ 228 STEERING_CONTROL: 5 ADAS
- SG_ STEER_TORQUE : 7|16@0- (1,0) [-3840|3840] "" EPS
- SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS
- SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS
- SG_ SET_ME_X00_2 : 31|8@0+ (1,0) [0|0] "" EPS
- SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
- SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS
-
-BO_ 304 GAS_PEDAL_2: 8 PCM
- SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
- SG_ ENGINE_TORQUE_REQUEST : 23|16@0- (1,0) [-1000|1000] "Nm" EON
- SG_ CAR_GAS : 39|8@0+ (1,0) [0|255] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 342 STEERING_SENSORS: 6 EPS
- SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON
- SG_ STEER_ANGLE_RATE : 23|16@0- (1,0) [-3000|3000] "deg/s" EON
- SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON
- 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_ANGLE_RATE : 23|16@0- (-0.1,0) [-31000|31000] "deg/s" 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_ STEER_CONFIG_INDEX : 43|4@0+ (1,0) [0|15] "" EON
- SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 51|4@0+ (1,0) [0|3] "" EON
-
-BO_ 401 GEARBOX: 8 PCM
- SG_ GEAR_SHIFTER : 5|6@0+ (1,0) [0|63] "" EON
- SG_ GEAR : 43|4@0+ (1,0) [0|15] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 422 SCM_BUTTONS: 8 SCM
- SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON
- SG_ LIGHTS_SETTING : 1|2@0+ (1,0) [0|3] "" EON
- SG_ MAIN_ON : 47|1@0+ (1,0) [0|1] "" EON
- SG_ CRUISE_SETTING : 43|2@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ DRIVERS_DOOR_OPEN : 63|1@0+ (1,0) [0|1] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 487 BRAKE_PRESSURE: 4 VSA
- SG_ BRAKE_PRESSURE1 : 7|10@0+ (0.015625,-103) [0|1000] "" EON
- SG_ BRAKE_PRESSURE2 : 9|10@0+ (0.015625,-103) [0|1000] "" EON
- SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON
-
-BO_ 660 SCM_FEEDBACK: 8 SCM
- SG_ RIGHT_BLINKER : 6|1@0+ (1,0) [0|1] "" EON
- SG_ LEFT_BLINKER : 5|1@0+ (1,0) [0|1] "" EON
- SG_ WIPERS_SPEED : 4|2@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
-
-BO_ 862 HIGHBEAM_CONTROL: 8 ADAS
- SG_ ZEROS_BOH : 7|50@0+ (1,0) [0|127] "" BDY
- SG_ ZEROS_BOH_2 : 48|4@1+ (1,0) [0|15] "" XXX
- SG_ HIGHBEAMS_ON : 52|1@0+ (1,0) [0|1] "" XXX
- SG_ AUTO_HIGHBEAMS_ACTIVE : 53|1@0+ (1,0) [0|1] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 884 STALK_STATUS: 8 XXX
- SG_ AUTO_HEADLIGHTS : 46|1@0+ (1,0) [0|1] "" EON
- SG_ HIGH_BEAM_HOLD : 47|1@0+ (1,0) [0|1] "" EON
- SG_ HIGH_BEAM_FLASH : 45|1@0+ (1,0) [0|1] "" EON
- SG_ HEADLIGHTS_ON : 54|1@0+ (1,0) [0|1] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
-
-CM_ SG_ 401 GEAR "10 = reverse, 11 = transition";
-CM_ SG_ 420 BRAKE_HOLD_RELATED "On when Brake Hold engaged";
-
-VAL_ 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" ;
-VAL_ 401 GEAR_SHIFTER 32 "L" 16 "S" 8 "D" 4 "N" 2 "R" 1 "P" ;
-VAL_ 401 GEAR 7 "L" 10 "S" 4 "D" 3 "N" 2 "R" 1 "P" ;
-VAL_ 422 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ;
-VAL_ 422 LIGHTS_SETTING 3 "high_beam" 2 "low_beam" 1 "position" 0 "no_lights" ;
-VAL_ 422 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ;
-
-CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";
@@ -62,10 +62,7 @@ BO_ 180 SPEED: 8 XXX

 BO_ 353 DSU_SPEED: 8 XXX
 SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
- 
-BO_ 452 ENGINE_RPM: 8 CGW
- SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
- 
+
 BO_ 466 PCM_CRUISE: 8 XXX
 SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
 SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
@@ -1,14 +0,0 @@
-BO_ 1014 BSM: 8 XXX
- SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
- SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
- SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
- SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
- SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX
-
-CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
-CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
-CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
-CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
-CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
-CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
@@ -2,8 +2,9 @@ CM_ "IMPORT _toyota_2017.dbc"
 CM_ "IMPORT _comma.dbc"

 BO_ 548 BRAKE_MODULE: 8 XXX
- SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX
- SG_ BRAKE_PRESSED : 5|1@0+ (1,0) [0|1] "" XXX
+ SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
+ SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX
+ SG_ BRAKE_PRESSED : 37|1@0+ (1,0) [0|1] "" XXX

 BO_ 581 GAS_PEDAL: 5 XXX
 SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX
@@ -13,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -1,46 +0,0 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
-
-BO_ 550 BRAKE_MODULE: 8 XXX
- SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_PRESSED : 37|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 581 GAS_PEDAL_ALT: 5 XXX
- SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 705 GAS_PEDAL: 8 XXX
- SG_ GAS_RELEASED : 3|1@0+ (1,0) [0|1] "" XXX
- SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
- SG_ STEER_TORQUE_EPS : 47|16@0- (1.30,0) [-20000|20000] "" XXX
- SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
- SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX
-
-BO_ 610 EPS_STATUS: 5 EPS
- SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
- SG_ LKA_STATE : 31|7@0+ (1,0) [0|127] "" XXX
- SG_ TYPE : 24|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 956 GEAR_PACKET: 8 XXX
- SG_ GEAR : 13|6@0+ (1,0) [0|63] "" XXX
-
-BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
- SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
-
-BO_ 1599 LIGHT_STALK_ISH: 8 SCM
- SG_ AUTO_HIGH_BEAM : 19|1@0+ (1,0) [0|1] "" XXX
-
-CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
-CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
-CM_ SG_ 610 TYPE "seems 1 on Corolla, 0 on all others";
-CM_ SG_ 1009 SET_SPEED "units seem to be whatever the car is set to";
-VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
-VAL_ 610 LKA_STATE 25 "temporary_fault" 9 "temporary_fault2" 5 "active" 1 "standby";
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -1,46 +0,0 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
-
-BO_ 550 BRAKE_MODULE: 8 XXX
- SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_PRESSED : 37|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 581 GAS_PEDAL_ALT: 5 XXX
- SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 705 GAS_PEDAL: 8 XXX
- SG_ GAS_RELEASED : 3|1@0+ (1,0) [0|1] "" XXX
- SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
- SG_ STEER_TORQUE_EPS : 47|16@0- (1.0,0) [-20000|20000] "" XXX
- SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
- SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX
-
-BO_ 610 EPS_STATUS: 5 EPS
- SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
- SG_ LKA_STATE : 31|7@0+ (1,0) [0|127] "" XXX
- SG_ TYPE : 24|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 956 GEAR_PACKET: 8 XXX
- SG_ GEAR : 13|6@0+ (1,0) [0|63] "" XXX
-
-BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
- SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
-
-BO_ 1599 LIGHT_STALK_ISH: 8 SCM
- SG_ AUTO_HIGH_BEAM : 19|1@0+ (1,0) [0|1] "" XXX
-
-CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
-CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
-CM_ SG_ 610 TYPE "seems 1 on Corolla, 0 on all others";
-CM_ SG_ 1009 SET_SPEED "units seem to be whatever the car is set to";
-VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
-VAL_ 610 LKA_STATE 25 "temporary_fault" 9 "temporary_fault2" 5 "active" 1 "standby";
@@ -11,7 +11,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -15,7 +15,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -15,7 +15,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -1,6 +1,5 @@
 CM_ "IMPORT _toyota_2017.dbc"
 CM_ "IMPORT _comma.dbc"
-CM_ "IMPORT _toyota_nodsu_bsm.dbc"

 BO_ 295 GEAR_PACKET: 8 XXX
 SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
@@ -1,6 +1,5 @@
 CM_ "IMPORT _toyota_2017.dbc"
 CM_ "IMPORT _comma.dbc"
-CM_ "IMPORT _toyota_nodsu_bsm.dbc"

 BO_ 401 STEERING_LTA: 8 XXX
 SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -14,7 +14,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -15,7 +15,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -116,7 +116,7 @@ BO_ 388 PSCMStatus: 8 K43_PSCM
 SG_ LKATorqueDelivered : 18|11@0- (0.01,0) [0|1] "" NEO
 SG_ LKATotalTorqueDelivered : 2|11@0- (0.01,0) [-10.24|10.23] "Nm" NEO

-BO_ 417 AcceleratorPedal: 7 XXX
+BO_ 417 AcceleratorPedal: 8 XXX
 SG_ AcceleratorPedal : 55|8@0+ (1,0) [0|0] ""  NEO

 BO_ 451 GasAndAcc: 8 XXX
@@ -170,7 +170,7 @@ BO_ 840 EBCMWheelSpdFront: 4 K17_EBCM
 SG_ FLWheelSpd : 7|16@0+ (0.0311,0) [0|255] "km/h"  NEO
 SG_ FRWheelSpd : 23|16@0+ (0.0311,0) [0|255] "km/h"  NEO

-BO_ 842 EBCMWheelSpdRear: 5 K17_EBCM
+BO_ 842 EBCMWheelSpdRear: 4 K17_EBCM
 SG_ RLWheelSpd : 7|16@0+ (0.0311,0) [0|255] "km/h"  NEO
 SG_ RRWheelSpd : 23|16@0+ (0.0311,0) [0|255] "km/h"  NEO

@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_accord_lx15t_2018_can.dbc starts here"
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_accord_s2t_2018_can.dbc starts here"
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_civic_hatchback_ex_2017_can.dbc starts here"
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_civic_sedan_16_diesel_2019_can.dbc starts here"
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_crv_ex_2017_can.dbc starts here"
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_crv_hybrid_2019_can.dbc starts here"
@@ -78,7 +78,6 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM

 BO_ 420 VSA_STATUS: 8 VSA
 SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON
- SG_ COMPUTER_BRAKING : 23|1@0+ (1,0) [0|1] "" EON
 SG_ ESP_DISABLED : 28|1@0+ (1,0) [0|1] "" EON
 SG_ BRAKE_HOLD_RELATED : 52|1@0+ (1,0) [0|1] "" XXX
 SG_ BRAKE_HOLD_ACTIVE : 46|1@0+ (1,0) [0|1] "" EON
@@ -86,13 +85,6 @@ BO_ 420 VSA_STATUS: 8 VSA
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON

-BO_ 427 STEER_MOTOR_TORQUE: 3 EPS
- SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON
- SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON
- SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 19|4@0+ (1,0) [0|15] "" EON
-
 BO_ 432 STANDSTILL: 7 VSA
 SG_ CONTROLLED_STANDSTILL : 0|1@0+ (1,0) [0|1] "" EON
 SG_ WHEELS_MOVING : 12|1@0+ (1,0) [0|1] "" EON
@@ -123,15 +115,12 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS
 SG_ CRUISE_FAULT_CMD : 18|1@0+ (1,0) [0|1] "" EBCM
 SG_ CRUISE_CANCEL_CMD : 17|1@0+ (1,0) [0|1] "" EBCM
 SG_ COMPUTER_BRAKE_REQUEST : 16|1@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_1 : 31|1@0+ (1,0) [0|1] "" EBCM
- SG_ AEB_REQ_1 : 29|1@0+ (1,0) [0|1] "" XXX
- SG_ AEB_REQ_2 : 26|3@0+ (1,0) [0|7] "" XXX
+ SG_ SET_ME_0X80 : 31|8@0+ (1,0) [0|1] "" EBCM
 SG_ BRAKE_LIGHTS : 39|1@0+ (1,0) [0|1] "" EBCM
 SG_ CRUISE_STATES : 38|7@0+ (1,0) [0|1] "" EBCM
 SG_ CHIME : 47|3@0+ (1,0) [0|7] "" EBCM
 SG_ ZEROS_BOH6 : 44|1@0+ (1,0) [0|1] "" EBCM
 SG_ FCW : 43|2@0+ (1,0) [0|3] "" EBCM
- SG_ AEB_STATUS : 41|2@0+ (1,0) [0|3] "" XXX
 SG_ COMPUTER_BRAKE : 55|10@0+ (1,0) [0|1] "" EBCM
 SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
@@ -171,7 +160,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
@@ -181,12 +170,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

@@ -236,7 +223,6 @@ BO_ 1029 DOORS_STATUS: 8 BDY
 SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON

 CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
-CM_ SG_ 506 AEB_REQ_1 "set for duration of suspected AEB event";
 CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light";
 CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light";
 CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
@@ -246,7 +232,6 @@ CM_ SG_ 829 BEEP "beeps are pleasant, chimes are for warnngs etc...";

 VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
 VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeating_chime" 0 "no_chime" ;
-VAL_ 506 AEB_STATUS 3 "aeb_prepare" 2 "aeb_ready" 1 "aeb_braking" 0 "no_aeb" ;
 VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
@@ -1,345 +0,0 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
-
-
-CM_ "Imported file _comma.dbc starts here"
-BO_ 512 GAS_COMMAND: 6 EON
- SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
- SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
- SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR
- SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR
- SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR
-
-BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
- SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON
- SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON
- SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON
- SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON
- SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON
-
-VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
-
-
-CM_ "Imported file _honda_2017.dbc starts here"
-VERSION ""
-
-
-NS_ :
-	NS_DESC_
-	CM_
-	BA_DEF_
-	BA_
-	VAL_
-	CAT_DEF_
-	CAT_
-	FILTER
-	BA_DEF_DEF_
-	EV_DATA_
-	ENVVAR_DATA_
-	SGTYPE_
-	SGTYPE_VAL_
-	BA_DEF_SGTYPE_
-	BA_SGTYPE_
-	SIG_TYPE_REF_
-	VAL_TABLE_
-	SIG_GROUP_
-	SIG_VALTYPE_
-	SIGTYPE_VALTYPE_
-	BO_TX_BU_
-	BA_DEF_REL_
-	BA_REL_
-	BA_DEF_DEF_REL_
-	BU_SG_REL_
-	BU_EV_REL_
-	BU_BO_REL_
-	SG_MUL_VAL_
-
-BU_: EBCM ADAS PCM EPS VSA SCM BDY XXX EPB EON
-
-BO_ 344 ENGINE_DATA: 8 PCM
- SG_ XMISSION_SPEED : 7|16@0+ (0.01,0) [0|250] "kph" EON
- SG_ ENGINE_RPM : 23|16@0+ (1,0) [0|15000] "rpm" EON
- SG_ XMISSION_SPEED2 : 39|16@0+ (0.01,0) [0|250] "kph" EON
- SG_ ODOMETER : 55|8@0+ (10,0) [0|2550] "m" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
-
-BO_ 380 POWERTRAIN_DATA: 8 PCM
- SG_ PEDAL_GAS : 7|8@0+ (1,0) [0|255] "" EON
- SG_ ENGINE_RPM : 23|16@0+ (1,0) [0|15000] "rpm" EON
- SG_ GAS_PRESSED : 39|1@0+ (1,0) [0|1] "" EON
- SG_ ACC_STATUS : 38|1@0+ (1,0) [0|1] "rpm" EON
- SG_ BOH_17C : 37|5@0+ (1,0) [0|1] "rpm" EON
- SG_ BRAKE_SWITCH : 32|1@0+ (1,0) [0|1] "rpm" EON
- SG_ BOH2_17C : 47|10@0+ (1,0) [0|1] "rpm" EON
- SG_ BRAKE_PRESSED : 53|1@0+ (1,0) [0|1] "" EON
- SG_ BOH3_17C : 52|5@0+ (1,0) [0|1] "rpm" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 420 VSA_STATUS: 8 VSA
- SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON
- SG_ COMPUTER_BRAKING : 23|1@0+ (1,0) [0|1] "" EON
- SG_ ESP_DISABLED : 28|1@0+ (1,0) [0|1] "" EON
- SG_ BRAKE_HOLD_RELATED : 52|1@0+ (1,0) [0|1] "" XXX
- SG_ BRAKE_HOLD_ACTIVE : 46|1@0+ (1,0) [0|1] "" EON
- SG_ BRAKE_HOLD_ENABLED : 45|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
-
-BO_ 427 STEER_MOTOR_TORQUE: 3 EPS
- SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON
- SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON
- SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 19|4@0+ (1,0) [0|15] "" EON
-
-BO_ 432 STANDSTILL: 7 VSA
- SG_ CONTROLLED_STANDSTILL : 0|1@0+ (1,0) [0|1] "" EON
- SG_ WHEELS_MOVING : 12|1@0+ (1,0) [0|1] "" EON
- SG_ BRAKE_ERROR_1 : 11|1@0+ (1,0) [0|1] "" EON
- SG_ BRAKE_ERROR_2 : 9|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 51|4@0+ (1,0) [0|3] "" EON
-
-BO_ 464 WHEEL_SPEEDS: 8 VSA
- SG_ WHEEL_SPEED_FL : 7|15@0+ (0.01,0) [0|250] "kph" EON
- SG_ WHEEL_SPEED_FR : 8|15@0+ (0.01,0) [0|250] "kph" EON
- SG_ WHEEL_SPEED_RL : 25|15@0+ (0.01,0) [0|250] "kph" EON
- SG_ WHEEL_SPEED_RR : 42|15@0+ (0.01,0) [0|250] "kph" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 490 VEHICLE_DYNAMICS: 8 VSA
- SG_ LONG_ACCEL : 23|16@0- (0.0015384,0) [-20|20] "m/s2" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 506 BRAKE_COMMAND: 8 ADAS
- SG_ COMPUTER_BRAKE : 7|10@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_X00 : 13|5@0+ (1,0) [0|1] "" EBCM
- SG_ BRAKE_PUMP_REQUEST : 8|1@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_X00_2 : 23|3@0+ (1,0) [0|1] "" EBCM
- SG_ CRUISE_OVERRIDE : 20|1@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_X00_3 : 19|1@0+ (1,0) [0|1] "" EBCM
- SG_ CRUISE_FAULT_CMD : 18|1@0+ (1,0) [0|1] "" EBCM
- SG_ CRUISE_CANCEL_CMD : 17|1@0+ (1,0) [0|1] "" EBCM
- SG_ COMPUTER_BRAKE_REQUEST : 16|1@0+ (1,0) [0|1] "" EBCM
- SG_ SET_ME_1 : 31|1@0+ (1,0) [0|1] "" EBCM
- SG_ AEB_REQ_1 : 29|1@0+ (1,0) [0|1] "" XXX
- SG_ AEB_REQ_2 : 26|3@0+ (1,0) [0|7] "" XXX
- SG_ BRAKE_LIGHTS : 39|1@0+ (1,0) [0|1] "" EBCM
- SG_ CRUISE_STATES : 38|7@0+ (1,0) [0|1] "" EBCM
- SG_ CHIME : 47|3@0+ (1,0) [0|7] "" EBCM
- SG_ SET_ME_X00_4 : 44|1@0+ (1,0) [0|1] "" EBCM
- SG_ FCW : 43|2@0+ (1,0) [0|3] "" EBCM
- SG_ AEB_STATUS : 41|2@0+ (1,0) [0|3] "" XXX
- SG_ SET_ME_X00_5 : 55|8@0+ (1,0) [0|0] "" EBCM
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
-
-BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
- SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
- SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
- SG_ WHEEL_SPEED_RL : 23|8@0+ (1,0) [0|255] "mph" EON
- SG_ WHEEL_SPEED_RR : 31|8@0+ (1,0) [0|255] "mph" EON
- SG_ SET_TO_X55 : 39|8@0+ (1,0) [0|255] "" EON
- SG_ SET_TO_X55_2 : 47|8@0+ (1,0) [0|255] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
-
-BO_ 773 SEATBELT_STATUS: 7 BDY
- SG_ SEATBELT_DRIVER_LAMP : 7|1@0+ (1,0) [0|1] "" EON
- SG_ SEATBELT_PASS_UNLATCHED : 10|1@0+ (1,0) [0|1] "" EON
- SG_ SEATBELT_PASS_LATCHED : 11|1@0+ (1,0) [0|1] "" EON
- SG_ SEATBELT_DRIVER_UNLATCHED : 12|1@0+ (1,0) [0|1] "" EON
- SG_ SEATBELT_DRIVER_LATCHED : 13|1@0+ (1,0) [0|1] "" EON
- SG_ PASS_AIRBAG_OFF : 14|1@0+ (1,0) [0|1] "" EON
- SG_ PASS_AIRBAG_ON : 15|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 51|4@0+ (1,0) [0|3] "" EON
-
-BO_ 777 LOCK_STATUS: 8 XXX
- SG_ DOORS_UNLOCKED : 54|1@0+ (1,0) [0|1] "" EON
- SG_ DOORS_LOCKED : 55|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 780 ACC_HUD: 8 ADAS
- SG_ PCM_SPEED : 7|16@0+ (0.01,0) [0|250] "kph" BDY
- SG_ PCM_GAS : 23|8@0+ (1,0) [0|127] "" BDY
- SG_ CRUISE_SPEED : 31|8@0+ (1,0) [0|255] "" BDY
- SG_ DTC_MODE : 39|1@0+ (1,0) [0|1] "" BDY
- 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_ 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
- SG_ HUD_DISTANCE : 47|2@0+ (1,0) [0|3] "" BDY
- SG_ HUD_LEAD : 45|2@0+ (1,0) [0|3] "" BDY
- SG_ BOH_3 : 43|1@0+ (1,0) [0|3] "" BDY
- 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_ 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
-
-BO_ 804 CRUISE: 8 PCM
- SG_ HUD_SPEED_KPH : 7|8@0+ (1,0) [0|255] "kph" EON
- SG_ HUD_SPEED_MPH : 15|8@0+ (1,0) [0|255] "mph" EON
- SG_ TRIP_FUEL_CONSUMED : 23|16@0+ (1,0) [0|255] "" EON
- SG_ CRUISE_SPEED_PCM : 39|8@0+ (1,0) [0|255] "" EON
- SG_ BOH2 : 47|8@0- (1,0) [0|255] "" EON
- SG_ BOH3 : 55|8@0+ (1,0) [0|255] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 829 LKAS_HUD: 5 ADAS
- SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY
- SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY
- SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY
- SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY
- SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY
- SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY
- SG_ LKAS_OFF : 11|1@0+ (1,0) [0|1] "" BDY
- SG_ SOLID_LANES : 10|1@0+ (1,0) [0|1] "" BDY
- SG_ LDW_RIGHT : 9|1@0+ (1,0) [0|1] "" BDY
- SG_ STEERING_REQUIRED : 8|1@0+ (1,0) [0|1] "" BDY
- SG_ BOH : 23|2@0+ (1,0) [0|4] "" BDY
- SG_ LDW_PROBLEM : 21|1@0+ (1,0) [0|1] "" BDY
- SG_ BEEP : 17|2@0+ (1,0) [0|1] "" BDY
- SG_ LDW_ON : 28|1@0+ (1,0) [0|1] "" BDY
- SG_ LDW_OFF : 27|1@0+ (1,0) [0|1] "" BDY
- SG_ CLEAN_WINDSHIELD : 26|1@0+ (1,0) [0|1] "" BDY
- SG_ SET_ME_X48 : 31|8@0+ (1,0) [0|255] "" BDY
- SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" BDY
- SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY
-
-BO_ 892 CRUISE_PARAMS: 8 PCM
- SG_ CRUISE_SPEED_OFFSET : 31|8@0- (0.1,0) [-128|127] "kph" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
-
-BO_ 1029 DOORS_STATUS: 8 BDY
- SG_ DOOR_OPEN_FL : 37|1@0+ (1,0) [0|1] "" EON
- SG_ DOOR_OPEN_FR : 38|1@0+ (1,0) [0|1] "" EON
- SG_ DOOR_OPEN_RL : 39|1@0+ (1,0) [0|1] "" EON
- SG_ DOOR_OPEN_RR : 40|1@0+ (1,0) [0|1] "" EON
- SG_ TRUNK_OPEN : 41|1@0+ (1,0) [0|1] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
-CM_ SG_ 506 AEB_REQ_1 "set for duration of suspected AEB event";
-CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light";
-CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light";
-CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
-CM_ SG_ 804 CRUISE_SPEED_PCM "255 = no speed";
-CM_ SG_ 829 BEEP "beeps are pleasant, chimes are for warnngs etc...";
-
-
-VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
-VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeating_chime" 0 "no_chime" ;
-VAL_ 506 AEB_STATUS 3 "aeb_prepare" 2 "aeb_ready" 1 "aeb_braking" 0 "no_aeb" ;
-VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
-VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
-VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
-
-CM_ "honda_hrv_touring_2019_can.dbc starts here"
-
-
-
-BO_ 145 KINEMATICS: 8 XXX
- SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
-
-BO_ 228 STEERING_CONTROL: 5 ADAS
- SG_ STEER_TORQUE : 7|16@0- (1,0) [-3840|3840] "" EPS
- SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS
- SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS
- SG_ SET_ME_X00_2 : 31|8@0+ (1,0) [0|0] "" EPS
- SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
- SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS
-
-BO_ 304 GAS_PEDAL_2: 8 PCM
- SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
- SG_ ENGINE_TORQUE_REQUEST : 23|16@0- (1,0) [-1000|1000] "Nm" EON
- SG_ CAR_GAS : 39|8@0+ (1,0) [0|255] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 342 STEERING_SENSORS: 6 EPS
- SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON
- SG_ STEER_ANGLE_RATE : 23|16@0- (1,0) [-3000|3000] "deg/s" EON
- SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON
- 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_ANGLE_RATE : 23|16@0- (-0.1,0) [-31000|31000] "deg/s" 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_ STEER_CONFIG_INDEX : 43|4@0+ (1,0) [0|15] "" EON
- SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 51|4@0+ (1,0) [0|3] "" EON
-
-BO_ 401 GEARBOX: 8 PCM
- SG_ GEAR_SHIFTER : 5|6@0+ (1,0) [0|63] "" EON
- SG_ GEAR : 43|4@0+ (1,0) [0|15] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 422 SCM_BUTTONS: 8 SCM
- SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON
- SG_ LIGHTS_SETTING : 1|2@0+ (1,0) [0|3] "" EON
- SG_ MAIN_ON : 47|1@0+ (1,0) [0|1] "" EON
- SG_ CRUISE_SETTING : 43|2@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ DRIVERS_DOOR_OPEN : 63|1@0+ (1,0) [0|1] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
-
-BO_ 487 BRAKE_PRESSURE: 4 VSA
- SG_ BRAKE_PRESSURE1 : 7|10@0+ (0.015625,-103) [0|1000] "" EON
- SG_ BRAKE_PRESSURE2 : 9|10@0+ (0.015625,-103) [0|1000] "" EON
- SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON
-
-BO_ 660 SCM_FEEDBACK: 8 SCM
- SG_ RIGHT_BLINKER : 6|1@0+ (1,0) [0|1] "" EON
- SG_ LEFT_BLINKER : 5|1@0+ (1,0) [0|1] "" EON
- SG_ WIPERS_SPEED : 4|2@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
-
-BO_ 862 HIGHBEAM_CONTROL: 8 ADAS
- SG_ ZEROS_BOH : 7|50@0+ (1,0) [0|127] "" BDY
- SG_ ZEROS_BOH_2 : 48|4@1+ (1,0) [0|15] "" XXX
- SG_ HIGHBEAMS_ON : 52|1@0+ (1,0) [0|1] "" XXX
- SG_ AUTO_HIGHBEAMS_ACTIVE : 53|1@0+ (1,0) [0|1] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 884 STALK_STATUS: 8 XXX
- SG_ AUTO_HEADLIGHTS : 46|1@0+ (1,0) [0|1] "" EON
- SG_ HIGH_BEAM_HOLD : 47|1@0+ (1,0) [0|1] "" EON
- SG_ HIGH_BEAM_FLASH : 45|1@0+ (1,0) [0|1] "" EON
- SG_ HEADLIGHTS_ON : 54|1@0+ (1,0) [0|1] "" EON
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
-
-CM_ SG_ 401 GEAR "10 = reverse, 11 = transition";
-CM_ SG_ 420 BRAKE_HOLD_RELATED "On when Brake Hold engaged";
-
-VAL_ 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" ;
-VAL_ 401 GEAR_SHIFTER 32 "L" 16 "S" 8 "D" 4 "N" 2 "R" 1 "P" ;
-VAL_ 401 GEAR 7 "L" 10 "S" 4 "D" 3 "N" 2 "R" 1 "P" ;
-VAL_ 422 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ;
-VAL_ 422 LIGHTS_SETTING 3 "high_beam" 2 "low_beam" 1 "position" 0 "no_lights" ;
-VAL_ 422 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ;
-
-CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";
@@ -51,14 +51,6 @@ BO_ 228 STEERING_CONTROL: 5 EON
 SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EPS
 SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" EPS

-BO_ 229 BOSCH_SUPPLEMENTAL_1: 8 XXX
- SG_ SET_ME_X04 : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 8|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X80 : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X10 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX
-
 BO_ 232 BRAKE_HOLD: 7 XXX
 SG_ XMISSION_SPEED : 7|14@0- (1,0) [1|0] "" XXX
 SG_ COMPUTER_BRAKE : 39|16@0+ (1,0) [0|0] "" XXX
@@ -172,82 +164,6 @@ BO_ 545 XXX_16: 6 SCM
 SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" BDY
 SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" BDY

-BO_ 576 LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 577 LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 579 RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 580 RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 582 ADJACENT_LEFT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 583 ADJACENT_LEFT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 585 ADJACENT_RIGHT_LANE_LINE_1: 8 CAM
- SG_ LINE_DISTANCE_VISIBLE : 39|9@0+ (1,0) [0|1] "" XXX
- SG_ LINE_PROBABILITY : 46|6@0+ (0.015625,0) [0|1] "" XXX
- SG_ LINE_OFFSET : 23|12@0+ (0.004,-8.192) [0|1] "Meters" XXX
- SG_ LINE_ANGLE : 7|12@0+ (0.0005,-1.024) [0|1] "" XXX
- SG_ FRAME_INDEX : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
-BO_ 586 ADJACENT_RIGHT_LANE_LINE_2: 8 CAM
- SG_ LINE_FAR_EDGE_POSITION : 55|8@0+ (1,-128) [0|1] "" XXX
- SG_ LINE_SOLID : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_DASHED : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LINE_CURVATURE : 23|12@0+ (0.00001,-0.02048) [0|1] "" XXX
- SG_ LINE_PARAMETER : 39|12@0+ (1,0) [0|1] "" XXX
- SG_ FRAME_INDEX : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ COUNTER : 61|2@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 59|4@0+ (1,0) [0|1] "" XXX
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
 SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
 SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -372,11 +288,7 @@ BO_ 891 STALK_STATUS_2: 8 XXX
 CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event";
 CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event";
 CM_ SG_ 479 AEB_PREPARE "set 1s before AEB";
-CM_ SG_ 576 LINE_DISTANCE_VISIBLE "Length of line visible, undecoded";
-CM_ SG_ 577 LINE_FAR_EDGE_POSITION "Appears to be a measure of line thickness, indicates location of the portion of the line furthest from the car, undecoded";
-CM_ SG_ 577 LINE_PARAMETER "Unclear if this is low quality line curvature rate or if this is something else, but it is correlated with line curvature, undecoded";
-CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
-CM_ SG_ 577 LINE_SOLID "1 = line is solid";
+
 VAL_ 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" ;

 CM_ "honda_insight_ex_2019_can.dbc starts here"
@@ -1446,10 +1446,3 @@ BO_ 905 SCC14: 8 SCC

 BO_ 882 ELECT_GEAR: 8 XXX
 SG_ Elect_Gear_Shifter : 16|3@1+ (1,0) [0|7] ""  CLU
-
-BO_ 1157 LFAHDA_MFC: 4 XXX
- SG_ LFA_USM : 28|2@1+ (1,0) [0|3] "" XXX
- SG_ LFA_SysWarning : 16|2@1+ (1,0) [0|3] "" XXX
- SG_ ACTIVE2 : 4|2@0+ (1,0) [0|3] "" XXX
- SG_ HDA_USM : 0|2@1+ (1,0) [0|3] "" XXX
- SG_ ACTIVE : 25|1@1+ (1,0) [0|3] "" XXX
@@ -96,10 +96,7 @@ BO_ 180 SPEED: 8 XXX

 BO_ 353 DSU_SPEED: 8 XXX
 SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
- 
-BO_ 452 ENGINE_RPM: 8 CGW
- SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
- 
+
 BO_ 466 PCM_CRUISE: 8 XXX
 SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
 SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
@@ -364,8 +361,9 @@ CM_ "lexus_ct200h_2018_pt.dbc starts here"


 BO_ 548 BRAKE_MODULE: 8 XXX
- SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX
- SG_ BRAKE_PRESSED : 5|1@0+ (1,0) [0|1] "" XXX
+ SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
+ SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX
+ SG_ BRAKE_PRESSED : 37|1@0+ (1,0) [0|1] "" XXX

 BO_ 581 GAS_PEDAL: 5 XXX
 SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX
@@ -375,7 +373,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -96,10 +96,7 @@ BO_ 180 SPEED: 8 XXX

 BO_ 353 DSU_SPEED: 8 XXX
 SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
- 
-BO_ 452 ENGINE_RPM: 8 CGW
- SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
- 
+
 BO_ 466 PCM_CRUISE: 8 XXX
 SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
 SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
@@ -376,7 +373,6 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX

 BO_ 610 EPS_STATUS: 5 EPS
 SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
@@ -1,408 +0,0 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
-
-
-CM_ "Imported file _comma.dbc starts here"
-BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
- SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
- SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX
- SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
-
- BO_ 512 GAS_COMMAND: 6 EON
-  SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
-  SG_ GAS_COMMAND2 : 23|16@0+ (0.159375,-151.111) [0|1] "" INTERCEPTOR
-  SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR
-  SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR
-  SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR
-
- BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
-  SG_ INTERCEPTOR_GAS : 7|16@0+ (0.159375,-75.555) [0|1] "" EON
-  SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.159375,-151.111) [0|1] "" EON
-  SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON
-  SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON
-  SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON
-
- VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
-
-
-CM_ "Imported file _toyota_2017.dbc starts here"
-VERSION ""
-
-
-NS_ :
-    NS_DESC_
-    CM_
-    BA_DEF_
-    BA_
-    VAL_
-    CAT_DEF_
-    CAT_
-    FILTER
-    BA_DEF_DEF_
-    EV_DATA_
-    ENVVAR_DATA_
-    SGTYPE_
-    SGTYPE_VAL_
-    BA_DEF_SGTYPE_
-    BA_SGTYPE_
-    SIG_TYPE_REF_
-    VAL_TABLE_
-    SIG_GROUP_
-    SIG_VALTYPE_
-    SIGTYPE_VALTYPE_
-    BO_TX_BU_
-    BA_DEF_REL_
-    BA_REL_
-    BA_DEF_DEF_REL_
-    BU_SG_REL_
-    BU_EV_REL_
-    BU_BO_REL_
-    SG_MUL_VAL_
-
-BS_:
-
-BU_: XXX DSU HCU EPS IPAS CGW
-
-BO_ 36 KINEMATICS: 8 XXX
- SG_ ACCEL_Y : 33|10@0+ (0.03589,-18.375) [0|65535] "m/s^2" XXX
- SG_ YAW_RATE : 1|10@0+ (0.244,-125) [0|65535] "deg/sec" XXX
- SG_ STEERING_TORQUE : 17|10@0+ (1,-512) [0|65535] "" XXX
-
-BO_ 37 STEER_ANGLE_SENSOR: 8 XXX
- SG_ STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" XXX
- SG_ STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" XXX
- SG_ STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" XXX
-
-BO_ 166 BRAKE: 8 XXX
- SG_ BRAKE_AMOUNT : 7|8@0+ (1,0) [0|255] "" XXX
- SG_ BRAKE_PEDAL : 23|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 170 WHEEL_SPEEDS: 8 XXX
- SG_ WHEEL_SPEED_FR : 7|16@0+ (0.01,-67.67) [0|250] "kph" XXX
- SG_ WHEEL_SPEED_FL : 23|16@0+ (0.01,-67.67) [0|250] "kph" XXX
- SG_ WHEEL_SPEED_RR : 39|16@0+ (0.01,-67.67) [0|250] "kph" XXX
- SG_ WHEEL_SPEED_RL : 55|16@0+ (0.01,-67.67) [0|250] "kph" XXX
-
-BO_ 180 SPEED: 8 XXX
- SG_ ENCODER : 39|8@0+ (1,0) [0|255] "" XXX
- SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 353 DSU_SPEED: 8 XXX
- SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
- 
-BO_ 452 ENGINE_RPM: 8 CGW
- SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
- 
-BO_ 466 PCM_CRUISE: 8 XXX
- SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
- SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
- SG_ STANDSTILL_ON : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ ACCEL_NET : 23|16@0- (0.001,0) [-20|20] "m/s2" XXX
- SG_ CRUISE_STATE : 55|4@0+ (1,0) [0|15] "" XXX
- SG_ CANCEL_REQ : 49|1@1+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 467 PCM_CRUISE_2: 8 XXX
- SG_ MAIN_ON : 15|1@0+ (1,0) [0|1] "" XXX
- SG_ LOW_SPEED_LOCKOUT : 14|2@0+ (1,0) [0|3] "kph" XXX
- SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "kph" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 552 ACCELEROMETER: 8 XXX
- SG_ ACCEL_Z : 22|15@0- (1,0) [0|32767] "" XXX
- SG_ ACCEL_X : 6|15@0- (0.001,0) [-20|20] "m/s2" XXX
-
-BO_ 560 BRAKE_MODULE2: 7 XXX
- SG_ BRAKE_PRESSED : 26|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 614 STEERING_IPAS: 8 IPAS
- SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
- SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
- SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX
- SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00_1 : 55|8@0+ (1,0) [0|255] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 643 PRE_COLLISION: 7 DSU
- SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X00 : 15|8@0+ (1,0) [0|255] "" XXX
- SG_ FORCE : 23|16@0- (2,0) [0|255] "N" XXX
- SG_ SET_ME_X002 : 33|8@0+ (1,0) [0|3] "" XXX
- SG_ BRAKE_STATUS : 39|3@0+ (1,0) [0|255] "" XXX
- SG_ STATE : 36|3@0+ (1,0) [0|255] "" XXX
- SG_ SET_ME_X003 : 40|1@0+ (1,0) [0|1] "" XXX
- SG_ PRECOLLISION_ACTIVE : 41|1@0+ (1,0) [0|255] "" XXX
- SG_ CHECKSUM : 55|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 740 STEERING_LKA: 5 XXX
- SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_REQUEST : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ COUNTER : 6|6@0+ (1,0) [0|63] "" XXX
- SG_ SET_ME_1 : 7|1@0+ (1,0) [0|1] "" XXX
- SG_ STEER_TORQUE_CMD : 15|16@0- (1,0) [0|65535] "" XXX
- SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 742 LEAD_INFO: 8 DSU
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" HCU
- SG_ LEAD_REL_SPEED : 23|12@0- (0.025,0) [-100|100] "m/s" HCU
- SG_ LEAD_LONG_DIST : 7|13@0+ (0.05,0) [0|300] "m" HCU
-
-BO_ 835 ACC_CONTROL: 8 DSU
- SG_ ACCEL_CMD : 7|16@0- (0.001,0) [-20|20] "m/s2" HCU
- SG_ SET_ME_X01 : 23|2@0+ (1,0) [0|3] "" HCU
- SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX
- SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX
- SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU
- SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU
- SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 836 PRE_COLLISION_2: 8 DSU
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX
-
-BO_ 869 DSU_CRUISE : 7 DSU
- SG_ RES_BTN : 3|1@0+ (1,0) [0|0] "" XXX
- SG_ SET_BTN : 2|1@0+ (1,0) [0|0] "" XXX
- SG_ CANCEL_BTN : 1|1@0+ (1,0) [0|0] "" XXX
- SG_ MAIN_ON : 0|1@0+ (1,0) [0|0] "" XXX
- SG_ SET_SPEED : 15|8@0+ (1,0) [0|0] "km/h" XXX
- SG_ CRUISE_REQUEST : 31|8@0+ (100,-12800) [0|0] "N" XXX
- SG_ LEAD_DISTANCE : 39|8@0+ (1,0) [0|0] "m" XXX
-
-BO_ 921 PCM_CRUISE_SM: 8 XXX
- SG_ MAIN_ON : 4|1@0+ (1,0) [0|1] "" XXX
- SG_ CRUISE_CONTROL_STATE : 11|4@0+ (1,0) [0|15] "" XXX
- SG_ DISTANCE_LINES : 14|2@0+ (1,0) [0|3] "" XXX
- SG_ UI_SET_SPEED : 31|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 951 ESP_CONTROL: 8 ESP
- SG_ TC_DISABLED : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ VSC_DISABLED : 12|2@0+ (1,0) [0|1] "" XXX
- SG_ BRAKE_LIGHTS_ACC : 18|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 1041 ACC_HUD: 8 DSU
- SG_ FCW : 4|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X20 : 15|8@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X10 : 39|8@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X80 : 55|8@0+ (1,0) [0|1] "" XXX
-
-BO_ 1042 LKAS_HUD: 8 XXX
- SG_ BARRIERS : 1|2@0+ (1,0) [0|3] "" XXX
- SG_ RIGHT_LINE : 3|2@0+ (1,0) [0|3] "" XXX
- SG_ LEFT_LINE : 5|2@0+ (1,0) [0|3] "" XXX
- SG_ SET_ME_X01 : 7|2@0+ (1,0) [0|3] "" XXX
- SG_ SET_ME_X01_2 : 11|2@0+ (1,0) [0|3] "" XXX
- SG_ LDA_ALERT : 9|2@0+ (1,0) [0|3] "" XXX
- SG_ TWO_BEEPS : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ ADJUSTING_CAMERA : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LDA_MALFUNCTION : 15|1@0+ (1,0) [0|1] "" XXX
- SG_ REPEATED_BEEPS : 32|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X0C : 23|8@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X2C : 47|8@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X38 : 55|8@0+ (1,0) [0|1] "" XXX
- SG_ SET_ME_X02 : 63|8@0+ (1,0) [0|1] "" XXX
-
-BO_ 1043 TIME : 8 CGW
- SG_ YEAR : 7|8@0+ (1,0) [0|0] "year" XXX
- SG_ MONTH : 15|8@0+ (1,0) [0|0] "month" XXX
- SG_ DAY : 23|8@0+ (1,0) [0|0] "day" XXX
- SG_ HOUR : 31|8@0+ (1,0) [0|0] "hour" XXX
- SG_ MINUTE : 39|8@0+ (1,0) [0|0] "minute" XXX
- SG_ GMT_DIFF : 55|1@0+ (1,0) [0|0] "" XXX
- SG_ GMTDIFF_HOURS : 54|4@0+ (1,0) [0|0] "hours" XXX
- SG_ GMTDIFF_MINUTES : 50|6@0+ (1,0) [0|0] "minutes" XXX
- SG_ SUMMER : 60|1@0+ (1,0) [0|0] "" XXX
-
-BO_ 1408 VIN_PART_1: 8 CGW
- SG_ VIN_1 : 7|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_2 : 15|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_3 : 23|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_4 : 31|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_5 : 39|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_6 : 47|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_7 : 55|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_8 : 63|8@0+ (1,0) [0|0] "" XXX
-
-BO_ 1409 VIN_PART_2: 8 CGW
- SG_ VIN_9 : 7|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_10 : 15|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_11 : 23|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_12 : 31|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_13 : 39|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_14 : 47|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_15 : 55|8@0+ (1,0) [0|0] "" XXX
- SG_ VIN_16 : 63|8@0+ (1,0) [0|0] "" XXX
-
-BO_ 1410 VIN_PART_3: 8 CGW
- SG_ VIN_17 : 7|8@0+ (1,0) [0|0] "" XXX
-
-BO_ 1553 UI_SETTING: 8 XXX
- SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
-
-BO_ 1556 STEERING_LEVERS: 8 XXX
- SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
-
-BO_ 1568 SEATS_DOORS: 8 XXX
- SG_ SEATBELT_DRIVER_UNLATCHED : 62|1@0+ (1,0) [0|1] "" XXX
- SG_ DOOR_OPEN_FL : 45|1@0+ (1,0) [0|1] "" XXX
- SG_ DOOR_OPEN_RL : 42|1@0+ (1,0) [0|1] "" XXX
- SG_ DOOR_OPEN_RR : 43|1@0+ (1,0) [0|1] "" XXX
- SG_ DOOR_OPEN_FR : 44|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 1570 LIGHT_STALK: 8 SCM
- SG_ AUTO_HIGH_BEAM : 37|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 1161 RSA1: 8 FCM
- SG_ TSGN1 : 7|8@0+ (1,0) [0|0] "" XXX
- SG_ TSGNGRY1 : 12|3@0+ (1,0) [0|0] "" XXX
- SG_ TSGNHLT1 : 9|2@0+ (1,0) [0|0] "" XXX
- SG_ SPDVAL1 : 23|8@0+ (1,0) [0|0] "kph" XXX
- SG_ SPLSGN1 : 31|4@0+ (1,0) [0|0] "" XXX
- SG_ SPLSGN2 : 27|4@0+ (1,0) [0|0] "" XXX
- SG_ TSGN2 : 39|8@0+ (1,0) [0|0] "" XXX
- SG_ TSGNGRY2 : 44|3@0+ (1,0) [0|0] "" XXX
- SG_ TSGNHLT2 : 41|2@0+ (1,0) [0|0] "" XXX
- SG_ SPDVAL2 : 55|8@0+ (1,0) [0|0] "" XXX
- SG_ BZRRQ_P : 63|2@0+ (1,0) [0|0] "" XXX
- SG_ BZRRQ_A : 61|2@0+ (1,0) [0|0] "" XXX
- SG_ SYNCID1 : 59|4@0+ (1,0) [0|0] "" XXX
-
-BO_ 1162 RSA2: 8 FCM
- SG_ TSGN3 : 7|8@0+ (1,0) [0|0] "" XXX
- SG_ TSGNGRY3 : 12|3@0+ (1,0) [0|0] "" XXX
- SG_ TSGNHLT3 : 9|2@0+ (1,0) [0|0] "" XXX
- SG_ SPLSGN3 : 31|4@0+ (1,0) [0|0] "" XXX
- SG_ SPLSGN4 : 27|4@0+ (1,0) [0|0] "" XXX
- SG_ TSGN4 : 39|8@0+ (1,0) [0|0] "" XXX
- SG_ TSGNGRY4 : 44|3@0+ (1,0) [0|0] "" XXX
- SG_ TSGNHLT4 : 41|2@0+ (1,0) [0|0] "" XXX
- SG_ DPSGNREQ : 54|1@0+ (1,0) [0|0] "" XXX
- SG_ SGNNUMP : 53|3@0+ (1,0) [0|0] "" XXX
- SG_ SGNNUMA : 50|3@0+ (1,0) [0|0] "" XXX
- SG_ SPDUNT : 63|2@0+ (1,0) [0|0] "" XXX
- SG_ TSRWMSG : 61|2@0+ (1,0) [0|0] "" XXX
- SG_ SYNCID2 : 59|4@0+ (1,0) [0|0] "" XXX
-
-BO_ 1163 RSA3: 8 FCM
- SG_ TSREQPD : 7|1@0+ (1,0) [0|0] "" XXX
- SG_ TSRMSW : 6|1@0+ (1,0) [0|0] "" XXX
- SG_ OTSGNNTM : 5|2@0+ (1,0) [0|0] "" XXX
- SG_ NTLVLSPD : 3|2@0+ (1,0) [0|0] "" XXX
- SG_ OVSPNTM : 1|2@0+ (1,0) [0|0] "" XXX
- SG_ OVSPVALL : 11|4@0+ (1,-5) [0|0] "" XXX
- SG_ OVSPVALM : 19|4@0+ (1,-5) [0|0] "" XXX
- SG_ OVSPVALH : 27|4@0+ (1,-5) [0|0] "" XXX
- SG_ TSRSPU : 33|2@0+ (1,0) [0|0] "" XXX
-
-CM_ SG_ 36 ACCEL_Y "unit is tbd";
-CM_ SG_ 36 YAW_RATE "verify";
-CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
-CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
-CM_ SG_ 37 STEER_RATE "factor is tbd";
-CM_ SG_ 466 ACCEL_NET "net acceleration produced by the system, given ACCEL_CMD, road grade and other factors";
-CM_ SG_ 467 SET_SPEED "43 kph are shown as 28mph, so conversion isnt perfect";
-CM_ SG_ 467 LOW_SPEED_LOCKOUT "in low speed lockout, system would always disengage below 28mph";
-CM_ SG_ 560 BRAKE_PRESSED "another brake pressed?";
-CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
-CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
-CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
-CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
-CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
-CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
-CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
-CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
-CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
-CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
-CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
-CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
-CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1163 TSREQPD "always 1";
-CM_ SG_ 1163 TSRMSW "always 1";
-CM_ SG_ 1163 OTSGNNTM "always 3";
-CM_ SG_ 1163 NTLVLSPD "always 3";
-CM_ SG_ 1163 OVSPNTM "always 3";
-CM_ SG_ 1163 OVSPVALL "-5 at start then 2 after 2 seconds";
-CM_ SG_ 1163 OVSPVALM "-5 at start then 5 after 2 seconds";
-CM_ SG_ 1163 OVSPVALH "-5 at start then 10 after 2 seconds";
-CM_ SG_ 1163 TSRSPU "always 1";
-
-VAL_ 466 CRUISE_STATE 8 "active" 7 "standstill" 1 "off";
-VAL_ 467 LOW_SPEED_LOCKOUT 2 "low speed locked" 1 "ok";
-VAL_ 614 STATE 3 "enabled" 1 "disabled";
-VAL_ 614 DIRECTION_CMD 3 "right" 2 "center" 1 "left";
-VAL_ 643 STATE 0 "normal" 1 "adaptive_cruise_control" 3 "emergency_braking";
-VAL_ 921 CRUISE_CONTROL_STATE 2 "disabled" 11 "hold" 10 "hold_waiting_user_cmd" 6 "enabled" 5 "faulted";
-VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
-VAL_ 1042 BARRIERS 3 "both" 2 "right" 1 "left" 0 "none";
-VAL_ 1042 RIGHT_LINE 3 "orange" 2 "faded" 1 "solid" 0 "none";
-VAL_ 1042 LEFT_LINE 3 "orange" 2 "faded" 1 "solid" 0 "none";
-VAL_ 1553 UNITS 1 "km" 2 "miles";
-VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
-VAL_ 1161 TSGN1 1 "speed sign" 0 "none";
-VAL_ 1161 TSGN2 1 "speed sign" 0 "none";
-VAL_ 1161 SPLSGN2 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
-VAL_ 1162 TSGN3 0 "none" 1 "speed sign" 2 "0 unlimited" 7 "unlimited" 16 "highway" 17 "no highway" 18 "motorway" 19 "no motorway" 20 "in city" 21 "outside city" 22 "pedestrian area" 23 "no pedestrian area" 65 "no overtaking left" 66 "no overtaking right" 67 "overtaking allowed again" 129 "no entry";
-VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
-
-
-CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
-
-CM_ "lexus_is_2018_pt.dbc starts here"
-
-
-
-BO_ 550 BRAKE_MODULE: 8 XXX
- SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX
- SG_ BRAKE_PRESSED : 37|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 581 GAS_PEDAL_ALT: 5 XXX
- SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 705 GAS_PEDAL: 8 XXX
- SG_ GAS_RELEASED : 3|1@0+ (1,0) [0|1] "" XXX
- SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX
-
-BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
- SG_ STEER_TORQUE_EPS : 47|16@0- (1.30,0) [-20000|20000] "" XXX
- SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
- SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ STEER_ANGLE : 31|16@0- (0.0573,0) [-500|500] "" XXX
-
-BO_ 610 EPS_STATUS: 5 EPS
- SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
- SG_ LKA_STATE : 31|7@0+ (1,0) [0|127] "" XXX
- SG_ TYPE : 24|1@0+ (1,0) [0|1] "" XXX
- SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
-
-BO_ 956 GEAR_PACKET: 8 XXX
- SG_ GEAR : 13|6@0+ (1,0) [0|63] "" XXX
-
-BO_ 1009 PCM_CRUISE_ALT: 8 XXX
- SG_ MAIN_ON : 13|1@0+ (1,0) [0|3] "" XXX
- SG_ CRUISE_STATE : 10|1@0+ (1,0) [0|1] "" XXX
- SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "mph" XXX
-
-BO_ 1599 LIGHT_STALK_ISH: 8 SCM
- SG_ AUTO_HIGH_BEAM : 19|1@0+ (1,0) [0|1] "" XXX
-
-CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
-CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
-CM_ SG_ 610 TYPE "seems 1 on Corolla, 0 on all others";
-CM_ SG_ 1009 SET_SPEED "units seem to be whatever the car is set to";
-VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
-VAL_ 610 LKA_STATE 25 "temporary_fault" 9 "temporary_fault2" 5 "active" 1 "standby";
@@ -96,10 +96,7 @@ BO_ 180 SPEED: 8 XXX

 BO_ 353 DSU_SPEED: 8 XXX
 SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
- 
-BO_ 452 ENGINE_RPM: 8 CGW
- SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
- 
+
 BO_ 466 PCM_CRUISE: 8 XXX
 SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
 SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
@@ -376,7 +373,7 @@ BO_ 705 GAS_PEDAL: 8 XXX
 SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX

 BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
- SG_ STEER_TORQUE_EPS : 47|16@0- (0.77,0) [-20000|20000] "" XXX
+ SG_ STEER_TORQUE_EPS : 47|16@0- (1.30,0) [-20000|20000] "" XXX
 SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX
 SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX
 SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
--- a/Show More
+++ b/Show More