lapin
/
LJ
forked from protonphoton/LJ
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sonoptik preconf

This commit is contained in:
Your Name 2020-10-04 20:43:54 +02:00
parent f973c910aa
commit ebfb47932e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LJ.conf
View File

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

2
ethertools/watch.py
View File

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

4
plugins/aurora/aurora.py
View File

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