From 601d0b8f1e168ff393a9436dc0be5cb97d543cc8 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 17 Oct 2019 09:58:47 +1000 Subject: [PATCH 1/4] Add DragonCarModel/DragonCarVIN params --- common/params.py | 2 ++ selfdrive/car/car_helpers.py | 2 ++ selfdrive/dragonpilot/dragonconf/__init__.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/common/params.py b/common/params.py index c83c9090b..19c487bbf 100755 --- a/common/params.py +++ b/common/params.py @@ -136,6 +136,8 @@ keys = { "DragonUIPath": [TxType.PERSISTENT], "DragonUIBlinker": [TxType.PERSISTENT], "DragonEnableDriverMonitoring": [TxType.PERSISTENT], + "DragonCarModel": [TxType.PERSISTENT], + "DragonCarVIN": [TxType.PERSISTENT], } diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 5e6954dab..ecf19f875 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -141,6 +141,8 @@ def fingerprint(logcan, sendcan, has_relay): put_nonblocking("DragonCachedModel", pickle.dumps(car_fingerprint)) put_nonblocking("DragonCachedFP", pickle.dumps(finger)) put_nonblocking("DragonCachedVIN", pickle.dumps(vin)) + put_nonblocking("DragonCarModel", car_fingerprint) + put_nonblocking("DragonCarVIN", vin) cloudlog.warning("fingerprinted %s", car_fingerprint) return car_fingerprint, finger, vin diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py index 67a81c22f..86cdee49c 100644 --- a/selfdrive/dragonpilot/dragonconf/__init__.py +++ b/selfdrive/dragonpilot/dragonconf/__init__.py @@ -46,6 +46,8 @@ default_conf = { 'DragonUIPath': '1', 'DragonUIBlinker': '0', 'DragonEnableDriverMonitoring': '1', + 'DragonCarModel': '', + 'DragonCarVIN': '', } deprecated_conf = { From 270702f54c9ac8fb9ade03350acedb5f0633f44b Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 17 Oct 2019 09:59:13 +1000 Subject: [PATCH 2/4] Fix charging_ctrl max/min value param reader --- selfdrive/thermald.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index ccea40d3d..6a4f23c4a 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -325,8 +325,8 @@ def thermald_thread(): # update variable status every 10 secs if ts - ts_last_update_vars > 10.: dragon_charging_ctrl = True if params.get('DragonChargingCtrl', encoding='utf8') == "1" else False - dragon_charging_max = int(params.get('DragonCharging')) - dragon_discharging_min = int(params.get('DragonDisCharging')) + dragon_charging_max = int(params.get('DragonCharging', encoding='utf8')) + dragon_discharging_min = int(params.get('DragonDisCharging', encoding='utf8')) ts_last_update_vars = ts # we only update charging status once every min From 84fc30a84be32259a6ae6bde11b6f1d245847e52 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 17 Oct 2019 10:21:00 +1000 Subject: [PATCH 3/4] Fix STEER_ANGLE in STEER_TORQUE_SENSOR factor to 0.573 (was 0.056) --- opendbc/lexus_is_2018_pt_generated.dbc | 2 +- opendbc/lexus_is_hybrid_2017_pt_generated.dbc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/lexus_is_2018_pt_generated.dbc b/opendbc/lexus_is_2018_pt_generated.dbc index 820fafa0b..05e8c4492 100644 --- a/opendbc/lexus_is_2018_pt_generated.dbc +++ b/opendbc/lexus_is_2018_pt_generated.dbc @@ -377,7 +377,7 @@ 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.056,0) [-500|500] "" XXX + SG_ STEER_ANGLE : 31|16@0- (0.573,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 5 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX diff --git a/opendbc/lexus_is_hybrid_2017_pt_generated.dbc b/opendbc/lexus_is_hybrid_2017_pt_generated.dbc index 47c42483a..970355160 100644 --- a/opendbc/lexus_is_hybrid_2017_pt_generated.dbc +++ b/opendbc/lexus_is_hybrid_2017_pt_generated.dbc @@ -361,7 +361,7 @@ 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.056,0) [-500|500] "" XXX + SG_ STEER_ANGLE : 31|16@0- (0.573,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 5 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX From 7c8f42c07e49bd832da1f1dfab0fdcdd1534d578 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 17 Oct 2019 10:30:50 +1000 Subject: [PATCH 4/4] update APK