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

Add legacy macro support

Browse Source
This commit is contained in:
Marianpol 2022-03-30 11:47:26 +02:00
parent dddbccaa92
commit a3ac8a02ab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pyren/mod_term.py
View File

@ -454,15 +454,15 @@ def play_macro(mname, elm):
def run_init_function(mname, elm): def run_init_function(mname, elm):
global var global var
if mname in ["init_can_250", "init_can_500"]: if mname in ["init_can_250", "can250", "init_can_500", "can500"]:
elm.init_can() elm.init_can()
if mname == "init_can_250": if mname in ["init_can_250", "can250"]:
elm.set_can_addr(var['$addr'], {'brp': '1'}) elm.set_can_addr(var['$addr'], {'brp': '1'})
else: else:
elm.set_can_addr(var['$addr'], {}) elm.set_can_addr(var['$addr'], {})
elif mname in ["init_iso_slow", "init_iso_fast"]: elif mname in ["init_iso_slow", "slow", "init_iso_fast", "fast"]:
elm.init_iso() elm.init_iso()
if mname == "init_iso_slow": if mname in ["init_iso_slow", "slow"]:
elm.set_iso_addr(var['$addr'], {'protocol': 'PRNA2000'}) elm.set_iso_addr(var['$addr'], {'protocol': 'PRNA2000'})
else: else:
elm.set_iso_addr(var['$addr'], {}) elm.set_iso_addr(var['$addr'], {})
@ -707,7 +707,7 @@ def proc_line( l, elm ):
mod_utils.clearScreen() mod_utils.clearScreen()
return return
if l.startswith("init"): if len(l) > 2 and l[0:3] in ["ini", "can", "slo", "fas"]::
run_init_function(l, elm) run_init_function(l, elm)
return return
elif l in macro.keys(): elif l in macro.keys():
@ -859,7 +859,7 @@ def main():
f.close() f.close()
if auto_macro != '': if auto_macro != '':
if auto_macro.startswith("init"): if len(auto_macro) > 2 and auto_macro[0:3] in ["ini", "can", "slo", "fas"]:
run_init_function(auto_macro, elm) run_init_function(auto_macro, elm)
elif auto_macro in macro.keys(): elif auto_macro in macro.keys():
play_macro( auto_macro, elm ) play_macro( auto_macro, elm )