tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ddt ecu search

Browse Source
This commit is contained in:
shrlnm 2023-01-05 17:47:38 +03:00
parent c3370c63b3
commit 5aa2367f7c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyren3/mod_ddt_ecu.py
View File

@ -237,8 +237,7 @@ class DDTECU():
''' 0 1 2 3 4 5 6 7 ''' ''' 0 1 2 3 4 5 6 7 '''
''' 01234567890123456789012345678901234567890123456789012345678901234567890123456''' ''' 01234567890123456789012345678901234567890123456789012345678901234567890123456'''
#IdRsp = '61 80 34 36 33 32 52 45 34 42 45 30 30 33 37 52 00 83 9D 00 1A 90 01 01 00 88 AA' #IdRsp = '61 80 82 00 41 86 46 04 41 46 4A 82 00 41 86 46 D1 00 30 00 00 48 00 05 09 05'
#IdRsp = '61 80 30 33 32 32 53 44 34 36 34 36 34 31 39 52 43 10 34 00 25 80 01 01 01 88 00'
''' -- -------- ----- ----- ''' ''' -- -------- ----- ----- '''
''' DiagVersion--+ | | +--Version ''' ''' DiagVersion--+ | | +--Version '''
''' Supplier--+ +--Soft ''' ''' Supplier--+ +--Soft '''
@ -298,6 +297,8 @@ class DDTECU():
fname = mod_globals.opt_ddtxml fname = mod_globals.opt_ddtxml
self.ecufname = mod_globals.ddtroot+'/ecus/'+fname self.ecufname = mod_globals.ddtroot+'/ecus/'+fname
else: else:
#vehTypeCode = 'x81'
#Address = '0D'
problist = ecuSearch(vehTypeCode, Address, DiagVersion, Supplier, Soft, Version, eculist) problist = ecuSearch(vehTypeCode, Address, DiagVersion, Supplier, Soft, Version, eculist)
while 1: while 1:
@ -1202,7 +1203,7 @@ def ecuSearch(vehTypeCode, Address, DiagVersion, Supplier, Soft, Version, el, in
#dist = dist + minDist(Version, ai['Version']) * 1 # weight #dist = dist + minDist(Version, ai['Version']) * 1 # weight
dist = AutoIdents_distance( DiagVersion, Supplier, Soft, Version, ai ) dist = AutoIdents_distance( DiagVersion, Supplier, Soft, Version, ai )
if vehTypeCode in t[k]['Projects'] or dist == 0: if vehTypeCode.upper() in t[k]['Projects'] or dist == 0:
if k not in list(cand.keys()): cand[k] = 0xFFFFFFFF if k not in list(cand.keys()): cand[k] = 0xFFFFFFFF
if dist < cand[k]: cand[k] = dist if dist < cand[k]: cand[k] = dist
if dist < min: min = dist if dist < min: min = dist