From a31e196205dbcb67e6f757a82dc98d84e4dfea5f Mon Sep 17 00:00:00 2001
From: Dragonpilot <dgnpilot@gmail.com>
Date: Thu, 1 Aug 2019 09:14:19 +1000
Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=A7=BB=E9=99=A4=E6=8C=87=E7=B4=8B?=
 =?UTF-8?q?=E6=9A=AB=E5=AD=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 89574f5c7aa058d51e45399505f2e40cbf482dd6.

Conflicts:
	apk/ai.comma.plus.offroad.apk
---
 common/params.py                             |  8 ++++----
 selfdrive/dragonpilot/dragonconf/__init__.py | 12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/common/params.py b/common/params.py
index 072961adb..1b4dd1890 100755
--- a/common/params.py
+++ b/common/params.py
@@ -94,10 +94,10 @@ keys = {
   "DragonDisableUploader": [TxType.PERSISTENT], # deprecated
   "DragonEnableUploader": [TxType.PERSISTENT],
   "DragonNoctuaMode": [TxType.PERSISTENT],
-  "DragonCacheCar": [TxType.PERSISTENT], # deprecated
-  "DragonCachedModel": [TxType.PERSISTENT], # deprecated
-  "DragonCachedFP": [TxType.PERSISTENT], # deprecated
-  "DragonCachedVIN": [TxType.PERSISTENT], # deprecated
+  "DragonCacheCar": [TxType.PERSISTENT],
+  "DragonCachedModel": [TxType.PERSISTENT],
+  "DragonCachedFP": [TxType.PERSISTENT],
+  "DragonCachedVIN": [TxType.PERSISTENT],
   "DragonAllowGas": [TxType.PERSISTENT],
   "DragonBBUI": [TxType.PERSISTENT],
   "DragonToyotaStockDSU": [TxType.PERSISTENT],
diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py
index 6edb15c98..3e325c592 100644
--- a/selfdrive/dragonpilot/dragonconf/__init__.py
+++ b/selfdrive/dragonpilot/dragonconf/__init__.py
@@ -18,10 +18,10 @@ default_conf = {
   'DragonDisableUploader': '0', # deprecated
   'DragonEnableUploader': '1',
   'DragonNoctuaMode': '0',
-  'DragonCacheCar': '1', # deprecated
-  'DragonCachedModel': '', # for cache car # deprecated
-  'DragonCachedFP': '', # for cache car # deprecated
-  'DragonCachedVIN': '', # for cache car # deprecated
+  'DragonCacheCar': '1',
+  'DragonCachedModel': '', # for cache car
+  'DragonCachedFP': '', # for cache car
+  'DragonCachedVIN': '', # for cache car
   'DragonAllowGas': '0',
   'DragonBBUI': '0',
   'DragonToyotaStockDSU': '0',
@@ -33,10 +33,6 @@ deprecated_conf = {
   'DragonTempDisableSteerOnSignal': 'DragonEnableSteeringOnSignal',
   'DragonDisableLogger': 'DragonEnableLogger',
   'DragonDisableUploader': 'DragonEnableUploader',
-  'DragonCacheCar': None,
-  'DragonCachedModel': None,
-  'DragonCachedFP': None,
-  'DragonCachedVIN': None,
 }
 
 deprecated_conf_invert = {