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

Missing import + missing snapshot data fix

Browse Source
This commit is contained in:
Marianpol 2020-09-11 16:59:51 +02:00
parent 367b7c412b
commit 1143670740
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyren/mod_ecu.py
View File

@ -32,6 +32,7 @@ import sys
import os import os
import time import time
import gc import gc
import re
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
@ -536,7 +537,7 @@ class ECU:
kb.set_getch_term() kb.set_getch_term()
else: else:
if mod_globals.opt_csv and (c in mod_globals.opt_usrkey): if mod_globals.opt_csv and (c in mod_globals.opt_usrkey):
csvline += ";" + c csvline += ";" + pyren_encode(c)
continue continue
kb.set_normal_term() kb.set_normal_term()
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv and csvf!=0:
@ -563,7 +564,7 @@ class ECU:
clearScreen() clearScreen()
continue continue
if mod_globals.opt_csv and (c in mod_globals.opt_usrkey): if mod_globals.opt_csv and (c in mod_globals.opt_usrkey):
csvline += ";" + c csvline += ";" + pyren_encode(c)
continue continue
kb.set_normal_term() kb.set_normal_term()
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv and csvf!=0:

3
pyren/mod_ecu_mnemonic.py
View File

@ -98,6 +98,9 @@ def get_SnapShotMnemonic(m, se, elm, dataids):
dataId = did dataId = did
startByte = dataids[dataId].mnemolocations[m.name].startByte startByte = dataids[dataId].mnemolocations[m.name].startByte
startBit = dataids[dataId].mnemolocations[m.name].startBit startBit = dataids[dataId].mnemolocations[m.name].startBit
if dataId not in didDict:
didDict[dataId] = '0' * (int(dataids[dataId].dataBitLength)/8)
hexval = getHexVal(m, startByte, startBit, didDict[dataId]) hexval = getHexVal(m, startByte, startBit, didDict[dataId])
return hexval return hexval