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 23:45:51 +01:00
parent a277a94ce9
commit db7438b207
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyren/mod_ecu.py
View File

@ -540,6 +540,8 @@ class ECU:
kb.set_normal_term() kb.set_normal_term()
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv and csvf!=0:
csvf.close() csvf.close()
if "DTC" in path:
mod_globals.ext_cur_DTC = "000000"
return return
def add_favourite(self): def add_favourite(self):

12
pyren/mod_ecu_mnemonic.py
View File

@ -35,7 +35,7 @@ def get_mnemonicDTC( m, resp ):
def get_mnemonic( m, se, elm, raw = 0 ): 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 != "000000":
for sid in se.keys(): for sid in se.keys():
if se[sid].startReq == "120004"+ 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
@ -58,7 +58,7 @@ def get_mnemonic( m, se, elm, raw = 0 ):
resp = ' '.join(a+b for a,b in zip(resp[::2], resp[1::2])) resp = ' '.join(a+b for a,b in zip(resp[::2], resp[1::2]))
if len(m.startByte)==0: m.startByte = u'01' if len(m.startByte)==0: m.startByte = u'01'
hexval = getHexVal(m.startByte, m.bitsLength, m.startBit, m.littleEndian, resp) hexval = getHexVal(m.startByte, m.bitsLength, m.startBit, m.littleEndian, resp, raw)
return hexval return hexval
def get_SnapShotMnemonic(m, se, elm, dataids): def get_SnapShotMnemonic(m, se, elm, dataids):
@ -100,7 +100,7 @@ def get_SnapShotMnemonic(m, se, elm, dataids):
hexval = getHexVal(startByte, m.bitsLength, startBit, m.littleEndian, didDict[dataId]) hexval = getHexVal(startByte, m.bitsLength, startBit, m.littleEndian, didDict[dataId])
return hexval return hexval
def getHexVal(startByte, bitsLength, startBit, littleEndian, resp): def getHexVal(startByte, bitsLength, startBit, littleEndian, resp, raw = 0):
#prepare local variables #prepare local variables
sb = int(startByte) - 1 sb = int(startByte) - 1
bits = int(bitsLength) bits = int(bitsLength)
@ -116,6 +116,12 @@ def getHexVal(startByte, bitsLength, startBit, littleEndian, resp):
hexval = resp[sb*3:(sb+bytes)*3-1] hexval = resp[sb*3:(sb+bytes)*3-1]
hexval = hexval.replace(" ","") hexval = hexval.replace(" ","")
if raw:
if resp.startswith(m.positive):
return hexval
else:
return 'ERROR'
#shift and mask #shift and mask
val = (int(hexval,16)>>rshift)&(2**bits-1) val = (int(hexval,16)>>rshift)&(2**bits-1)