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

Compare commits

base: protonphoton:ebfb47932e92fbea9fddb89acf3c3436fff9507c
Branches Tags
protonphoton:master
protonphoton:feature/docker
protonphoton:dev/marc
protonphoton:feat/dac_helios
protonphoton:feature-install
protonphoton:feature-opencv2
..
compare: protonphoton:d951c7442a69b5b5e456c1c9ecd51903814a8c80
Branches Tags
protonphoton:feature/docker
protonphoton:dev/marc
protonphoton:master
protonphoton:feat/dac_helios
protonphoton:feature-install
protonphoton:feature-opencv2

No commits in common. "ebfb47932e92fbea9fddb89acf3c3436fff9507c" and "d951c7442a69b5b5e456c1c9ecd51903814a8c80" have entirely different histories.
ebfb47932e ... d951c7442a

10 changed files with 32 additions and 32 deletions
Show Stats Expand all files Collapse all files

44
LJ.conf
View File

@ -2,7 +2,7 @@
lasernumber = 4 lasernumber = 4
debug = 0 debug = 0
ljayserverip = 0.0.0.0 ljayserverip = 0.0.0.0
wwwip = 192.168.2.44 wwwip = 0.0.0.0
nozoscip = 127.0.0.1 nozoscip = 127.0.0.1
bhoroscip = 127.0.0.1 bhoroscip = 127.0.0.1
autostart = artnet autostart = artnet
@ -10,7 +10,7 @@ autostart = artnet
[laser0] [laser0]
color = -1 color = -1
type = DS1000 type = DS1000
ip = 192.168.2.3 ip = 127.0.0.1
kpps = 25000 kpps = 25000
centerx = -393 centerx = -393
centery = 390 centery = 390
@ -23,14 +23,14 @@ swapx = -1
swapy = -1 swapy = -1
lsteps = [ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)] lsteps = [ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.], warpdest = [[-1500., 1500.],
[ 1500., 1500.], [ 1500., 1500.],
[ 1500.,-1500.], [ 1500.,-1500.],
[-1500.,-1500.]] [-1500.,-1500.]]
[laser1] [laser1]
color = -1 color = -1
type = LOCAL type = LOCAL
ip = 192.168.2.5 ip = 192.168.2.43
kpps = 25000 kpps = 25000
centerx = 0 centerx = 0
centery = 0 centery = 0
@ -43,19 +43,19 @@ swapx = -1
swapy = -1 swapy = -1
lsteps = [ (1.0, 2),(0.25, 1), (0.75, 1), (1.0, 5)] lsteps = [ (1.0, 2),(0.25, 1), (0.75, 1), (1.0, 5)]
warpdest = [[-1500., 1500.], warpdest = [[-1500., 1500.],
[ 1500., 1500.], [ 1500., 1500.],
[ 1500.,-1500.], [ 1500.,-1500.],
[-1500.,-1500.]] [-1500.,-1500.]]
[laser2] [laser2]
color = -1 color = -1
type = LUKE400 type = LUKE400
ip = 192.168.2.6 ip = 192.168.2.6
kpps = 20361 kpps = 25000
centerx = -3798 centerx = 0
centery = -13079 centery = 0
zoomx = 73.0 zoomx = 79.0
zoomy = 70.0 zoomy = 82.0
sizex = 32000 sizex = 32000
sizey = 32000 sizey = 32000
finangle = 0.2792526803190927 finangle = 0.2792526803190927
@ -63,9 +63,9 @@ swapx = -1
swapy = -1 swapy = -1
lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)] lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.], warpdest = [[-1500., 1500.],
[ 1500., 1500.], [ 1500., 1500.],
[ 1500.,-1500.], [ 1500.,-1500.],
[-1500.,-1500.]] [-1500.,-1500.]]
[laser3] [laser3]
color = -1 color = -1
@ -74,8 +74,8 @@ ip = 192.168.2.4
kpps = 25000 kpps = 25000
centerx = 2531 centerx = 2531
centery = -1 centery = -1
zoomx = 85.0 zoomx = 90.0
zoomy = 70.0 zoomy = 75.0
sizex = 32000 sizex = 32000
sizey = 32000 sizey = 32000
finangle = 0.0 finangle = 0.0
@ -83,9 +83,9 @@ swapx = 1
swapy = 1 swapy = 1
lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)] lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]
warpdest = [[-1500., 1500.], warpdest = [[-1500., 1500.],
[ 1500., 1500.], [ 1500., 1500.],
[ 1500.,-1500.], [ 1500.,-1500.],
[-1500.,-1500.]] [-1500.,-1500.]]
[plugins] [plugins]
plugins = { plugins = {

2
ethertools/watch.py
View File

@ -16,6 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import dac3 as dac import dac
dac.find_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 = 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("-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("-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("-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("-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') 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: if args.scene:
ljscene = args.scene ljscene = args.scene
else: else:
ljscene = 1 ljscene = 0
# Redis Computer IP # Redis Computer IP
if args.redisIP != None: if args.redisIP != None:

2
www/LJ.js
View File

@ -4,7 +4,7 @@
// LJ websocket address. IP will be updated at LJ startup according to LJ.conf wwwIP // 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/'
// //

2
www/align.html
View File

@ -658,7 +658,7 @@
<!-- LJ style WS : A nettoyer ! --> <!-- LJ style WS : A nettoyer ! -->
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var _WS = { var _WS = {
uri: LJ, uri: LJ,

2
www/auralls.html
View File

@ -417,7 +417,7 @@
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var pl = ""; var pl = "";

2
www/index.html
View File

@ -231,7 +231,7 @@
<!-- LJ style WS : A nettoyer ! --> <!-- LJ style WS : A nettoyer ! -->
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var _WS = { var _WS = {

2
www/simu.html
View File

@ -197,7 +197,7 @@
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var pl = ""; var pl = "";

2
www/trckr/trckr.html
View File

@ -378,7 +378,7 @@
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var _WS = { var _WS = {
uri: LJ, uri: LJ,

2
www/trckr/trckrcam1.html
View File

@ -378,7 +378,7 @@
<script type="text/javascript"> <script type="text/javascript">
var LJ = 'ws://192.168.2.44:9001/' var LJ = 'ws://0.0.0.0:9001/'
var _WS = { var _WS = {
uri: LJ, uri: LJ,