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

Rename

Browse Source
This commit is contained in:
Marianpol 2020-02-22 18:58:16 +01:00
parent f5e864453f
commit 787d3d264a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyren/mod_ecu.py
View File

@ -429,12 +429,12 @@ class ECU:
datastr = dr.name datastr = dr.name
help = dr.type help = dr.type
if dr.type=='State': if dr.type=='State':
if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].ssdatarefs: if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds ) datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else: else:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Parameter': if dr.type=='Parameter':
if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].ssdatarefs: if self.DataIds and DTCpos and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds ) datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else: else:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
@ -721,7 +721,7 @@ class ECU:
mem_dtrf_txt = mod_globals.language_dict['299'] + " DTC" + mod_globals.ext_cur_DTC + "\n" mem_dtrf_txt = mod_globals.language_dict['299'] + " DTC" + mod_globals.ext_cur_DTC + "\n"
cur_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['300'] + "\n", 'Text')] + self.Defaults[dtchex[:4]].datarefs cur_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['300'] + "\n", 'Text')] + self.Defaults[dtchex[:4]].datarefs
mem_dtrf = [ecu_screen_dataref(0, mem_dtrf_txt, 'Text')] + self.Defaults[dtchex[:4]].ssdatarefs mem_dtrf = [ecu_screen_dataref(0, mem_dtrf_txt, 'Text')] + self.Defaults[dtchex[:4]].memDatarefs
tmp_dtrf = mem_dtrf + cur_dtrf tmp_dtrf = mem_dtrf + cur_dtrf
@ -767,7 +767,7 @@ class ECU:
mem_dtrf_txt = mod_globals.language_dict['299'] + " DTC" + mod_globals.ext_cur_DTC + "\n" mem_dtrf_txt = mod_globals.language_dict['299'] + " DTC" + mod_globals.ext_cur_DTC + "\n"
cur_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['300'] + "\n", 'Text')] + self.Defaults[dtchex[:4]].datarefs cur_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['300'] + "\n", 'Text')] + self.Defaults[dtchex[:4]].datarefs
mem_dtrf = [ecu_screen_dataref(0, mem_dtrf_txt, 'Text')] + self.Defaults[dtchex[:4]].ssdatarefs mem_dtrf = [ecu_screen_dataref(0, mem_dtrf_txt, 'Text')] + self.Defaults[dtchex[:4]].memDatarefs
ext_info_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['1691'] + "\n", 'Text')] + self.ext_de ext_info_dtrf = [ecu_screen_dataref(0, "\n" + mod_globals.language_dict['1691'] + "\n", 'Text')] + self.ext_de
tmp_dtrf = mem_dtrf + cur_dtrf + ext_info_dtrf tmp_dtrf = mem_dtrf + cur_dtrf + ext_info_dtrf

7
pyren/mod_ecu_default.py
View File

@ -350,7 +350,7 @@ class ecu_default:
label = "" label = ""
status = 0 status = 0
datarefs = [] datarefs = []
ssdatarefs = [] memDatarefs = []
helps = [] helps = []
caracter = {} caracter = {}
interpInfoPeri = "" interpInfoPeri = ""
@ -385,7 +385,8 @@ class ecu_default:
for dr in DataRef: for dr in DataRef:
dataref = ecu_screen_dataref( dr ) dataref = ecu_screen_dataref( dr )
self.datarefs.append( dataref ) self.datarefs.append( dataref )
self.ssdatarefs = []
self.memDatarefs = []
MemorisedInfo = df.getElementsByTagName("MemorisedInfo") MemorisedInfo = df.getElementsByTagName("MemorisedInfo")
if MemorisedInfo: if MemorisedInfo:
for mi in MemorisedInfo: for mi in MemorisedInfo:
@ -393,7 +394,7 @@ class ecu_default:
if DataRef: if DataRef:
for dr in DataRef: for dr in DataRef:
dataref = ecu_screen_dataref( dr ) dataref = ecu_screen_dataref( dr )
self.ssdatarefs.append( dataref ) self.memDatarefs.append( dataref )
self.helps = [] self.helps = []
Helps = df.getElementsByTagName("Helps") Helps = df.getElementsByTagName("Helps")