From 787d3d264aa65f96b5cffaf9030fba616af868f9 Mon Sep 17 00:00:00 2001 From: Marianpol Date: Sat, 22 Feb 2020 18:58:16 +0100 Subject: [PATCH] Rename --- pyren/mod_ecu.py | 8 ++++---- pyren/mod_ecu_default.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pyren/mod_ecu.py b/pyren/mod_ecu.py index e30ad54..5bad1e4 100755 --- a/pyren/mod_ecu.py +++ b/pyren/mod_ecu.py @@ -429,12 +429,12 @@ class ECU: datastr = dr.name help = dr.type 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 ) else: datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc ) 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 ) else: 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" 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 @@ -767,7 +767,7 @@ class ECU: 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 - 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 tmp_dtrf = mem_dtrf + cur_dtrf + ext_info_dtrf diff --git a/pyren/mod_ecu_default.py b/pyren/mod_ecu_default.py index a5b6059..d6c598d 100644 --- a/pyren/mod_ecu_default.py +++ b/pyren/mod_ecu_default.py @@ -350,7 +350,7 @@ class ecu_default: label = "" status = 0 datarefs = [] - ssdatarefs = [] + memDatarefs = [] helps = [] caracter = {} interpInfoPeri = "" @@ -385,7 +385,8 @@ class ecu_default: for dr in DataRef: dataref = ecu_screen_dataref( dr ) self.datarefs.append( dataref ) - self.ssdatarefs = [] + + self.memDatarefs = [] MemorisedInfo = df.getElementsByTagName("MemorisedInfo") if MemorisedInfo: for mi in MemorisedInfo: @@ -393,7 +394,7 @@ class ecu_default: if DataRef: for dr in DataRef: dataref = ecu_screen_dataref( dr ) - self.ssdatarefs.append( dataref ) + self.memDatarefs.append( dataref ) self.helps = [] Helps = df.getElementsByTagName("Helps")