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

add cropper.js

Browse Source
This commit is contained in:
Sam 2024-08-15 18:52:07 +02:00
parent c55e0aa6c7
commit a9a89f86c5
4 changed files with 3632 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LJ.conf
View File

@ -2,7 +2,7 @@
lasernumber = 1 lasernumber = 1
debug = 0 debug = 0
rediserverip = 0.0.0.0 rediserverip = 0.0.0.0
wwwip = 192.168.2.43 wwwip = 192.168.1.14
nozoscip = 127.0.0.1 nozoscip = 127.0.0.1
oscserverip = 127.0.0.1 oscserverip = 127.0.0.1
autostart = artnet autostart = artnet
@ -12,9 +12,9 @@ wsport = 9001
[laser0] [laser0]
color = -1 color = -1
type = LOCAL type = LOCAL
dac_family = helios dac_family = etherdream
ip = 127.0.0.1 ip = 127.0.0.1
kpps = 194 kpps = 10000
centerx = 7.0 centerx = 7.0
centery = 61.0 centery = 61.0
zoomx = 312.0 zoomx = 312.0

4
libs3/commands.py
View File

@ -58,6 +58,7 @@ lsteps is a string like "[ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]"
6 : Max Intensity Change = reread redis key /intensity 6 : Max Intensity Change = reread redis key /intensity
7 : kpps change = reread redis key /kpps 7 : kpps change = reread redis key /kpps
8 : color balance change = reread redis keys /red /green /blue 8 : color balance change = reread redis keys /red /green /blue
9 : shutdown
/planet will be forwarded to planetarium client. /planet will be forwarded to planetarium client.
/nozoid will be forwarded to nozoid client. /nozoid will be forwarded to nozoid client.
@ -685,9 +686,11 @@ def UpdateAllwww():
def isOpen(ip): def isOpen(ip):
dacksock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) dacksock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
dacksock.settimeout(1) dacksock.settimeout(1)
istate = False istate = False
try: try:
dacksock.connect((ip, 7765)) dacksock.connect((ip, 7765))
#s.shutdown(2) #s.shutdown(2)
@ -742,6 +745,7 @@ def LJautokill():
r.set('/lack/'+str(laserid),64) r.set('/lack/'+str(laserid),64)
r.set('/lstt/'+str(laserid),64) r.set('/lstt/'+str(laserid),64)
r.set('/cap/'+str(laserid),0) r.set('/cap/'+str(laserid),0)
log.infog("LJ stopped.") log.infog("LJ stopped.")

3624
www/cropper.js Executable file
View File

File diff suppressed because it is too large Load Diff