From ebfb47932e92fbea9fddb89acf3c3436fff9507c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 4 Oct 2020 20:43:54 +0200
Subject: [PATCH] sonoptik preconf

---
 LJ.conf                  | 14 +++++++-------
 ethertools/watch.py      |  2 +-
 plugins/aurora/aurora.py |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/LJ.conf b/LJ.conf
index c89997f..669baa9 100644
--- a/LJ.conf
+++ b/LJ.conf
@@ -2,7 +2,7 @@
 lasernumber = 4
 debug = 0
 ljayserverip = 0.0.0.0
-wwwip = 0.0.0.0
+wwwip = 192.168.2.44
 nozoscip = 127.0.0.1
 bhoroscip = 127.0.0.1
 autostart = artnet
@@ -10,7 +10,7 @@ autostart = artnet
 [laser0]
 color = -1
 type = DS1000
-ip = 127.0.0.1
+ip = 192.168.2.3
 kpps = 25000
 centerx = -393
 centery = 390
@@ -30,7 +30,7 @@ warpdest = [[-1500., 1500.],
 [laser1]
 color = -1
 type = LOCAL
-ip = 192.168.2.43
+ip = 192.168.2.5
 kpps = 25000
 centerx = 0
 centery = 0
@@ -54,8 +54,8 @@ ip = 192.168.2.6
 kpps = 20361
 centerx = -3798
 centery = -13079
-zoomx = 61
-zoomy = 60
+zoomx = 73.0
+zoomy = 70.0
 sizex = 32000
 sizey = 32000
 finangle = 0.2792526803190927
@@ -74,8 +74,8 @@ ip = 192.168.2.4
 kpps = 25000
 centerx = 2531
 centery = -1
-zoomx = 85
-zoomy = 70
+zoomx = 85.0
+zoomy = 70.0
 sizex = 32000
 sizey = 32000
 finangle = 0.0
diff --git a/ethertools/watch.py b/ethertools/watch.py
index 9fff745..1250f12 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 <http://www.gnu.org/licenses/>.
 
-import dac
+import dac3 as dac
 
 dac.find_dac()
diff --git a/plugins/aurora/aurora.py b/plugins/aurora/aurora.py
index c2c9996..14835d0 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 (0 by default)",type=int)
+argsparser.add_argument("-s","--scene",help="LJ scene number (1 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 = 0
+    ljscene = 1
 
 # Redis Computer IP
 if args.redisIP  != None: