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

EGR done

Browse Source
This commit is contained in:
Marianpol 2020-02-04 23:15:25 +01:00
parent 94414a6085
commit b1d3601a19
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pyren/scen_ecri_paraminj1.py
View File

@ -182,12 +182,12 @@ def run( elm, ecu, command, data ):
if not correctEcu and mod_globals.opt_demo: if not correctEcu and mod_globals.opt_demo:
correctEcu = ecusList[0] correctEcu = ecusList[0]
# for i in ecusList: for i in ecusList:
# print i.vdiag print i.vdiag
# print i.ncalib print i.ncalib
# for l in i.buttons.keys(): for l in i.buttons.keys():
# print l print l
# print str(i.buttons[l]) print str(i.buttons[l])
#Prepare buttons #Prepare buttons
buttons = OrderedDict() buttons = OrderedDict()
@ -216,6 +216,11 @@ def run( elm, ecu, command, data ):
begin = int(ScmParam['Idents'+key+'Begin']) begin = int(ScmParam['Idents'+key+'Begin'])
end = int(ScmParam['Idents'+key+'End']) end = int(ScmParam['Idents'+key+'End'])
identsKeys[key] = {"begin": begin, "end": end} identsKeys[key] = {"begin": begin, "end": end}
try:
identsList['D'+str(begin)] = ScmParam['Ident'+str(begin)]
except:
break
else:
for idnum in range(begin ,end + 1): for idnum in range(begin ,end + 1):
identsList['D'+str(idnum)] = ScmParam['Ident'+str(idnum)] identsList['D'+str(idnum)] = ScmParam['Ident'+str(idnum)]
@ -257,17 +262,15 @@ def run( elm, ecu, command, data ):
else: else:
identsList[k] = v identsList[k] = v
def resetEGRValve():
paramToSend = ""
params = getValuesToChange("EGR_VALVE")
confirm = get_message_by_id('19800') confirm = get_message_by_id('19800')
successMessage = get_message('Message32') successMessage = get_message('Message32')
failMessage = get_message('MessageNACK') failMessage = get_message('MessageNACK')
clearScreen()
for idKey in range(identsKeys[identsKeys.keys()[0]]['begin'], identsKeys[identsKeys.keys()[0]]['end'] + 1): def resetValues():
identsList["D" + str(idKey)] = ecu.get_id(identsList["D" + str(idKey)], 1) paramToSend = ""
params = getValuesToChange("EGR_VALVE")
clearScreen()
print buttons[2] print buttons[2]
print print
@ -279,6 +282,21 @@ def run( elm, ecu, command, data ):
clearScreen() clearScreen()
if not params:
print
response = ecu.run_cmd(commands['Cmd5'])
print
if "NR" in response:
print failMessage
else:
print successMessage
print
ch = raw_input('Press ENTER to exit')
return
for idKey in range(identsKeys[identsKeys.keys()[0]]['begin'], identsKeys[identsKeys.keys()[0]]['end'] + 1):
identsList["D" + str(idKey)] = ecu.get_id(identsList["D" + str(idKey)], 1)
replaceValues(params) replaceValues(params)
for idKey in range(identsKeys[identsKeys.keys()[0]]['begin'], identsKeys[identsKeys.keys()[0]]['end'] + 1): for idKey in range(identsKeys[identsKeys.keys()[0]]['begin'], identsKeys[identsKeys.keys()[0]]['end'] + 1):
@ -286,6 +304,7 @@ def run( elm, ecu, command, data ):
print print
response = ecu.run_cmd(commands['Cmd5'],paramToSend) response = ecu.run_cmd(commands['Cmd5'],paramToSend)
print
if "NR" in response: if "NR" in response:
print failMessage print failMessage
else: else:
@ -294,6 +313,7 @@ def run( elm, ecu, command, data ):
print print
ch = raw_input('Press ENTER to exit') ch = raw_input('Press ENTER to exit')
functions = OrderedDict() functions = OrderedDict()
functions[2] = resetEGRValve functions[2] = resetEGRValve