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

DB V200 allvin fix

Browse Source
This commit is contained in:
Marianpol 2020-08-01 10:47:23 +02:00
parent 610699d2c4
commit 386a69c1b3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyren/mod_ecu.py
View File

@ -393,7 +393,8 @@ class ECU:
csvline += ";" + self.States[dr.name].codeMR + (":" + self.States[dr.name].label if mod_globals.opt_csv_human else "") csvline += ";" + self.States[dr.name].codeMR + (":" + self.States[dr.name].label if mod_globals.opt_csv_human else "")
nparams += 1 nparams += 1
if dr.type=='Parameter': if dr.type=='Parameter':
csvline += ";" + self.Parameters[dr.name].codeMR + (":" +self.Parameters[dr.name].label if mod_globals.opt_csv_human else "") csvline += (";" + self.Parameters[dr.name].codeMR + (":" +self.Parameters[dr.name].label if mod_globals.opt_csv_human else "") +
" [" + self.Parameters[dr.name].unit + "]")
nparams += 1 nparams += 1
if mod_globals.opt_usrkey: csvline += ";User events" if mod_globals.opt_usrkey: csvline += ";User events"
csvline = pyren_encode(csvline) csvline = pyren_encode(csvline)

3
pyren/mod_ecu_scenario.py
View File

@ -26,7 +26,8 @@ def playScenario(command, ecu, elm):
if showable: if showable:
ecuNumberPattern = re.compile(r'\d{5}') ecuNumberPattern = re.compile(r'\d{5}')
ecuNumberIndex = ecuNumberPattern.search(scenarioData) ecuNumberIndex = ecuNumberPattern.search(scenarioData)
scenarioName = scenarioData[:scenarioData.find(ecuNumberIndex.group(0)) - 1].lower() if ecuNumberIndex:
scenarioName = scenarioData[:scenarioData.find(ecuNumberIndex.group(0)) - 1].lower()
if os.path.isfile('./'+scenarioName+'.py'): if os.path.isfile('./'+scenarioName+'.py'):
scen = __import__( scenarioName ) scen = __import__( scenarioName )

4
pyren/mod_mtc.py
View File

@ -71,12 +71,14 @@ def acf_buildFull( platf ):
mtcf = open(plDIR+'/MTC.dat', 'rb') mtcf = open(plDIR+'/MTC.dat', 'rb')
mtc_list = csv.reader(mtcf, delimiter=';') mtc_list = csv.reader(mtcf, delimiter=';')
for i in mtc_list: for i in mtc_list:
if i:
mtc[int(i[0][:-4])] = i[1:] mtc[int(i[0][:-4])] = i[1:]
ref = {} ref = {}
reff = open(plDIR+'/REF.dat', 'rb') reff = open(plDIR+'/REF.dat', 'rb')
ref_list = csv.reader(reff, delimiter=';') ref_list = csv.reader(reff, delimiter=';')
for i in ref_list: for i in ref_list:
if i:
ref[int(i[0][:10])] = [i[0][11:]] + i[1:] ref[int(i[0][:10])] = [i[0][11:]] + i[1:]
all_vin = open(plDIR+'/all_vin.csv', 'w') all_vin = open(plDIR+'/all_vin.csv', 'w')
@ -111,9 +113,9 @@ def acf_buildFull( platf ):
try: try:
d = vr[4].split(':')[1].split('.') d = vr[4].split(':')[1].split('.')
data = d[2] + d[1] + d[0] data = d[2] + d[1] + d[0]
outl = data+'#'+VIN+'#'+' '.join(vr[1:])+'#'+' '.join(mtc[int(vr[1])])+'#'+'_'.join(ref[int(vr[2])])
except: except:
pass pass
outl = data+'#'+VIN+'#'+' '.join(vr[1:])+'#'+' '.join(mtc[int(vr[1])])+'#'+'_'.join(ref[int(vr[2])])
all_vin.write(outl+'\n') all_vin.write(outl+'\n')
all_vin.close() all_vin.close()
print "\n\n File: "+plDIR+"/all_vin.csv is build\n\n" print "\n\n File: "+plDIR+"/all_vin.csv is build\n\n"