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

Black mode bug

Browse Source
This commit is contained in:
Sam 2023-06-03 17:44:15 +02:00
parent cfc7c70d16
commit 6b1b75858f
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LJ.conf
View File

@ -1,6 +1,6 @@
[General] [General]
lasernumber = 1 lasernumber = 1
debug = 2 debug = 1
rediserverip = 0.0.0.0 rediserverip = 0.0.0.0
wwwip = 192.168.2.43 wwwip = 192.168.2.43
nozoscip = 127.0.0.1 nozoscip = 127.0.0.1
@ -14,18 +14,18 @@ dac_family = helios
color = -1 color = -1
type = DS1000 type = DS1000
ip = 127.0.0.1 ip = 127.0.0.1
kpps = 4615 kpps = 31921
intens = 255.0 intens = 255.0
red = 100 red = 100
green = 100 green = 100
blue = 100 blue = 100
centerx = -18940.600341796875 centerx = -21504.0
centery = 19426.399658203125 centery = 21000.0
zoomx = 14.4375 zoomx = 48.0
zoomy = 14.625 zoomy = 47.4375
sizex = 32000.0 sizex = 32000.0
sizey = 32000.0 sizey = 32000.0
finangle = 2.1467549799530254 finangle = 3.246312408709453
swapx = -1 swapx = -1
swapy = -1 swapy = -1
lsteps = [ (1.0, 1),(0.25, 1), (0.75, 1), (1.0, 1)] lsteps = [ (1.0, 1),(0.25, 1), (0.75, 1), (1.0, 1)]

10
libs3/commands.py
View File

@ -456,7 +456,17 @@ def handler(oscpath, args):
laser = int(oscpath[3]) laser = int(oscpath[3])
#print "args[0] :",args[0]," ", type(args[0]) #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) # /grid/lasernumber value (0 or 1)
if oscpath[1] == "grid": if oscpath[1] == "grid":