mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-07-07 13:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel-en' into devel-zhs

Browse Source
This commit is contained in:
dragonpilot
2019-10-17 10:37:34 +10:00
parent 012ad245f4 7c8f42c07e
commit 17ba9712c3
6 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/params.py
+2
View File
@@ -136,6 +136,8 @@ keys = {
"DragonUIPath": [TxType.PERSISTENT],
"DragonUIBlinker": [TxType.PERSISTENT],
"DragonEnableDriverMonitoring": [TxType.PERSISTENT],
"DragonCarModel": [TxType.PERSISTENT],
"DragonCarVIN": [TxType.PERSISTENT],
}
opendbc/lexus_is_2018_pt_generated.dbc
+1 -1
View File
@@ -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
opendbc/lexus_is_hybrid_2017_pt_generated.dbc
+1 -1
View File
@@ -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
selfdrive/car/car_helpers.py
+2
View File
@@ -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
selfdrive/dragonpilot/dragonconf/__init__.py
+2
View File
@@ -46,6 +46,8 @@ default_conf = {
'DragonUIPath': '1',
'DragonUIBlinker': '0',
'DragonEnableDriverMonitoring': '1',
'DragonCarModel': '',
'DragonCarVIN': '',
}
deprecated_conf = {
selfdrive/thermald.py
+2 -2
View File
@@ -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