diff --git a/LJ.conf b/LJ.conf index c87de98..45891e5 100644 --- a/LJ.conf +++ b/LJ.conf @@ -1,9 +1,9 @@ [General] lasernumber = 4 debug = 0 -ljayserverip = 127.0.0.1 +ljayserverip = 192.168.2.13 nozoscip = 127.0.0.1 -bhoroscip = 127.0.0.1 +bhoroscip = 192.168.2.13 [laser0] color = -1 diff --git a/cli.py b/cli.py index 6179cfb..ea29177 100644 --- a/cli.py +++ b/cli.py @@ -114,7 +114,7 @@ def handle(): if args.bhoroscIP != None: gstt.oscIPin = args.bhoroscIP else: - gstt.oscIPin = '127.0.0.1' + gstt.oscIPin = gstt.LjayServerIP if args.nozoidIP != None: gstt.nozoscIP = args.nozoidIP diff --git a/main.py b/main.py index 446ac9b..1310df7 100755 --- a/main.py +++ b/main.py @@ -112,6 +112,8 @@ wsPORT = 9001 # OSC Server : accept OSC message on port 8002 #oscIPin = "192.168.1.10"s extoscIPin = serverIP + +print "extoscIPin", extoscIPin extoscPORTin = 8002 # OSC Client : to send OSC message to an IP port 8001 diff --git a/plugins/VJing/idiotia.py b/plugins/VJing/idiotia.py index c1298c8..0518489 100644 --- a/plugins/VJing/idiotia.py +++ b/plugins/VJing/idiotia.py @@ -340,8 +340,9 @@ def Starfield(hori=0,verti=0): lj3.DrawPL(3) -def OSCidiotia(address, value): - print("Pose bank idiotia got", address, "with value", value) +def OSCidiotia(address,value): + print("idiotia",address,value) + def OSCfield(address, value): @@ -401,6 +402,10 @@ anims =[[],[],[],[]] color = lj3.rgb2int(255,255,255) + + + + prepareIdiotIA() #prepareSTARFIELD() diff --git a/plugins/VJing/lj3.py b/plugins/VJing/lj3.py index 3060693..5f54c26 100644 --- a/plugins/VJing/lj3.py +++ b/plugins/VJing/lj3.py @@ -52,8 +52,8 @@ from osc4py3 import oscbuildparse from osc4py3.oscmethod import * -redisIP = '127.0.0.1' -r = redis.StrictRedis(host=redisIP, port=6379, db=0) +#redisIP = '127.0.0.1' +#r = redis.StrictRedis(host=redisIP, port=6379, db=0) ClientNumber = 0 @@ -230,6 +230,7 @@ def Config(redisIP,client): r = redis.StrictRedis(host=redisIP, port=6379, db=0) ClientNumber = client osc_udp_client(redisIP, 8002, "LJ 8002") + return r def LjClient(client): diff --git a/plugins/laserglyph.py b/plugins/laserglyph.py index 5a50844..b8eb391 100644 --- a/plugins/laserglyph.py +++ b/plugins/laserglyph.py @@ -21,6 +21,7 @@ from osc4py3 import oscbuildparse from osc4py3.oscmethod import * OSCinPort = 8004 +myIP = "192.168.2.52" print ("") print ("Arguments parsing if needed...") @@ -49,6 +50,7 @@ if args.redisIP != None: else: redisIP = '127.0.0.1' +print("redisIP",redisIP) if args.verbose: debug = args.verbose @@ -56,9 +58,9 @@ else: debug = 0 -lj3.Config(redisIP,ljclient) - +r = lj3.Config(redisIP,ljclient) +print("r :",r) width = 800 height = 600 centerX = width / 2 @@ -159,12 +161,12 @@ def Run(): Left = [] Right = [] counter =0 - WebStatus("LaserGlyph") + lj3.WebStatus("LaserGlyph") # OSC Server callbacks - print("Starting OSC at 127.0.0.1 port",OSCinPort,"...") + print("Starting OSC at",myIP," port",OSCinPort,"...") osc_startup() - osc_udp_server("127.0.0.1", OSCinPort, "InPort") + osc_udp_server(myIP, OSCinPort, "InPort") osc_method("/ping*", lj3.OSCping) osc_method("/glyph/ljclient", OSCljclient) @@ -227,7 +229,7 @@ def Run(): finally: - WebStatus("Glyph Exit") + lj3.WebStatus("Glyph Exit") print("Stopping OSC...") lj3.OSCstop() pass diff --git a/plugins/lj3.py b/plugins/lj3.py index 3060693..5f54c26 100644 --- a/plugins/lj3.py +++ b/plugins/lj3.py @@ -52,8 +52,8 @@ from osc4py3 import oscbuildparse from osc4py3.oscmethod import * -redisIP = '127.0.0.1' -r = redis.StrictRedis(host=redisIP, port=6379, db=0) +#redisIP = '127.0.0.1' +#r = redis.StrictRedis(host=redisIP, port=6379, db=0) ClientNumber = 0 @@ -230,6 +230,7 @@ def Config(redisIP,client): r = redis.StrictRedis(host=redisIP, port=6379, db=0) ClientNumber = client osc_udp_client(redisIP, 8002, "LJ 8002") + return r def LjClient(client): diff --git a/plugins/planetarium/lj3.py b/plugins/planetarium/lj3.py index 115f2db..22cb4af 100644 --- a/plugins/planetarium/lj3.py +++ b/plugins/planetarium/lj3.py @@ -28,8 +28,8 @@ from osc4py3.as_eventloop import * from osc4py3 import oscbuildparse -redisIP = '127.0.0.1' -r = redis.StrictRedis(host=redisIP, port=6379, db=0) +#redisIP = '127.0.0.1' +#r = redis.StrictRedis(host=redisIP, port=6379, db=0) ClientNumber = 0 @@ -67,7 +67,7 @@ def SendLJ(oscaddress,oscargs=''): # Answer to LJ pings def OSCping(value): - + print("I got /ping with value", value) SendLJ("/pong",value) diff --git a/webui/LJ.js b/webui/LJ.js index 5b3de27..305b978 100644 --- a/webui/LJ.js +++ b/webui/LJ.js @@ -204,7 +204,7 @@ var pl = ""; var pl2 = new Array(); var _WS = { - uri: 'ws://127.0.0.1:9001/', + uri: 'ws://192.168.2.13:9001/', ws: null, init : function (e) {