|
|
@@ -861,16 +861,21 @@ if type(options.videoplayer) is str:
|
|
|
|
|
|
max_videoplayer = 4
|
|
|
dmx_start = options.videoplayer.split(",")
|
|
|
+ univ = 0
|
|
|
for cdmx in dmx_start:
|
|
|
+ if "." in cdmx:
|
|
|
+ univ,cdmx=cdmx.split(".",1)
|
|
|
+
|
|
|
if len(videoplayer) > max_videoplayer:
|
|
|
print("-- videoplayer max count {} !! break".format(max_videoplayer))
|
|
|
break
|
|
|
print("-- videoplayer dmx:",cdmx)
|
|
|
try:
|
|
|
cdmx = int(cdmx)
|
|
|
+ univ = int(univ)
|
|
|
videoplayer.append( PixelMedia(cdmx,_id=_vid) )
|
|
|
_vid += 1
|
|
|
- _tmp = {"DMX":cdmx,"DIM":0,"PAN":127,"TILT":127
|
|
|
+ _tmp = {"DMX":cdmx,"UNIV":univ,"DIM":0,"PAN":127,"TILT":127
|
|
|
,"CONTROL":0,"SEC":10,"VIDEO":"3"
|
|
|
,"RED":255,"GREEN":255,"BLUE":255
|
|
|
,"_time":time.time()
|
|
|
@@ -2253,8 +2258,12 @@ def counter_dmx(COUNTER,dataA):
|
|
|
count["_start"] = int(count["SEC"])
|
|
|
count["_SEC"] = int(count["_start"])
|
|
|
if count["CONTROL"] >= 20 and count["CONTROL"] < 30: # PAUSE COUNTER
|
|
|
+ if count["_RUN"] == 0:
|
|
|
+ print("CONTROL SET TO PAUSE",self)
|
|
|
count["_RUN"] = 0
|
|
|
if count["CONTROL"] >= 30 and count["CONTROL"] < 40: # PLAY COUNTER
|
|
|
+ if count["_RUN"] == 1:
|
|
|
+ print("CONTROL SET TO RUN",self)
|
|
|
count["_RUN"] = 1
|
|
|
|
|
|
|
|
|
@@ -2468,15 +2477,16 @@ def dmx_raw():
|
|
|
ips = read_index()
|
|
|
|
|
|
# ----
|
|
|
- ip = select_ip(ips,univ=1) # univ 1 gobo
|
|
|
+ ip = select_ip(ips,univ=6) # univ 1 gobo
|
|
|
dataA = read_dmx(ip)
|
|
|
# ----
|
|
|
|
|
|
- data = read_dmx_data(ip,ips)
|
|
|
+ #data = read_dmx_data(ip,ips)
|
|
|
|
|
|
|
|
|
if options.countdown:
|
|
|
- counter_dmx(COUNTER,dataA)
|
|
|
+ #counter_dmx(COUNTER,dataA)
|
|
|
+ pass
|
|
|
|
|
|
if len(VIDEO) > 0:
|
|
|
video_dmx(VIDEO,dataA)
|
