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

Fixes

Browse Source
This commit is contained in:
Marianpol 2020-02-23 10:30:07 +01:00
parent 787d3d264a
commit 8f9e4d4dff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyren/mod_ecu.py
View File

@ -429,12 +429,12 @@ class ECU:
datastr = dr.name datastr = dr.name
help = dr.type help = dr.type
if dr.type=='State': if dr.type=='State':
if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs: if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds ) datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else: else:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Parameter': if dr.type=='Parameter':
if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs: if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds ) datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else: else:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )

2
pyren/mod_ecu_mnemonic.py
View File

@ -37,7 +37,7 @@ def get_mnemonic( m, se, elm, raw = 0 ):
if not m.serviceID and mod_globals.ext_cur_DTC: if not m.serviceID and mod_globals.ext_cur_DTC:
for sid in se.keys(): for sid in se.keys():
if se[sid].startReq.endswith(mod_globals.ext_cur_DTC[:4]): if se[sid].startReq == "120004"+ mod_globals.ext_cur_DTC[:4]:
m.startByte = se[sid].responces[se[sid].responces.keys()[0]].mnemolocations[m.name].startByte m.startByte = se[sid].responces[se[sid].responces.keys()[0]].mnemolocations[m.name].startByte
m.startBit = se[sid].responces[se[sid].responces.keys()[0]].mnemolocations[m.name].startBit m.startBit = se[sid].responces[se[sid].responces.keys()[0]].mnemolocations[m.name].startBit
m.request = se[sid].startReq m.request = se[sid].startReq