diff --git a/LJ.conf b/LJ.conf index 54ad009..e09573b 100644 --- a/LJ.conf +++ b/LJ.conf @@ -1,6 +1,6 @@ [General] lasernumber = 1 -debug = 2 +debug = 1 rediserverip = 0.0.0.0 wwwip = 192.168.2.43 nozoscip = 127.0.0.1 @@ -14,18 +14,18 @@ dac_family = helios color = -1 type = DS1000 ip = 127.0.0.1 -kpps = 4615 +kpps = 31921 intens = 255.0 red = 100 green = 100 blue = 100 -centerx = -18940.600341796875 -centery = 19426.399658203125 -zoomx = 14.4375 -zoomy = 14.625 +centerx = -21504.0 +centery = 21000.0 +zoomx = 48.0 +zoomy = 47.4375 sizex = 32000.0 sizey = 32000.0 -finangle = 2.1467549799530254 +finangle = 3.246312408709453 swapx = -1 swapy = -1 lsteps = [ (1.0, 1),(0.25, 1), (0.75, 1), (1.0, 1)] diff --git a/libs3/commands.py b/libs3/commands.py index c9adc5d..96f1bfd 100644 --- a/libs3/commands.py +++ b/libs3/commands.py @@ -456,7 +456,17 @@ def handler(oscpath, args): laser = int(oscpath[3]) #print "args[0] :",args[0]," ", type(args[0]) + + # /black/lasernumber value (0 or 1) + if oscpath[1] == "black": + if args[0] == "1": + print("Black requested for laser ", laser) + BlackOn(laser) + else: + print("User mode for laser ", laser) + UserOn(laser) + # /grid/lasernumber value (0 or 1) if oscpath[1] == "grid":