add cropper.js

LJ.conf

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

libs3/commands.py

@@ -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
 7 : kpps change              = reread redis key /kpps
 8 : color balance change     = reread redis keys /red /green /blue
+9 : shutdown
 
 /planet will be forwarded to planetarium client.
 /nozoid will be forwarded to nozoid client.
@@ -685,9 +686,11 @@ def UpdateAllwww():
 
 
 def isOpen(ip):
+
     dacksock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     dacksock.settimeout(1)
     istate = False
+
     try:
         dacksock.connect((ip, 7765))
         #s.shutdown(2)
@@ -742,6 +745,7 @@ def LJautokill():
         r.set('/lack/'+str(laserid),64)
         r.set('/lstt/'+str(laserid),64)
         r.set('/cap/'+str(laserid),0)
+
     log.infog("LJ stopped.")