Browse Source

fix: vpu performence (not jet)

micha 2 years ago
parent
commit
376b816f94
3 changed files with 15 additions and 5 deletions
  1. 7 3
      _console.py
  2. 1 1
      fix_gen.py
  3. 7 1
      vpu/vpu_live.py

+ 7 - 3
_console.py

@@ -666,7 +666,7 @@ class DMXCH(object):
 
 
 Bdmx = []
-for i in range(512*5+1):
+for i in range(512*7+1):
     Bdmx.append( DMXCH(i) )
     #print(type(dmx[i]))
 
@@ -1011,8 +1011,12 @@ def JCB(data): #json client input
                     else:delay=0
 
                     if "DMX-FINE" in x:
-                        Bdmx[DMX]._dmx_fine = int(x["DMX-FINE"])
-                        #cprint("DMX-FINE",Bdmx[DMX],color="blue") 
+                        try:
+                            Bdmx[DMX]._dmx_fine = int(x["DMX-FINE"])
+                            #cprint("DMX-FINE",Bdmx[DMX],color="blue") 
+                        except Exception as e:
+                            cprint(x,color="red")
+                            cprint("except 3455",e,color="red")
 
                     if len(Bdmx) < DMX:
                         continue

+ 1 - 1
fix_gen.py

@@ -42,7 +42,7 @@ univ=2
 #for i in range(9*13): # fixtures
 #for i in range(8+1*12+1): # fixtures
 #for i in range((8*2)+1*(12*2)+1): # fixtures
-for i in range(240): # fixtures
+for i in range(640): # fixtures
     print("====================================")
     rdata='{"DMX": 1, "UNIVERS": 2, "NAME": "VPU_01", "TYPE": "MOVER", "VENDOR": "AYERTON", "ATTRIBUT":{}}'
     jdata = json.loads(rdata,object_pairs_hook=OrderedDict)

+ 7 - 1
vpu/vpu_live.py

@@ -620,9 +620,14 @@ def main():
         data3 = read_dmx(ip)
         data.extend(data3)
 
-        #ip = select_ip(ips,univ=START_UNIV+4)
+        ip = select_ip(ips,univ=START_UNIV+4)
+        data3 = read_dmx(ip)
+        data.extend(data3)
+
+        #ip = select_ip(ips,univ=START_UNIV+5)
         #data3 = read_dmx(ip)
         #data.extend(data3)
+        
         # GRID loop
         try:
             ddd = 1023 #univ 3 512
@@ -662,6 +667,7 @@ def main():
 
                 #print(fix.dmx,rgb,pos)
                 #pygame.draw.circle(window,rgb,(pos[0]+int(pos[2]/2),pos[1]+int(pos[3]/2)),int(pos[3]/2))
+                FUNC = 0
                 if FUNC > 10 and FUNC <= 20: # big dot
                     draw_circle(window,srgb,(spos[0]+int(spos[2]/2),spos[1]+int(spos[3]/2)),int(spos[3]/2))
                 elif FUNC > 20 and FUNC <= 30:#small dot