diff --git a/LJ.conf b/LJ.conf
index 669baa9..0b8d797 100644
--- a/LJ.conf
+++ b/LJ.conf
@@ -2,7 +2,7 @@
lasernumber = 4
debug = 0
ljayserverip = 0.0.0.0
-wwwip = 192.168.2.44
+wwwip = 0.0.0.0
nozoscip = 127.0.0.1
bhoroscip = 127.0.0.1
autostart = artnet
@@ -10,7 +10,7 @@ autostart = artnet
[laser0]
color = -1
type = DS1000
-ip = 192.168.2.3
+ip = 127.0.0.1
kpps = 25000
centerx = -393
centery = 390
@@ -23,14 +23,14 @@ swapx = -1
swapy = -1
lsteps = [ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.],
- [ 1500., 1500.],
- [ 1500.,-1500.],
- [-1500.,-1500.]]
+ [ 1500., 1500.],
+ [ 1500.,-1500.],
+ [-1500.,-1500.]]
[laser1]
color = -1
type = LOCAL
-ip = 192.168.2.5
+ip = 192.168.2.43
kpps = 25000
centerx = 0
centery = 0
@@ -43,19 +43,19 @@ swapx = -1
swapy = -1
lsteps = [ (1.0, 2),(0.25, 1), (0.75, 1), (1.0, 5)]
warpdest = [[-1500., 1500.],
- [ 1500., 1500.],
- [ 1500.,-1500.],
- [-1500.,-1500.]]
+ [ 1500., 1500.],
+ [ 1500.,-1500.],
+ [-1500.,-1500.]]
[laser2]
color = -1
type = LUKE400
ip = 192.168.2.6
-kpps = 20361
-centerx = -3798
-centery = -13079
-zoomx = 73.0
-zoomy = 70.0
+kpps = 25000
+centerx = 0
+centery = 0
+zoomx = 79.0
+zoomy = 82.0
sizex = 32000
sizey = 32000
finangle = 0.2792526803190927
@@ -63,9 +63,9 @@ swapx = -1
swapy = -1
lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.],
- [ 1500., 1500.],
- [ 1500.,-1500.],
- [-1500.,-1500.]]
+ [ 1500., 1500.],
+ [ 1500.,-1500.],
+ [-1500.,-1500.]]
[laser3]
color = -1
@@ -74,8 +74,8 @@ ip = 192.168.2.4
kpps = 25000
centerx = 2531
centery = -1
-zoomx = 85.0
-zoomy = 70.0
+zoomx = 90.0
+zoomy = 75.0
sizex = 32000
sizey = 32000
finangle = 0.0
@@ -83,9 +83,9 @@ swapx = 1
swapy = 1
lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.],
- [ 1500., 1500.],
- [ 1500.,-1500.],
- [-1500.,-1500.]]
+ [ 1500., 1500.],
+ [ 1500.,-1500.],
+ [-1500.,-1500.]]
[plugins]
plugins = {
diff --git a/ethertools/watch.py b/ethertools/watch.py
index 1250f12..9fff745 100755
--- a/ethertools/watch.py
+++ b/ethertools/watch.py
@@ -16,6 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-import dac3 as dac
+import dac
dac.find_dac()
diff --git a/plugins/aurora/aurora.py b/plugins/aurora/aurora.py
index 14835d0..c2c9996 100644
--- a/plugins/aurora/aurora.py
+++ b/plugins/aurora/aurora.py
@@ -213,7 +213,7 @@ log.info('Startup...')
argsparser = argparse.ArgumentParser(description="Aurora for LJ")
argsparser.add_argument("-r","--redisIP",help="IP of the Redis server used by LJ (127.0.0.1 by default) ",type=str)
argsparser.add_argument("-m","--myIP",help="IP to bind (0.0.0.0 by default) ",type=str)
-argsparser.add_argument("-s","--scene",help="LJ scene number (1 by default)",type=int)
+argsparser.add_argument("-s","--scene",help="LJ scene number (0 by default)",type=int)
argsparser.add_argument("-v","--verbose",help="Verbosity level (0 by default)",type=int)
argsparser.add_argument("-L","--Lasers",help="Number of lasers connected (1 by default).",type=int)
argsparser.add_argument('-song',help="Run according to external (LIVE is default)", dest='song', action='store_true')
@@ -231,7 +231,7 @@ else:
if args.scene:
ljscene = args.scene
else:
- ljscene = 1
+ ljscene = 0
# Redis Computer IP
if args.redisIP != None:
diff --git a/www/LJ.js b/www/LJ.js
index 639e743..3720eb0 100644
--- a/www/LJ.js
+++ b/www/LJ.js
@@ -4,7 +4,7 @@
// LJ websocket address. IP will be updated at LJ startup according to LJ.conf wwwIP
- var LJ = 'ws://192.168.2.44:9001/'
+ var LJ = 'ws://0.0.0.0:9001/'
//
diff --git a/www/align.html b/www/align.html
index cd09258..d19caff 100644
--- a/www/align.html
+++ b/www/align.html
@@ -658,7 +658,7 @@