diff --git a/pyren/mod_ecu.py b/pyren/mod_ecu.py index 5bad1e4..83acc3a 100755 --- a/pyren/mod_ecu.py +++ b/pyren/mod_ecu.py @@ -429,12 +429,12 @@ class ECU: datastr = dr.name help = dr.type 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 ) else: datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) 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 ) else: datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) diff --git a/pyren/mod_ecu_mnemonic.py b/pyren/mod_ecu_mnemonic.py index ea092fc..e19e327 100755 --- a/pyren/mod_ecu_mnemonic.py +++ b/pyren/mod_ecu_mnemonic.py @@ -37,7 +37,7 @@ def get_mnemonic( m, se, elm, raw = 0 ): if not m.serviceID and mod_globals.ext_cur_DTC: 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.startBit = se[sid].responces[se[sid].responces.keys()[0]].mnemolocations[m.name].startBit m.request = se[sid].startReq