protonphoton/LJ
7
0
Fork 1
Code Issues Pull requests 1 Releases Wiki Activity

tracer shutdown order

Browse source
This commit is contained in:
Sam 2023-07-09 16:09:18 +02:00
parent 23a07470e6
commit e45ab18f5d
14 changed files with 80 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/aurora/aurora.py
View file

@ -228,7 +228,7 @@ args = argsparser.parse_args()
if args.verbose:
debug = args.verbose
else:
debug = 0
debug = 1
if args.scene:
ljscene = args.scene
@ -372,13 +372,12 @@ def OSChandler(path, tags, args, source):
#print()
print("Aurora default OSC Handler : " + str(path) + " from Client : " + str(source[0]))
#print(args)
if len(args) > 0:
pass
# OSC ui connection
if path.find("/connect") :
print("OSCUI asked by", source)
if path.find("/connect") == 0:
print("Aurora : OSCUI asked by", source)
gstt.TouchOSCUI = True
gstt.TouchOSCIP= source[0]
beatstepUI()
@ -403,10 +402,10 @@ def OSChandler(path, tags, args, source):
#log.info("with args " + str(args))
# /aurora/fx/layernumber FXname
if path.find('/aurora/fx') == 0:
if int(path.find('/aurora/fx')) == 0:
#print("path", path, 'args', args)
#print("layer", path[11:12])
print("Aurora FX got : path", path, 'args', args)
print("Aurora layer", path[11:12])
layer = int(path[11:12])
if layer <= lasernumber-1:
@ -418,15 +417,16 @@ def OSChandler(path, tags, args, source):
lj.SendLJ("/line1",[fx])
midix.SendUI('/status', [fx])
else:
print("unknwon FX.")
print("Aurora : unknwon FX.")
else:
print("NOT POSSIBLE : only", lasernumber,"laser requested at startup")
print("Aurora : NOT POSSIBLE : only", lasernumber,"laser requested at startup")
lj.SendLJ("/line1",str(lasernumber)+ " Laser")
# /aurora/color/layernumber colorname
if path.find('/aurora/color') == 0:
print()
#if args[1] =='1':
layer = int(path[14:15])
if layer <= lasernumber-1:
@ -434,7 +434,7 @@ def OSChandler(path, tags, args, source):
Layer[layer]['color'] = eval(color)
print("Aurora default OSc for Layer", layer,Layer[layer]['FX'], "Got color change to", color)
else:
print("NOT POSSIBLE : only", lasernumber,"laser requested at startup")
print("Aurora : NOT POSSIBLE : only", lasernumber,"laser requested at startup")
lj.SendLJ("/line1",str(lasernumber)+ " Laser")
# [0,1] or [0,127]
@ -513,7 +513,7 @@ def OSChandler(path, tags, args, source):
# /aurora/scim
if path.find('/aurora/scim') == 0:
print("OSC default got /scim",int(args[0]))
print("Aurora OSC : /scim",int(args[0]))
#lj.SendLJ("/scim", [int(args[0])+24])
# /aurora/poses layer number
@ -1116,6 +1116,7 @@ def AllFX():
anim.Onefield(LAY, StarFields[l], hori=0, verti=0)
elif LAY['FX'] == "anim.Trckr":
#print("Aurora FX anim.Trckr for laser ",l, " points ",TrckrPts[l])
anim.Trckr(LAY, TrckrPts[l])
elif LAY['FX'] == "anim.Word":
@ -1214,6 +1215,7 @@ prepareStarfield()
prepareTrckr()
currentPose = 0
lj.WebStatus("Init Poses...")
anim.debug = debug
anim.preparePoses(currentPose)
log.info("Starting OSC server at " + str(gstt.myIP)+ " port "+ str(OSCinPort)+ " ...")