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

Fix#3

Browse Source
This commit is contained in:
Marianpol 2020-02-03 23:58:40 +01:00
parent bf380daa22
commit f2a3bbe5f4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pyren/scen_ecri_paraminj1.py
View File

@ -169,19 +169,13 @@ def run( elm, ecu, command, data ):
if ecuSet.ncalib: if ecuSet.ncalib:
value2, datastr2 = ecu.get_id(ScmParam['Ncalib']) value2, datastr2 = ecu.get_id(ScmParam['Ncalib'])
if ecuSet.ncalib == value2.upper(): if ecuSet.ncalib == value2.upper():
# print datastr1
# print datastr2
correctEcu = ecuSet correctEcu = ecuSet
break break
elif ecuSet.ncalib == "Other": elif ecuSet.ncalib == "Other":
# print datastr1
# print ecuSet.ncalib
correctEcu = ecuSet correctEcu = ecuSet
else: else:
# print datastr1
correctEcu = ecuSet correctEcu = ecuSet
else: else:
# print datastr1
correctEcu = ecuSet correctEcu = ecuSet
else: else:
correctEcu = ecusList[0] correctEcu = ecusList[0]
@ -193,6 +187,7 @@ def run( elm, ecu, command, data ):
# print l # print l
# print str(i.buttons[l]) # print str(i.buttons[l])
#Prepare buttons
buttons = OrderedDict() buttons = OrderedDict()
for l in correctEcu.buttons.keys(): for l in correctEcu.buttons.keys():
@ -209,6 +204,7 @@ def run( elm, ecu, command, data ):
if str(correctEcu.buttons[l]) == 'true': if str(correctEcu.buttons[l]) == 'true':
buttons[l.strip('Button')] = get_message(l[:-6] + "Text") buttons[l.strip('Button')] = get_message(l[:-6] + "Text")
#Get identifications
identsList = OrderedDict() identsList = OrderedDict()
def getIdents(start, end): def getIdents(start, end):
@ -224,6 +220,7 @@ def run( elm, ecu, command, data ):
end = int(ScmParam['Idents'+key+'End']) end = int(ScmParam['Idents'+key+'End'])
identsList[key] = getIdents(start, end) identsList[key] = getIdents(start, end)
#Get commands
commands = {} commands = {}
for child in root: for child in root: