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

different align enhancments

Browse source
This commit is contained in:
sam 2020-10-03 00:15:12 +02:00
parent 39ac8c9960
commit 4b07dfc263
5 changed files with 71 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libs3/commands.py
View file

@ -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)