diff --git a/LJ.conf b/LJ.conf
index 17a495d..406ea9c 100644
--- a/LJ.conf
+++ b/LJ.conf
@@ -12,10 +12,10 @@ color = -1
type = DS1000
ip = 192.168.2.44
kpps = 25000
-centerx = 0
-centery = 0
-zoomx = 45.0
-zoomy = 45.0
+centerx = -393
+centery = 390
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
finangle = 0.0
@@ -34,8 +34,8 @@ ip = 192.168.2.43
kpps = 25000
centerx = 0
centery = 0
-zoomx = 30.0
-zoomy = 30.0
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
finangle = 0.0
@@ -54,11 +54,11 @@ ip = 192.168.2.6
kpps = 25000
centerx = 0
centery = 0
-zoomx = 85.0
-zoomy = 85.0
+zoomx = 79
+zoomy = 82
sizex = 32000
sizey = 32000
-finangle = 0.0
+finangle = 0.2792526803190927
swapx = -1
swapy = -1
lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
@@ -72,10 +72,10 @@ color = -1
type = LUKE400
ip = 192.168.2.4
kpps = 25000
-centerx = 0
-centery = 0
-zoomx = 45.0
-zoomy = 45.0
+centerx = -3797
+centery = -1
+zoomx = 51.0
+zoomy = 48.0
sizex = 32000
sizey = 32000
finangle = 0.0
diff --git a/LJ_template..conf b/LJ_template..conf
index 90d0b10..f6456f0 100644
--- a/LJ_template..conf
+++ b/LJ_template..conf
@@ -14,8 +14,8 @@ ip = 192.168.2.4
kpps = 25000
centerx = 0
centery = 0
-zoomx = 45.0
-zoomy = 45.0
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
finangle = 0.0
@@ -34,11 +34,11 @@ ip = 192.168.2.43
kpps = 25000
centerx = 0
centery = 0
-zoomx = 30.0
-zoomy = 30.0
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
-finangle = 0
+finangle = 0.0
swapx = -1
swapy = -1
lsteps = [ (1.0, 2),(0.25, 1), (0.75, 1), (1.0, 5)]
@@ -54,8 +54,8 @@ ip = 192.168.2.6
kpps = 25000
centerx = 0
centery = 0
-zoomx = 45.0
-zoomy = 45.0
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
finangle = 0.0
@@ -74,8 +74,8 @@ ip = 192.168.1.5
kpps = 25000
centerx = 0
centery = 0
-zoomx = 45.0
-zoomy = 45.0
+zoomx = 50.0
+zoomy = 50.0
sizex = 32000
sizey = 32000
finangle = 0.0
diff --git a/README.md b/README.md
index 085a400..8a986ec 100644
--- a/README.md
+++ b/README.md
@@ -398,7 +398,7 @@ Try these steps in this order ;
python3 talk3.py -i etherdreamIP
-- You should see "connected to yourLJserverIP" on webUI. If not : LJ is not started / your network configuration is bad / a wrong IP in the configure parameters : python3 configure.py.
+- You should see "connected to yourLJserverIP" on webUI. If not : LJ is not started / reload webpage / your network configuration is bad / a wrong IP in the configure parameters : python3 configure.py.
- Switch to simu page. If you don't see anything : check redis server or your points in redis doesn't respect pointlist formatting (see command reference).
@@ -427,22 +427,23 @@ Use the same syntax if you send your pointlist directly in redis : "/pl/0/0" is
Every point must be : (x,y,color). Color is the hex color like #FFFFFF in decimal. For new laserist : if point A is green and next point B is red, line AB will be red.
-/scale/X/lasernumber value
+/scale/X/lasernumber value (0-200)
-/scale/Y/lasernumber value
+/scale/Y/lasernumber value (0-200)
/swap/X/lasernumber value (0 or 1)
/swap/Y/lasernumber value (0 or 1)
-/angle/lasernumber value : increase/decrease angle correction for given laser by value
+/angle/lasernumber value : angle correction for given laser by value (0-360)
-/loffset/X/lasernumber value : change X offset of given laser by value
+/loffset/X/lasernumber value : change X offset of given laser to value (-32000/32000)
-/loffset/Y/lasernumber value : change Y offset of given laser by value
+/loffset/Y/lasernumber value : change Y offset of given laser to value (-32000/32000)
/kpps/lasernumber value : live change of kpps
+
/intens/lasernumber value : increase/decrease intensity for given laser by value. Needs analog modulation laser
diff --git a/libs3/commands.py b/libs3/commands.py
index 3651580..f0380d7 100644
--- a/libs3/commands.py
+++ b/libs3/commands.py
@@ -16,8 +16,8 @@ UpdateAllwww()
/forwardui "htmlid args"
-/scale/X/lasernumber value
-/scale/Y/lasernumber value
+/scale/X/lasernumber value (0-200)
+/scale/Y/lasernumber value (0-200)
/client or note on < 8 : change client displayed for Current Laser
23 < /noteon < 32 : PL number displayed on webUI simulator
@@ -31,7 +31,7 @@ UpdateAllwww()
/kpps/lasernumber value
Live change of kpps is not implemented in newdac.py. Change will effect next startup.
-/angle/lasernumber value : increase/decrease angle correction for given laser by value
+/angle/lasernumber value : angle correction for given laser by value (0-360)
/intens/lasernumber value : increase/decrease intensity for given laser by value
@@ -43,8 +43,8 @@ lsteps is a string like "[ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]"
/swap/X/lasernumber value (0 or 1)
/swap/Y/lasernumber value (0 or 1)
-/loffset/X/lasernumber value : change X offset of given laser by value
-/loffset/Y/lasernumber value : change Y offset of given laser by value
+/loffset/X/lasernumber value : change X offset of given laser to value (-32000/32000)
+/loffset/Y/lasernumber value : change Y offset of given laser to value (-32000/32000)
/order value : instruct tracer what to do.
@@ -89,7 +89,7 @@ Bob could use /pl/2/0 and /pl/2/1 and Lisa could use /pl/2/2 and /pl/2/3.
"""
-import types, time, socket
+import types, time, socket, math
from libs3 import gstt
import redis
from libs3 import settings, plugins, homographyp,log
@@ -432,7 +432,7 @@ def handler(oscpath, args):
# /angle/lasernumber value
if oscpath[1] == "angle":
print("New Angle modification for laser ", oscpath[2], ":", float(args[0]))
- gstt.finANGLE[laser] += float(args[0])
+ gstt.finANGLE[laser] = math.radians(float(args[0]))
NewEDH(laser)
print("New angle", gstt.finANGLE[laser])
@@ -491,28 +491,30 @@ def handler(oscpath, args):
# /loffset/X/lasernumber value
if oscpath[1] == "loffset" and oscpath[2] == "X":
- print("offset/X laser", laser, "modified to", args[0])
- gstt.centerX[laser] -= int(args[0])
- NewEDH(laser)
+ if -32000 < int(args[0]) < 32000:
+ print("offset/X laser", laser, "modified to", args[0])
+ gstt.centerX[laser] = int(args[0])
+ NewEDH(laser)
# /loffset/Y/lasernumber value
if oscpath[1] == "loffset" and oscpath[2] == "Y":
- print("offset/Y laser", laser, "modified to", args[0])
- gstt.centerY[laser] -= int(args[0])
- NewEDH(laser)
+ if -32000 < int(args[0]) < 32000:
+ print("offset/Y laser", laser, "modified to", args[0])
+ gstt.centerY[laser] = int(args[0])
+ NewEDH(laser)
# /scale/X/lasernumber value
if oscpath[1] == "scale" and oscpath[2] == "X":
- if gstt.zoomX[laser] + int(args[0]) > 0:
- gstt.zoomX[laser] += int(args[0])
+
+ gstt.zoomX[laser] = int(args[0])
print("scale/X laser", laser , "modified to", gstt.zoomX[laser])
NewEDH(laser)
# /scale/Y/lasernumber value
if oscpath[1] == "scale" and oscpath[2] == "Y":
- if gstt.zoomY[laser] + int(args[0]) > 0:
- gstt.zoomY[laser] += int(args[0])
+
+ gstt.zoomY[laser] = int(args[0])
print("scale/Y laser", laser, "modified to", gstt.zoomY[laser])
NewEDH(laser)
diff --git a/www/align.html b/www/align.html
index cc3c4e2..3441aed 100644
--- a/www/align.html
+++ b/www/align.html
@@ -327,7 +327,7 @@
-
+
@@ -346,8 +346,8 @@
-
-
+
+
Angle
Offset X
Offset Y
@@ -360,8 +360,8 @@
-
-
+
+
Intens
Scale X
Scale X
@@ -410,7 +410,7 @@
-
+
@@ -429,9 +429,9 @@
-
-
-
+
+
+
Angle
Offset X
Offset Y
@@ -444,8 +444,8 @@
-
-
+
+
Intens
Scale X
Scale X
@@ -494,7 +494,7 @@
-
+
@@ -511,9 +511,9 @@
-
-
-
+
+
+
Angle
Offset X
Offset Y
@@ -526,8 +526,8 @@
-
-
+
+
Intens
Scale X
Scale X
@@ -576,7 +576,7 @@
-
+
@@ -594,9 +594,9 @@
-
-
-
+
+
+
Angle
Offset X
Offset Y
@@ -609,8 +609,8 @@
-
-
+
+
Intens
Scale X
Scale X