From f2a3bbe5f4dfd973c91ecb76f4f1a2f389f9d11c Mon Sep 17 00:00:00 2001 From: Marianpol Date: Mon, 3 Feb 2020 23:58:40 +0100 Subject: [PATCH] Fix#3 --- pyren/scen_ecri_paraminj1.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pyren/scen_ecri_paraminj1.py b/pyren/scen_ecri_paraminj1.py index 218875c..430b536 100644 --- a/pyren/scen_ecri_paraminj1.py +++ b/pyren/scen_ecri_paraminj1.py @@ -169,19 +169,13 @@ def run( elm, ecu, command, data ): if ecuSet.ncalib: value2, datastr2 = ecu.get_id(ScmParam['Ncalib']) if ecuSet.ncalib == value2.upper(): - # print datastr1 - # print datastr2 correctEcu = ecuSet break elif ecuSet.ncalib == "Other": - # print datastr1 - # print ecuSet.ncalib correctEcu = ecuSet else: - # print datastr1 correctEcu = ecuSet else: - # print datastr1 correctEcu = ecuSet else: correctEcu = ecusList[0] @@ -193,6 +187,7 @@ def run( elm, ecu, command, data ): # print l # print str(i.buttons[l]) + #Prepare buttons buttons = OrderedDict() for l in correctEcu.buttons.keys(): @@ -209,6 +204,7 @@ def run( elm, ecu, command, data ): if str(correctEcu.buttons[l]) == 'true': buttons[l.strip('Button')] = get_message(l[:-6] + "Text") + #Get identifications identsList = OrderedDict() def getIdents(start, end): @@ -224,6 +220,7 @@ def run( elm, ecu, command, data ): end = int(ScmParam['Idents'+key+'End']) identsList[key] = getIdents(start, end) + #Get commands commands = {} for child in root: