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

fix make macro from dump without savedEcus

Browse Source
This commit is contained in:
shrlnm 2023-07-22 09:42:16 +03:00
parent e51f2575fb
commit e24baa15a8
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyren3/mod_ddt_ecu.py
View File

@ -339,6 +339,16 @@ class DDTECU():
#print et.dump(root) #print et.dump(root)
try:
funcs = root.findall('ns0:Target/ns0:Function', ns)
if funcs:
for fun in funcs:
self.Addr = can.attrib["Address"]
if len(self.Addr):
self.Addr = hex(int(self.Addr))[2:]
except:
self.Addr = None
cans = root.findall('ns0:Target/ns0:CAN', ns) #xdoc.findall("CAN") cans = root.findall('ns0:Target/ns0:CAN', ns) #xdoc.findall("CAN")
if cans: if cans:
for can in cans: for can in cans:

23
pyren3/mod_ddt_screen.py
View File

@ -730,17 +730,18 @@ class DDTScreen (tk.Frame):
# show confirmation dialog if approve is True # show confirmation dialog if approve is True
confirmed = True confirmed = True
xText = f'#The macro made by mod_ddt from file {fname}\n\n' xText = f'#The macro made by mod_ddt from file {fname}\n\n'
xText += f'$addr = {self.decu.cecu["dst"]}\n\n' if self.decu.cecu != None:
if self.decu.cecu["pin"] == 'can' and self.decu.cecu["brp"] == '0': xText += f'$addr = {self.decu.cecu["dst"]}\n\n'
xText += f'can500 # init can macro\n\n' if self.decu.cecu["pin"] == 'can' and self.decu.cecu["brp"] == '0':
elif self.decu.cecu["pin"] == 'can' and self.decu.cecu["brp"] == '1': xText += f'can500 # init can macro\n\n'
xText += f'can250 # init can macro\n\n' elif self.decu.cecu["pin"] == 'can' and self.decu.cecu["brp"] == '1':
else: xText += f'can250 # init can macro\n\n'
xText += f'fast # init iso macro\n\n' else:
xText += f'delay 1\n\n' xText += f'fast # init iso macro\n\n'
xText += f'# open session\n\n' xText += f'delay 1\n\n'
xText += f'session {self.decu.cecu["startDiagReq"]}\n\n' xText += f'# open session\n\n'
xText += f'# configuration\n\n' xText += f'session {self.decu.cecu["startDiagReq"]}\n\n'
xText += f'# configuration\n\n'
for i in conf_1: for i in conf_1:
xText += f'{i}\n' xText += f'{i}\n'