From 386a69c1b30336fa446d17559a4581579d56c770 Mon Sep 17 00:00:00 2001 From: Marianpol Date: Sat, 1 Aug 2020 10:47:23 +0200 Subject: [PATCH] DB V200 allvin fix --- pyren/mod_ecu.py | 3 ++- pyren/mod_ecu_scenario.py | 3 ++- pyren/mod_mtc.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyren/mod_ecu.py b/pyren/mod_ecu.py index 4ece561..52728c8 100755 --- a/pyren/mod_ecu.py +++ b/pyren/mod_ecu.py @@ -393,7 +393,8 @@ class ECU: csvline += ";" + self.States[dr.name].codeMR + (":" + self.States[dr.name].label if mod_globals.opt_csv_human else "") nparams += 1 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 if mod_globals.opt_usrkey: csvline += ";User events" csvline = pyren_encode(csvline) diff --git a/pyren/mod_ecu_scenario.py b/pyren/mod_ecu_scenario.py index 84aae75..f871374 100755 --- a/pyren/mod_ecu_scenario.py +++ b/pyren/mod_ecu_scenario.py @@ -26,7 +26,8 @@ def playScenario(command, ecu, elm): if showable: ecuNumberPattern = re.compile(r'\d{5}') 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'): scen = __import__( scenarioName ) diff --git a/pyren/mod_mtc.py b/pyren/mod_mtc.py index b60fa00..6c17523 100755 --- a/pyren/mod_mtc.py +++ b/pyren/mod_mtc.py @@ -71,12 +71,14 @@ def acf_buildFull( platf ): mtcf = open(plDIR+'/MTC.dat', 'rb') mtc_list = csv.reader(mtcf, delimiter=';') for i in mtc_list: + if i: mtc[int(i[0][:-4])] = i[1:] ref = {} reff = open(plDIR+'/REF.dat', 'rb') ref_list = csv.reader(reff, delimiter=';') for i in ref_list: + if i: ref[int(i[0][:10])] = [i[0][11:]] + i[1:] all_vin = open(plDIR+'/all_vin.csv', 'w') @@ -111,9 +113,9 @@ def acf_buildFull( platf ): try: d = vr[4].split(':')[1].split('.') data = d[2] + d[1] + d[0] + outl = data+'#'+VIN+'#'+' '.join(vr[1:])+'#'+' '.join(mtc[int(vr[1])])+'#'+'_'.join(ref[int(vr[2])]) except: pass - outl = data+'#'+VIN+'#'+' '.join(vr[1:])+'#'+' '.join(mtc[int(vr[1])])+'#'+'_'.join(ref[int(vr[2])]) all_vin.write(outl+'\n') all_vin.close() print "\n\n File: "+plDIR+"/all_vin.csv is build\n\n"