From c440cf720212dccfe3894fa72a4ad60545d211dd Mon Sep 17 00:00:00 2001 From: Marianpol Date: Tue, 30 Jun 2020 00:07:28 +0200 Subject: [PATCH] Write one valve fix --- pyren/mod_ecu_scenario.py | 2 +- pyren/scen_lect_ssppx91.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pyren/mod_ecu_scenario.py b/pyren/mod_ecu_scenario.py index 85bd53c..84aae75 100755 --- a/pyren/mod_ecu_scenario.py +++ b/pyren/mod_ecu_scenario.py @@ -27,7 +27,7 @@ def playScenario(command, ecu, elm): ecuNumberPattern = re.compile(r'\d{5}') ecuNumberIndex = ecuNumberPattern.search(scenarioData) scenarioName = scenarioData[:scenarioData.find(ecuNumberIndex.group(0)) - 1].lower() - + if os.path.isfile('./'+scenarioName+'.py'): scen = __import__( scenarioName ) if mod_globals.clip_arc: diff --git a/pyren/scen_lect_ssppx91.py b/pyren/scen_lect_ssppx91.py index 02613fb..f33af53 100644 --- a/pyren/scen_lect_ssppx91.py +++ b/pyren/scen_lect_ssppx91.py @@ -261,7 +261,7 @@ def run( elm, ecu, command, data ): clearScreen() print screen print - choice = Choice(valveLabelsDict.values(), get_message_by_id('14127', False).replace('.',':')) + choice = Choice(valveLabelsDict.values(), get_message_by_id('14127').replace('.',':')) clearScreen() print screen @@ -282,13 +282,17 @@ def run( elm, ecu, command, data ): paramToSend = '' if summerTyresSet: - for code in summerTyreCodes: - paramToSend += code - paramToSend = paramToSend.replace(summerTyreCodes[selectedValveKey], userCode) + for code in range(len(summerTyreCodes)): + if code == selectedValveKey: + paramToSend += userCode + else: + paramToSend += summerTyreCodes[code] else: - for code in winterTyreCodes: - paramToSend += code - paramToSend = paramToSend.replace(winterTyreCodes[selectedValveKey], userCode) + for code in range(len(winterTyreCodes)): + if code == selectedValveKey: + paramToSend += userCode + else: + paramToSend += winterTyreCodes[code] clearScreen() print screen