|
@@ -274,7 +274,7 @@ class MASTER_FX():
|
|
|
|
|
|
def _init(self):
|
|
|
self._shuffle()
|
|
|
- for i,v in enumerate(self.old_offsets):
|
|
|
+ for i,_ in enumerate(self.old_offsets):
|
|
|
offset = self.old_offsets[i]
|
|
|
self.offsets[i] = offset
|
|
|
self.init = 0
|
|
@@ -621,7 +621,6 @@ class DMXCH(object):
|
|
|
|
|
|
def flash_fx(self,xtype="sinus",size=40,speed=40,invert=0,width=100,start=0,offset=0,base="",clock=0,master=None):
|
|
|
if str(xtype).lower() == "off":
|
|
|
- fx_value = self._fx_value
|
|
|
self._flash_fx = None
|
|
|
self._flash_fx_value = 0
|
|
|
else:
|
|
@@ -750,11 +749,6 @@ class VDMX():
|
|
|
def __init__(self):
|
|
|
self.data = OrderedDict()
|
|
|
self.data[4] = {"DMX":[21,22,23],"VALUE":255, "LIMIT":255} #,"DMXCH":DMXCH("V4")}
|
|
|
- for k,v in self.data.items():
|
|
|
- pass
|
|
|
- #dmxch = v["DMXCH"]
|
|
|
- #dmxch.fade(10,0)
|
|
|
- #dmxch.fx(size=200,speed=200,base="-") #self,xtype="sinus",size=40,speed=40,invert=0,width=100,start=0,offset=0,base="", clock=0,master=None):
|
|
|
|
|
|
def _list_by_dmx(self,_dmx=0):
|
|
|
data = OrderedDict()
|
|
@@ -838,7 +832,7 @@ class HTP_MASTER():
|
|
|
val=0
|
|
|
flag = 0
|
|
|
data = self._list_by_dmx(dmx)
|
|
|
- for i,link in data.items():
|
|
|
+ for _,link in data.items():
|
|
|
|
|
|
#print("master_by_dmx", i,link)
|
|
|
if link["VALUE"] > val:
|
|
@@ -883,7 +877,6 @@ class Core():
|
|
|
cprint("Exception v*vv",[v,vv],e)
|
|
|
continue
|
|
|
|
|
|
- vf = int(v%1*255)
|
|
|
dmx_fine = dmx_fine%512
|
|
|
try:
|
|
|
if v >= 255:
|
|
@@ -914,8 +907,7 @@ class Core():
|
|
|
def artnete_init(self,Bdmx):
|
|
|
"""Init artnet if not exist's
|
|
|
"""
|
|
|
- for ii,dmxch in enumerate(Bdmx):
|
|
|
- i = ii%512
|
|
|
+ for ii,_ in enumerate(Bdmx):
|
|
|
univ = ii//512
|
|
|
if str(univ) not in self.artnet:
|
|
|
print("add uiv",univ)
|
|
@@ -949,7 +941,7 @@ class Core():
|
|
|
|
|
|
self.lock.release_lock()
|
|
|
|
|
|
- for k,artnet in self.artnet.items():
|
|
|
+ for _,artnet in self.artnet.items():
|
|
|
artnet.next()
|
|
|
|
|
|
time.sleep(1/30)
|
|
@@ -1307,17 +1299,13 @@ def JCB(data,sock=None): #json client input
|
|
|
|
|
|
c = clock.time()
|
|
|
c = float(c)
|
|
|
- ftime = 0
|
|
|
- delay = 0
|
|
|
out = {}
|
|
|
- line=""
|
|
|
-
|
|
|
|
|
|
process_flash(jdatas)
|
|
|
calc_jitter(jdatas,t_start)
|
|
|
|
|
|
for cmds in jdatas:
|
|
|
- master_fx = MASTER_FX()
|
|
|
+ #master_fx = MASTER_FX()
|
|
|
out = _parse_cmds(cmds,clock=c)
|
|
|
|
|
|
line_count = 0
|